Mercurial > pidgin.yaz
diff po/en_CA.po @ 10697:9b50ea54f3bb
[gaim-migrate @ 12251]
some i18n love for cvs HEAD also
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 15 Mar 2005 02:04:53 +0000 |
| parents | 581de78cf809 |
| children | 364a2ef907ae |
line wrap: on
line diff
--- a/po/en_CA.po Mon Mar 14 15:48:34 2005 +0000 +++ b/po/en_CA.po Tue Mar 15 02:04:53 2005 +0000 @@ -1,5 +1,5 @@ # Canadian English translation of gaim -# Copyright (C) 2004 Adam Weinberger +# Copyright (C) 2004-2005 Adam Weinberger # This file is distributed under the same licence as the gaim package. # en_CA.po Maintainer: Adam Weinberger <adamw@gnome.org> # @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gaim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-12-02 18:38-0500\n" -"PO-Revision-Date: 2004-11-28 19:45-0400\n" +"POT-Creation-Date: 2005-02-13 21:38-0500\n" +"PO-Revision-Date: 2005-02-13 19:45-0400\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: en_CA <adamw@FreeBSD.org>\n" "MIME-Version: 1.0\n" @@ -17,19 +17,19 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: plugins/autorecon.c:276 +#: plugins/autorecon.c:281 msgid "Error Message Suppression" msgstr "Error Message Suppression" -#: plugins/autorecon.c:280 +#: plugins/autorecon.c:285 msgid "Hide Disconnect Errors" msgstr "Hide Disconnect Errors" -#: plugins/autorecon.c:284 +#: plugins/autorecon.c:289 msgid "Hide Login Errors" msgstr "Hide Login Errors" -#: plugins/autorecon.c:288 +#: plugins/autorecon.c:293 msgid "Hide Reconnecting Dialog" msgstr "Hide Reconnecting Dialogue" @@ -39,7 +39,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/autorecon.c:312 +#: plugins/autorecon.c:317 msgid "Auto-Reconnect" msgstr "Auto-Reconnect" @@ -47,24 +47,25 @@ #. *< version #. * summary #. * description -#: plugins/autorecon.c:315 plugins/autorecon.c:317 +#: plugins/autorecon.c:320 plugins/autorecon.c:322 msgid "When you are kicked offline, this reconnects you." msgstr "When you are kicked offline, this reconnects you." -#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126 +#: plugins/chkmail.c:92 plugins/chkmail.c:114 plugins/chkmail.c:123 msgid "Mail Server" msgstr "Mail Server" -#: plugins/chkmail.c:136 +#. XXX - This needs to use ngettext() +#: plugins/chkmail.c:132 #, c-format msgid "%s (%d new/%d total)" msgstr "%s (%d new/%d total)" -#: plugins/chkmail.c:199 +#: plugins/chkmail.c:194 msgid "Check Mail" msgstr "Check Mail" -#: plugins/chkmail.c:203 +#: plugins/chkmail.c:198 msgid "Check email every X seconds.\n" msgstr "Check email every X seconds.\n" @@ -166,15 +167,16 @@ msgid "New..." msgstr "New..." -#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52 -#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189 -#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:987 -#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811 +#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/protocols/gg/gg.c:52 +#: src/protocols/irc/irc.c:179 src/protocols/irc/msgs.c:189 +#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:994 +#: src/protocols/msn/msn.c:539 src/protocols/novell/novell.c:2811 #: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980 -#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592 -#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883 -#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52 -#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2225 +#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:5742 +#: src/protocols/oscar/oscar.c:6803 src/protocols/oscar/oscar.c:7024 +#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:52 +#: src/protocols/yahoo/yahoo.c:2927 src/protocols/zephyr/zephyr.c:2225 +#: src/status.c:160 msgid "Away" msgstr "Away" @@ -186,15 +188,15 @@ msgid "Mute Sounds" msgstr "Mute Sounds" -#: plugins/docklet/docklet.c:213 src/gtkft.c:628 +#: plugins/docklet/docklet.c:213 src/gtkft.c:621 msgid "File Transfers" msgstr "File Transfers" -#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345 +#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2244 msgid "Accounts" msgstr "Accounts" -#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263 +#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2195 msgid "Preferences" msgstr "Preferences" @@ -206,11 +208,11 @@ msgid "Quit" msgstr "Quit" -#: plugins/docklet/docklet.c:553 +#: plugins/docklet/docklet.c:559 msgid "Tray Icon Configuration" msgstr "Tray Icon Configuration" -#: plugins/docklet/docklet.c:557 +#: plugins/docklet/docklet.c:563 msgid "_Hide new messages until tray icon is clicked" msgstr "_Hide new messages until tray icon is clicked" @@ -220,19 +222,19 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/docklet/docklet.c:583 +#: plugins/docklet/docklet.c:589 msgid "System Tray Icon" msgstr "System Tray Icon" #. *< name #. *< version #. * summary -#: plugins/docklet/docklet.c:586 +#: plugins/docklet/docklet.c:592 msgid "Displays an icon for Gaim in the system tray." msgstr "Displays an icon for Gaim in the system tray." #. * description -#: plugins/docklet/docklet.c:588 +#: plugins/docklet/docklet.c:594 msgid "" "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, " @@ -292,7 +294,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/filectl.c:249 +#: plugins/filectl.c:248 msgid "Gaim File Control" msgstr "Gaim File Control" @@ -300,7 +302,7 @@ #. *< version #. * summary #. * description -#: plugins/filectl.c:252 plugins/filectl.c:254 +#: plugins/filectl.c:251 plugins/filectl.c:253 msgid "Allows you to control Gaim by entering commands in a file." msgstr "Allows you to control Gaim by entering commands in a file." @@ -320,7 +322,7 @@ msgid "Invalid AIM URI" msgstr "Invalid AIM URI" -#: plugins/gaim-remote/remote.c:742 +#: plugins/gaim-remote/remote.c:749 #, c-format msgid "" "Failed to assign %s to a socket:\n" @@ -329,7 +331,7 @@ "Failed to assign %s to a socket:\n" "%s" -#: plugins/gaim-remote/remote.c:765 +#: plugins/gaim-remote/remote.c:773 msgid "Unable to open socket" msgstr "Unable to open socket" @@ -339,19 +341,19 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/gaim-remote/remote.c:815 +#: plugins/gaim-remote/remote.c:823 msgid "Remote Control" msgstr "Remote Control" #. *< name #. *< version #. * summary -#: plugins/gaim-remote/remote.c:818 +#: plugins/gaim-remote/remote.c:826 msgid "Provides remote control for gaim applications." msgstr "Provides remote control for gaim applications." #. * description -#: plugins/gaim-remote/remote.c:820 +#: plugins/gaim-remote/remote.c:828 msgid "" "Gives Gaim the ability to be remote-controlled through third-party " "applications or through the gaim-remote tool." @@ -389,6 +391,76 @@ "- It reverses all incoming text\n" "- It sends a message to people on your list immediately when they sign on" +#: plugins/gaimrc.c:40 +msgid "Cursor Color" +msgstr "Cursor Colour" + +#: plugins/gaimrc.c:41 +msgid "Secondary Cursor Color" +msgstr "Secondary Cursor Colour" + +#: plugins/gaimrc.c:42 +msgid "Hyperlink Color" +msgstr "Hyperlink Colour" + +#: plugins/gaimrc.c:53 +msgid "GtkTreeView Expander Size" +msgstr "GtkTreeView Expander Size" + +#: plugins/gaimrc.c:72 +msgid "Conversation Entry" +msgstr "Conversation Entry" + +#: plugins/gaimrc.c:73 +msgid "Conversation History" +msgstr "Conversation History" + +#: plugins/gaimrc.c:74 +msgid "Log Viewer" +msgstr "Log Viewer" + +#: plugins/gaimrc.c:75 +msgid "Request Dialog" +msgstr "Request Dialogue" + +#: plugins/gaimrc.c:76 +msgid "Notify Dialog" +msgstr "Notify Dialogue" + +#: plugins/gaimrc.c:209 +#, c-format +msgid "Select Color for %s" +msgstr "Select Colour for %s" + +#: plugins/gaimrc.c:211 +msgid "Select Color" +msgstr "Select Colour" + +#: plugins/gaimrc.c:246 +#, c-format +msgid "Select Font for %s" +msgstr "Select Font for %s" + +#: plugins/gaimrc.c:284 +msgid "Select Interface Font" +msgstr "Select Interface Font" + +#: plugins/gaimrc.c:343 +msgid "Gtk interface font" +msgstr "GTK interface font" + +#: plugins/gaimrc.c:362 +msgid "Gtk text shortcut theme" +msgstr "GTK text shortcut theme" + +#: plugins/gaimrc.c:460 +msgid "Gaim GTK+ Theme Control" +msgstr "Gaim GTK+ Theme Control" + +#: plugins/gaimrc.c:462 plugins/gaimrc.c:463 +msgid "Provides access to commonly used gtkrc settings." +msgstr "Provides access to commonly used gtkrc settings." + #. Configuration frame #: plugins/gestures/gestures.c:221 msgid "Mouse Gestures Configuration" @@ -442,9 +514,9 @@ "Drag up and then to the right to switch to the next conversation." #: plugins/gevolution/add_buddy_dialog.c:132 -#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080 -#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606 -#: src/protocols/msn/msn.c:1501 src/protocols/trepia/trepia.c:399 +#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2014 +#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607 +#: src/protocols/msn/msn.c:1455 src/protocols/trepia/trepia.c:399 msgid "Name" msgstr "Name" @@ -459,13 +531,13 @@ #. "Search" #: plugins/gevolution/add_buddy_dialog.c:468 -#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189 +#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7388 msgid "Search" msgstr "Search" #: plugins/gevolution/add_buddy_dialog.c:549 -#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4053 -#: src/gtkblist.c:4402 +#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4281 +#: src/gtkblist.c:4659 msgid "Group:" msgstr "Group:" @@ -504,7 +576,7 @@ msgstr "_Associate Buddy" #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90 -#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3873 +#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4101 #: src/protocols/jabber/roster.c:66 msgid "Buddies" msgstr "Buddies" @@ -523,7 +595,7 @@ msgid "Select all accounts that buddies should be auto-added to." msgstr "Select all accounts that buddies should be auto-added to." -#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:626 +#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:416 msgid "Account" msgstr "Account" @@ -567,8 +639,8 @@ msgstr "Optional information:" #. Label -#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372 -#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583 +#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:377 +#: src/gtkaccount.c:407 src/protocols/oscar/oscar.c:597 msgid "Buddy Icon" msgstr "Buddy Icon" @@ -703,68 +775,68 @@ msgstr "Adds a small box to the buddy list that shows if you have new mail." #. ---------- "Notify For" ---------- -#: plugins/notify.c:599 +#: plugins/notify.c:618 msgid "Notify For" msgstr "Notify For" -#: plugins/notify.c:603 +#: plugins/notify.c:622 msgid "_IM windows" msgstr "_IM windows" -#: plugins/notify.c:610 +#: plugins/notify.c:629 msgid "C_hat windows" msgstr "C_hat windows" -#: plugins/notify.c:617 +#: plugins/notify.c:636 msgid "_Focused windows" msgstr "_Focused windows" #. ---------- "Notification Methods" ---------- -#: plugins/notify.c:625 +#: plugins/notify.c:644 msgid "Notification Methods" msgstr "Notification Methods" -#: plugins/notify.c:632 +#: plugins/notify.c:654 msgid "Prepend _string into window title:" msgstr "Prepend _string into window title:" #. Count method button -#: plugins/notify.c:651 +#: plugins/notify.c:673 msgid "Insert c_ount of new messages into window title" msgstr "Insert c_ount of new messages into window title" #. Urgent method button -#: plugins/notify.c:659 +#: plugins/notify.c:681 msgid "Set window manager \"_URGENT\" hint" msgstr "Set window manager \"_URGENT\" hint" #. ---------- "Notification Removals" ---------- -#: plugins/notify.c:667 +#: plugins/notify.c:689 msgid "Notification Removal" msgstr "Notification Removal" #. Remove on focus button -#: plugins/notify.c:672 +#: plugins/notify.c:694 msgid "Remove when conversation window _gains focus" msgstr "Remove when conversation window _gains focus" #. Remove on click button -#: plugins/notify.c:679 +#: plugins/notify.c:701 msgid "Remove when conversation window _receives click" msgstr "Remove when conversation window _receives click" #. Remove on type button -#: plugins/notify.c:687 +#: plugins/notify.c:709 msgid "Remove when _typing in conversation window" msgstr "Remove when _typing in conversation window" #. Remove on message send button -#: plugins/notify.c:695 +#: plugins/notify.c:717 msgid "Remove when a _message gets sent" msgstr "Remove when a _message gets sent" #. Remove on conversation switch button -#: plugins/notify.c:704 +#: plugins/notify.c:726 msgid "Remove on switch to conversation ta_b" msgstr "Remove on switch to conversation ta_b" @@ -774,7 +846,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/notify.c:794 +#: plugins/notify.c:816 msgid "Message Notification" msgstr "Message Notification" @@ -782,7 +854,7 @@ #. *< version #. * summary #. * description -#: plugins/notify.c:797 plugins/notify.c:799 +#: plugins/notify.c:819 plugins/notify.c:821 msgid "Provides a variety of ways of notifying you of unread messages." msgstr "Provides a variety of ways of notifying you of unread messages." @@ -908,35 +980,35 @@ msgid "Tests to see that most things are working." msgstr "Tests to see that most things are working." -#: plugins/spellchk.c:415 +#: plugins/spellchk.c:417 msgid "Text Replacements" msgstr "Text Replacements" -#: plugins/spellchk.c:439 +#: plugins/spellchk.c:441 msgid "You type" msgstr "You type" -#: plugins/spellchk.c:451 +#: plugins/spellchk.c:453 msgid "You send" msgstr "You send" -#: plugins/spellchk.c:477 +#: plugins/spellchk.c:479 msgid "Add a new text replacement" msgstr "Add a new text replacement" -#: plugins/spellchk.c:484 +#: plugins/spellchk.c:486 msgid "You _type:" msgstr "You _type:" -#: plugins/spellchk.c:498 +#: plugins/spellchk.c:500 msgid "You _send:" msgstr "You _send:" -#: plugins/spellchk.c:540 +#: plugins/spellchk.c:542 msgid "Text replacement" msgstr "Text replacement" -#: plugins/spellchk.c:542 plugins/spellchk.c:543 +#: plugins/spellchk.c:544 plugins/spellchk.c:545 msgid "Replaces text in outgoing messages according to user-defined rules." msgstr "Replaces text in outgoing messages according to user-defined rules." @@ -1074,19 +1146,19 @@ msgid "A horizontal scrolling version of the buddy list." msgstr "A horizontal scrolling version of the buddy list." -#: plugins/timestamp.c:183 +#: plugins/timestamp.c:202 msgid "iChat Timestamp" msgstr "iChat Timestamp" -#: plugins/timestamp.c:190 +#: plugins/timestamp.c:209 msgid "Delay" msgstr "Delay" -#: plugins/timestamp.c:197 +#: plugins/timestamp.c:216 msgid "minutes." msgstr "minutes." -#: plugins/timestamp.c:203 +#: plugins/timestamp.c:222 msgid "_Apply" msgstr "_Apply" @@ -1096,7 +1168,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/timestamp.c:268 +#: plugins/timestamp.c:295 msgid "Timestamp" msgstr "Timestamp" @@ -1104,7 +1176,7 @@ #. *< version #. * summary #. * description -#: plugins/timestamp.c:271 plugins/timestamp.c:273 +#: plugins/timestamp.c:298 plugins/timestamp.c:300 msgid "Adds iChat-style timestamps to conversations every N minutes." msgstr "Adds iChat-style timestamps to conversations every N minutes." @@ -1166,153 +1238,163 @@ "\n" "* Note: This plugin requires Win2000 or WinXP." -#: plugins/win32/winprefs/winprefs.c:344 +#: plugins/win32/winprefs/winprefs.c:320 msgid "GTK+ Runtime Version" msgstr "GTK+ Runtime Version" #. Autostart -#: plugins/win32/winprefs/winprefs.c:352 +#: plugins/win32/winprefs/winprefs.c:328 msgid "Startup" msgstr "Startup" -#: plugins/win32/winprefs/winprefs.c:353 +#: plugins/win32/winprefs/winprefs.c:329 msgid "_Start Gaim on Windows startup" msgstr "_Start Gaim on Windows startup" #. Buddy List -#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3145 -#: src/gtkprefs.c:2178 +#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3377 +#: src/gtkprefs.c:2111 msgid "Buddy List" msgstr "Buddy List" -#: plugins/win32/winprefs/winprefs.c:363 +#: plugins/win32/winprefs/winprefs.c:339 msgid "_Dockable Buddy List" msgstr "_Dockable Buddy List" #. Docked Blist On Top -#: plugins/win32/winprefs/winprefs.c:367 +#: plugins/win32/winprefs/winprefs.c:343 msgid "Docked _Buddy List is always on top" msgstr "Docked _Buddy List is always on top" #. Blist On Top -#: plugins/win32/winprefs/winprefs.c:377 +#: plugins/win32/winprefs/winprefs.c:353 msgid "_Keep Buddy List window on top" msgstr "_Keep Buddy List window on top" #. Conversations -#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910 -#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1838 +#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:867 +#: src/gtkprefs.c:2112 msgid "Conversations" msgstr "Conversations" +#: plugins/win32/winprefs/winprefs.c:359 +msgid "_Flash Window when messages are received" +msgstr "_Flash Window when messages are received" + #: plugins/win32/winprefs/winprefs.c:383 -msgid "_Flash Window when messages are received" -msgstr "_Flash Window when messages are received" - -#: plugins/win32/winprefs/winprefs.c:407 msgid "WinGaim Options" msgstr "WinGaim Options" -#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410 +#: plugins/win32/winprefs/winprefs.c:385 plugins/win32/winprefs/winprefs.c:386 msgid "Options specific to Windows Gaim." msgstr "Options specific to Windows Gaim." -#: src/account.c:294 src/protocols/jabber/jabber.c:1043 +#: src/account.c:532 +msgid "accounts" +msgstr "accounts" + +#: src/account.c:732 src/protocols/jabber/jabber.c:1050 msgid "New passwords do not match." msgstr "New passwords do not match." -#: src/account.c:303 +#: src/account.c:741 msgid "Fill out all fields completely." msgstr "Fill out all fields completely." -#: src/account.c:328 +#: src/account.c:766 msgid "Original password" msgstr "Original password" -#: src/account.c:335 +#: src/account.c:773 msgid "New password" msgstr "New password" -#: src/account.c:342 +#: src/account.c:780 msgid "New password (again)" msgstr "New password (again)" -#: src/account.c:348 +#: src/account.c:786 #, c-format msgid "Change password for %s" msgstr "Change password for %s" -#: src/account.c:356 +#: src/account.c:794 msgid "Please enter your current password and your new password." msgstr "Please enter your current password and your new password." #. * #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons. #. -#: src/account.c:359 src/connection.c:188 src/gtkblist.c:2419 -#: src/gtkdialogs.c:375 src/gtkdialogs.c:518 src/gtkdialogs.c:574 -#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090 -#: 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:3533 -#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976 -#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120 +#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2605 +#: src/gtkdialogs.c:472 src/gtkdialogs.c:615 src/gtkdialogs.c:671 +#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1097 +#: 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:2398 +#: src/protocols/oscar/oscar.c:3650 src/protocols/oscar/oscar.c:3744 +#: src/protocols/oscar/oscar.c:7117 src/protocols/oscar/oscar.c:7242 +#: src/protocols/oscar/oscar.c:7267 src/protocols/oscar/oscar.c:7319 #: 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:1083 -#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717 -#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901 +#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460 +#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083 +#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:706 +#: src/protocols/yahoo/yahoo.c:2650 src/protocols/yahoo/yahoo.c:2659 #: src/request.h:1244 msgid "OK" msgstr "OK" -#: src/account.c:360 src/account.c:398 src/connection.c:189 -#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2420 -#: src/gtkblist.c:4440 src/gtkconn.c:171 src/gtkdialogs.c:376 -#: src/gtkdialogs.c:519 src/gtkdialogs.c:575 src/gtkdialogs.c:673 -#: src/gtkdialogs.c:695 src/gtkdialogs.c:715 src/gtkdialogs.c:751 -#: src/gtkdialogs.c:813 src/gtkdialogs.c:855 src/gtkdialogs.c:893 -#: src/gtkimhtmltoolbar.c:440 src/gtkprivacy.c:588 src/gtkprivacy.c:601 -#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260 -#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772 -#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:1091 -#: 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:1534 src/protocols/oscar/oscar.c:3491 -#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571 -#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977 -#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121 -#: src/protocols/oscar/oscar.c:7190 src/protocols/silc/buddy.c:461 +#: src/account.c:798 src/account.c:836 src/connection.c:188 +#: src/gtkaccount.c:1989 src/gtkaccount.c:2404 src/gtkblist.c:2606 +#: src/gtkblist.c:4697 src/gtkdialogs.c:473 src/gtkdialogs.c:616 +#: src/gtkdialogs.c:672 src/gtkdialogs.c:770 src/gtkdialogs.c:792 +#: src/gtkdialogs.c:812 src/gtkdialogs.c:856 src/gtkdialogs.c:918 +#: src/gtkdialogs.c:960 src/gtkdialogs.c:998 src/gtkimhtmltoolbar.c:443 +#: src/gtkprivacy.c:585 src/gtkprivacy.c:598 src/gtkprivacy.c:623 +#: src/gtkprivacy.c:634 src/gtkrequest.c:260 src/gtksavedstatuses.c:188 +#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:774 +#: src/protocols/jabber/jabber.c:676 src/protocols/jabber/jabber.c:1098 +#: 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:1580 src/protocols/oscar/oscar.c:2399 +#: src/protocols/oscar/oscar.c:3608 src/protocols/oscar/oscar.c:3651 +#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3745 +#: src/protocols/oscar/oscar.c:7118 src/protocols/oscar/oscar.c:7243 +#: src/protocols/oscar/oscar.c:7268 src/protocols/oscar/oscar.c:7320 +#: src/protocols/oscar/oscar.c:7389 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:1690 src/protocols/silc/silc.c:718 -#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893 -#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254 +#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724 +#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:707 +#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2651 +#: src/protocols/yahoo/yahoo.c:2660 src/request.h:1244 src/request.h:1254 msgid "Cancel" msgstr "Cancel" -#: src/account.c:389 +#: src/account.c:827 #, c-format msgid "Change user information for %s" msgstr "Change user information for %s" -#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564 +#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564 #: src/protocols/trepia/trepia.c:347 msgid "Save" msgstr "Save" -#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621 -#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081 +#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:623 +#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/buddy.c:1083 #: src/protocols/novell/novell.c:2823 msgid "Unknown" msgstr "Unknown" -#: src/blist.c:681 +#: src/blist.c:544 +msgid "buddy list" +msgstr "buddy list" + +#: src/blist.c:1132 msgid "Chats" msgstr "Chats" -#: src/blist.c:1352 +#: src/blist.c:1813 #, c-format msgid "" "%d buddy from group %s was not removed because its account was not logged " @@ -1327,40 +1409,32 @@ "%d buddies from group %s were not removed because their accounts were not " "logged in. These buddies and the group were not removed.\n" -#: src/blist.c:1361 +#: src/blist.c:1822 msgid "Group not removed" msgstr "Group not removed" -#: src/blist.c:2064 -msgid "" -"An error was encountered parsing your buddy list. It has not been loaded, " -"and the old file has moved to blist.xml~." -msgstr "" -"An error was encountered parsing your buddy list. It has not been loaded, " -"and the old file has moved to blist.xml~." - -#: src/blist.c:2067 -msgid "Buddy List Error" -msgstr "Buddy List Error" - -#: src/connection.c:112 src/connection.c:161 +#: src/connection.c:113 src/connection.c:159 #, c-format msgid "Missing protocol plugin for %s" msgstr "Missing protocol plugin for %s" -#: src/connection.c:116 +#: src/connection.c:117 msgid "Registration Error" msgstr "Registration Error" -#: src/connection.c:165 +#: src/connection.c:163 msgid "Connection Error" msgstr "Connection Error" -#: src/connection.c:185 +#: src/connection.c:183 #, c-format msgid "Enter password for %s (%s)" msgstr "Enter password for %s (%s)" +#: src/connection.c:185 +msgid "Enter Password" +msgstr "Enter Password" + #: src/conversation.c:236 msgid "Unable to send message: The message is too large." msgstr "Unable to send message: The message is too large." @@ -1383,67 +1457,67 @@ msgid "Unable to send messge to %s." msgstr "Unable to send messge to %s." -#: src/conversation.c:2005 +#: src/conversation.c:2052 #, c-format msgid "%s entered the room." msgstr "%s entered the room." -#: src/conversation.c:2008 +#: src/conversation.c:2055 #, c-format msgid "%s [<I>%s</I>] entered the room." msgstr "%s [<I>%s</I>] entered the room." -#: src/conversation.c:2104 +#: src/conversation.c:2151 #, c-format msgid "You are now known as %s" msgstr "You are now known as %s" -#: src/conversation.c:2107 +#: src/conversation.c:2154 #, c-format msgid "%s is now known as %s" msgstr "%s is now known as %s" -#: src/conversation.c:2148 +#: src/conversation.c:2195 #, c-format msgid "%s left the room (%s)." msgstr "%s left the room (%s)." -#: src/conversation.c:2150 +#: src/conversation.c:2197 #, c-format msgid "%s left the room." msgstr "%s left the room." -#: src/conversation.c:2219 +#: src/conversation.c:2270 #, c-format msgid "(+%d more)" msgstr "(+%d more)" -#: src/conversation.c:2221 +#: src/conversation.c:2272 #, c-format msgid " left the room (%s)." msgstr " left the room (%s)." -#: src/conversation.c:2626 +#: src/conversation.c:2677 msgid "Last created window" msgstr "Last created window" -#: src/conversation.c:2628 +#: src/conversation.c:2679 msgid "Separate IM and Chat windows" msgstr "Separate IM and Chat windows" -#: src/conversation.c:2630 src/gtkprefs.c:1287 +#: src/conversation.c:2681 src/gtkprefs.c:1221 msgid "New window" msgstr "New window" -#: src/conversation.c:2632 +#: src/conversation.c:2683 msgid "By group" msgstr "By group" -#: src/conversation.c:2634 +#: src/conversation.c:2685 msgid "By account" msgstr "By account" -#: src/ft.c:148 src/protocols/msn/msn.c:370 +#: src/ft.c:148 src/protocols/msn/msn.c:368 #, c-format msgid "" "Error reading %s: \n" @@ -1483,17 +1557,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" -#: src/ft.c:260 +#: src/ft.c:261 #, c-format msgid "%s wants to send you %s (%s)" msgstr "%s wants to send you %s (%s)" -#: src/ft.c:302 +#: src/ft.c:269 +#, c-format +msgid "%s wants to send you a file" +msgstr "%s wants to send you a file" + +#: src/ft.c:308 #, c-format msgid "Accept file transfer request from %s?" msgstr "Accept file transfer request from %s?" -#: src/ft.c:306 +#: src/ft.c:312 #, c-format msgid "" "A file is available for download from:\n" @@ -1504,37 +1583,50 @@ "Remote host: %s\n" "Remote port: %d" -#: src/ft.c:359 +#: src/ft.c:365 #, c-format msgid "%s is not a valid filename.\n" msgstr "%s is not a valid filename.\n" -#: src/ft.c:377 +#: src/ft.c:383 #, c-format msgid "Offering to send %s to %s" msgstr "Offering to send %s to %s" -#: src/ft.c:870 -#, c-format -msgid "Transfer of %s complete" -msgstr "Transfer of %s complete" - -#: src/ft.c:918 +#: src/ft.c:877 +#, c-format +msgid "Transfer of file %s complete" +msgstr "Transfer of file %s complete" + +#: src/ft.c:880 +msgid "File transfer complete" +msgstr "File transfer complete" + +#: src/ft.c:929 #, c-format msgid "You canceled the transfer of %s" msgstr "You cancelled the transfer of %s" -#: src/ft.c:970 +#: src/ft.c:935 +msgid "File transfer cancelled" +msgstr "File transfer cancelled" + +#: src/ft.c:988 #, c-format msgid "%s canceled the transfer of %s" msgstr "%s cancelled the transfer of %s" -#: src/ft.c:1020 +#: src/ft.c:994 +#, c-format +msgid "%s canceled the file transfer" +msgstr "%s cancelled the file transfer" + +#: src/ft.c:1043 #, c-format msgid "File transfer to %s aborted.\n" msgstr "File transfer to %s aborted.\n" -#: src/ft.c:1022 +#: src/ft.c:1045 #, c-format msgid "File transfer from %s aborted.\n" msgstr "File transfer from %s aborted.\n" @@ -1545,11 +1637,12 @@ "Usage: %s command [OPTIONS] [URI]\n" "\n" " COMMANDS:\n" +" send Send message\n" " uri Handle AIM: URI\n" " away Popup the away dialog with the default " "message\n" " back Remove the away dialog\n" -" send Send message\n" +" logout Log out all accounts\n" " quit Close running copy of Gaim\n" "\n" " OPTIONS:\n" @@ -1564,11 +1657,12 @@ "Usage: %s command [OPTIONS] [URI]\n" "\n" " COMMANDS:\n" +" send Send message\n" " uri Handle AIM: URI\n" -" away Pop up the away dialogue with the default " +" away Popup the away dialogue with the default " "message\n" " back Remove the away dialogue\n" -" send Send message\n" +" logout Log out all accounts\n" " quit Close running copy of Gaim\n" "\n" " OPTIONS:\n" @@ -1580,7 +1674,7 @@ " -s, --session=SESSION Specify which Gaim session to use\n" " -h, --help [command] Show help for command\n" -#: src/gaim-remote.c:193 +#: src/gaim-remote.c:195 #, c-format msgid "" "Gaim not running (on session %d)\n" @@ -1589,7 +1683,7 @@ "Gaim not running (on session %d)\n" "Is the \"Remote Control\" plugin loaded?\n" -#: src/gaim-remote.c:280 +#: src/gaim-remote.c:282 msgid "" "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments " "greater than 9999 chars\n" @@ -1597,7 +1691,7 @@ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments " "greater than 9999 chars\n" -#: src/gaim-remote.c:291 +#: src/gaim-remote.c:293 msgid "" "\n" "Using AIM: URIs:\n" @@ -1639,7 +1733,15 @@ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n" "...prompts you to add 'Penguin' to your buddy list.\n" -#: src/gaim-remote.c:311 +#: src/gaim-remote.c:313 +msgid "" +"\n" +"Log out all accounts\n" +msgstr "" +"\n" +"Log out all accounts\n" + +#: src/gaim-remote.c:317 msgid "" "\n" "Close running copy of Gaim\n" @@ -1647,7 +1749,7 @@ "\n" "Close running copy of Gaim\n" -#: src/gaim-remote.c:315 +#: src/gaim-remote.c:321 msgid "" "\n" "Mark all accounts as \"away\" with the default message.\n" @@ -1655,7 +1757,7 @@ "\n" "Mark all accounts as \"away\" with the default message.\n" -#: src/gaim-remote.c:319 +#: src/gaim-remote.c:325 msgid "" "\n" "Set all accounts as not away.\n" @@ -1663,7 +1765,7 @@ "\n" "Set all accounts as not away.\n" -#: src/gaim-remote.c:323 +#: src/gaim-remote.c:329 msgid "" "\n" "Send instant message\n" @@ -1671,7 +1773,7 @@ "\n" "Send instant message\n" -#: src/gtkaccount.c:325 +#: src/gtkaccount.c:329 #, c-format msgid "" "<b>File:</b> %s\n" @@ -1683,186 +1785,161 @@ "<b>Image size:</b> %dx%d" #. Build the login options frame. -#: src/gtkaccount.c:625 +#: src/gtkaccount.c:652 msgid "Login Options" msgstr "Login Options" -#: src/gtkaccount.c:642 src/gtkft.c:555 +#: src/gtkaccount.c:669 src/gtkft.c:554 msgid "Protocol:" msgstr "Protocol:" -#: src/gtkaccount.c:647 src/gtkblist.c:4025 +#: src/gtkaccount.c:674 src/gtkblist.c:4253 msgid "Screen Name:" msgstr "Screen Name:" -#: src/gtkaccount.c:720 +#: src/gtkaccount.c:747 msgid "Password:" msgstr "Password:" -#: src/gtkaccount.c:725 src/gtkblist.c:4039 src/gtkblist.c:4388 +#: src/gtkaccount.c:752 src/gtkblist.c:4267 src/gtkblist.c:4644 msgid "Alias:" msgstr "Alias:" -#: src/gtkaccount.c:729 +#: src/gtkaccount.c:756 msgid "Remember password" msgstr "Remember password" -#: src/gtkaccount.c:738 -msgid "Auto log in" -msgstr "Auto login" - #. Build the user options frame. -#: src/gtkaccount.c:785 +#: src/gtkaccount.c:801 msgid "User Options" msgstr "User Options" -#: src/gtkaccount.c:798 +#: src/gtkaccount.c:814 msgid "New mail notifications" msgstr "New mail notifications" -#: src/gtkaccount.c:807 +#: src/gtkaccount.c:823 msgid "Buddy icon:" msgstr "Buddy icon:" #. Build the protocol options frame. -#: src/gtkaccount.c:896 +#: src/gtkaccount.c:912 #, c-format msgid "%s Options" msgstr "%s Options" #. Use Global Proxy Settings -#: src/gtkaccount.c:1032 src/gtkaccount.c:1079 +#: src/gtkaccount.c:1048 src/gtkaccount.c:1095 msgid "Use Global Proxy Settings" msgstr "Use Global Proxy Settings" #. No Proxy -#: src/gtkaccount.c:1038 src/gtkaccount.c:1086 +#: src/gtkaccount.c:1054 src/gtkaccount.c:1102 msgid "No Proxy" msgstr "No Proxy" #. HTTP -#: src/gtkaccount.c:1044 src/gtkaccount.c:1093 +#: src/gtkaccount.c:1060 src/gtkaccount.c:1109 msgid "HTTP" msgstr "HTTP" #. SOCKS 4 -#: src/gtkaccount.c:1050 src/gtkaccount.c:1100 +#: src/gtkaccount.c:1066 src/gtkaccount.c:1116 msgid "SOCKS 4" msgstr "SOCKS 4" #. SOCKS 5 -#: src/gtkaccount.c:1056 src/gtkaccount.c:1107 +#: src/gtkaccount.c:1072 src/gtkaccount.c:1123 msgid "SOCKS 5" msgstr "SOCKS 5" #. Use Environmental Settings -#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090 +#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1024 msgid "Use Environmental Settings" msgstr "Use Environmental Settings" -#: src/gtkaccount.c:1153 +#: src/gtkaccount.c:1169 msgid "you can see the butterflies mating" msgstr "you can see the butterflies mating" -#: src/gtkaccount.c:1157 +#: src/gtkaccount.c:1173 msgid "If you look real closely" msgstr "If you look real closely" -#: src/gtkaccount.c:1173 +#: src/gtkaccount.c:1189 msgid "Proxy Options" msgstr "Proxy Options" -#: src/gtkaccount.c:1191 src/gtkprefs.c:1084 +#: src/gtkaccount.c:1207 src/gtkprefs.c:1018 msgid "Proxy _type:" msgstr "Proxy _type:" -#: src/gtkaccount.c:1200 src/gtkprefs.c:1111 +#: src/gtkaccount.c:1216 src/gtkprefs.c:1045 msgid "_Host:" msgstr "_Host:" -#: src/gtkaccount.c:1204 src/gtkprefs.c:1129 +#: src/gtkaccount.c:1220 src/gtkprefs.c:1063 msgid "_Port:" msgstr "_Port:" -#: src/gtkaccount.c:1212 +#: src/gtkaccount.c:1228 msgid "_Username:" msgstr "_Username:" -#: src/gtkaccount.c:1217 src/gtkprefs.c:1166 +#: src/gtkaccount.c:1233 src/gtkprefs.c:1100 msgid "Pa_ssword:" msgstr "Pa_ssword:" -#: src/gtkaccount.c:1589 +#: src/gtkaccount.c:1602 msgid "Add Account" msgstr "Add Account" -#: src/gtkaccount.c:1591 +#: src/gtkaccount.c:1604 msgid "Modify Account" msgstr "Modify Account" #. Add the disclosure -#: src/gtkaccount.c:1615 +#: src/gtkaccount.c:1628 msgid "Show more options" msgstr "Show more options" -#: src/gtkaccount.c:1616 +#: src/gtkaccount.c:1629 msgid "Show fewer options" msgstr "Show fewer options" #. Register button -#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:674 +#: src/gtkaccount.c:1651 src/protocols/jabber/jabber.c:675 msgid "Register" msgstr "Register" -#: src/gtkaccount.c:2008 +#: src/gtkaccount.c:1983 src/gtksavedstatuses.c:184 #, c-format msgid "Are you sure you want to delete %s?" msgstr "Are you sure you want to delete %s?" -#: src/gtkaccount.c:2013 src/gtkrequest.c:263 +#: src/gtkaccount.c:1988 src/gtkrequest.c:263 src/gtksavedstatuses.c:187 msgid "Delete" msgstr "Delete" -#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179 +#: src/gtkaccount.c:2045 src/gtksavedstatuses.c:622 +#: src/protocols/oscar/oscar.c:4297 msgid "Screen Name" msgstr "Screen Name" -#. zephyr has several exposures -#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong) -#. OPSTAFF "hidden" -#. REALM-VISIBLE visible to people in local realm -#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*> -#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm -#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced to <login,username,*> -#. -#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE), -#. Hidden, will set the user's exposure to OPSTAFF -#. -#. Away won't change their exposure but will set an auto away message (for IMs only) -#. -#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161 -#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975 -#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561 -#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871 -#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655 -#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2218 -msgid "Online" -msgstr "Online" - -#: src/gtkaccount.c:2164 -msgid "Auto Log In" -msgstr "Auto Login" - -#: src/gtkaccount.c:2172 +#: src/gtkaccount.c:2068 +msgid "Enabled" +msgstr "Enabled" + +#: src/gtkaccount.c:2076 msgid "Protocol" msgstr "Protocol" -#: src/gtkaccount.c:2485 +#: src/gtkaccount.c:2379 #, c-format msgid "%s%s%s%s has made %s his or her buddy%s%s%s" msgstr "%s%s%s%s has made %s his or her buddy%s%s%s" -#: src/gtkaccount.c:2499 +#: src/gtkaccount.c:2393 msgid "" "\n" "\n" @@ -1872,26 +1949,25 @@ "\n" "Do you wish to add him or her to your buddy list?" -#: src/gtkaccount.c:2503 +#: src/gtkaccount.c:2397 msgid "Information" msgstr "Information" -#: src/gtkaccount.c:2507 +#: src/gtkaccount.c:2401 msgid "Add buddy to your list?" msgstr "Add buddy to your list?" -#. Add button -#: src/gtkaccount.c:2509 src/gtkblist.c:4439 src/gtkconv.c:1476 -#: src/gtkconv.c:3790 src/gtkconv.c:3861 src/gtkrequest.c:264 -#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593 +#: src/gtkaccount.c:2403 src/gtkblist.c:4696 src/gtkconv.c:1454 +#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3922 +#: src/protocols/silc/chat.c:594 msgid "Add" msgstr "Add" -#: src/gtkblist.c:813 +#: src/gtkblist.c:840 msgid "Join a Chat" msgstr "Join a Chat" -#: src/gtkblist.c:834 +#: src/gtkblist.c:861 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -1899,228 +1975,228 @@ "Please enter the appropriate information about the chat you would like to " "join.\n" -#: src/gtkblist.c:845 src/gtkpounce.c:415 src/gtkroomlist.c:354 +#: src/gtkblist.c:872 src/gtkpounce.c:415 src/gtkroomlist.c:354 msgid "_Account:" msgstr "_Account:" -#: src/gtkblist.c:1117 +#: src/gtkblist.c:1144 msgid "Get _Info" msgstr "Get _Info" -#: src/gtkblist.c:1120 +#: src/gtkblist.c:1147 msgid "I_M" msgstr "I_M" -#: src/gtkblist.c:1126 +#: src/gtkblist.c:1153 msgid "_Send File" msgstr "_Send File" -#: src/gtkblist.c:1132 +#: src/gtkblist.c:1159 msgid "Add Buddy _Pounce" msgstr "Add Buddy _Pounce" -#: src/gtkblist.c:1134 src/gtkblist.c:1231 +#: src/gtkblist.c:1161 src/gtkblist.c:1258 msgid "View _Log" msgstr "View _Log" -#: src/gtkblist.c:1144 +#: src/gtkblist.c:1171 msgid "_Alias Buddy..." msgstr "_Alias Buddy..." -#: src/gtkblist.c:1146 +#: src/gtkblist.c:1173 msgid "_Remove Buddy" msgstr "_Remove Buddy" -#: src/gtkblist.c:1148 +#: src/gtkblist.c:1175 msgid "Alias Contact..." msgstr "Alias Contact..." -#: src/gtkblist.c:1151 src/gtkdialogs.c:749 src/gtkdialogs.c:750 +#: src/gtkblist.c:1178 src/gtkdialogs.c:854 src/gtkdialogs.c:855 msgid "Remove Contact" msgstr "Remove Contact" -#: src/gtkblist.c:1155 src/gtkblist.c:1239 src/gtkblist.c:1253 +#: src/gtkblist.c:1182 src/gtkblist.c:1266 src/gtkblist.c:1280 msgid "_Alias..." msgstr "_Alias..." -#: src/gtkblist.c:1157 src/gtkblist.c:1241 src/gtkblist.c:1258 -#: src/gtkconn.c:367 +#: src/gtkblist.c:1184 src/gtkblist.c:1268 src/gtkblist.c:1285 +#: src/gtkconn.c:156 msgid "_Remove" msgstr "_Remove" -#: src/gtkblist.c:1203 +#: src/gtkblist.c:1230 msgid "Add a _Buddy" msgstr "Add a _Buddy" -#: src/gtkblist.c:1205 +#: src/gtkblist.c:1232 msgid "Add a C_hat" msgstr "Add a C_hat" -#: src/gtkblist.c:1207 +#: src/gtkblist.c:1234 msgid "_Delete Group" msgstr "_Delete Group" -#: src/gtkblist.c:1209 +#: src/gtkblist.c:1236 msgid "_Rename" msgstr "_Rename" #. join button -#: src/gtkblist.c:1227 src/gtkroomlist.c:264 src/gtkroomlist.c:409 +#: src/gtkblist.c:1254 src/gtkroomlist.c:264 src/gtkroomlist.c:409 #: src/gtkstock.c:89 msgid "_Join" msgstr "_Join" -#: src/gtkblist.c:1229 +#: src/gtkblist.c:1256 msgid "Auto-Join" msgstr "Auto-Join" -#: src/gtkblist.c:1255 src/gtkblist.c:1280 +#: src/gtkblist.c:1282 src/gtkblist.c:1307 msgid "_Collapse" msgstr "_Collapse" -#: src/gtkblist.c:1285 +#: src/gtkblist.c:1312 msgid "_Expand" msgstr "_Expand" -#: src/gtkblist.c:1502 src/gtkblist.c:1512 src/gtkblist.c:3284 -#: src/gtkblist.c:3287 +#: src/gtkblist.c:1529 src/gtkblist.c:1539 src/gtkblist.c:3509 +#: src/gtkblist.c:3512 msgid "/Tools/Mute Sounds" msgstr "/Tools/Mute Sounds" -#: src/gtkblist.c:1953 src/gtkconv.c:4356 src/gtkpounce.c:316 +#: src/gtkblist.c:1980 src/gtkconv.c:4145 src/gtkpounce.c:314 msgid "" "You are not currently signed on with an account that can add that buddy." msgstr "" "You are not currently signed on with an account that can add that buddy." #. Buddies menu -#: src/gtkblist.c:2363 +#: src/gtkblist.c:2549 msgid "/_Buddies" msgstr "/_Buddies" -#: src/gtkblist.c:2364 +#: src/gtkblist.c:2550 msgid "/Buddies/New Instant _Message..." msgstr "/Buddies/New Instant _Message..." -#: src/gtkblist.c:2365 +#: src/gtkblist.c:2551 msgid "/Buddies/Join a _Chat..." msgstr "/Buddies/Join a _Chat..." -#: src/gtkblist.c:2366 +#: src/gtkblist.c:2552 msgid "/Buddies/Get User _Info..." msgstr "/Buddies/Get User _Info..." -#: src/gtkblist.c:2367 +#: src/gtkblist.c:2553 msgid "/Buddies/View User _Log..." msgstr "/Buddies/View User _Log..." -#: src/gtkblist.c:2369 +#: src/gtkblist.c:2555 msgid "/Buddies/Show _Offline Buddies" msgstr "/Buddies/Show _Offline Buddies" -#: src/gtkblist.c:2370 +#: src/gtkblist.c:2556 msgid "/Buddies/Show _Empty Groups" msgstr "/Buddies/Show _Empty Groups" -#: src/gtkblist.c:2371 +#: src/gtkblist.c:2557 msgid "/Buddies/_Add Buddy..." msgstr "/Buddies/_Add Buddy..." -#: src/gtkblist.c:2372 +#: src/gtkblist.c:2558 msgid "/Buddies/Add C_hat..." msgstr "/Buddies/Add C_hat..." -#: src/gtkblist.c:2373 +#: src/gtkblist.c:2559 msgid "/Buddies/Add _Group..." msgstr "/Buddies/Add _Group..." -#: src/gtkblist.c:2375 +#: src/gtkblist.c:2561 msgid "/Buddies/_Log Out" msgstr "/Buddies/_Log Out" -#: src/gtkblist.c:2376 +#: src/gtkblist.c:2562 msgid "/Buddies/_Quit" msgstr "/Buddies/_Quit" #. Tools -#: src/gtkblist.c:2379 +#: src/gtkblist.c:2565 msgid "/_Tools" msgstr "/_Tools" -#: src/gtkblist.c:2380 -msgid "/Tools/_Away" -msgstr "/Tools/_Away" - -#: src/gtkblist.c:2381 +#: src/gtkblist.c:2566 msgid "/Tools/Buddy _Pounce" msgstr "/Tools/Buddy _Pounce" -#: src/gtkblist.c:2382 +#: src/gtkblist.c:2567 msgid "/Tools/Account Ac_tions" msgstr "/Tools/Account Ac_tions" -#: src/gtkblist.c:2383 +#: src/gtkblist.c:2568 msgid "/Tools/Pl_ugin Actions" msgstr "/Tools/Pl_ugin Actions" -#: src/gtkblist.c:2385 +#: src/gtkblist.c:2570 +msgid "/Tools/_Statuses" +msgstr "/Tools/_Statuses" + +#: src/gtkblist.c:2571 msgid "/Tools/A_ccounts" msgstr "/Tools/A_ccounts" -#: src/gtkblist.c:2386 -msgid "/Tools/_File Transfers" -msgstr "/Tools/_File Transfers" - -#: src/gtkblist.c:2387 -msgid "/Tools/R_oom List" -msgstr "/Tools/R_oom List" - -#: src/gtkblist.c:2388 +#: src/gtkblist.c:2572 msgid "/Tools/Pr_eferences" msgstr "/Tools/Pr_eferences" -#: src/gtkblist.c:2389 +#: src/gtkblist.c:2573 msgid "/Tools/Pr_ivacy" msgstr "/Tools/Pr_ivacy" -#: src/gtkblist.c:2390 +#: src/gtkblist.c:2574 +msgid "/Tools/_File Transfers" +msgstr "/Tools/_File Transfers" + +#: src/gtkblist.c:2575 +msgid "/Tools/R_oom List" +msgstr "/Tools/R_oom List" + +#: src/gtkblist.c:2577 msgid "/Tools/Mute _Sounds" msgstr "/Tools/Mute _Sounds" -#: src/gtkblist.c:2392 +#: src/gtkblist.c:2578 msgid "/Tools/View System _Log" msgstr "/Tools/View System _Log" #. Help -#: src/gtkblist.c:2395 +#: src/gtkblist.c:2581 msgid "/_Help" msgstr "/_Help" -#: src/gtkblist.c:2396 +#: src/gtkblist.c:2582 msgid "/Help/Online _Help" msgstr "/Help/Online _Help" -#: src/gtkblist.c:2397 +#: src/gtkblist.c:2583 msgid "/Help/_Debug Window" msgstr "/Help/_Debug Window" -#: src/gtkblist.c:2398 +#: src/gtkblist.c:2584 msgid "/Help/_About" msgstr "/Help/_About" -#: src/gtkblist.c:2416 +#: src/gtkblist.c:2602 msgid "Rename Group" msgstr "Rename Group" -#: src/gtkblist.c:2416 +#: src/gtkblist.c:2602 msgid "New group name" msgstr "New group name" -#: src/gtkblist.c:2417 +#: src/gtkblist.c:2603 msgid "Please enter a new name for the selected group." msgstr "Please enter a new name for the selected group." -#: src/gtkblist.c:2446 +#: src/gtkblist.c:2634 src/gtkblist.c:2701 #, c-format msgid "" "\n" @@ -2129,7 +2205,83 @@ "\n" "<b>Account:</b> %s" -#: src/gtkblist.c:2520 +#: src/gtkblist.c:2710 +#, c-format +msgid "" +"\n" +"<b>Contact Alias:</b> %s" +msgstr "" +"\n" +"<b>Contact Alias:</b> %s" + +#: src/gtkblist.c:2718 +#, c-format +msgid "" +"\n" +"<b>Alias:</b> %s" +msgstr "" +"\n" +"<b>Alias:</b> %s" + +#: src/gtkblist.c:2726 +#, c-format +msgid "" +"\n" +"<b>Nickname:</b> %s" +msgstr "" +"\n" +"<b>Nickname:</b> %s" + +#: src/gtkblist.c:2735 +#, c-format +msgid "" +"\n" +"<b>Logged In:</b> %s" +msgstr "" +"\n" +"<b>Logged In:</b> %s" + +#: src/gtkblist.c:2747 +#, c-format +msgid "" +"\n" +"<b>Idle:</b> %s" +msgstr "" +"\n" +"<b>Idle:</b> %s" + +#: src/gtkblist.c:2751 +msgid "" +"\n" +"<b>Idle</b>" +msgstr "" +"\n" +"<b>Idle</b>" + +#: src/gtkblist.c:2762 +#, c-format +msgid "" +"\n" +"<b>Last Seen:</b> %s ago" +msgstr "" +"\n" +"<b>Last Seen:</b> %s ago" + +#: src/gtkblist.c:2771 +#, c-format +msgid "%d%%" +msgstr "%d%%" + +#: src/gtkblist.c:2772 +#, c-format +msgid "" +"\n" +"<b>Warned:</b> %s" +msgstr "" +"\n" +"<b>Warned:</b> %s" + +#: src/gtkblist.c:2778 msgid "" "\n" "<b>Status:</b> Offline" @@ -2137,76 +2289,7 @@ "\n" "<b>Status:</b> Offline" -#: src/gtkblist.c:2535 -#, c-format -msgid "%d%%" -msgstr "%d%%" - -#: src/gtkblist.c:2551 -msgid "" -"\n" -"<b>Account:</b>" -msgstr "" -"\n" -"<b>Account:</b>" - -#: src/gtkblist.c:2552 -msgid "" -"\n" -"<b>Contact Alias:</b>" -msgstr "" -"\n" -"<b>Contact Alias:</b>" - -#: src/gtkblist.c:2553 -msgid "" -"\n" -"<b>Alias:</b>" -msgstr "" -"\n" -"<b>Alias:</b>" - -#: src/gtkblist.c:2554 -msgid "" -"\n" -"<b>Nickname:</b>" -msgstr "" -"\n" -"<b>Nickname:</b>" - -#: src/gtkblist.c:2555 -msgid "" -"\n" -"<b>Logged In:</b>" -msgstr "" -"\n" -"<b>Logged In:</b>" - -#: src/gtkblist.c:2556 -msgid "" -"\n" -"<b>Idle:</b>" -msgstr "" -"\n" -"<b>Idle:</b>" - -#: src/gtkblist.c:2556 -msgid "" -"\n" -"<b>Idle</b>" -msgstr "" -"\n" -"<b>Idle</b>" - -#: src/gtkblist.c:2558 -msgid "" -"\n" -"<b>Warned:</b>" -msgstr "" -"\n" -"<b>Warned:</b>" - -#: src/gtkblist.c:2560 +#: src/gtkblist.c:2799 msgid "" "\n" "<b>Description:</b> Spooky" @@ -2214,115 +2297,127 @@ "\n" "<b>Description:</b> Spooky" -#: src/gtkblist.c:2561 +#: src/gtkblist.c:2801 msgid "" "\n" -"<b>Status</b>: Awesome" +"<b>Status:</b> Awesome" msgstr "" "\n" -"<b>Status</b>: Awesome" - -#: src/gtkblist.c:2562 +"<b>Status:</b> Awesome" + +#: src/gtkblist.c:2803 msgid "" "\n" -"<b>Status</b>: Rockin'" +"<b>Status:</b> Rockin'" msgstr "" "\n" -"<b>Status</b>: Rockin'" - -#: src/gtkblist.c:2864 +"<b>Status:</b>: Rockin'" + +#: src/gtkblist.c:3045 #, c-format msgid "Idle (%dh%02dm) " msgstr "Idle (%dh%02dm) " -#: src/gtkblist.c:2866 +#: src/gtkblist.c:3047 #, c-format msgid "Idle (%dm) " msgstr "Idle (%dm) " -#: src/gtkblist.c:2869 +#: src/gtkblist.c:3050 msgid "Idle " msgstr "Idle " -#: src/gtkblist.c:2877 +#: src/gtkblist.c:3056 #, c-format msgid "Warned (%d%%) " msgstr "Warned (%d%%) " -#: src/gtkblist.c:2881 +#: src/gtkblist.c:3060 msgid "Offline " msgstr "Offline " -#. Make menu items sensitive/insensitive where appropriate -#: src/gtkblist.c:3008 +#: src/gtkblist.c:3179 +msgid "/Buddies/New Instant Message..." +msgstr "/Buddies/New Instant Message..." + +#: src/gtkblist.c:3180 src/gtkblist.c:3215 msgid "/Buddies/Join a Chat..." msgstr "/Buddies/Join a Chat..." -#: src/gtkblist.c:3011 +#: src/gtkblist.c:3181 +msgid "/Buddies/Get User Info..." +msgstr "/Buddies/Get User Info..." + +#: src/gtkblist.c:3182 +msgid "/Buddies/Add Buddy..." +msgstr "/Buddies/Add Buddy..." + +#: src/gtkblist.c:3183 +msgid "/Buddies/Add Chat..." +msgstr "/Buddies/Add Chat..." + +#: src/gtkblist.c:3184 +msgid "/Buddies/Add Group..." +msgstr "/Buddies/Add Group..." + +#: src/gtkblist.c:3185 +msgid "/Buddies/Log Out" +msgstr "/Buddies/Log Out" + +#: src/gtkblist.c:3218 msgid "/Tools/Room List" msgstr "/Tools/Room List" -#: src/gtkblist.c:3014 +#: src/gtkblist.c:3221 msgid "/Tools/Privacy" msgstr "/Tools/Privacy" -#: src/gtkblist.c:3070 src/gtkprefs.c:917 src/gtkprefs.c:1774 -#: src/protocols/jabber/jabber.c:935 +#: src/gtkblist.c:3289 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936 msgid "None" msgstr "None" -#: src/gtkblist.c:3072 +#: src/gtkblist.c:3291 msgid "Alphabetical" msgstr "Alphabetical" -#: src/gtkblist.c:3073 +#: src/gtkblist.c:3292 msgid "By status" msgstr "By status" -#: src/gtkblist.c:3074 +#: src/gtkblist.c:3293 msgid "By log size" msgstr "By log size" -#: src/gtkblist.c:3110 -#, fuzzy -msgid "Statuses" -msgstr "Status" - -#. FIXME: Status -#: src/gtkblist.c:3174 -msgid "/Tools/Away" -msgstr "/Tools/Away" - -#: src/gtkblist.c:3177 +#: src/gtkblist.c:3405 msgid "/Tools/Buddy Pounce" msgstr "/Tools/Buddy Pounce" -#: src/gtkblist.c:3180 +#: src/gtkblist.c:3406 msgid "/Tools/Account Actions" msgstr "/Tools/Account Actions" -#: src/gtkblist.c:3183 +#: src/gtkblist.c:3407 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 #. -#: src/gtkblist.c:3280 +#: src/gtkblist.c:3505 msgid "/Buddies/Show Offline Buddies" msgstr "/Buddies/Show Offline Buddies" -#: src/gtkblist.c:3282 +#: src/gtkblist.c:3507 msgid "/Buddies/Show Empty Groups" msgstr "/Buddies/Show Empty Groups" -#: src/gtkblist.c:3979 src/protocols/silc/buddy.c:731 +#: src/gtkblist.c:4207 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:2822 +#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2581 msgid "Add Buddy" msgstr "Add Buddy" -#: src/gtkblist.c:4003 +#: src/gtkblist.c:4231 msgid "" "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. " @@ -2333,15 +2428,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:4063 src/gtkblist.c:4368 +#: src/gtkblist.c:4291 src/gtkblist.c:4624 msgid "Account:" msgstr "Account:" -#: src/gtkblist.c:4301 +#: src/gtkblist.c:4557 msgid "This protocol does not support chat rooms." msgstr "This protocol does not support chat rooms." -#: src/gtkblist.c:4317 +#: src/gtkblist.c:4573 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." @@ -2349,11 +2444,11 @@ "You are not currently signed on with any protocols that have the ability to " "chat." -#: src/gtkblist.c:4334 +#: src/gtkblist.c:4590 msgid "Add Chat" msgstr "Add Chat" -#: src/gtkblist.c:4358 +#: src/gtkblist.c:4614 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" @@ -2361,39 +2456,23 @@ "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" -#: src/gtkblist.c:4436 +#: src/gtkblist.c:4693 msgid "Add Group" msgstr "Add Group" -#: src/gtkblist.c:4437 +#: src/gtkblist.c:4694 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:5011 src/gtkblist.c:5108 +#: src/gtkblist.c:5239 src/gtkblist.c:5335 msgid "No actions available" msgstr "No actions available" -#: src/gtkconn.c:81 src/gtkconn.c:254 src/gtkconn.c:267 -msgid "Done." -msgstr "Done." - -#: src/gtkconn.c:160 -msgid "Logging in: " -msgstr "Logging in: " - -#: src/gtkconn.c:206 -msgid "Logging In" -msgstr "Logging In" - -#: src/gtkconn.c:218 -msgid "Cancel All" -msgstr "Cancel All" - -#: src/gtkconn.c:367 src/gtkconn.c:599 +#: src/gtkconn.c:156 src/gtkconn.c:389 msgid "_Reconnect" msgstr "_Reconnect" -#: src/gtkconn.c:563 +#: src/gtkconn.c:353 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n" @@ -2406,36 +2485,36 @@ "%s\n" "%s" -#: src/gtkconn.c:565 +#: src/gtkconn.c:355 msgid "Reason Unknown." msgstr "Reason Unknown." -#: src/gtkconn.c:573 +#: src/gtkconn.c:363 msgid "Disconnected" msgstr "Disconnected" -#: src/gtkconn.c:604 +#: src/gtkconn.c:394 msgid "Reconnect _All" msgstr "Reconnect _All" -#: src/gtkconn.c:634 +#: src/gtkconn.c:424 msgid "Time" msgstr "Time" -#: src/gtkconv.c:319 +#: src/gtkconv.c:310 #, c-format msgid "me is using Gaim v%s." msgstr "me is using Gaim v%s." -#: src/gtkconv.c:328 +#: src/gtkconv.c:319 msgid "Supported debug options are: version" msgstr "Supported debug options are: version" -#: src/gtkconv.c:352 +#: src/gtkconv.c:343 msgid "No such command (in this context)." msgstr "No such command (in this context)." -#: src/gtkconv.c:355 +#: src/gtkconv.c:346 msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" @@ -2443,47 +2522,47 @@ "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" -#: src/gtkconv.c:427 +#: src/gtkconv.c:418 msgid "No such command." msgstr "No such command." -#: src/gtkconv.c:434 +#: src/gtkconv.c:425 msgid "Syntax Error: You typed the wrong number of arguments to that command." msgstr "" "Syntax Error: You typed the wrong number of arguments to that command." -#: src/gtkconv.c:439 +#: src/gtkconv.c:430 msgid "Your command failed for an unknown reason." msgstr "Your command failed for an unknown reason." -#: src/gtkconv.c:446 +#: src/gtkconv.c:437 msgid "That command only works in Chats, not IMs." msgstr "That command only works in Chats, not IMs." -#: src/gtkconv.c:449 +#: src/gtkconv.c:440 msgid "That command only works in IMs, not Chats." msgstr "That command only works in IMs, not Chats." -#: src/gtkconv.c:453 +#: src/gtkconv.c:444 msgid "That command doesn't work on this protocol." msgstr "That command doesn't work on this protocol." -#: src/gtkconv.c:687 src/gtkconv.c:713 +#: src/gtkconv.c:672 src/gtkconv.c:698 msgid "That buddy is not on the same protocol as this chat" msgstr "That buddy is not on the same protocol as this chat" -#: src/gtkconv.c:707 +#: src/gtkconv.c:692 msgid "" "You are not currently signed on with an account that can invite that buddy." msgstr "" "You are not currently signed on with an account that can invite that buddy." -#: src/gtkconv.c:761 +#: src/gtkconv.c:746 msgid "Invite Buddy Into Chat Room" msgstr "Invite Buddy Into Chat Room" #. Put our happy label in it. -#: src/gtkconv.c:791 +#: src/gtkconv.c:776 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." @@ -2491,344 +2570,295 @@ "Please enter the name of the user you wish to invite, along with an optional " "invite message." -#: src/gtkconv.c:812 +#: src/gtkconv.c:797 msgid "_Buddy:" msgstr "_Buddy:" -#: src/gtkconv.c:832 +#: src/gtkconv.c:817 src/gtksavedstatuses.c:774 msgid "_Message:" msgstr "_Message:" -#: src/gtkconv.c:888 src/gtkconv.c:2559 src/gtkdebug.c:179 +#: src/gtkconv.c:873 src/gtkconv.c:2524 src/gtkdebug.c:177 msgid "Unable to open file." msgstr "Unable to open file." -#: src/gtkconv.c:893 +#: src/gtkconv.c:878 #, c-format msgid "<h1>Conversation with %s</h1>\n" msgstr "<h1>Conversation with %s</h1>\n" -#: src/gtkconv.c:907 +#: src/gtkconv.c:892 msgid "Save Conversation" msgstr "Save Conversation" -#: src/gtkconv.c:992 src/gtkdebug.c:128 +#: src/gtkconv.c:977 src/gtkdebug.c:126 msgid "Find" msgstr "Find" -#: src/gtkconv.c:1018 src/gtkdebug.c:156 +#: src/gtkconv.c:1003 src/gtkdebug.c:154 msgid "_Search for:" msgstr "_Search for:" -#: src/gtkconv.c:1437 +#: src/gtkconv.c:1415 msgid "IM" msgstr "IM" -#. Send File button -#: src/gtkconv.c:1443 src/gtkconv.c:3783 src/protocols/oscar/oscar.c:598 +#: src/gtkconv.c:1421 src/protocols/oscar/oscar.c:612 msgid "Send File" msgstr "Send File" -#: src/gtkconv.c:1450 +#: src/gtkconv.c:1428 msgid "Un-Ignore" msgstr "Un-Ignore" -#: src/gtkconv.c:1453 src/gtkprefs.c:781 +#: src/gtkconv.c:1431 src/gtkprefs.c:762 msgid "Ignore" msgstr "Ignore" -#. Info button -#: src/gtkconv.c:1458 src/gtkconv.c:3804 +#: src/gtkconv.c:1436 msgid "Info" msgstr "Info" -#: src/gtkconv.c:1464 +#: src/gtkconv.c:1442 msgid "Get Away Message" msgstr "Get Away Message" -#. Remove button -#: src/gtkconv.c:1473 src/gtkconv.c:3797 src/gtkconv.c:3868 -#: src/gtkrequest.c:265 +#: src/gtkconv.c:1451 src/gtkrequest.c:265 msgid "Remove" msgstr "Remove" -#: src/gtkconv.c:2567 +#: src/gtkconv.c:2532 msgid "Unable to save icon file to disk." msgstr "Unable to save icon file to disk." -#: src/gtkconv.c:2588 +#: src/gtkconv.c:2553 msgid "Save Icon" msgstr "Save Icon" -#: src/gtkconv.c:2618 +#: src/gtkconv.c:2583 msgid "Animate" msgstr "Animate" -#: src/gtkconv.c:2623 +#: src/gtkconv.c:2588 msgid "Hide Icon" msgstr "Hide Icon" -#: src/gtkconv.c:2629 +#: src/gtkconv.c:2594 msgid "Save Icon As..." msgstr "Save Icon As..." -#: src/gtkconv.c:2996 +#: src/gtkconv.c:2952 msgid "User is typing..." msgstr "User is typing..." -#: src/gtkconv.c:3004 +#: src/gtkconv.c:2957 msgid "User has typed something and paused" msgstr "User has typed something and paused" #. Build the Send As menu -#: src/gtkconv.c:3107 +#: src/gtkconv.c:3058 msgid "_Send As" msgstr "_Send As" #. Conversation menu -#: src/gtkconv.c:3560 +#: src/gtkconv.c:3512 msgid "/_Conversation" msgstr "/_Conversation" -#: src/gtkconv.c:3562 +#: src/gtkconv.c:3514 msgid "/Conversation/New Instant _Message..." msgstr "/Conversation/New Instant _Message..." -#: src/gtkconv.c:3567 +#: src/gtkconv.c:3519 msgid "/Conversation/_Find..." msgstr "/Conversation/_Find..." -#: src/gtkconv.c:3569 +#: src/gtkconv.c:3521 msgid "/Conversation/View _Log" msgstr "/Conversation/View _Log" -#: src/gtkconv.c:3570 +#: src/gtkconv.c:3522 msgid "/Conversation/_Save As..." msgstr "/Conversation/_Save As..." -#: src/gtkconv.c:3572 +#: src/gtkconv.c:3524 msgid "/Conversation/Clear" msgstr "/Conversation/Clear" -#: src/gtkconv.c:3576 +#: src/gtkconv.c:3528 msgid "/Conversation/Se_nd File..." msgstr "/Conversation/Se_nd File..." -#: src/gtkconv.c:3577 +#: src/gtkconv.c:3529 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/Conversation/Add Buddy _Pounce..." -#: src/gtkconv.c:3579 +#: src/gtkconv.c:3531 msgid "/Conversation/_Get Info" msgstr "/Conversation/_Get Info" -#: src/gtkconv.c:3581 +#: src/gtkconv.c:3533 msgid "/Conversation/_Warn..." msgstr "/Conversation/_Warn..." -#: src/gtkconv.c:3583 +#: src/gtkconv.c:3535 msgid "/Conversation/In_vite..." msgstr "/Conversation/In_vite..." -#: src/gtkconv.c:3588 +#: src/gtkconv.c:3540 msgid "/Conversation/A_lias..." msgstr "/Conversation/A_lias..." -#: src/gtkconv.c:3590 +#: src/gtkconv.c:3542 msgid "/Conversation/_Block..." msgstr "/Conversation/_Block..." -#: src/gtkconv.c:3592 +#: src/gtkconv.c:3544 msgid "/Conversation/_Add..." msgstr "/Conversation/_Add..." -#: src/gtkconv.c:3594 +#: src/gtkconv.c:3546 msgid "/Conversation/_Remove..." msgstr "/Conversation/_Remove..." -#: src/gtkconv.c:3599 +#: src/gtkconv.c:3551 msgid "/Conversation/Insert Lin_k..." msgstr "/Conversation/Insert Lin_k..." -#: src/gtkconv.c:3601 +#: src/gtkconv.c:3553 msgid "/Conversation/Insert Imag_e..." msgstr "/Conversation/Insert Imag_e..." -#: src/gtkconv.c:3606 +#: src/gtkconv.c:3558 msgid "/Conversation/_Close" msgstr "/Conversation/_Close" #. Options -#: src/gtkconv.c:3610 +#: src/gtkconv.c:3562 msgid "/_Options" msgstr "/_Options" -#: src/gtkconv.c:3611 +#: src/gtkconv.c:3563 msgid "/Options/Enable _Logging" msgstr "/Options/Enable _Logging" -#: src/gtkconv.c:3612 +#: src/gtkconv.c:3564 msgid "/Options/Enable _Sounds" msgstr "/Options/Enable _Sounds" -#: src/gtkconv.c:3613 -msgid "/Options/Show Formatting _Toolbar" -msgstr "/Options/Show Formatting _Toolbar" - -#: src/gtkconv.c:3614 +#: src/gtkconv.c:3565 +msgid "/Options/Show Formatting _Toolbars" +msgstr "/Options/Show Formatting _Toolbars" + +#: src/gtkconv.c:3566 msgid "/Options/Show T_imestamps" msgstr "/Options/Show T_imestamps" -#: src/gtkconv.c:3656 +#: src/gtkconv.c:3567 +msgid "/Options/Show Buddy _Icon" +msgstr "/Options/Show Buddy _Icon" + +#: src/gtkconv.c:3611 msgid "/Conversation/View Log" msgstr "/Conversation/View Log" -#: src/gtkconv.c:3661 +#: src/gtkconv.c:3616 msgid "/Conversation/Send File..." msgstr "/Conversation/Send File..." -#: src/gtkconv.c:3665 +#: src/gtkconv.c:3620 msgid "/Conversation/Add Buddy Pounce..." msgstr "/Conversation/Add Buddy Pounce..." -#: src/gtkconv.c:3671 +#: src/gtkconv.c:3626 msgid "/Conversation/Get Info" msgstr "/Conversation/Get Info" -#: src/gtkconv.c:3675 +#: src/gtkconv.c:3630 msgid "/Conversation/Warn..." msgstr "/Conversation/Warn..." -#: src/gtkconv.c:3679 +#: src/gtkconv.c:3634 msgid "/Conversation/Invite..." msgstr "/Conversation/Invite..." -#: src/gtkconv.c:3685 +#: src/gtkconv.c:3640 msgid "/Conversation/Alias..." msgstr "/Conversation/Alias..." -#: src/gtkconv.c:3689 +#: src/gtkconv.c:3644 msgid "/Conversation/Block..." msgstr "/Conversation/Block..." -#: src/gtkconv.c:3693 +#: src/gtkconv.c:3648 msgid "/Conversation/Add..." msgstr "/Conversation/Add..." -#: src/gtkconv.c:3697 +#: src/gtkconv.c:3652 msgid "/Conversation/Remove..." msgstr "/Conversation/Remove..." -#: src/gtkconv.c:3703 +#: src/gtkconv.c:3658 msgid "/Conversation/Insert Link..." msgstr "/Conversation/Insert Link..." -#: src/gtkconv.c:3707 +#: src/gtkconv.c:3662 msgid "/Conversation/Insert Image..." msgstr "/Conversation/Insert Image..." -#: src/gtkconv.c:3713 +#: src/gtkconv.c:3668 msgid "/Options/Enable Logging" msgstr "/Options/Enable Logging" -#: src/gtkconv.c:3716 +#: src/gtkconv.c:3671 msgid "/Options/Enable Sounds" msgstr "/Options/Enable Sounds" -#: src/gtkconv.c:3719 -msgid "/Options/Show Formatting Toolbar" -msgstr "/Options/Show Formatting Toolbar" - -#: src/gtkconv.c:3722 +#: src/gtkconv.c:3674 +msgid "/Options/Show Formatting Toolbars" +msgstr "/Options/Show Formatting Toolbars" + +#: src/gtkconv.c:3677 msgid "/Options/Show Timestamps" msgstr "/Options/Show Timestamps" -#. The buttons, from left to right -#. Block button -#: src/gtkconv.c:3776 src/gtkprivacy.c:625 src/gtkprivacy.c:636 -msgid "Block" -msgstr "Block" - -#: src/gtkconv.c:3777 -msgid "Block the user" -msgstr "Block the user" - -#: src/gtkconv.c:3784 -msgid "Send a file to the user" -msgstr "Send a file to the user" - -#: src/gtkconv.c:3791 -msgid "Add the user to your buddy list" -msgstr "Add the user to your buddy list" - -#: src/gtkconv.c:3798 -msgid "Remove the user from your buddy list" -msgstr "Remove the user from your buddy list" - -#: src/gtkconv.c:3805 src/gtkconv.c:4126 -msgid "Get the user's information" -msgstr "Get the user's information" - -#. Send button -#: src/gtkconv.c:3811 src/gtkconv.c:3875 -msgid "Send" -msgstr "Send" - -#: src/gtkconv.c:3812 src/gtkconv.c:3876 -msgid "Send message" -msgstr "Send message" - -#. The buttons, from left to right -#. Invite -#: src/gtkconv.c:3854 -msgid "Invite" -msgstr "Invite" - -#: src/gtkconv.c:3855 -msgid "Invite a user" -msgstr "Invite a user" - -#: src/gtkconv.c:3862 -msgid "Add the chat to your buddy list" -msgstr "Add the chat to your buddy list" - -#: src/gtkconv.c:3869 -msgid "Remove the chat from your buddy list" -msgstr "Remove the chat from your buddy list" - -#: src/gtkconv.c:3993 +#: src/gtkconv.c:3680 +msgid "/Options/Show Buddy Icon" +msgstr "/Options/Show Buddy Icon" + +#: src/gtkconv.c:3795 msgid "Topic:" msgstr "Topic:" #. Setup the label telling how many people are in the room. -#: src/gtkconv.c:4042 +#: src/gtkconv.c:3843 msgid "0 people in room" msgstr "0 people in room" -#: src/gtkconv.c:4103 +#: src/gtkconv.c:3905 msgid "IM the user" msgstr "IM the user" -#: src/gtkconv.c:4115 +#: src/gtkconv.c:3918 msgid "Ignore the user" msgstr "Ignore the user" -#: src/gtkconv.c:4634 +#: src/gtkconv.c:3930 +msgid "Get the user's information" +msgstr "Get the user's information" + +#: src/gtkconv.c:4431 msgid "Close conversation" msgstr "Close conversation" -#: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352 +#: src/gtkconv.c:4933 src/gtkconv.c:4962 src/gtkconv.c:5058 src/gtkconv.c:5116 #, c-format 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:5925 src/gtkconv.c:5928 -msgid "<main>/Conversation/Close" -msgstr "<main>/Conversation/Close" - -#: src/gtkconv.c:6249 +#: src/gtkconv.c:6021 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." @@ -2836,11 +2866,11 @@ "say <message>: Send a message normally as if you weren't using a " "command." -#: src/gtkconv.c:6252 +#: src/gtkconv.c:6024 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." -#: src/gtkconv.c:6255 +#: src/gtkconv.c:6027 msgid "" "debug <option>: Send various debug information to the current " "conversation." @@ -2848,23 +2878,23 @@ "debug <option>: Send various debug information to the current " "conversation." -#: src/gtkconv.c:6259 +#: src/gtkconv.c:6031 msgid "help <command>: Help on a specific command." msgstr "help <command>: Help on a specific command." -#: src/gtkdebug.c:194 +#: src/gtkdebug.c:192 msgid "Save Debug Log" msgstr "Save Debug Log" -#: src/gtkdebug.c:247 +#: src/gtkdebug.c:245 msgid "Debug Window" msgstr "Debug Window" -#: src/gtkdebug.c:285 +#: src/gtkdebug.c:283 msgid "Pause" msgstr "Pause" -#: src/gtkdebug.c:291 +#: src/gtkdebug.c:289 msgid "Timestamps" msgstr "Timestamps" @@ -2876,196 +2906,197 @@ msgid "lead developer" msgstr "lead developer" -#: src/gtkdialogs.c:68 +#: src/gtkdialogs.c:68 src/gtkdialogs.c:71 src/gtkdialogs.c:72 +#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75 +#: src/gtkdialogs.c:77 +msgid "developer" +msgstr "developer" + +#: src/gtkdialogs.c:69 msgid "developer & webmaster" msgstr "developer & webmaster" -#: src/gtkdialogs.c:69 +#: src/gtkdialogs.c:70 msgid "win32 port" msgstr "win32 port" -#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72 -#: src/gtkdialogs.c:73 src/gtkdialogs.c:75 -msgid "developer" -msgstr "developer" - -#: src/gtkdialogs.c:74 +#: src/gtkdialogs.c:76 msgid "support" msgstr "support" -#: src/gtkdialogs.c:80 +#: src/gtkdialogs.c:93 msgid "former libfaim maintainer" msgstr "former libfaim maintainer" -#: src/gtkdialogs.c:81 +#: src/gtkdialogs.c:94 msgid "former lead developer" msgstr "former lead developer" -#: src/gtkdialogs.c:82 +#: src/gtkdialogs.c:95 msgid "former maintainer" msgstr "former maintainer" -#: src/gtkdialogs.c:83 +#: src/gtkdialogs.c:96 msgid "former Jabber developer" msgstr "former Jabber developer" -#: src/gtkdialogs.c:84 +#: src/gtkdialogs.c:97 msgid "original author" msgstr "original author" -#: src/gtkdialogs.c:85 +#: src/gtkdialogs.c:98 msgid "hacker and designated driver [lazy bum]" msgstr "hacker and designated driver [lazy bum]" -#: src/gtkdialogs.c:90 src/gtkdialogs.c:128 +#: src/gtkdialogs.c:103 src/gtkdialogs.c:141 msgid "Bulgarian" msgstr "Bulgarian" -#: src/gtkdialogs.c:91 src/gtkdialogs.c:129 src/gtkdialogs.c:130 +#: src/gtkdialogs.c:104 src/gtkdialogs.c:142 src/gtkdialogs.c:143 msgid "Catalan" msgstr "Catalan" -#: src/gtkdialogs.c:92 src/gtkdialogs.c:131 +#: src/gtkdialogs.c:105 src/gtkdialogs.c:144 msgid "Czech" msgstr "Czech" -#: src/gtkdialogs.c:93 +#: src/gtkdialogs.c:106 msgid "Danish" msgstr "Danish" -#: src/gtkdialogs.c:94 +#: src/gtkdialogs.c:107 msgid "Australian English" msgstr "Australian English" -#: src/gtkdialogs.c:95 +#: src/gtkdialogs.c:108 msgid "British English" msgstr "British English" -#: src/gtkdialogs.c:96 +#: src/gtkdialogs.c:109 msgid "Canadian English" msgstr "Canadian English" -#: src/gtkdialogs.c:97 src/gtkdialogs.c:132 +#: src/gtkdialogs.c:110 src/gtkdialogs.c:145 msgid "German" msgstr "German" -#: src/gtkdialogs.c:98 src/gtkdialogs.c:133 +#: src/gtkdialogs.c:111 src/gtkdialogs.c:146 msgid "Spanish" msgstr "Spanish" -#: src/gtkdialogs.c:99 src/gtkdialogs.c:134 +#: src/gtkdialogs.c:112 src/gtkdialogs.c:147 msgid "Finnish" msgstr "Finnish" -#: src/gtkdialogs.c:100 src/gtkdialogs.c:135 +#: src/gtkdialogs.c:113 src/gtkdialogs.c:148 msgid "French" msgstr "French" -#: src/gtkdialogs.c:101 +#: src/gtkdialogs.c:114 msgid "Hebrew" msgstr "Hebrew" -#: src/gtkdialogs.c:102 +#: src/gtkdialogs.c:115 msgid "Hindi" msgstr "Hindi" -#: src/gtkdialogs.c:103 +#: src/gtkdialogs.c:116 msgid "Hungarian" msgstr "Hungarian" -#: src/gtkdialogs.c:104 src/gtkdialogs.c:136 +#: src/gtkdialogs.c:117 src/gtkdialogs.c:149 msgid "Italian" msgstr "Italian" -#: src/gtkdialogs.c:105 src/gtkdialogs.c:137 +#: src/gtkdialogs.c:118 src/gtkdialogs.c:150 msgid "Japanese" msgstr "Japanese" -#: src/gtkdialogs.c:106 +#: src/gtkdialogs.c:119 msgid "Lithuanian" msgstr "Lithuanian" -#: src/gtkdialogs.c:107 src/gtkdialogs.c:138 +#: src/gtkdialogs.c:120 src/gtkdialogs.c:151 msgid "Korean" msgstr "Korean" -#: src/gtkdialogs.c:108 +#: src/gtkdialogs.c:121 msgid "Dutch; Flemish" msgstr "Dutch; Flemish" -#: src/gtkdialogs.c:109 +#: src/gtkdialogs.c:122 msgid "Macedonian" msgstr "Macedonian" -#: src/gtkdialogs.c:110 +#: src/gtkdialogs.c:123 msgid "Norwegian" msgstr "Norwegian" -#: src/gtkdialogs.c:111 src/gtkdialogs.c:139 +#: src/gtkdialogs.c:124 src/gtkdialogs.c:152 msgid "Polish" msgstr "Polish" -#: src/gtkdialogs.c:112 +#: src/gtkdialogs.c:125 msgid "Portuguese" msgstr "Portuguese" -#: src/gtkdialogs.c:113 +#: src/gtkdialogs.c:126 msgid "Portuguese-Brazil" msgstr "Portuguese-Brazil" -#: src/gtkdialogs.c:114 +#: src/gtkdialogs.c:127 msgid "Romanian" msgstr "Romanian" -#: src/gtkdialogs.c:115 src/gtkdialogs.c:140 src/gtkdialogs.c:141 +#: src/gtkdialogs.c:128 src/gtkdialogs.c:153 src/gtkdialogs.c:154 msgid "Russian" msgstr "Russian" -#: src/gtkdialogs.c:116 +#: src/gtkdialogs.c:129 msgid "Serbian" msgstr "Serbian" -#: src/gtkdialogs.c:117 +#: src/gtkdialogs.c:130 msgid "Slovenian" msgstr "Slovenian" -#: src/gtkdialogs.c:118 src/gtkdialogs.c:143 +#: src/gtkdialogs.c:131 src/gtkdialogs.c:156 msgid "Swedish" msgstr "Swedish" -#: src/gtkdialogs.c:119 +#: src/gtkdialogs.c:132 msgid "Vietnamese" msgstr "Vietnamese" -#: src/gtkdialogs.c:119 +#: src/gtkdialogs.c:132 msgid "T.M.Thanh and the Gnome-Vi Team" msgstr "T.M.Thanh and the Gnome-Vi Team" -#: src/gtkdialogs.c:120 +#: src/gtkdialogs.c:133 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: src/gtkdialogs.c:121 +#: src/gtkdialogs.c:134 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: src/gtkdialogs.c:127 +#: src/gtkdialogs.c:140 msgid "Amharic" msgstr "Amharic" -#: src/gtkdialogs.c:142 +#: src/gtkdialogs.c:155 msgid "Slovak" msgstr "Slovak" -#: src/gtkdialogs.c:144 +#: src/gtkdialogs.c:157 msgid "Chinese" msgstr "Chinese" -#: src/gtkdialogs.c:185 +#: src/gtkdialogs.c:198 msgid "About Gaim" msgstr "About Gaim" -#: src/gtkdialogs.c:208 +#: src/gtkdialogs.c:222 msgid "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " @@ -3075,71 +3106,75 @@ "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>" -#: src/gtkdialogs.c:217 +#: src/gtkdialogs.c:231 +msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>" +msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>" + +#: src/gtkdialogs.c:234 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>" -#: src/gtkdialogs.c:222 +#: src/gtkdialogs.c:240 msgid "Active Developers" msgstr "Active Developers" -#: src/gtkdialogs.c:237 +#: src/gtkdialogs.c:255 msgid "Crazy Patch Writers" msgstr "Crazy Patch Writers" -#: src/gtkdialogs.c:252 +#: src/gtkdialogs.c:270 msgid "Retired Developers" msgstr "Retired Developers" -#: src/gtkdialogs.c:267 +#: src/gtkdialogs.c:285 msgid "Current Translators" msgstr "Current Translators" -#: src/gtkdialogs.c:287 +#: src/gtkdialogs.c:305 msgid "Past Translators" msgstr "Past Translators" -#: src/gtkdialogs.c:357 src/gtkdialogs.c:500 src/gtkdialogs.c:555 +#: src/gtkdialogs.c:454 src/gtkdialogs.c:597 src/gtkdialogs.c:652 msgid "_Screen name" msgstr "_Screen name" -#: src/gtkdialogs.c:363 src/gtkdialogs.c:506 src/gtkdialogs.c:561 +#: src/gtkdialogs.c:460 src/gtkdialogs.c:603 src/gtkdialogs.c:658 msgid "_Account" msgstr "_Account" -#: src/gtkdialogs.c:370 +#: src/gtkdialogs.c:467 msgid "New Instant Message" msgstr "New Instant Message" -#: src/gtkdialogs.c:372 +#: src/gtkdialogs.c:469 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." -#: src/gtkdialogs.c:513 +#: src/gtkdialogs.c:610 msgid "Get User Info" msgstr "Get User Info" -#: src/gtkdialogs.c:515 +#: src/gtkdialogs.c:612 msgid "" "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 info you would like to view." -#: src/gtkdialogs.c:569 +#: src/gtkdialogs.c:666 msgid "Get User Log" msgstr "Get User Log" -#: src/gtkdialogs.c:571 +#: src/gtkdialogs.c:668 msgid "" "Please enter the screen name of the person whose log you would like to view." msgstr "" "Please enter the screen name of the person whose log you would like to view." -#: src/gtkdialogs.c:611 +#: src/gtkdialogs.c:708 msgid "Warn User" msgstr "Warn User" -#: src/gtkdialogs.c:632 +#: src/gtkdialogs.c:729 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n" @@ -3152,54 +3187,60 @@ "This will increase %s's warning level and he or she will be subject to " "harsher rate limiting.\n" -#: src/gtkdialogs.c:641 +#: src/gtkdialogs.c:738 msgid "Warn _anonymously?" msgstr "Warn _anonymously?" -#: src/gtkdialogs.c:648 +#: src/gtkdialogs.c:745 msgid "<b>Anonymous warnings are less severe.</b>" msgstr "<b>Anonymous warnings are less severe.</b>" -#: src/gtkdialogs.c:669 +#: src/gtkdialogs.c:766 msgid "Alias Contact" msgstr "Alias Contact" -#: src/gtkdialogs.c:670 +#: src/gtkdialogs.c:767 msgid "Enter an alias for this contact." msgstr "Enter an alias for this contact." -#: src/gtkdialogs.c:672 src/gtkdialogs.c:694 src/gtkdialogs.c:714 -#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584 +#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811 +#: src/gtkrequest.c:267 src/protocols/silc/chat.c:585 msgid "Alias" msgstr "Alias" -#: src/gtkdialogs.c:690 +#: src/gtkdialogs.c:787 #, c-format msgid "Enter an alias for %s." msgstr "Enter an alias for %s." -#: src/gtkdialogs.c:692 +#: src/gtkdialogs.c:789 msgid "Alias Buddy" msgstr "Alias Buddy" -#: src/gtkdialogs.c:711 +#: src/gtkdialogs.c:808 msgid "Alias Chat" msgstr "Alias Chat" -#: src/gtkdialogs.c:712 +#: src/gtkdialogs.c:809 msgid "Enter an alias for this chat." msgstr "Enter an alias for this chat." -#: src/gtkdialogs.c:746 -#, c-format -msgid "" +#: src/gtkdialogs.c:846 +#, c-format +msgid "" +"You are about to remove the contact containing %s and %d other buddy from " +"your buddy list. Do you want to continue?" +msgid_plural "" "You are about to remove the contact containing %s and %d other buddies from " "your buddy list. Do you want to continue?" -msgstr "" +msgstr[0] "" +"You are about to remove the contact containing %s and %d other buddy from " +"your buddy list. Do you want to continue?" +msgstr[1] "" "You are about to remove the contact containing %s and %d other buddies from " "your buddy list. Do you want to continue?" -#: src/gtkdialogs.c:808 +#: src/gtkdialogs.c:913 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " @@ -3208,22 +3249,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:811 src/gtkdialogs.c:812 +#: src/gtkdialogs.c:916 src/gtkdialogs.c:917 msgid "Remove Group" msgstr "Remove Group" -#: src/gtkdialogs.c:850 +#: src/gtkdialogs.c:955 #, c-format msgid "" "You are about to remove %s from your buddy list. Do you want to continue?" msgstr "" "You are about to remove %s from your buddy list. Do you want to continue?" -#: src/gtkdialogs.c:853 src/gtkdialogs.c:854 +#: src/gtkdialogs.c:958 src/gtkdialogs.c:959 msgid "Remove Buddy" msgstr "Remove Buddy" -#: src/gtkdialogs.c:887 +#: src/gtkdialogs.c:992 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " @@ -3232,7 +3273,7 @@ "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" -#: src/gtkdialogs.c:891 src/gtkdialogs.c:892 +#: src/gtkdialogs.c:996 src/gtkdialogs.c:997 msgid "Remove Chat" msgstr "Remove Chat" @@ -3241,15 +3282,15 @@ msgid "%.2f KB/s" msgstr "%.2f KB/s" -#: src/gtkft.c:161 src/gtkft.c:978 +#: src/gtkft.c:161 src/gtkft.c:966 msgid "Finished" msgstr "Finished" -#: src/gtkft.c:164 src/gtkft.c:929 +#: src/gtkft.c:164 src/gtkft.c:917 msgid "Canceled" msgstr "Cancelled" -#: src/gtkft.c:167 src/gtkft.c:848 +#: src/gtkft.c:167 src/gtkft.c:836 msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" @@ -3293,54 +3334,54 @@ msgid "Remaining" msgstr "Remaining" -#: src/gtkft.c:556 +#: src/gtkft.c:555 msgid "Filename:" msgstr "Filename:" +#: src/gtkft.c:556 +msgid "Status:" +msgstr "Status:" + #: src/gtkft.c:557 -msgid "Status:" -msgstr "Status:" +msgid "Speed:" +msgstr "Speed:" #: src/gtkft.c:558 -msgid "Speed:" -msgstr "Speed:" +msgid "Time Elapsed:" +msgstr "Time Elapsed:" #: src/gtkft.c:559 -msgid "Time Elapsed:" -msgstr "Time Elapsed:" - -#: src/gtkft.c:560 msgid "Time Remaining:" msgstr "Time Remaining:" -#: src/gtkft.c:652 +#: src/gtkft.c:645 msgid "_Keep the dialog open" msgstr "_Keep the dialogue open" -#: src/gtkft.c:662 +#: src/gtkft.c:655 msgid "_Clear finished transfers" msgstr "_Clear finished transfers" #. "Download Details" arrow -#: src/gtkft.c:671 +#: src/gtkft.c:664 msgid "Show transfer details" msgstr "Show transfer details" -#: src/gtkft.c:672 +#: src/gtkft.c:665 msgid "Hide transfer details" msgstr "Hide transfer details" #. Pause button -#: src/gtkft.c:714 src/gtkstock.c:93 +#: src/gtkft.c:702 src/gtkstock.c:93 msgid "_Pause" msgstr "_Pause" #. Resume button -#: src/gtkft.c:724 +#: src/gtkft.c:712 msgid "_Resume" msgstr "_Resume" -#: src/gtkft.c:931 +#: src/gtkft.c:919 msgid "Failed" msgstr "Failed" @@ -3356,27 +3397,27 @@ msgid "Pa_ste As Text" msgstr "Pa_ste As Text" -#: src/gtkimhtml.c:1019 +#: src/gtkimhtml.c:1021 msgid "Hyperlink color" msgstr "Hyperlink colour" -#: src/gtkimhtml.c:1020 +#: src/gtkimhtml.c:1022 msgid "Color to draw hyperlinks." msgstr "Colour to draw hyperlinks." -#: src/gtkimhtml.c:1237 +#: src/gtkimhtml.c:1236 msgid "_Copy E-Mail Address" msgstr "_Copy E-Mail Address" -#: src/gtkimhtml.c:1249 +#: src/gtkimhtml.c:1248 msgid "_Copy Link Location" msgstr "_Copy Link Location" -#: src/gtkimhtml.c:1259 +#: src/gtkimhtml.c:1258 msgid "_Open Link in Browser" msgstr "_Open Link in Browser" -#: src/gtkimhtml.c:2817 +#: src/gtkimhtml.c:2848 msgid "" "Unable to guess the image type based on the file extension supplied. " "Defaulting to PNG." @@ -3384,16 +3425,16 @@ "Unable to guess the image type based on the file extension supplied. " "Defaulting to PNG." -#: src/gtkimhtml.c:2825 +#: src/gtkimhtml.c:2856 #, c-format msgid "Error saving image: %s" msgstr "Error saving image: %s" -#: src/gtkimhtml.c:2902 src/gtkimhtml.c:2914 +#: src/gtkimhtml.c:2933 src/gtkimhtml.c:2945 msgid "Save Image" msgstr "Save Image" -#: src/gtkimhtml.c:2942 +#: src/gtkimhtml.c:2973 msgid "_Save Image..." msgstr "_Save Image..." @@ -3401,23 +3442,23 @@ msgid "Select Font" msgstr "Select Font" -#: src/gtkimhtmltoolbar.c:258 +#: src/gtkimhtmltoolbar.c:259 msgid "Select Text Color" msgstr "Select Text Colour" -#: src/gtkimhtmltoolbar.c:332 +#: src/gtkimhtmltoolbar.c:334 msgid "Select Background Color" msgstr "Select Background Colour" -#: src/gtkimhtmltoolbar.c:415 +#: src/gtkimhtmltoolbar.c:418 msgid "_URL" msgstr "_URL" -#: src/gtkimhtmltoolbar.c:423 +#: src/gtkimhtmltoolbar.c:426 msgid "_Description" msgstr "_Description" -#: src/gtkimhtmltoolbar.c:426 +#: src/gtkimhtmltoolbar.c:429 msgid "" "Please enter the URL and description of the link that you want to insert. " "The description is optional." @@ -3425,164 +3466,127 @@ "Please enter the URL and description of the link that you want to insert. " "The description is optional." -#: src/gtkimhtmltoolbar.c:430 +#: src/gtkimhtmltoolbar.c:433 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:435 +#: src/gtkimhtmltoolbar.c:438 msgid "Insert Link" msgstr "Insert Link" -#: src/gtkimhtmltoolbar.c:439 +#: src/gtkimhtmltoolbar.c:442 msgid "_Insert" msgstr "_Insert" -#: src/gtkimhtmltoolbar.c:508 +#: src/gtkimhtmltoolbar.c:511 #, c-format msgid "Failed to store image: %s\n" msgstr "Failed to store image: %s\n" -#: src/gtkimhtmltoolbar.c:534 src/gtkimhtmltoolbar.c:544 +#: src/gtkimhtmltoolbar.c:537 src/gtkimhtmltoolbar.c:547 msgid "Insert Image" msgstr "Insert Image" -#: src/gtkimhtmltoolbar.c:703 src/gtkimhtmltoolbar.c:781 +#: src/gtkimhtmltoolbar.c:706 src/gtkimhtmltoolbar.c:784 msgid "This theme has no available smileys." msgstr "This theme has no available smileys." #. show everything -#: src/gtkimhtmltoolbar.c:795 +#: src/gtkimhtmltoolbar.c:798 msgid "Smile!" msgstr "Smile!" -#: src/gtkimhtmltoolbar.c:974 +#: src/gtkimhtmltoolbar.c:977 msgid "Bold" msgstr "Bold" -#: src/gtkimhtmltoolbar.c:985 +#: src/gtkimhtmltoolbar.c:988 msgid "Italic" msgstr "Italic" -#: src/gtkimhtmltoolbar.c:996 +#: src/gtkimhtmltoolbar.c:999 msgid "Underline" msgstr "Underline" -#: src/gtkimhtmltoolbar.c:1012 +#: src/gtkimhtmltoolbar.c:1015 msgid "Larger font size" msgstr "Larger font size" -#: src/gtkimhtmltoolbar.c:1024 +#: src/gtkimhtmltoolbar.c:1027 msgid "Smaller font size" msgstr "Smaller font size" -#: src/gtkimhtmltoolbar.c:1041 +#: src/gtkimhtmltoolbar.c:1044 msgid "Font Face" msgstr "Font Face" -#: src/gtkimhtmltoolbar.c:1053 +#: src/gtkimhtmltoolbar.c:1056 msgid "Foreground font color" msgstr "Foreground font colour" -#: src/gtkimhtmltoolbar.c:1065 +#: src/gtkimhtmltoolbar.c:1068 msgid "Background color" msgstr "Background colour" -#: src/gtkimhtmltoolbar.c:1080 +#: src/gtkimhtmltoolbar.c:1083 msgid "Insert link" msgstr "Insert link" -#: src/gtkimhtmltoolbar.c:1090 +#: src/gtkimhtmltoolbar.c:1093 msgid "Insert image" msgstr "Insert image" -#: src/gtkimhtmltoolbar.c:1101 +#: src/gtkimhtmltoolbar.c:1104 msgid "Insert smiley" msgstr "Insert smiley" -#: src/gtklog.c:303 +#: src/gtklog.c:308 #, c-format msgid "Conversations with %s" msgstr "Conversations with %s" #. Window ********** -#: src/gtklog.c:391 src/gtklog.c:407 +#: src/gtklog.c:396 src/gtklog.c:412 msgid "System Log" msgstr "System Log" -#: src/gtkmain.c:151 -msgid "Please create an account." -msgstr "Please create an account." - -#: src/gtkmain.c:233 -msgid "Login" -msgstr "Login" - -#: src/gtkmain.c:249 -msgid "<b>_Account:</b>" -msgstr "<b>_Account:</b>" - -#: src/gtkmain.c:263 -msgid "<b>_Password:</b>" -msgstr "<b>_Password:</b>" - -#. And now for the buttons -#: src/gtkmain.c:280 -msgid "A_ccounts" -msgstr "A_ccounts" - -#: src/gtkmain.c:286 -msgid "P_references" -msgstr "P_references" - -#: src/gtkmain.c:292 -msgid "_Log in" -msgstr "_Log in" - -#. full help text -#: src/gtkmain.c:517 +#: src/gtkmain.c:319 +#, c-format +msgid "Gaim %s. Try `%s -h' for more information.\n" +msgstr "Gaim %s. Try `%s -h' for more information.\n" + +#: src/gtkmain.c:321 #, c-format msgid "" "Gaim %s\n" "Usage: %s [OPTION]...\n" "\n" " -a, --acct display account editor window\n" -" -w, --away[=MESG] make away on signon (optional argument MESG specifies\n" -" name of away message to use)\n" +" -c, --config=DIR use DIR for config files\n" +" -d, --debug print debugging messages to stdout\n" +" -h, --help display this help and exit\n" +" -n, --nologin don't automatically login\n" " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" " account(s) to use, seperated by commas)\n" -" -n, --loginwin don't automatically login; show login window\n" -" -u, --user=NAME use account NAME\n" -" -c, --config=DIR use DIR for config files\n" -" -d, --debug print debugging messages to stdout\n" " -v, --version display the current version and exit\n" -" -h, --help display this help and exit\n" msgstr "" "Gaim %s\n" "Usage: %s [OPTION]...\n" "\n" " -a, --acct display account editor window\n" -" -w, --away[=MESG] make away on signon (optional argument MESG specifies\n" -" name of away message to use)\n" -" -l, --login[=NAME] automatically login (optional argument NAME specifies\n" -" account(s) to use, seperated by commas)\n" -" -n, --loginwin don't automatically login; show login window\n" -" -u, --user=NAME use account NAME\n" " -c, --config=DIR use DIR for config files\n" " -d, --debug print debugging messages to stdout\n" +" -h, --help display this help and exit\n" +" -n, --nologin don't automatically log in\n" +" -l, --login[=NAME] automatically log in (optional argument NAME specifies\n" +" account(s) to use, separated by commas)\n" " -v, --version display the current version and exit\n" -" -h, --help display this help and exit\n" - -#. short message -#: src/gtkmain.c:532 -#, c-format -msgid "Gaim %s. Try `%s -h' for more information.\n" -msgstr "Gaim %s. Try `%s -h' for more information.\n" - -#: src/gtkmain.c:899 + +#: src/gtkmain.c:633 msgid "Unable to load preferences" msgstr "Unable to load preferences" -#: src/gtkmain.c:899 +#: src/gtkmain.c:634 msgid "" "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 " @@ -3593,24 +3597,24 @@ "Preferences window." #. Descriptive label -#: src/gtknotify.c:218 +#: src/gtknotify.c:262 #, c-format msgid "%s has %d new message." msgid_plural "%s has %d new messages." msgstr[0] "%s has %d new message." msgstr[1] "%s has %d new messages." -#: src/gtknotify.c:232 +#: src/gtknotify.c:276 #, c-format msgid "<span weight=\"bold\">From:</span> %s\n" msgstr "<span weight=\"bold\">From:</span> %s\n" -#: src/gtknotify.c:241 +#: src/gtknotify.c:285 #, c-format msgid "<span weight=\"bold\">Subject:</span> %s\n" msgstr "<span weight=\"bold\">Subject:</span> %s\n" -#: src/gtknotify.c:246 +#: src/gtknotify.c:290 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n" @@ -3621,7 +3625,7 @@ "\n" "%s%s%s%s" -#: src/gtknotify.c:262 +#: src/gtknotify.c:306 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n" @@ -3632,22 +3636,26 @@ "\n" "%s" -#: src/gtknotify.c:419 +#: src/gtknotify.c:446 +msgid "Search Results" +msgstr "Search Results" + +#: src/gtknotify.c:601 #, c-format msgid "The browser command <b>%s</b> is invalid." msgstr "The browser command <b>%s</b> is invalid." -#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446 -#: src/gtknotify.c:570 +#: src/gtknotify.c:603 src/gtknotify.c:615 src/gtknotify.c:628 +#: src/gtknotify.c:752 msgid "Unable to open URL" msgstr "Unable to open URL" -#: src/gtknotify.c:431 src/gtknotify.c:444 +#: src/gtknotify.c:613 src/gtknotify.c:626 #, c-format msgid "Error launching <b>%s</b>: %s" msgstr "Error launching <b>%s</b>: %s" -#: src/gtknotify.c:571 +#: src/gtknotify.c:753 msgid "" "The 'Manual' browser command has been chosen, but no command has been set." msgstr "" @@ -3662,7 +3670,7 @@ msgstr "Please enter a buddy to pounce." #. "New Buddy Pounce" -#: src/gtkpounce.c:391 src/gtkpounce.c:901 +#: src/gtkpounce.c:391 src/gtkpounce.c:898 msgid "New Buddy Pounce" msgstr "New Buddy Pounce" @@ -3758,63 +3766,55 @@ msgstr "Sav_e this pounce after activation" #. "Remove Buddy Pounce" -#: src/gtkpounce.c:908 +#: src/gtkpounce.c:906 msgid "Remove Buddy Pounce" msgstr "Remove Buddy Pounce" -#: src/gtkpounce.c:969 +#: src/gtkpounce.c:967 #, c-format msgid "%s has started typing to you (%s)" msgstr "%s has started typing to you (%s)" -#: src/gtkpounce.c:971 +#: src/gtkpounce.c:969 #, c-format msgid "%s has signed on (%s)" msgstr "%s has signed on (%s)" -#: src/gtkpounce.c:973 +#: src/gtkpounce.c:971 #, c-format msgid "%s has returned from being idle (%s)" msgstr "%s has returned from being idle (%s)" -#: src/gtkpounce.c:975 +#: src/gtkpounce.c:973 #, c-format msgid "%s has returned from being away (%s)" msgstr "%s has returned from being away (%s)" -#: src/gtkpounce.c:977 +#: src/gtkpounce.c:975 #, c-format msgid "%s has stopped typing to you (%s)" msgstr "%s has stopped typing to you (%s)" -#: src/gtkpounce.c:979 +#: src/gtkpounce.c:977 #, c-format msgid "%s has signed off (%s)" msgstr "%s has signed off (%s)" -#: src/gtkpounce.c:981 +#: src/gtkpounce.c:979 #, c-format msgid "%s has become idle (%s)" msgstr "%s has become idle (%s)" -#: src/gtkpounce.c:983 +#: src/gtkpounce.c:981 #, c-format msgid "%s has gone away. (%s)" msgstr "%s has gone away. (%s)" -#: src/gtkpounce.c:984 +#: src/gtkpounce.c:982 msgid "Unknown pounce event. Please report this!" msgstr "Unknown pounce event. Please report this!" -#: src/gtkprefs.c:398 -msgid "Interface Options" -msgstr "Interface Options" - -#: src/gtkprefs.c:400 -msgid "D_isplay remote nicknames if no alias is set" -msgstr "D_isplay remote nicknames if no alias is set" - -#: src/gtkprefs.c:632 +#: src/gtkprefs.c:615 msgid "" "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." @@ -3822,48 +3822,36 @@ "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:672 +#: src/gtkprefs.c:655 msgid "Icon" msgstr "Icon" -#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267 -#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761 +#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:267 +#: src/protocols/jabber/buddy.c:801 src/protocols/jabber/chat.c:763 msgid "Description" msgstr "Description" -#: src/gtkprefs.c:774 +#: src/gtkprefs.c:757 msgid "Display" msgstr "Display" -#: src/gtkprefs.c:775 -msgid "Show _timestamp on messages" -msgstr "Show _timestamp on messages" - -#: src/gtkprefs.c:778 +#: src/gtkprefs.c:759 msgid "_Highlight misspelled words" msgstr "_Highlight misspelled words" -#: src/gtkprefs.c:782 -msgid "Ignore c_olors" -msgstr "Ignore c_olours" - -#: src/gtkprefs.c:784 -msgid "Ignore font _faces" -msgstr "Ignore font _faces" - -#: src/gtkprefs.c:786 -msgid "Ignore font si_zes" -msgstr "Ignore font si_zes" - -#: src/gtkprefs.c:789 +#: src/gtkprefs.c:763 +msgid "Ignore _formatting" +msgstr "Ignore _formatting" + +#: src/gtkprefs.c:766 msgid "Default Formatting" msgstr "Default Formatting" -#: src/gtkprefs.c:791 +#: src/gtkprefs.c:768 msgid "_Send default formatting with outgoing messages" msgstr "_Send default formatting with outgoing messages" -#: src/gtkprefs.c:801 +#: src/gtkprefs.c:778 msgid "" "This is how your outgoing message text will appear when you use protocols " "that support formatting. :)" @@ -3871,237 +3859,185 @@ "This is how your outgoing message text will appear when you use protocols " "that support formatting. :)" -#: src/gtkprefs.c:804 +#: src/gtkprefs.c:781 msgid "_Clear Formatting" msgstr "_Clear Formatting" -#: src/gtkprefs.c:841 -msgid "Window Closing" -msgstr "Window Closing" - -#: src/gtkprefs.c:842 -msgid "_Escape closes window" -msgstr "_Escape closes window" - -#: src/gtkprefs.c:858 +#: src/gtkprefs.c:821 msgid "Buddy List Sorting" msgstr "Buddy List Sorting" -#: src/gtkprefs.c:867 +#: src/gtkprefs.c:830 msgid "_Sorting:" msgstr "_Sorting:" +#: src/gtkprefs.c:835 +msgid "Buddy Display" +msgstr "Buddy Display" + +#: src/gtkprefs.c:836 +msgid "Show more buddy details" +msgstr "Show more buddy details" + +#: src/gtkprefs.c:869 +msgid "Send unknown \"_slash\" commands as messages" +msgstr "Send unknown \"_slash\" commands as messages" + #: src/gtkprefs.c:872 -msgid "Buddy Display" -msgstr "Buddy Display" - -#: src/gtkprefs.c:873 src/gtkprefs.c:933 msgid "Show buddy _icons" msgstr "Show buddy _icons" -#: src/gtkprefs.c:875 -msgid "Show _warning levels" -msgstr "Show _warning levels" - -#: src/gtkprefs.c:877 -msgid "Show idle _times" -msgstr "Show idle _times" - -#: src/gtkprefs.c:879 -msgid "_Automatically expand contacts" -msgstr "_Automatically expand contacts" - -#: src/gtkprefs.c:912 -msgid "Show _buttons as:" -msgstr "Show _buttons as:" - -#: src/gtkprefs.c:914 -msgid "Pictures" -msgstr "Pictures" - -#: src/gtkprefs.c:915 -msgid "Text" -msgstr "Text" - -#: src/gtkprefs.c:916 -msgid "Pictures and text" -msgstr "Pictures and text" - -#: src/gtkprefs.c:923 -msgid "Enable \"_slash\" commands" -msgstr "Enable \"_slash\" commands" - -#: src/gtkprefs.c:926 -msgid "Send unknown \"_slash\" commands as messages" -msgstr "Send unknown \"_slash\" commands as messages" - -#: src/gtkprefs.c:929 -msgid "Show _formatting toolbar" -msgstr "Show _formatting toolbar" - -#: src/gtkprefs.c:931 -msgid "Show _aliases in tabs/titles" -msgstr "Show _aliases in tabs/titles" - -#: src/gtkprefs.c:935 +#: src/gtkprefs.c:874 msgid "Enable buddy ic_on animation" msgstr "Enable buddy ic_on animation" -#: src/gtkprefs.c:937 +#: src/gtkprefs.c:876 msgid "_Notify buddies that you are typing to them" msgstr "_Notify buddies that you are typing to them" -#: src/gtkprefs.c:939 -msgid "_Raise IM window on events" -msgstr "_Raise IM window on events" - -#: src/gtkprefs.c:942 -msgid "Raise chat _window on events" -msgstr "Raise chat _window on events" - #. All the tab options! -#: src/gtkprefs.c:946 +#: src/gtkprefs.c:880 msgid "Tab Options" msgstr "Tab Options" -#: src/gtkprefs.c:948 +#: src/gtkprefs.c:882 msgid "Show IMs and chats in _tabbed windows" msgstr "Show IMs and chats in _tabbed windows" -#: src/gtkprefs.c:962 +#: src/gtkprefs.c:896 msgid "Show close b_utton on tabs" msgstr "Show close b_utton on tabs" -#: src/gtkprefs.c:965 +#: src/gtkprefs.c:899 msgid "Tab p_lacement:" msgstr "Tab p_lacement:" -#: src/gtkprefs.c:967 +#: src/gtkprefs.c:901 msgid "Top" msgstr "Top" -#: src/gtkprefs.c:968 +#: src/gtkprefs.c:902 msgid "Bottom" msgstr "Bottom" -#: src/gtkprefs.c:969 +#: src/gtkprefs.c:903 msgid "Left" msgstr "Left" -#: src/gtkprefs.c:970 +#: src/gtkprefs.c:904 msgid "Right" msgstr "Right" -#: src/gtkprefs.c:976 +#: src/gtkprefs.c:910 msgid "New conversation _placement:" msgstr "New conversation _placement:" -#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749 -#: src/protocols/oscar/oscar.c:5045 +#: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765 +#: src/protocols/oscar/oscar.c:5185 msgid "IP Address" msgstr "IP Address" -#: src/gtkprefs.c:1029 +#: src/gtkprefs.c:963 msgid "_Autodetect IP Address" msgstr "_Autodetect IP Address" -#: src/gtkprefs.c:1038 +#: src/gtkprefs.c:972 msgid "Public _IP:" msgstr "Public _IP:" -#: src/gtkprefs.c:1062 +#: src/gtkprefs.c:996 msgid "Ports" msgstr "Ports" -#: src/gtkprefs.c:1065 +#: src/gtkprefs.c:999 msgid "_Manually specify range of ports to listen on" msgstr "_Manually specify range of ports to listen on" -#: src/gtkprefs.c:1068 +#: src/gtkprefs.c:1002 msgid "_Start Port:" msgstr "_Start Port:" -#: src/gtkprefs.c:1075 +#: src/gtkprefs.c:1009 msgid "_End Port:" msgstr "_End Port:" -#: src/gtkprefs.c:1082 +#: src/gtkprefs.c:1016 msgid "Proxy Server" msgstr "Proxy Server" -#: src/gtkprefs.c:1086 +#: src/gtkprefs.c:1020 msgid "No proxy" msgstr "No proxy" -#: src/gtkprefs.c:1148 +#: src/gtkprefs.c:1082 msgid "_User:" msgstr "_User:" -#: src/gtkprefs.c:1204 +#: src/gtkprefs.c:1138 msgid "Epiphany" msgstr "Epiphany" -#: src/gtkprefs.c:1205 +#: src/gtkprefs.c:1139 msgid "Firebird" msgstr "Firebird" -#: src/gtkprefs.c:1206 +#: src/gtkprefs.c:1140 msgid "Firefox" msgstr "Firefox" -#: src/gtkprefs.c:1207 +#: src/gtkprefs.c:1141 msgid "Galeon" msgstr "Galeon" -#: src/gtkprefs.c:1208 +#: src/gtkprefs.c:1142 msgid "Gnome Default" msgstr "Gnome Default" -#: src/gtkprefs.c:1209 +#: src/gtkprefs.c:1143 msgid "Konqueror" msgstr "Konqueror" -#: src/gtkprefs.c:1210 +#: src/gtkprefs.c:1144 msgid "Mozilla" msgstr "Mozilla" -#: src/gtkprefs.c:1211 +#: src/gtkprefs.c:1145 msgid "Netscape" msgstr "Netscape" -#: src/gtkprefs.c:1212 +#: src/gtkprefs.c:1146 msgid "Opera" msgstr "Opera" -#: src/gtkprefs.c:1221 +#: src/gtkprefs.c:1155 msgid "Manual" msgstr "Manual" -#: src/gtkprefs.c:1272 +#: src/gtkprefs.c:1206 msgid "Browser Selection" msgstr "Browser Selection" -#: src/gtkprefs.c:1276 +#: src/gtkprefs.c:1210 msgid "_Browser:" msgstr "_Browser:" -#: src/gtkprefs.c:1283 +#: src/gtkprefs.c:1217 msgid "_Open link in:" msgstr "_Open link in:" -#: src/gtkprefs.c:1285 +#: src/gtkprefs.c:1219 msgid "Browser default" msgstr "Browser default" -#: src/gtkprefs.c:1286 +#: src/gtkprefs.c:1220 msgid "Existing window" msgstr "Existing window" -#: src/gtkprefs.c:1288 +#: src/gtkprefs.c:1222 msgid "New tab" msgstr "New tab" -#: src/gtkprefs.c:1302 +#: src/gtkprefs.c:1236 #, c-format msgid "" "_Manual:\n" @@ -4110,75 +4046,75 @@ "_Manual:\n" "(%s for URL)" -#: src/gtkprefs.c:1339 +#: src/gtkprefs.c:1273 msgid "Message Logs" msgstr "Message Logs" -#: src/gtkprefs.c:1342 +#: src/gtkprefs.c:1276 msgid "Log _Format:" msgstr "Log _Format:" -#: src/gtkprefs.c:1345 +#: src/gtkprefs.c:1279 msgid "_Log all instant messages" msgstr "_Log all instant messages" -#: src/gtkprefs.c:1347 +#: src/gtkprefs.c:1281 msgid "Log all c_hats" msgstr "Log all c_hats" -#: src/gtkprefs.c:1350 +#: src/gtkprefs.c:1284 msgid "System Logs" msgstr "System Logs" -#: src/gtkprefs.c:1352 +#: src/gtkprefs.c:1286 msgid "_Enable system log" msgstr "_Enable system log" -#: src/gtkprefs.c:1355 +#: src/gtkprefs.c:1289 msgid "Log when buddies log in/log _out" msgstr "Log when buddies log in/log _out" -#: src/gtkprefs.c:1361 +#: src/gtkprefs.c:1295 msgid "Log when buddies become _idle/un-idle" msgstr "Log when buddies become _idle/un-idle" -#: src/gtkprefs.c:1367 +#: src/gtkprefs.c:1301 msgid "Log when buddies go away/come _back" msgstr "Log when buddies go away/come _back" -#: src/gtkprefs.c:1373 +#: src/gtkprefs.c:1307 msgid "Log your own _signons/idleness/awayness" msgstr "Log your own _signons/idleness/awayness" -#: src/gtkprefs.c:1509 +#: src/gtkprefs.c:1443 msgid "Sound Selection" msgstr "Sound Selection" -#: src/gtkprefs.c:1561 +#: src/gtkprefs.c:1495 msgid "Sound Method" msgstr "Sound Method" -#: src/gtkprefs.c:1562 +#: src/gtkprefs.c:1496 msgid "_Method:" msgstr "_Method:" -#: src/gtkprefs.c:1564 +#: src/gtkprefs.c:1498 msgid "Console beep" msgstr "Console beep" -#: src/gtkprefs.c:1566 +#: src/gtkprefs.c:1500 msgid "Automatic" msgstr "Automatic" -#: src/gtkprefs.c:1573 +#: src/gtkprefs.c:1507 msgid "Command" msgstr "Command" -#: src/gtkprefs.c:1574 +#: src/gtkprefs.c:1508 msgid "No sounds" msgstr "No sounds" -#: src/gtkprefs.c:1582 +#: src/gtkprefs.c:1516 #, c-format msgid "" "Sound c_ommand:\n" @@ -4187,102 +4123,102 @@ "Sound c_ommand:\n" "(%s for filename)" -#: src/gtkprefs.c:1609 +#: src/gtkprefs.c:1543 msgid "Sound Options" msgstr "Sound Options" -#: src/gtkprefs.c:1610 +#: src/gtkprefs.c:1544 msgid "Sounds when conversation has _focus" msgstr "Sounds when conversation has _focus" -#: src/gtkprefs.c:1612 +#: src/gtkprefs.c:1546 msgid "_Sounds while away" msgstr "_Sounds while away" -#: src/gtkprefs.c:1622 +#: src/gtkprefs.c:1556 msgid "Sound Events" msgstr "Sound Events" -#: src/gtkprefs.c:1673 +#: src/gtkprefs.c:1607 msgid "Play" msgstr "Play" -#: src/gtkprefs.c:1680 +#: src/gtkprefs.c:1614 msgid "Event" msgstr "Event" -#: src/gtkprefs.c:1699 +#: src/gtkprefs.c:1633 msgid "Test" msgstr "Test" -#: src/gtkprefs.c:1703 +#: src/gtkprefs.c:1637 msgid "Reset" msgstr "Reset" -#: src/gtkprefs.c:1707 +#: src/gtkprefs.c:1641 msgid "Choose..." msgstr "Choose..." -#: src/gtkprefs.c:1761 +#: src/gtkprefs.c:1695 msgid "_Queue new messages when away" msgstr "_Queue new messages when away" -#: src/gtkprefs.c:1764 +#: src/gtkprefs.c:1698 msgid "_Auto-reply:" msgstr "_Auto-reply:" -#: src/gtkprefs.c:1766 +#: src/gtkprefs.c:1700 msgid "Never" msgstr "Never" -#: src/gtkprefs.c:1767 +#: src/gtkprefs.c:1701 msgid "When away" msgstr "When away" -#: src/gtkprefs.c:1768 +#: src/gtkprefs.c:1702 msgid "When away and idle" msgstr "When away and idle" -#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507 -#: src/protocols/msn/msn.c:1356 src/protocols/msn/state.c:32 -#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194 -#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665 +#: src/gtkprefs.c:1705 src/protocols/msn/msn.c:504 +#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2817 +#: src/protocols/oscar/oscar.c:4312 src/protocols/yahoo/yahoo.c:2410 +#: src/protocols/yahoo/yahoo_profile.c:665 msgid "Idle" msgstr "Idle" -#: src/gtkprefs.c:1772 +#: src/gtkprefs.c:1706 msgid "Idle _time reporting:" msgstr "Idle _time reporting:" -#: src/gtkprefs.c:1775 +#: src/gtkprefs.c:1709 msgid "Gaim usage" msgstr "Gaim usage" -#: src/gtkprefs.c:1778 +#: src/gtkprefs.c:1712 msgid "X usage" msgstr "X usage" -#: src/gtkprefs.c:1780 +#: src/gtkprefs.c:1714 msgid "Windows usage" msgstr "Windows usage" -#: src/gtkprefs.c:1788 +#: src/gtkprefs.c:1722 msgid "Auto-away" msgstr "Auto-away" -#: src/gtkprefs.c:1789 +#: src/gtkprefs.c:1723 msgid "Set away _when idle" msgstr "Set away _when idle" -#: src/gtkprefs.c:1793 +#: src/gtkprefs.c:1727 msgid "_Minutes before setting away:" msgstr "_Minutes before setting away:" -#: src/gtkprefs.c:1801 +#: src/gtkprefs.c:1735 msgid "Away m_essage:" msgstr "Away m_essage:" -#: src/gtkprefs.c:1859 +#: src/gtkprefs.c:1793 #, c-format msgid "" "<span size=\"larger\">%s %s</span>\n" @@ -4297,7 +4233,7 @@ "<span weight=\"bold\">Web site:</span>\t\t%s\n" "<span weight=\"bold\">File name:</span>\t%s" -#: src/gtkprefs.c:1864 +#: src/gtkprefs.c:1798 #, c-format msgid "" "<span size=\"larger\">%s %s</span>\n" @@ -4312,55 +4248,47 @@ "<span weight=\"bold\">URL:</span> %s\n" "<span weight=\"bold\">File name:</span> %s" -#: src/gtkprefs.c:2073 +#: src/gtkprefs.c:2007 msgid "Load" msgstr "Load" -#: src/gtkprefs.c:2087 +#: src/gtkprefs.c:2021 msgid "Summary" msgstr "Summary" -#: src/gtkprefs.c:2135 +#: src/gtkprefs.c:2069 msgid "Details" msgstr "Details" -#: src/gtkprefs.c:2177 -msgid "Interface" -msgstr "Interface" - -#: src/gtkprefs.c:2180 +#: src/gtkprefs.c:2113 msgid "Message Text" msgstr "Message Text" -#: src/gtkprefs.c:2181 -msgid "Shortcuts" -msgstr "Shortcuts" - -#: src/gtkprefs.c:2182 +#: src/gtkprefs.c:2114 msgid "Smiley Themes" msgstr "Smiley Themes" -#: src/gtkprefs.c:2183 +#: src/gtkprefs.c:2115 msgid "Sounds" msgstr "Sounds" -#: src/gtkprefs.c:2184 +#: src/gtkprefs.c:2116 msgid "Network" msgstr "Network" -#: src/gtkprefs.c:2189 +#: src/gtkprefs.c:2121 msgid "Browser" msgstr "Browser" -#: src/gtkprefs.c:2192 +#: src/gtkprefs.c:2124 msgid "Logging" msgstr "Logging" -#: src/gtkprefs.c:2193 +#: src/gtkprefs.c:2125 msgid "Away / Idle" msgstr "Away / Idle" -#: src/gtkprefs.c:2196 +#: src/gtkprefs.c:2128 msgid "Plugins" msgstr "Plugins" @@ -4384,7 +4312,7 @@ msgid "Block only the users below" msgstr "Block only the users below" -#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508 +#: src/gtkprivacy.c:388 msgid "Privacy" msgstr "Privacy" @@ -4397,50 +4325,54 @@ msgid "Set privacy for:" msgstr "Set privacy for:" -#: src/gtkprivacy.c:582 src/gtkprivacy.c:598 +#: src/gtkprivacy.c:579 src/gtkprivacy.c:595 msgid "Permit User" msgstr "Permit User" -#: src/gtkprivacy.c:583 +#: src/gtkprivacy.c:580 msgid "Type a user you permit to contact you." msgstr "Type a user you permit to contact you." -#: src/gtkprivacy.c:584 +#: src/gtkprivacy.c:581 msgid "Please enter the name of the user you wish to be able to contact you." msgstr "Please enter the name of the user you wish to be able to contact you." -#: src/gtkprivacy.c:587 src/gtkprivacy.c:600 +#: src/gtkprivacy.c:584 src/gtkprivacy.c:597 msgid "Permit" msgstr "Permit" -#: src/gtkprivacy.c:592 +#: src/gtkprivacy.c:589 #, c-format msgid "Allow %s to contact you?" msgstr "Allow %s to contact you?" -#: src/gtkprivacy.c:594 +#: src/gtkprivacy.c:591 #, c-format msgid "Are you sure you wish to allow %s to contact you?" msgstr "Are you sure you wish to allow %s to contact you?" -#: src/gtkprivacy.c:621 src/gtkprivacy.c:634 +#: src/gtkprivacy.c:618 src/gtkprivacy.c:631 msgid "Block User" msgstr "Block User" -#: src/gtkprivacy.c:622 +#: src/gtkprivacy.c:619 msgid "Type a user to block." msgstr "Type a user to block." -#: src/gtkprivacy.c:623 +#: src/gtkprivacy.c:620 msgid "Please enter the name of the user you wish to block." msgstr "Please enter the name of the user you wish to block." -#: src/gtkprivacy.c:630 +#: src/gtkprivacy.c:622 src/gtkprivacy.c:633 +msgid "Block" +msgstr "Block" + +#: src/gtkprivacy.c:627 #, c-format msgid "Block %s?" msgstr "Block %s?" -#: src/gtkprivacy.c:632 +#: src/gtkprivacy.c:629 #, c-format msgid "Are you sure you want to block %s?" msgstr "Are you sure you want to block %s?" @@ -4448,15 +4380,17 @@ #. * #. * A wrapper for gaim_request_action() that uses Yes and No buttons. #. -#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514 -#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901 +#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1027 +#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:511 +#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1901 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117 #: src/request.h:1235 msgid "Yes" msgstr "Yes" -#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514 -#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902 +#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1027 +#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:511 +#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1902 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118 #: src/request.h:1235 msgid "No" @@ -4466,24 +4400,24 @@ msgid "Apply" msgstr "Apply" -#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316 +#: src/gtkrequest.c:262 src/protocols/msn/msn.c:314 #: src/protocols/silc/util.c:332 msgid "Close" msgstr "Close" -#: src/gtkrequest.c:1483 +#: src/gtkrequest.c:1492 msgid "That file already exists" msgstr "That file already exists" -#: src/gtkrequest.c:1484 +#: src/gtkrequest.c:1493 msgid "Would you like to overwrite it?" msgstr "Would you like to overwrite it?" -#: src/gtkrequest.c:1522 src/gtkrequest.c:1543 +#: src/gtkrequest.c:1531 src/gtkrequest.c:1556 msgid "Save File..." msgstr "Save File..." -#: src/gtkrequest.c:1523 src/gtkrequest.c:1544 +#: src/gtkrequest.c:1532 src/gtkrequest.c:1557 msgid "Open File..." msgstr "Open File..." @@ -4496,6 +4430,67 @@ msgid "_Get List" msgstr "_Get List" +#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:264 +#: src/protocols/jabber/buddy.c:795 src/protocols/novell/novell.c:1460 +msgid "Title" +msgstr "Title" + +#: src/gtksavedstatuses.c:325 +msgid "Type" +msgstr "Type" + +#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:292 +#: src/protocols/gg/gg.c:298 src/protocols/gg/gg.c:304 +#: src/protocols/gg/gg.c:310 src/protocols/gg/gg.c:316 +#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328 +#: src/protocols/irc/irc.c:180 src/protocols/jabber/jabber.c:971 +#: src/protocols/jabber/jabber.c:977 src/protocols/jabber/jabber.c:983 +#: src/protocols/jabber/jabber.c:989 src/protocols/jabber/jabber.c:995 +#: src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:1007 +#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7018 +#: src/protocols/oscar/oscar.c:7025 src/protocols/yahoo/yahoo.c:2894 +#: src/protocols/yahoo/yahoo.c:2928 src/protocols/zephyr/zephyr.c:2226 +msgid "Message" +msgstr "Message" + +#: src/gtksavedstatuses.c:399 +msgid "Saved Statuses" +msgstr "Saved Statuses" + +#: src/gtksavedstatuses.c:520 +msgid "Title already in use. You must choose a unique title." +msgstr "Title already in use. You must choose a unique title." + +#: src/gtksavedstatuses.c:611 +msgid "Custom status" +msgstr "Custom status" + +#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:616 +#: src/protocols/jabber/buddy.c:623 src/protocols/jabber/buddy.c:634 +#: src/protocols/jabber/jabber.c:950 src/protocols/msn/msn.c:502 +#: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834 +#: src/protocols/oscar/oscar.c:747 src/protocols/oscar/oscar.c:753 +#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2533 +msgid "Status" +msgstr "Status" + +#: src/gtksavedstatuses.c:733 +msgid "_Title:" +msgstr "_Title:" + +#: src/gtksavedstatuses.c:744 +msgid "Out of the office" +msgstr "Out of the office" + +#: src/gtksavedstatuses.c:755 +msgid "_Status:" +msgstr "_Status:" + +#. Custom status message disclosure +#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791 +msgid "Use a different status for some accounts" +msgstr "Use a different status for some accounts" + #: src/gtksound.c:65 msgid "Buddy logs in" msgstr "Buddy logs in" @@ -4536,12 +4531,12 @@ msgid "Someone says your name in chat" msgstr "Someone says your name in chat" -#: src/gtksound.c:180 +#: src/gtksound.c:282 #, c-format msgid "Unable to play sound because the chosen file (%s) does not exist." msgstr "Unable to play sound because the chosen file (%s) does not exist." -#: src/gtksound.c:196 +#: src/gtksound.c:298 msgid "" "Unable to play sound because the 'Command' sound method has been chosen, but " "no command has been set." @@ -4549,7 +4544,7 @@ "Unable to play sound because the 'Command' sound method has been chosen, but " "no command has been set." -#: src/gtksound.c:208 +#: src/gtksound.c:310 #, c-format msgid "" "Unable to play sound because the configured sound command could not be " @@ -4558,6 +4553,11 @@ "Unable to play sound because the configured sound command could not be " "launched: %s" +#. TODO: Add saved statuses here? +#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659 +msgid "New Status" +msgstr "New Status" + #: src/gtkstock.c:88 msgid "_Alias" msgstr "_Alias" @@ -4578,21 +4578,21 @@ msgid "_Warn" msgstr "_Warn" -#: src/gtkutils.c:1399 src/gtkutils.c:1424 +#: src/gtkutils.c:1393 src/gtkutils.c:1418 #, c-format msgid "The following error has occurred loading %s: %s" msgstr "The following error has occurred loading %s: %s" -#: src/gtkutils.c:1401 src/gtkutils.c:1426 +#: src/gtkutils.c:1395 src/gtkutils.c:1420 msgid "Failed to load image" msgstr "Failed to load image" -#: src/gtkutils.c:1487 +#: src/gtkutils.c:1483 #, c-format msgid "Cannot send folder %s." msgstr "Cannot send folder %s." -#: src/gtkutils.c:1489 +#: src/gtkutils.c:1485 msgid "" "Gaim cannot transfer a folder. You will need to send the files within " "individually" @@ -4600,11 +4600,11 @@ "Gaim cannot transfer a folder. You will need to send the files within it " "individually" -#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530 +#: src/gtkutils.c:1513 src/gtkutils.c:1522 src/gtkutils.c:1527 msgid "You have dragged an image" msgstr "You have dragged an image" -#: src/gtkutils.c:1517 +#: src/gtkutils.c:1514 msgid "" "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." @@ -4612,23 +4612,23 @@ "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." -#: src/gtkutils.c:1521 src/gtkutils.c:1536 +#: src/gtkutils.c:1518 src/gtkutils.c:1533 msgid "Set as buddy icon" msgstr "Set as buddy icon" -#: src/gtkutils.c:1522 src/gtkutils.c:1537 +#: src/gtkutils.c:1519 src/gtkutils.c:1534 msgid "Send image file" msgstr "Send image file" -#: src/gtkutils.c:1523 src/gtkutils.c:1537 +#: src/gtkutils.c:1520 src/gtkutils.c:1534 msgid "Insert in message" msgstr "Insert in message" -#: src/gtkutils.c:1526 +#: src/gtkutils.c:1523 msgid "Would you like to set it as the buddy icon for this user?" msgstr "Would you like to set it as the buddy icon for this user?" -#: src/gtkutils.c:1531 +#: src/gtkutils.c:1528 msgid "" "You can send this image as a file transfer orembed it into this message, or " "use it as the buddy icon for this user." @@ -4636,7 +4636,7 @@ "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." -#: src/gtkutils.c:1533 +#: src/gtkutils.c:1530 msgid "" "You can insert this image into this message, or use it as the buddy icon for " "this user" @@ -4649,11 +4649,11 @@ #. * send. The only logical one is "Application," but do we really want to send a binary and nothing else? #. * Probably not. I'll just give an error and return. #. The original patch sent the icon used by the launcher. That's probably wrong -#: src/gtkutils.c:1587 +#: src/gtkutils.c:1584 msgid "Cannot send launcher" msgstr "Cannot send launcher" -#: src/gtkutils.c:1587 +#: src/gtkutils.c:1584 msgid "" "You dragged a desktop launcher. Most likely you wanted to send whatever this " "launcher points to instead of this launcher itself." @@ -4665,11 +4665,11 @@ msgid "<b><font color=\"red\">The logger has no read function</font></b>" msgstr "<b><font color=\"red\">The logger has no read function</font></b>" -#: src/log.c:528 +#: src/log.c:545 msgid "XML" msgstr "XML" -#: src/log.c:591 +#: src/log.c:608 #, c-format msgid "" "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" @@ -4678,7 +4678,7 @@ "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" "REPLY>:</b></font> %s<br/>\n" -#: src/log.c:593 +#: src/log.c:610 #, c-format msgid "" "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" @@ -4687,29 +4687,29 @@ "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" "REPLY>:</b></font> %s<br/>\n" -#: src/log.c:644 src/log.c:774 +#: src/log.c:661 src/log.c:791 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>" msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>" -#: src/log.c:654 src/log.c:786 +#: src/log.c:671 src/log.c:803 #, c-format msgid "<font color=\"red\"><b>Could not read file: %s</b></font>" msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>" -#: src/log.c:658 +#: src/log.c:675 msgid "HTML" msgstr "HTML" -#: src/log.c:719 +#: src/log.c:736 #, c-format msgid "(%s) %s <AUTO-REPLY>: %s\n" msgstr "(%s) %s <AUTO-REPLY>: %s\n" -#: src/log.c:790 +#: src/log.c:807 msgid "Plain text" msgstr "Plain text" -#: src/plugin.c:304 +#: src/plugin.c:287 #, c-format msgid "" "The required plugin %s was not found. Please install this plugin and try " @@ -4718,26 +4718,27 @@ "The required plugin %s was not found. Please install this plugin and try " "again." -#: src/plugin.c:309 src/plugin.c:337 +#: src/plugin.c:292 src/plugin.c:320 msgid "Gaim was unable to load your plugin." msgstr "Gaim was unable to load your plugin." -#: src/plugin.c:333 +#: src/plugin.c:316 #, c-format msgid "The required plugin %s was unable to load." msgstr "The required plugin %s was unable to load." -#: src/prefs.c:114 +#: src/prefs.c:1094 msgid "Slightly less boring default" msgstr "Slightly less boring default" -#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165 -#: src/protocols/msn/msn.c:538 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:2808 -#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978 -#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876 -#: src/protocols/yahoo/yahoo.c:3128 +#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175 +#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535 +#: 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:2808 src/protocols/novell/novell.c:2927 +#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787 +#: src/protocols/oscar/oscar.c:7017 src/protocols/yahoo/yahoo.c:2888 +#: src/status.c:157 msgid "Available" msgstr "Available" @@ -4749,9 +4750,9 @@ msgid "Away for friends only" msgstr "Away for friends only" -#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681 -#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649 -#: src/protocols/yahoo/yahoo.c:3172 +#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:695 +#: src/protocols/oscar/oscar.c:7031 src/protocols/yahoo/yahoo.c:2408 +#: src/protocols/yahoo/yahoo.c:2932 msgid "Invisible" msgstr "Invisible" @@ -4759,234 +4760,244 @@ msgid "Invisible for friends only" msgstr "Invisible for friends only" -#: src/protocols/gg/gg.c:56 +#: src/protocols/gg/gg.c:56 src/status.c:158 msgid "Unavailable" msgstr "Unavailable" -#: src/protocols/gg/gg.c:137 +#: src/protocols/gg/gg.c:151 msgid "Unable to resolve hostname." msgstr "Unable to resolve hostname." -#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720 +#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720 msgid "Unable to connect to server." msgstr "Unable to connect to server." -#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130 -#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365 -#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475 +#: src/protocols/gg/gg.c:157 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." -#: src/protocols/gg/gg.c:146 +#: src/protocols/gg/gg.c:160 msgid "Error while reading from socket." msgstr "Error while reading from socket." -#: src/protocols/gg/gg.c:149 +#: src/protocols/gg/gg.c:163 msgid "Error while writing to socket." msgstr "Error while writing to socket." -#: src/protocols/gg/gg.c:152 +#: src/protocols/gg/gg.c:166 msgid "Authentication failed." msgstr "Authentication failed." -#: src/protocols/gg/gg.c:155 +#: src/protocols/gg/gg.c:169 msgid "Unknown Error Code." msgstr "Unknown Error Code." -#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994 +#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4111 #, c-format msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s" msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s" #. res[0] == username -#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075 -#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998 -#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088 +#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1089 +#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4115 +#: src/protocols/oscar/oscar.c:4341 src/protocols/silc/ops.c:1088 #: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469 #: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136 msgid "Buddy Information" msgstr "Buddy Information" -#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157 -#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970 -#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556 -#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739 -#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866 -#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653 -#: src/protocols/yahoo/yahoo.c:3122 +#: src/protocols/gg/gg.c:282 src/protocols/irc/irc.c:167 +#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:971 +#: src/protocols/msn/msn.c:527 src/protocols/napster/napster.c:556 +#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:755 +#: src/protocols/oscar/oscar.c:6813 src/protocols/oscar/oscar.c:7007 +#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2412 +#: src/protocols/yahoo/yahoo.c:2882 src/status.c:155 msgid "Offline" msgstr "Offline" -#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284 -#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296 -#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308 -#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170 -#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976 -#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988 -#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000 -#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877 -#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134 -#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2226 -msgid "Message" -msgstr "Message" - -#: src/protocols/gg/gg.c:327 +#. zephyr has several exposures +#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong) +#. OPSTAFF "hidden" +#. REALM-VISIBLE visible to people in local realm +#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*> +#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm +#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced to <login,username,*> +#. +#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE), +#. Hidden, will set the user's exposure to OPSTAFF +#. +#. Away won't change their exposure but will set an auto away message (for IMs only) +#. +#: src/protocols/gg/gg.c:286 src/protocols/irc/irc.c:171 +#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:976 +#: src/protocols/msn/msn.c:531 src/protocols/napster/napster.c:561 +#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7012 +#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2414 +#: src/protocols/yahoo/yahoo.c:2885 src/protocols/zephyr/zephyr.c:2218 +#: src/status.c:156 +msgid "Online" +msgstr "Online" + +#: src/protocols/gg/gg.c:341 #, c-format msgid "Status: %s" msgstr "Status: %s" -#: src/protocols/gg/gg.c:481 +#: src/protocols/gg/gg.c:495 msgid "Could not connect" msgstr "Could not connect" -#: src/protocols/gg/gg.c:488 +#: src/protocols/gg/gg.c:502 msgid "Unable to read socket" msgstr "Unable to read socket" #. we didn't successfully connect. tdt->toc_fd is valid here -#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486 +#: src/protocols/gg/gg.c:752 src/protocols/napster/napster.c:486 #: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171 -#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309 -#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68 -#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482 +#: src/protocols/yahoo/yahoo.c:2009 src/protocols/yahoo/yahoo.c:2036 +#: src/protocols/yahoo/yahoo.c:2099 src/protocols/yahoo/yahoo_filexfer.c:69 +#: src/protocols/yahoo/yahoo_filexfer.c:112 src/protocols/yahoo/ycht.c:483 msgid "Unable to connect." msgstr "Unable to connect." -#: src/protocols/gg/gg.c:754 +#: src/protocols/gg/gg.c:768 msgid "Reading data" msgstr "Reading data" -#: src/protocols/gg/gg.c:757 +#: src/protocols/gg/gg.c:771 msgid "Balancer handshake" msgstr "Balancer handshake" -#: src/protocols/gg/gg.c:760 +#: src/protocols/gg/gg.c:774 msgid "Reading server key" msgstr "Reading server key" -#: src/protocols/gg/gg.c:763 +#: src/protocols/gg/gg.c:777 msgid "Exchanging key hash" msgstr "Exchanging key hash" -#: src/protocols/gg/gg.c:773 +#: src/protocols/gg/gg.c:787 msgid "Critical error in GG library\n" msgstr "Critical error in GG library\n" -#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882 +#: src/protocols/gg/gg.c:805 src/protocols/gg/gg.c:896 #: src/protocols/toc/toc.c:147 #, c-format msgid "Connect to %s failed" msgstr "Connect to %s failed" -#: src/protocols/gg/gg.c:839 +#: src/protocols/gg/gg.c:853 msgid "Unable to ping server" msgstr "Unable to ping server" -#: src/protocols/gg/gg.c:851 +#: src/protocols/gg/gg.c:865 msgid "Send as message" msgstr "Send as message" -#: src/protocols/gg/gg.c:856 +#: src/protocols/gg/gg.c:870 msgid "Looking up GG server" msgstr "Looking up GG server" -#: src/protocols/gg/gg.c:859 +#: src/protocols/gg/gg.c:873 msgid "Invalid Gadu-Gadu UIN specified" msgstr "Invalid Gadu-Gadu UIN specified" -#: src/protocols/gg/gg.c:906 +#: src/protocols/gg/gg.c:920 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN." msgstr "You are trying to send a message to an invalid Gadu-Gadu UIN." -#: src/protocols/gg/gg.c:981 +#: src/protocols/gg/gg.c:995 msgid "Couldn't get search results" msgstr "Couldn't get search results" -#: src/protocols/gg/gg.c:986 +#: src/protocols/gg/gg.c:1000 msgid "Gadu-Gadu Search Engine" msgstr "Gadu-Gadu Search Engine" -#: src/protocols/gg/gg.c:1012 +#: src/protocols/gg/gg.c:1026 msgid "Active" msgstr "Active" -#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037 +#: src/protocols/gg/gg.c:1031 src/protocols/oscar/oscar.c:5177 msgid "UIN" msgstr "UIN" #. First Name -#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621 -#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810 +#: src/protocols/gg/gg.c:1035 src/protocols/jabber/jabber.c:622 +#: src/protocols/oscar/oscar.c:5188 src/protocols/silc/ops.c:810 #: src/protocols/trepia/trepia.c:268 msgid "First Name" msgstr "First Name" #. Last Name -#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626 -#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275 +#: src/protocols/gg/gg.c:1040 src/protocols/jabber/jabber.c:627 +#: src/protocols/oscar/oscar.c:5189 src/protocols/trepia/trepia.c:275 msgid "Last Name" msgstr "Last Name" -#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775 -#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038 +#: src/protocols/gg/gg.c:1044 src/protocols/gg/gg.c:1789 +#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5178 #: src/protocols/silc/ops.c:1202 msgid "Nick" msgstr "Nick" -#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040 +#: src/protocols/gg/gg.c:1051 src/protocols/gg/gg.c:1054 msgid "Birth Year" msgstr "Birth Year" -#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048 -#: src/protocols/gg/gg.c:1050 +#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1062 +#: src/protocols/gg/gg.c:1064 msgid "Sex" msgstr "Sex" #. City -#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636 -#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100 +#: src/protocols/gg/gg.c:1068 src/protocols/jabber/jabber.c:637 +#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5240 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411 msgid "City" msgstr "City" -#: src/protocols/gg/gg.c:1097 +#: src/protocols/gg/gg.c:1111 msgid "There is no Buddy List stored on the Gadu-Gadu server." msgstr "There is no Buddy List stored on the Gadu-Gadu server." -#: src/protocols/gg/gg.c:1105 +#: src/protocols/gg/gg.c:1119 msgid "Couldn't Import Buddy List from Server" msgstr "Couldn't Import Buddy List from Server" -#: src/protocols/gg/gg.c:1167 +#: src/protocols/gg/gg.c:1181 msgid "Buddy List successfully transferred to Gadu-Gadu server" msgstr "Buddy List successfully transferred to Gadu-Gadu server" -#: src/protocols/gg/gg.c:1175 +#: src/protocols/gg/gg.c:1189 msgid "Couldn't transfer Buddy List to Gadu-Gadu server" msgstr "Couldn't transfer Buddy List to Gadu-Gadu server" -#: src/protocols/gg/gg.c:1183 +#: src/protocols/gg/gg.c:1197 msgid "Buddy List successfully deleted from Gadu-Gadu server" msgstr "Buddy List successfully deleted from Gadu-Gadu server" -#: src/protocols/gg/gg.c:1191 +#: src/protocols/gg/gg.c:1205 msgid "Couldn't delete Buddy List from Gadu-Gadu server" msgstr "Couldn't delete Buddy List from Gadu-Gadu server" -#: src/protocols/gg/gg.c:1200 +#: src/protocols/gg/gg.c:1214 msgid "Password changed successfully" msgstr "Password changed successfully" -#: src/protocols/gg/gg.c:1207 +#: src/protocols/gg/gg.c:1221 msgid "Password couldn't be changed" msgstr "Password couldn't be changed" -#: src/protocols/gg/gg.c:1326 +#: src/protocols/gg/gg.c:1340 msgid "Error communicating with Gadu-Gadu server" msgstr "Error communicating with Gadu-Gadu server" -#: src/protocols/gg/gg.c:1327 +#: src/protocols/gg/gg.c:1341 msgid "" "Gaim was unable to complete your request due to a problem communicating with " "the Gadu-Gadu HTTP server. Please try again later." @@ -4994,11 +5005,11 @@ "Gaim was unable to complete your request due to a problem communicating with " "the Gadu-Gadu HTTP server. Please try again later." -#: src/protocols/gg/gg.c:1356 +#: src/protocols/gg/gg.c:1370 msgid "Unable to import Gadu-Gadu buddy list" msgstr "Unable to import Gadu-Gadu buddy list" -#: src/protocols/gg/gg.c:1357 +#: src/protocols/gg/gg.c:1371 msgid "" "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please try " "again later." @@ -5006,25 +5017,25 @@ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please try " "again later." -#: src/protocols/gg/gg.c:1430 +#: src/protocols/gg/gg.c:1444 msgid "Couldn't export buddy list" msgstr "Couldn't export buddy list" -#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454 +#: src/protocols/gg/gg.c:1445 src/protocols/gg/gg.c:1468 msgid "" "Gaim was unable to connect to the buddy list server. Please try again later." msgstr "" "Gaim was unable to connect to the buddy list server. Please try again later." -#: src/protocols/gg/gg.c:1453 +#: src/protocols/gg/gg.c:1467 msgid "Unable to delete Gadu-Gadu buddy list" msgstr "Unable to delete Gadu-Gadu buddy list" -#: src/protocols/gg/gg.c:1504 +#: src/protocols/gg/gg.c:1518 msgid "Unable to access directory" msgstr "Unable to access directory" -#: src/protocols/gg/gg.c:1505 +#: src/protocols/gg/gg.c:1519 msgid "" "Gaim was unable to search the Directory because it was unable to connect to " "the directory server. Please try again later." @@ -5032,11 +5043,11 @@ "Gaim was unable to search the Directory because it was unable to connect to " "the directory server. Please try again later." -#: src/protocols/gg/gg.c:1539 +#: src/protocols/gg/gg.c:1553 msgid "Unable to change Gadu-Gadu password" msgstr "Unable to change Gadu-Gadu password" -#: src/protocols/gg/gg.c:1540 +#: src/protocols/gg/gg.c:1554 msgid "" "Gaim was unable to change your password due to an error connecting to the " "Gadu-Gadu server. Please try again later." @@ -5044,33 +5055,33 @@ "Gaim was unable to change your password due to an error connecting to the " "Gadu-Gadu server. Please try again later." -#: src/protocols/gg/gg.c:1556 +#: src/protocols/gg/gg.c:1570 msgid "Directory Search" msgstr "Directory Search" #. if (js->protocol_options & CHANGE_PASSWORD) { -#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104 -#: src/protocols/toc/toc.c:1571 +#: src/protocols/gg/gg.c:1575 src/protocols/jabber/jabber.c:1111 +#: src/protocols/toc/toc.c:1577 msgid "Change Password" msgstr "Change Password" -#: src/protocols/gg/gg.c:1565 +#: src/protocols/gg/gg.c:1579 msgid "Import Buddy List from Server" msgstr "Import Buddy List from Server" -#: src/protocols/gg/gg.c:1569 +#: src/protocols/gg/gg.c:1583 msgid "Export Buddy List to Server" msgstr "Export Buddy List to Server" -#: src/protocols/gg/gg.c:1573 +#: src/protocols/gg/gg.c:1587 msgid "Delete Buddy List from Server" msgstr "Delete Buddy List from Server" -#: src/protocols/gg/gg.c:1606 +#: src/protocols/gg/gg.c:1620 msgid "Unable to access user profile." msgstr "Unable to access user profile." -#: src/protocols/gg/gg.c:1607 +#: src/protocols/gg/gg.c:1621 msgid "" "Gaim was unable to access this user's profile due to an error connecting to " "the directory server. Please try again later." @@ -5088,30 +5099,30 @@ #. *< version #. * summary #. * description -#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756 +#: src/protocols/gg/gg.c:1768 src/protocols/gg/gg.c:1770 msgid "Gadu-Gadu Protocol Plugin" msgstr "Gadu-Gadu Protocol Plugin" -#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310 +#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1299 #, c-format msgid "Unknown command: %s" msgstr "Unknown command: %s" -#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584 -#: src/protocols/silc/silc.c:1018 +#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:586 +#: src/protocols/silc/silc.c:1007 #, c-format msgid "current topic is: %s" msgstr "current topic is: %s" -#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588 -#: src/protocols/silc/silc.c:1022 +#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:590 +#: src/protocols/silc/silc.c:1011 msgid "No topic is set" msgstr "No topic is set" -#: 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:168 +#: src/protocols/yahoo/yahoo_filexfer.c:178 +#: src/protocols/yahoo/yahoo_filexfer.c:187 +#: src/protocols/yahoo/yahoo_filexfer.c:197 msgid "File Transfer Aborted" msgstr "File Transfer Aborted" @@ -5119,68 +5130,87 @@ msgid "Gaim could not open a listening port." msgstr "Gaim could not open a listening port." -#: src/protocols/irc/irc.c:75 +#: src/protocols/irc/irc.c:78 msgid "Error displaying MOTD" msgstr "Error displaying MOTD" -#: src/protocols/irc/irc.c:75 +#: src/protocols/irc/irc.c:78 msgid "No MOTD available" msgstr "No MOTD available" -#: src/protocols/irc/irc.c:76 +#: src/protocols/irc/irc.c:79 msgid "There is no MOTD associated with this connection." msgstr "There is no MOTD associated with this connection." -#: src/protocols/irc/irc.c:79 +#: src/protocols/irc/irc.c:82 #, c-format msgid "MOTD for %s" msgstr "MOTD for %s" -#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412 +#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:516 +#: src/protocols/irc/irc.c:538 msgid "Server has disconnected" msgstr "Server has disconnected" -#: src/protocols/irc/irc.c:181 +#: src/protocols/irc/irc.c:191 msgid "View MOTD" msgstr "View MOTD" -#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32 +#: src/protocols/irc/irc.c:203 src/protocols/silc/chat.c:32 msgid "_Channel:" msgstr "_Channel:" -#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56 +#: src/protocols/irc/irc.c:208 src/protocols/jabber/chat.c:56 msgid "_Password:" msgstr "_Password:" -#: src/protocols/irc/irc.c:230 +#: src/protocols/irc/irc.c:240 msgid "IRC nicks may not contain whitespace" msgstr "IRC nicks may not contain whitespace" -#: src/protocols/irc/irc.c:249 -#, c-format -msgid "Logging in: %s" -msgstr "Logging in: %s" - -#: src/protocols/irc/irc.c:258 +#. connect to the server +#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:801 +#: src/protocols/msn/session.c:338 src/protocols/napster/napster.c:510 +#: src/protocols/novell/novell.c:2163 src/protocols/oscar/oscar.c:1818 +#: src/protocols/trepia/trepia.c:1067 src/protocols/yahoo/yahoo.c:2230 +#: src/protocols/zephyr/zephyr.c:1492 +msgid "Connecting" +msgstr "Connecting" + +#: src/protocols/irc/irc.c:267 src/protocols/jabber/jabber.c:407 +#: src/protocols/jabber/jabber.c:739 +msgid "SSL support unavailable" +msgstr "SSL support unavailable" + +#: src/protocols/irc/irc.c:278 msgid "Couldn't create socket" msgstr "Couldn't create socket" -#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:301 -#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757 +#: src/protocols/irc/irc.c:346 src/protocols/jabber/jabber.c:302 +#: src/protocols/oscar/oscar.c:1737 src/protocols/oscar/oscar.c:1814 msgid "Couldn't connect to host" msgstr "Couldn't connect to host" -#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929 +#: src/protocols/irc/irc.c:371 src/protocols/jabber/jabber.c:329 +msgid "Connection Failed" +msgstr "Connection Failed" + +#: src/protocols/irc/irc.c:374 src/protocols/jabber/jabber.c:332 +msgid "SSL Handshake Failed" +msgstr "SSL Handshake Failed" + +#: src/protocols/irc/irc.c:513 src/protocols/irc/irc.c:535 +#: src/protocols/trepia/trepia.c:929 msgid "Read error" msgstr "Read error" -#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373 -#: src/protocols/yahoo/yahoochat.c:1398 +#: src/protocols/irc/irc.c:674 src/protocols/silc/chat.c:1374 +#: src/protocols/yahoo/yahoochat.c:1355 msgid "Users" msgstr "Users" -#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376 -#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407 +#: src/protocols/irc/irc.c:677 src/protocols/silc/chat.c:1377 +#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364 msgid "Topic" msgstr "Topic" @@ -5192,42 +5222,46 @@ #. *< id #. *< name #. *< version -#: src/protocols/irc/irc.c:674 +#: src/protocols/irc/irc.c:784 msgid "IRC Protocol Plugin" msgstr "IRC Protocol Plugin" #. * summary -#: src/protocols/irc/irc.c:675 +#: src/protocols/irc/irc.c:785 msgid "The IRC Protocol Plugin that Sucks Less" msgstr "The IRC Protocol Plugin that Sucks Less" -#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201 -#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691 +#: src/protocols/irc/irc.c:804 src/protocols/irc/msgs.c:201 +#: src/protocols/jabber/jabber.c:1607 src/protocols/napster/napster.c:691 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132 msgid "Server" msgstr "Server" -#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1642 -#: src/protocols/msn/msn.c:1961 src/protocols/napster/napster.c:696 -#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303 +#: src/protocols/irc/irc.c:807 src/protocols/jabber/jabber.c:1628 +#: src/protocols/msn/msn.c:1887 src/protocols/napster/napster.c:696 +#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1303 msgid "Port" msgstr "Port" -#: src/protocols/irc/irc.c:700 +#: src/protocols/irc/irc.c:810 msgid "Encodings" msgstr "Encodings" -#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195 -#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1450 +#: src/protocols/irc/irc.c:813 src/protocols/irc/msgs.c:195 +#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1459 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128 msgid "Username" msgstr "Username" -#: src/protocols/irc/irc.c:706 +#: src/protocols/irc/irc.c:816 msgid "Real name" msgstr "Real name" +#: src/protocols/irc/irc.c:819 +msgid "Use SSL" +msgstr "Use SSL" + #: src/protocols/irc/msgs.c:97 msgid "Bad mode" msgstr "Bad mode" @@ -5257,7 +5291,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:1356 src/protocols/yahoo/yahoo_profile.c:665 +#: src/protocols/yahoo/yahoo_profile.c:665 #, c-format msgid "<b>%s:</b> %s<br>" msgstr "<b>%s:</b> %s<br>" @@ -5289,120 +5323,128 @@ msgid "Buddy Information for %s" msgstr "Buddy Information for %s" -#: src/protocols/irc/msgs.c:286 +#: src/protocols/irc/msgs.c:287 #, c-format 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 #, c-format 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 #, c-format msgid "Unknown message '%s'" msgstr "Unknown message '%s'" -#: src/protocols/irc/msgs.c:309 +#: src/protocols/irc/msgs.c:310 msgid "Unknown message" msgstr "Unknown message" -#: 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 #, c-format msgid "Users on %s: %s" msgstr "Users on %s: %s" -#: src/protocols/irc/msgs.c:426 +#: src/protocols/irc/msgs.c:428 +msgid "Time Response" +msgstr "Time Response" + +#: src/protocols/irc/msgs.c:429 +msgid "The IRC server's local time is:" +msgstr "The IRC server's local time is:" + +#: src/protocols/irc/msgs.c:440 msgid "No such channel" msgstr "No such channel" #. does this happen? -#: src/protocols/irc/msgs.c:437 +#: src/protocols/irc/msgs.c:451 msgid "no such channel" msgstr "no such channel" -#: src/protocols/irc/msgs.c:440 +#: src/protocols/irc/msgs.c:454 msgid "User is not logged in" msgstr "User is not logged in" -#: src/protocols/irc/msgs.c:445 +#: src/protocols/irc/msgs.c:459 msgid "No such nick or channel" msgstr "No such nick or channel" -#: src/protocols/irc/msgs.c:465 +#: src/protocols/irc/msgs.c:479 msgid "Could not send" msgstr "Could not send" -#: src/protocols/irc/msgs.c:521 +#: src/protocols/irc/msgs.c:535 #, c-format msgid "Joining %s requires an invitation." msgstr "Joining %s requires an invitation." -#: src/protocols/irc/msgs.c:522 +#: src/protocols/irc/msgs.c:536 msgid "Invitation only" msgstr "Invitation only" -#: src/protocols/irc/msgs.c:623 +#: src/protocols/irc/msgs.c:637 #, c-format msgid "You have been kicked by %s: (%s)" msgstr "You have been kicked by %s: (%s)" -#: src/protocols/irc/msgs.c:628 +#: src/protocols/irc/msgs.c:642 #, c-format msgid "Kicked by %s (%s)" msgstr "Kicked by %s (%s)" -#: src/protocols/irc/msgs.c:649 +#: src/protocols/irc/msgs.c:663 #, c-format msgid "mode (%s %s) by %s" msgstr "mode (%s %s) by %s" -#: src/protocols/irc/msgs.c:758 +#: src/protocols/irc/msgs.c:773 msgid "Could not change nick" msgstr "Could not change nick" -#: src/protocols/irc/msgs.c:759 +#: src/protocols/irc/msgs.c:774 msgid "Cannot change nick" msgstr "Cannot change nick" -#: src/protocols/irc/msgs.c:780 +#: src/protocols/irc/msgs.c:795 #, c-format msgid "You have parted the channel%s%s" msgstr "You have parted the channel%s%s" -#: src/protocols/irc/msgs.c:820 +#: src/protocols/irc/msgs.c:836 msgid "Error: invalid PONG from server" msgstr "Error: invalid PONG from server" -#: src/protocols/irc/msgs.c:822 +#: src/protocols/irc/msgs.c:838 #, c-format msgid "PING reply -- Lag: %lu seconds" msgstr "PING reply -- Lag: %lu seconds" -#: src/protocols/irc/msgs.c:897 +#: src/protocols/irc/msgs.c:913 #, c-format msgid "Cannot join %s:" msgstr "Cannot join %s:" -#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914 +#: src/protocols/irc/msgs.c:914 src/protocols/silc/ops.c:914 msgid "Cannot join channel" msgstr "Cannot join channel" -#: src/protocols/irc/msgs.c:934 +#: src/protocols/irc/msgs.c:950 #, c-format msgid "Wallops from %s" msgstr "Wallops from %s" -#: src/protocols/irc/parse.c:110 +#: src/protocols/irc/parse.c:111 msgid "action <action to perform>: Perform an action." msgstr "action <action to perform>: Perform an action." -#: src/protocols/irc/parse.c:111 +#: src/protocols/irc/parse.c:112 msgid "" "away [message]: Set an away message, or use no message to return from being " "away." @@ -5410,7 +5452,7 @@ "away [message]: Set an away message, or use no message to return from being " "away." -#: src/protocols/irc/parse.c:112 +#: src/protocols/irc/parse.c:113 msgid "" "deop <nick1> [nick2] ...: Remove channel operator status from " "someone. You must be a channel operator to do this." @@ -5418,7 +5460,7 @@ "deop <nick1> [nick2] ...: Remove channel operator status from " "someone. You must be a channel operator to do this." -#: src/protocols/irc/parse.c:113 +#: src/protocols/irc/parse.c:114 msgid "" "devoice <nick1> [nick2] ...: Remove channel voice status from " "someone, preventing them from speaking if the channel is moderated (+m). You " @@ -5428,7 +5470,7 @@ "someone, preventing them from speaking if the channel is moderated (+m). You " "must be a channel operator to do this." -#: src/protocols/irc/parse.c:114 +#: src/protocols/irc/parse.c:115 msgid "" "invite <nick> [room]: Invite someone to join you in the specified " "channel, or the current channel." @@ -5436,7 +5478,7 @@ "invite <nick> [room]: Invite someone to join you in the specified " "channel, or the current channel." -#: src/protocols/irc/parse.c:115 +#: src/protocols/irc/parse.c:116 msgid "" "j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " "channels, optionally providing a channel key for each if needed." @@ -5444,7 +5486,7 @@ "j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " "channels, optionally providing a channel key for each if needed." -#: src/protocols/irc/parse.c:116 +#: src/protocols/irc/parse.c:117 msgid "" "join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " "channels, optionally providing a channel key for each if needed." @@ -5452,7 +5494,7 @@ "join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " "channels, optionally providing a channel key for each if needed." -#: src/protocols/irc/parse.c:117 +#: src/protocols/irc/parse.c:118 msgid "" "kick <nick> [message]: Remove someone from a channel. You must be a " "channel operator to do this." @@ -5460,7 +5502,7 @@ "kick <nick> [message]: Remove someone from a channel. You must be a " "channel operator to do this." -#: src/protocols/irc/parse.c:118 +#: src/protocols/irc/parse.c:119 msgid "" "list: Display a list of chat rooms on the network. <i>Warning, some servers " "may disconnect you upon doing this.</i>" @@ -5468,11 +5510,11 @@ "list: Display a list of chat rooms on the network. <i>Warning, some servers " "may disconnect you upon doing this.</i>" -#: src/protocols/irc/parse.c:119 +#: src/protocols/irc/parse.c:120 msgid "me <action to perform>: Perform an action." msgstr "me <action to perform>: Perform an action." -#: src/protocols/irc/parse.c:120 +#: src/protocols/irc/parse.c:121 msgid "" "mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel " "or user mode." @@ -5480,7 +5522,7 @@ "mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel " "or user mode." -#: src/protocols/irc/parse.c:121 +#: src/protocols/irc/parse.c:122 msgid "" "msg <nick> <message>: Send a private message to a user (as " "opposed to a channel)." @@ -5488,15 +5530,15 @@ "msg <nick> <message>: Send a private message to a user (as " "opposed to a channel)." -#: src/protocols/irc/parse.c:122 +#: src/protocols/irc/parse.c:123 msgid "names [channel]: List the users currently in a channel." msgstr "names [channel]: List the users currently in a channel." -#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452 +#: src/protocols/irc/parse.c:124 src/protocols/jabber/jabber.c:1459 msgid "nick <new nickname>: Change your nickname." msgstr "nick <new nickname>: Change your nickname." -#: src/protocols/irc/parse.c:124 +#: src/protocols/irc/parse.c:125 msgid "" "op <nick1> [nick2] ...: Grant channel operator status to someone. You " "must be a channel operator to do this." @@ -5504,7 +5546,7 @@ "op <nick1> [nick2] ...: Grant channel operator status to someone. You " "must be a channel operator to do this." -#: src/protocols/irc/parse.c:125 +#: src/protocols/irc/parse.c:126 msgid "" "operwall <message>: If you don't know what this is, you probably " "can't use it." @@ -5512,7 +5554,7 @@ "operwall <message>: If you don't know what this is, you probably " "can't use it." -#: src/protocols/irc/parse.c:126 +#: src/protocols/irc/parse.c:127 msgid "" "part [room] [message]: Leave the current channel, or a specified channel, " "with an optional message." @@ -5520,7 +5562,7 @@ "part [room] [message]: Leave the current channel, or a specified channel, " "with an optional message." -#: src/protocols/irc/parse.c:127 +#: src/protocols/irc/parse.c:128 msgid "" "ping [nick]: Asks how much lag a user (or the server if no user specified) " "has." @@ -5528,7 +5570,7 @@ "ping [nick]: Asks how much lag a user (or the server if no user specified) " "has." -#: src/protocols/irc/parse.c:128 +#: src/protocols/irc/parse.c:129 msgid "" "query <nick> <message>: Send a private message to a user (as " "opposed to a channel)." @@ -5536,15 +5578,15 @@ "query <nick> <message>: Send a private message to a user (as " "opposed to a channel)." -#: src/protocols/irc/parse.c:129 +#: src/protocols/irc/parse.c:130 msgid "quit [message]: Disconnect from the server, with an optional message." msgstr "quit [message]: Disconnect from the server, with an optional message." -#: src/protocols/irc/parse.c:130 +#: src/protocols/irc/parse.c:131 msgid "quote [...]: Send a raw command to the server." msgstr "quote [...]: Send a raw command to the server." -#: src/protocols/irc/parse.c:131 +#: src/protocols/irc/parse.c:132 msgid "" "remove <nick> [message]: Remove someone from a room. You must be a " "channel operator to do this." @@ -5552,15 +5594,19 @@ "remove <nick> [message]: Remove someone from a room. You must be a " "channel operator to do this." -#: src/protocols/irc/parse.c:132 +#: src/protocols/irc/parse.c:133 +msgid "time: Displays the current local time at the IRC server." +msgstr "time: Displays the current local time at the IRC server." + +#: src/protocols/irc/parse.c:134 msgid "topic [new topic]: View or change the channel topic." msgstr "topic [new topic]: View or change the channel topic." -#: src/protocols/irc/parse.c:133 +#: src/protocols/irc/parse.c:135 msgid "umode <+|-><A-Za-z>: Set or unset a user mode." msgstr "umode <+|-><A-Za-z>: Set or unset a user mode." -#: src/protocols/irc/parse.c:134 +#: src/protocols/irc/parse.c:136 msgid "" "voice <nick1> [nick2] ...: Grant channel voice status to someone. You " "must be a channel operator to do this." @@ -5568,7 +5614,7 @@ "voice <nick1> [nick2] ...: Grant channel voice status to someone. You " "must be a channel operator to do this." -#: src/protocols/irc/parse.c:135 +#: src/protocols/irc/parse.c:137 msgid "" "wallops <message>: If you don't know what this is, you probably can't " "use it." @@ -5576,44 +5622,52 @@ "wallops <message>: If you don't know what this is, you probably can't " "use it." -#: src/protocols/irc/parse.c:136 +#: src/protocols/irc/parse.c:138 msgid "whois <nick>: Get information on a user." msgstr "whois <nick>: Get information on a user." -#: src/protocols/irc/parse.c:414 +#: src/protocols/irc/parse.c:419 #, c-format msgid "Reply time from %s: %lu seconds" msgstr "Reply time from %s: %lu seconds" -#: src/protocols/irc/parse.c:415 +#: src/protocols/irc/parse.c:420 msgid "PONG" msgstr "PONG" -#: src/protocols/irc/parse.c:415 +#: src/protocols/irc/parse.c:420 msgid "CTCP PING reply" msgstr "CTCP PING reply" -#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522 -#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189 +#: src/protocols/irc/parse.c:523 src/protocols/irc/parse.c:527 +#: src/protocols/oscar/oscar.c:1634 src/protocols/toc/toc.c:189 #: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613 #: src/protocols/toc/toc.c:690 msgid "Disconnected." msgstr "Disconnected." -#: 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 +msgid "" +"Server requires TLS/SSL for login. Select \"Use TLS if available\" in " +"account properties" +msgstr "" +"Server requires TLS/SSL for login. Select \"Use TLS if available\" in " +"account properties" + +#: 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 msgid "" "This server requires plaintext authentication over an unencrypted " "connection. Allow this and continue authentication?" @@ -5621,97 +5675,92 @@ "This server requires plaintext authentication over an unencrypted " "connection. Allow this and continue authentication?" -#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248 +#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252 msgid "Server does not use any supported authentication method" msgstr "Server does not use any supported authentication method" -#: src/protocols/jabber/auth.c:386 +#: src/protocols/jabber/auth.c:390 msgid "Invalid challenge from server" msgstr "Invalid challenge from server" -#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655 +#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:657 #: src/protocols/silc/ops.c:806 msgid "Full Name" msgstr "Full Name" -#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668 +#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:670 #: src/protocols/silc/ops.c:818 msgid "Family Name" msgstr "Family Name" -#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672 +#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:674 msgid "Given Name" msgstr "Given Name" -#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686 -#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1346 -#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822 +#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:688 +#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1309 +#: src/protocols/silc/buddy.c:1456 src/protocols/silc/ops.c:822 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116 #: src/protocols/yahoo/yahoo_profile.c:1002 msgid "Nickname" msgstr "Nickname" -#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:656 +#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:657 msgid "URL" msgstr "URL" -#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714 +#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716 msgid "Street Address" msgstr "Street Address" -#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710 +#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:712 msgid "Extended Address" msgstr "Extended Address" -#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718 +#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:720 msgid "Locality" msgstr "Locality" -#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722 +#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:724 msgid "Region" msgstr "Region" -#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726 -#: src/protocols/jabber/jabber.c:646 +#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:728 +#: src/protocols/jabber/jabber.c:647 msgid "Postal Code" msgstr "Postal Code" #. Country -#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731 +#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417 msgid "Country" msgstr "Country" -#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742 -#: src/protocols/jabber/buddy.c:749 +#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:744 +#: src/protocols/jabber/buddy.c:751 msgid "Telephone" msgstr "Telephone" -#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760 -#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662 +#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:762 +#: src/protocols/jabber/buddy.c:770 src/protocols/silc/silc.c:651 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997 msgid "Email" msgstr "Email" -#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783 +#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:785 msgid "Organization Name" msgstr "Organization Name" -#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787 +#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:789 msgid "Organization Unit" msgstr "Organization Unit" -#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793 -#: src/protocols/novell/novell.c:1460 -msgid "Title" -msgstr "Title" - -#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796 +#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:798 msgid "Role" msgstr "Role" -#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689 -#: src/protocols/oscar/oscar.c:5073 +#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:691 +#: src/protocols/oscar/oscar.c:5213 msgid "Birthday" msgstr "Birthday" @@ -5727,94 +5776,86 @@ "All items below are optional. Enter only the information with which you feel " "comfortable." -#: src/protocols/jabber/buddy.c:604 +#: src/protocols/jabber/buddy.c:606 msgid "Jabber ID" msgstr "Jabber ID" -#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621 -#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:949 -#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830 -#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731 -#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739 -#: src/protocols/yahoo/yahoo.c:2774 -msgid "Status" -msgstr "Status" - -#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624 +#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:1610 msgid "Resource" msgstr "Resource" -#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814 +#: src/protocols/jabber/buddy.c:678 src/protocols/silc/ops.c:814 msgid "Middle Name" msgstr "Middle Name" -#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631 -#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099 +#: src/protocols/jabber/buddy.c:696 src/protocols/jabber/jabber.c:632 +#: src/protocols/oscar/oscar.c:5231 src/protocols/oscar/oscar.c:5239 #: src/protocols/silc/ops.c:850 msgid "Address" msgstr "Address" -#: src/protocols/jabber/buddy.c:706 +#: src/protocols/jabber/buddy.c:708 msgid "P.O. Box" msgstr "P.O. Box" -#: src/protocols/jabber/buddy.c:812 +#: src/protocols/jabber/buddy.c:814 msgid "Photo" msgstr "Photo" -#: src/protocols/jabber/buddy.c:812 +#: src/protocols/jabber/buddy.c:814 msgid "Logo" msgstr "Logo" -#: src/protocols/jabber/buddy.c:834 +#: src/protocols/jabber/buddy.c:836 msgid "Jabber Profile" msgstr "Jabber Profile" -#: src/protocols/jabber/buddy.c:1016 +#: src/protocols/jabber/buddy.c:1018 msgid "Un-hide From" msgstr "Un-hide From" -#: src/protocols/jabber/buddy.c:1019 +#: src/protocols/jabber/buddy.c:1021 msgid "Temporarily Hide From" msgstr "Temporarily Hide From" #. && NOT ME -#: src/protocols/jabber/buddy.c:1026 +#: src/protocols/jabber/buddy.c:1028 msgid "Cancel Presence Notification" msgstr "Cancel Presence Notification" -#: src/protocols/jabber/buddy.c:1032 +#: src/protocols/jabber/buddy.c:1034 msgid "(Re-)Request authorization" msgstr "(Re-)Request authorization" #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? -#: src/protocols/jabber/buddy.c:1040 +#: src/protocols/jabber/buddy.c:1042 msgid "Unsubscribe" msgstr "Unsubscribe" -#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669 -#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957 +#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/chat.c:671 +#: src/protocols/jabber/chat.c:682 src/protocols/jabber/jabber.c:958 #: src/protocols/silc/ops.c:1239 msgid "Error" msgstr "Error" -#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981 +#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:988 msgid "Chatty" msgstr "Chatty" -#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:993 +#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:1000 +#: src/status.c:161 msgid "Extended Away" msgstr "Extended Away" -#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999 -#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910 +#: src/protocols/jabber/buddy.c:1080 src/protocols/jabber/jabber.c:1006 +#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7051 msgid "Do Not Disturb" msgstr "Do Not Disturb" -#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371 -#: src/protocols/yahoo/yahoochat.c:1003 +#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6532 +#: src/protocols/yahoo/yahoochat.c:958 msgid "_Room:" msgstr "_Room:" @@ -5853,48 +5894,48 @@ msgid "Invalid Room Handle" msgstr "Invalid Room Handle" -#: src/protocols/jabber/chat.c:387 +#: src/protocols/jabber/chat.c:389 msgid "Configuration error" msgstr "Configuration error" -#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541 +#: src/protocols/jabber/chat.c:398 src/protocols/jabber/chat.c:543 msgid "Unable to configure" msgstr "Unable to configure" -#: src/protocols/jabber/chat.c:412 +#: src/protocols/jabber/chat.c:414 msgid "Room Configuration Error" msgstr "Room Configuration Error" -#: src/protocols/jabber/chat.c:413 +#: src/protocols/jabber/chat.c:415 msgid "This room is not capable of being configured" msgstr "This room is not capable of being configured" -#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532 +#: src/protocols/jabber/chat.c:465 src/protocols/jabber/chat.c:534 msgid "Registration error" msgstr "Registration error" -#: src/protocols/jabber/chat.c:620 +#: src/protocols/jabber/chat.c:622 msgid "Nick changing not supported in non-MUC chatrooms" msgstr "Nick changing not supported in non-MUC chatrooms" -#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681 +#: src/protocols/jabber/chat.c:672 src/protocols/jabber/chat.c:683 #: src/protocols/silc/ops.c:1239 msgid "Error retrieving room list" msgstr "Error retrieving room list" -#: src/protocols/jabber/chat.c:729 +#: src/protocols/jabber/chat.c:731 msgid "Invalid Server" msgstr "Invalid Server" -#: src/protocols/jabber/chat.c:767 +#: src/protocols/jabber/chat.c:769 msgid "Enter a Conference Server" msgstr "Enter a Conference Server" -#: src/protocols/jabber/chat.c:768 +#: src/protocols/jabber/chat.c:770 msgid "Select a conference server to query" msgstr "Select a conference server to query" -#: src/protocols/jabber/chat.c:771 +#: src/protocols/jabber/chat.c:773 msgid "Find Rooms" msgstr "Find Rooms" @@ -5902,427 +5943,403 @@ msgid "Error initializing session" msgstr "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:990 src/protocols/trepia/trepia.c:1034 -#: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179 +#: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248 +#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:990 +#: src/protocols/trepia/trepia.c:1034 src/protocols/trepia/trepia.c:1133 +#: src/protocols/trepia/trepia.c:1179 msgid "Write error" msgstr "Write error" -#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268 +#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269 msgid "Read Error" msgstr "Read Error" -#: src/protocols/jabber/jabber.c:328 -msgid "Connection Failed" -msgstr "Connection Failed" - -#: src/protocols/jabber/jabber.c:331 -msgid "SSL Handshake Failed" -msgstr "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" msgstr "Invalid Jabber ID" -#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738 -msgid "SSL support unavailable" -msgstr "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:1073 msgid "Unable to create socket" msgstr "Unable to create socket" -#: src/protocols/jabber/jabber.c:441 +#: src/protocols/jabber/jabber.c:442 #, c-format msgid "Registration of %s@%s successful" msgstr "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" msgstr "Registration Successful" -#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223 +#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1230 msgid "Unknown Error" msgstr "Unknown Error" -#: 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 "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" msgstr "Already Registered" -#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078 +#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1085 msgid "Password" msgstr "Password" -#: src/protocols/jabber/jabber.c:611 +#: src/protocols/jabber/jabber.c:612 msgid "E-Mail" msgstr "E-Mail" #. State -#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5093 -#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336 +#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5233 +#: src/protocols/oscar/oscar.c:5241 src/protocols/trepia/trepia.c:336 #: src/protocols/trepia/trepia.c:414 msgid "State" msgstr "Province/Territory" -#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855 -#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510 +#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:855 +#: src/protocols/silc/silc.c:653 src/protocols/silc/util.c:510 msgid "Phone" msgstr "Phone" -#: src/protocols/jabber/jabber.c:661 +#: src/protocols/jabber/jabber.c:662 msgid "Date" msgstr "Date" -#: 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 "Please fill out the information below to register your new account." -#: 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 "Register New Jabber Account" -#. connect to the server -#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697 -#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163 -#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067 -#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1492 -msgid "Connecting" -msgstr "Connecting" - -#: src/protocols/jabber/jabber.c:804 +#: src/protocols/jabber/jabber.c:805 msgid "Initializing Stream" msgstr "Initializing Stream" -#: src/protocols/jabber/jabber.c:810 +#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:344 msgid "Authenticating" msgstr "Authenticating" -#: src/protocols/jabber/jabber.c:819 +#: src/protocols/jabber/jabber.c:820 msgid "Re-initializing Stream" msgstr "Re-initializing Stream" -#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201 -#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275 -#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670 +#: src/protocols/jabber/jabber.c:892 src/protocols/jabber/jabber.c:1208 +#: src/protocols/jabber/jabber.c:1249 src/protocols/jabber/jabber.c:1282 +#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6811 msgid "Not Authorized" msgstr "Not Authorized" -#: src/protocols/jabber/jabber.c:924 +#: src/protocols/jabber/jabber.c:925 msgid "Both" msgstr "Both" -#: src/protocols/jabber/jabber.c:926 +#: src/protocols/jabber/jabber.c:927 msgid "From (To pending)" msgstr "From (To pending)" -#: src/protocols/jabber/jabber.c:928 +#: src/protocols/jabber/jabber.c:929 msgid "From" msgstr "From" -#: src/protocols/jabber/jabber.c:931 +#: src/protocols/jabber/jabber.c:932 msgid "To" msgstr "To" -#: src/protocols/jabber/jabber.c:933 +#: src/protocols/jabber/jabber.c:934 msgid "None (To pending)" msgstr "None (To pending)" -#: src/protocols/jabber/jabber.c:937 +#: src/protocols/jabber/jabber.c:938 msgid "Subscription" msgstr "Subscription" -#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981 -#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993 -#: src/protocols/jabber/jabber.c:999 +#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:982 +#: src/protocols/jabber/jabber.c:988 src/protocols/jabber/jabber.c:994 +#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jabber.c:1006 msgid "Priority" msgstr "Priority" -#: src/protocols/jabber/jabber.c:1021 +#: src/protocols/jabber/jabber.c:1028 msgid "Password Changed" msgstr "Password Changed" -#: src/protocols/jabber/jabber.c:1022 +#: src/protocols/jabber/jabber.c:1029 msgid "Your password has been changed." msgstr "Your password has been changed." -#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027 +#: src/protocols/jabber/jabber.c:1033 src/protocols/jabber/jabber.c:1034 msgid "Error changing password" msgstr "Error changing password" -#: src/protocols/jabber/jabber.c:1083 +#: src/protocols/jabber/jabber.c:1090 msgid "Password (again)" msgstr "Password (again)" -#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089 +#: src/protocols/jabber/jabber.c:1095 src/protocols/jabber/jabber.c:1096 msgid "Change Jabber Password" msgstr "Change Jabber Password" -#: src/protocols/jabber/jabber.c:1089 +#: src/protocols/jabber/jabber.c:1096 msgid "Please enter your new password" msgstr "Please enter your new password" -#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561 +#: src/protocols/jabber/jabber.c:1106 src/protocols/toc/toc.c:1567 msgid "Set User Info" msgstr "Set User Info" -#: src/protocols/jabber/jabber.c:1181 +#: src/protocols/jabber/jabber.c:1188 msgid "Bad Request" msgstr "Bad Request" -#: src/protocols/jabber/jabber.c:1183 +#: src/protocols/jabber/jabber.c:1190 msgid "Conflict" msgstr "Conflict" -#: src/protocols/jabber/jabber.c:1185 +#: src/protocols/jabber/jabber.c:1192 msgid "Feature Not Implemented" msgstr "Feature Not Implemented" -#: src/protocols/jabber/jabber.c:1187 +#: src/protocols/jabber/jabber.c:1194 msgid "Forbidden" msgstr "Forbidden" -#: src/protocols/jabber/jabber.c:1189 +#: src/protocols/jabber/jabber.c:1196 msgid "Gone" msgstr "Gone" -#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265 +#: src/protocols/jabber/jabber.c:1198 src/protocols/jabber/jabber.c:1272 msgid "Internal Server Error" msgstr "Internal Server Error" -#: src/protocols/jabber/jabber.c:1193 +#: src/protocols/jabber/jabber.c:1200 msgid "Item Not Found" msgstr "Item Not Found" -#: src/protocols/jabber/jabber.c:1195 +#: src/protocols/jabber/jabber.c:1202 msgid "Malformed Jabber ID" msgstr "Malformed Jabber ID" -#: src/protocols/jabber/jabber.c:1197 +#: src/protocols/jabber/jabber.c:1204 msgid "Not Acceptable" msgstr "Not Acceptable" -#: src/protocols/jabber/jabber.c:1199 +#: src/protocols/jabber/jabber.c:1206 msgid "Not Allowed" msgstr "Not Allowed" -#: src/protocols/jabber/jabber.c:1203 +#: src/protocols/jabber/jabber.c:1210 msgid "Payment Required" msgstr "Payment Required" -#: src/protocols/jabber/jabber.c:1205 +#: src/protocols/jabber/jabber.c:1212 msgid "Recipient Unavailable" msgstr "Recipient Unavailable" -#: src/protocols/jabber/jabber.c:1209 +#: src/protocols/jabber/jabber.c:1216 msgid "Registration Required" msgstr "Registration Required" -#: src/protocols/jabber/jabber.c:1211 +#: src/protocols/jabber/jabber.c:1218 msgid "Remote Server Not Found" msgstr "Remote Server Not Found" -#: src/protocols/jabber/jabber.c:1213 +#: src/protocols/jabber/jabber.c:1220 msgid "Remote Server Timeout" msgstr "Remote Server Timeout" -#: src/protocols/jabber/jabber.c:1215 +#: src/protocols/jabber/jabber.c:1222 msgid "Server Overloaded" msgstr "Server Overloaded" -#: src/protocols/jabber/jabber.c:1217 +#: src/protocols/jabber/jabber.c:1224 msgid "Service Unavailable" msgstr "Service Unavailable" -#: src/protocols/jabber/jabber.c:1219 +#: src/protocols/jabber/jabber.c:1226 msgid "Subscription Required" msgstr "Subscription Required" -#: src/protocols/jabber/jabber.c:1221 +#: src/protocols/jabber/jabber.c:1228 msgid "Unexpected Request" msgstr "Unexpected Request" -#: src/protocols/jabber/jabber.c:1228 +#: src/protocols/jabber/jabber.c:1235 msgid "Authorization Aborted" msgstr "Authorization Aborted" -#: src/protocols/jabber/jabber.c:1230 +#: src/protocols/jabber/jabber.c:1237 msgid "Incorrect encoding in authorization" msgstr "Incorrect encoding in authorization" -#: src/protocols/jabber/jabber.c:1233 +#: src/protocols/jabber/jabber.c:1240 msgid "Invalid authzid" msgstr "Invalid authzid" -#: src/protocols/jabber/jabber.c:1236 +#: src/protocols/jabber/jabber.c:1243 msgid "Invalid Authorization Mechanism" msgstr "Invalid Authorization Mechanism" -#: src/protocols/jabber/jabber.c:1239 +#: src/protocols/jabber/jabber.c:1246 msgid "Authorization mechanism too weak" msgstr "Authorization mechanism too weak" -#: src/protocols/jabber/jabber.c:1244 +#: src/protocols/jabber/jabber.c:1251 msgid "Temporary Authentication Failure" msgstr "Temporary Authentication Failure" -#: src/protocols/jabber/jabber.c:1246 +#: src/protocols/jabber/jabber.c:1253 msgid "Authentication Failure" msgstr "Authentication Failure" -#: src/protocols/jabber/jabber.c:1250 +#: src/protocols/jabber/jabber.c:1257 msgid "Bad Format" msgstr "Bad Format" -#: src/protocols/jabber/jabber.c:1252 +#: src/protocols/jabber/jabber.c:1259 msgid "Bad Namespace Prefix" msgstr "Bad Namespace Prefix" -#: src/protocols/jabber/jabber.c:1255 +#: src/protocols/jabber/jabber.c:1262 msgid "Resource Conflict" msgstr "Resource Conflict" -#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509 +#: src/protocols/jabber/jabber.c:1264 src/protocols/silc/ops.c:1509 msgid "Connection Timeout" msgstr "Connection Timeout" -#: src/protocols/jabber/jabber.c:1259 +#: src/protocols/jabber/jabber.c:1266 msgid "Host Gone" msgstr "Host Gone" -#: src/protocols/jabber/jabber.c:1261 +#: src/protocols/jabber/jabber.c:1268 msgid "Host Unknown" msgstr "Host Unknown" -#: src/protocols/jabber/jabber.c:1263 +#: src/protocols/jabber/jabber.c:1270 msgid "Improper Addressing" msgstr "Improper Addressing" -#: src/protocols/jabber/jabber.c:1267 +#: src/protocols/jabber/jabber.c:1274 msgid "Invalid ID" msgstr "Invalid ID" -#: src/protocols/jabber/jabber.c:1269 +#: src/protocols/jabber/jabber.c:1276 msgid "Invalid Namespace" msgstr "Invalid Namespace" -#: src/protocols/jabber/jabber.c:1271 +#: src/protocols/jabber/jabber.c:1278 msgid "Invalid XML" msgstr "Invalid XML" -#: src/protocols/jabber/jabber.c:1273 +#: src/protocols/jabber/jabber.c:1280 msgid "Non-matching Hosts" msgstr "Non-matching Hosts" -#: src/protocols/jabber/jabber.c:1277 +#: src/protocols/jabber/jabber.c:1284 msgid "Policy Violation" msgstr "Policy Violation" -#: src/protocols/jabber/jabber.c:1279 +#: src/protocols/jabber/jabber.c:1286 msgid "Remote Connection Failed" msgstr "Remote Connection Failed" -#: src/protocols/jabber/jabber.c:1281 +#: src/protocols/jabber/jabber.c:1288 msgid "Resource Constraint" msgstr "Resource Constraint" -#: src/protocols/jabber/jabber.c:1283 +#: src/protocols/jabber/jabber.c:1290 msgid "Restricted XML" msgstr "Restricted XML" -#: src/protocols/jabber/jabber.c:1285 +#: src/protocols/jabber/jabber.c:1292 msgid "See Other Host" msgstr "See Other Host" -#: src/protocols/jabber/jabber.c:1287 +#: src/protocols/jabber/jabber.c:1294 msgid "System Shutdown" msgstr "System Shutdown" -#: src/protocols/jabber/jabber.c:1289 +#: src/protocols/jabber/jabber.c:1296 msgid "Undefined Condition" msgstr "Undefined Condition" -#: src/protocols/jabber/jabber.c:1291 +#: src/protocols/jabber/jabber.c:1298 msgid "Unsupported Encoding" msgstr "Unsupported Encoding" -#: src/protocols/jabber/jabber.c:1293 +#: src/protocols/jabber/jabber.c:1300 msgid "Unsupported Stanza Type" msgstr "Unsupported Stanza Type" -#: src/protocols/jabber/jabber.c:1295 +#: src/protocols/jabber/jabber.c:1302 msgid "Unsupported Version" msgstr "Unsupported Version" -#: src/protocols/jabber/jabber.c:1297 +#: src/protocols/jabber/jabber.c:1304 msgid "XML Not Well Formed" msgstr "XML Not Well Formed" -#: src/protocols/jabber/jabber.c:1299 +#: src/protocols/jabber/jabber.c:1306 msgid "Stream Error" msgstr "Stream Error" -#: src/protocols/jabber/jabber.c:1366 +#: src/protocols/jabber/jabber.c:1373 #, c-format msgid "Unable to ban user %s" msgstr "Unable to ban user %s" -#: src/protocols/jabber/jabber.c:1418 +#: src/protocols/jabber/jabber.c:1425 #, c-format msgid "Unable to kick user %s" msgstr "Unable to kick user %s" -#: src/protocols/jabber/jabber.c:1444 +#: src/protocols/jabber/jabber.c:1451 msgid "config: Configure a chat room." msgstr "config: Configure a chat room." -#: src/protocols/jabber/jabber.c:1448 +#: src/protocols/jabber/jabber.c:1455 msgid "configure: Configure a chat room." msgstr "configure: Configure a chat room." -#: src/protocols/jabber/jabber.c:1457 +#: src/protocols/jabber/jabber.c:1464 msgid "part [room]: Leave the room." msgstr "part [room]: Leave the room." -#: src/protocols/jabber/jabber.c:1462 +#: src/protocols/jabber/jabber.c:1469 msgid "register: Register with a chat room." msgstr "register: Register with a chat room." -#: src/protocols/jabber/jabber.c:1468 +#: src/protocols/jabber/jabber.c:1475 msgid "topic [new topic]: View or change the topic." msgstr "topic [new topic]: View or change the topic." -#: src/protocols/jabber/jabber.c:1474 +#: src/protocols/jabber/jabber.c:1481 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:1480 +#: src/protocols/jabber/jabber.c:1487 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:1486 +#: src/protocols/jabber/jabber.c:1493 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:1492 +#: src/protocols/jabber/jabber.c:1499 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:1497 +#: src/protocols/jabber/jabber.c:1504 msgid "" "msg <user> <message>: Send a private message to another user." msgstr "" "msg <user> <message>: Send a private message to another user." -#: src/protocols/jabber/jabber.c:1512 -msgid "Hide Operating System" -msgstr "Hide Operating System" - #. *< type #. *< ui_requirement #. *< flags @@ -6333,52 +6350,52 @@ #. *< version #. * summary #. * description -#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601 +#: src/protocols/jabber/jabber.c:1585 src/protocols/jabber/jabber.c:1587 msgid "Jabber Protocol Plugin" msgstr "Jabber Protocol Plugin" -#: src/protocols/jabber/jabber.c:1627 +#: src/protocols/jabber/jabber.c:1613 msgid "Use TLS if available" msgstr "Use TLS if available" -#: src/protocols/jabber/jabber.c:1632 +#: src/protocols/jabber/jabber.c:1618 msgid "Force old SSL" msgstr "Force old SSL" -#: src/protocols/jabber/jabber.c:1637 +#: src/protocols/jabber/jabber.c:1623 msgid "Allow plaintext auth over unencrypted streams" msgstr "Allow plaintext auth over unencrypted streams" #. Account options -#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600 +#: src/protocols/jabber/jabber.c:1632 src/protocols/silc/silc.c:1589 msgid "Connect server" msgstr "Connect server" -#: src/protocols/jabber/message.c:111 +#: src/protocols/jabber/message.c:114 #, c-format msgid "Message from %s" msgstr "Message from %s" -#: src/protocols/jabber/message.c:175 +#: src/protocols/jabber/message.c:178 #, c-format msgid "%s has set the topic to: %s" msgstr "%s has set the topic to: %s" -#: src/protocols/jabber/message.c:177 +#: src/protocols/jabber/message.c:180 #, c-format msgid "The topic is: %s" msgstr "The topic is: %s" -#: src/protocols/jabber/message.c:230 +#: src/protocols/jabber/message.c:233 #, c-format msgid "Message delivery to %s failed: %s" msgstr "Message delivery to %s failed: %s" -#: src/protocols/jabber/message.c:233 +#: src/protocols/jabber/message.c:236 msgid "Jabber Message Error" msgstr "Jabber Message Error" -#: src/protocols/jabber/message.c:297 +#: src/protocols/jabber/message.c:300 #, c-format msgid " (Code %s)" msgstr " (Code %s)" @@ -6387,30 +6404,30 @@ msgid "XML Parse error" msgstr "XML Parse error" -#: src/protocols/jabber/presence.c:255 +#: src/protocols/jabber/presence.c:264 msgid "Unknown Error in presence" msgstr "Unknown Error in presence" -#: src/protocols/jabber/presence.c:258 +#: src/protocols/jabber/presence.c:267 #, c-format 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:264 src/protocols/msn/userlist.c:102 -#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300 +#: src/protocols/jabber/presence.c:273 src/protocols/msn/userlist.c:102 +#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6461 msgid "Authorize" msgstr "Authorize" -#: src/protocols/jabber/presence.c:265 src/protocols/msn/userlist.c:103 -#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301 +#: src/protocols/jabber/presence.c:274 src/protocols/msn/userlist.c:103 +#: src/protocols/oscar/oscar.c:3852 src/protocols/oscar/oscar.c:6462 msgid "Deny" msgstr "Deny" -#: src/protocols/jabber/presence.c:312 src/protocols/jabber/presence.c:313 +#: src/protocols/jabber/presence.c:321 src/protocols/jabber/presence.c:322 msgid "Create New Room" msgstr "Create New Room" -#: src/protocols/jabber/presence.c:314 +#: src/protocols/jabber/presence.c:323 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" @@ -6418,20 +6435,20 @@ "You are creating a new room. Would you like to configure it, or accept the " "default settings?" -#: src/protocols/jabber/presence.c:316 +#: src/protocols/jabber/presence.c:325 msgid "Configure Room" msgstr "Configure Room" -#: src/protocols/jabber/presence.c:318 +#: src/protocols/jabber/presence.c:327 msgid "Accept Defaults" msgstr "Accept Defaults" -#: src/protocols/jabber/presence.c:355 +#: src/protocols/jabber/presence.c:364 #, c-format msgid "Error in chat %s" msgstr "Error in chat %s" -#: src/protocols/jabber/presence.c:358 +#: src/protocols/jabber/presence.c:367 #, c-format msgid "Error joining chat %s" msgstr "Error joining chat %s" @@ -6445,17 +6462,28 @@ msgid "File Send Failed" msgstr "File Send Failed" -#: src/protocols/msn/cmdproc.c:358 -msgid "Miscellaneous error" -msgstr "Miscellaneous error" - -#: src/protocols/msn/cmdproc.c:361 -msgid "You have signed on from another location." -msgstr "You have signed on from another location." - -#: src/protocols/msn/cmdproc.c:363 -msgid "The MSN servers are going down temporarily." -msgstr "The MSN servers are going down temporarily." +#: src/protocols/msn/dialog.c:91 +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Buddy list synchronization issue in %s (%s)" + +#: src/protocols/msn/dialog.c:97 +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" + +#: src/protocols/msn/dialog.c:105 +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" #: src/protocols/msn/error.c:35 msgid "Unable to parse message" @@ -6553,7 +6581,7 @@ msgid "Too many hits to a FND" msgstr "Too many hits to a FND" -#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194 +#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:197 msgid "Not logged in" msgstr "Not logged in" @@ -6646,7 +6674,7 @@ msgid "Server too busy" msgstr "Server too busy" -#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194 +#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2258 #: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631 msgid "Authentication failed" msgstr "Authentication failed" @@ -6681,35 +6709,35 @@ msgid "MSN Error: %s\n" msgstr "MSN Error: %s\n" -#: src/protocols/msn/msn.c:116 +#: src/protocols/msn/msn.c:114 msgid "Your new MSN friendly name is too long." msgstr "Your new MSN friendly name is too long." -#: src/protocols/msn/msn.c:224 +#: src/protocols/msn/msn.c:222 msgid "Set your friendly name." msgstr "Set your friendly name." -#: src/protocols/msn/msn.c:225 +#: src/protocols/msn/msn.c:223 msgid "This is the name that other MSN buddies will see you as." msgstr "This is the name that other MSN buddies will see you as." -#: src/protocols/msn/msn.c:241 +#: src/protocols/msn/msn.c:239 msgid "Set your home phone number." msgstr "Set your home phone number." -#: src/protocols/msn/msn.c:256 +#: src/protocols/msn/msn.c:254 msgid "Set your work phone number." msgstr "Set your work phone number." -#: src/protocols/msn/msn.c:271 +#: src/protocols/msn/msn.c:269 msgid "Set your mobile phone number." msgstr "Set your mobile phone number." -#: src/protocols/msn/msn.c:284 +#: src/protocols/msn/msn.c:282 msgid "Allow MSN Mobile pages?" msgstr "Allow MSN Mobile pages?" -#: src/protocols/msn/msn.c:285 +#: src/protocols/msn/msn.c:283 msgid "" "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?" @@ -6717,24 +6745,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:289 +#: src/protocols/msn/msn.c:287 msgid "Allow" msgstr "Allow" -#: src/protocols/msn/msn.c:290 +#: src/protocols/msn/msn.c:288 msgid "Disallow" msgstr "Disallow" +#: src/protocols/msn/msn.c:311 +msgid "Send a mobile message." +msgstr "Send a mobile message." + #: src/protocols/msn/msn.c:313 -msgid "Send a mobile message." -msgstr "Send a mobile message." - -#: src/protocols/msn/msn.c:315 msgid "Page" msgstr "Page" -#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512 -#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774 +#: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509 +#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2533 #, c-format msgid "" "\n" @@ -6743,74 +6771,75 @@ "\n" "<b>%s:</b> %s" -#: src/protocols/msn/msn.c:512 +#: src/protocols/msn/msn.c:509 msgid "Has you" msgstr "Has you" -#: src/protocols/msn/msn.c:515 +#: src/protocols/msn/msn.c:512 msgid "Blocked" msgstr "Blocked" -#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33 -#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139 +#: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33 +#: src/protocols/yahoo/yahoo.c:2390 src/protocols/yahoo/yahoo.c:2899 msgid "Be Right Back" msgstr "Be Right Back" -#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31 +#: src/protocols/msn/msn.c:547 src/protocols/msn/state.c:31 #: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929 -#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388 -#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633 -#: src/protocols/yahoo/yahoo.c:3142 +#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1397 +#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2392 +#: src/protocols/yahoo/yahoo.c:2902 msgid "Busy" msgstr "Busy" -#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35 -#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154 +#: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35 +#: src/protocols/yahoo/yahoo.c:2400 src/protocols/yahoo/yahoo.c:2914 msgid "On The Phone" msgstr "On The Phone" -#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36 -#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160 +#: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36 +#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2920 msgid "Out To Lunch" msgstr "Out To Lunch" -#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2221 +#: src/protocols/msn/msn.c:559 src/protocols/zephyr/zephyr.c:2221 +#: src/status.c:159 msgid "Hidden" msgstr "Hidden" -#: src/protocols/msn/msn.c:574 +#: src/protocols/msn/msn.c:571 msgid "Set Friendly Name" msgstr "Set Friendly Name" -#: src/protocols/msn/msn.c:579 +#: src/protocols/msn/msn.c:576 msgid "Set Home Phone Number" msgstr "Set Home Phone Number" -#: src/protocols/msn/msn.c:583 +#: src/protocols/msn/msn.c:580 msgid "Set Work Phone Number" msgstr "Set Work Phone Number" -#: src/protocols/msn/msn.c:587 +#: src/protocols/msn/msn.c:584 msgid "Set Mobile Phone Number" msgstr "Set Mobile Phone Number" -#: src/protocols/msn/msn.c:593 +#: src/protocols/msn/msn.c:590 msgid "Enable/Disable Mobile Devices" msgstr "Enable/Disable Mobile Devices" -#: src/protocols/msn/msn.c:598 +#: src/protocols/msn/msn.c:595 msgid "Allow/Disallow Mobile Pages" msgstr "Allow/Disallow Mobile Pages" -#: src/protocols/msn/msn.c:621 +#: src/protocols/msn/msn.c:618 msgid "Send to Mobile" msgstr "Send to Mobile" -#: src/protocols/msn/msn.c:631 -msgid "Initiate Chat" -msgstr "Initiate Chat" - -#: src/protocols/msn/msn.c:667 +#: src/protocols/msn/msn.c:627 src/protocols/novell/novell.c:3380 +msgid "Initiate _Chat" +msgstr "Initiate _Chat" + +#: src/protocols/msn/msn.c:663 msgid "" "SSL support is needed for MSN. Please install a supported SSL library. See " "http://gaim.sf.net/faq-ssl.php for more information." @@ -6818,91 +6847,95 @@ "SSL support is needed for MSN. Please install a supported SSL library. See " "http://gaim.sf.net/faq-ssl.php for more information." -#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo_profile.c:659 +#: src/protocols/msn/msn.c:691 +msgid "Failed to connect to server." +msgstr "Failed to connect to server." + +#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo_profile.c:659 #: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126 #, c-format 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:1346 src/protocols/msn/msn.c:1702 -#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782 +#: src/protocols/msn/msn.c:1309 src/protocols/msn/msn.c:1656 +#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:783 #, c-format msgid "<b>%s:</b> " msgstr "<b>%s:</b> " -#: src/protocols/msn/msn.c:1432 +#: src/protocols/msn/msn.c:1386 msgid "MSN Profile" msgstr "MSN Profile" -#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1689 +#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1643 #: src/protocols/yahoo/yahoo_profile.c:763 msgid "Error retrieving profile" msgstr "Error retrieving profile" #. Age -#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5078 +#: src/protocols/msn/msn.c:1462 src/protocols/oscar/oscar.c:5218 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405 #: src/protocols/yahoo/yahoo_profile.c:1017 msgid "Age" msgstr "Age" #. Gender -#: src/protocols/msn/msn.c:1515 src/protocols/oscar/oscar.c:5065 +#: src/protocols/msn/msn.c:1469 src/protocols/oscar/oscar.c:5205 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407 #: src/protocols/yahoo/yahoo_profile.c:1027 msgid "Gender" msgstr "Gender" -#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1022 +#: src/protocols/msn/msn.c:1478 src/protocols/yahoo/yahoo_profile.c:1022 msgid "Marital Status" msgstr "Marital Status" -#: src/protocols/msn/msn.c:1531 src/protocols/novell/novell.c:1454 +#: src/protocols/msn/msn.c:1485 src/protocols/novell/novell.c:1454 #: src/protocols/yahoo/yahoo_profile.c:1012 msgid "Location" msgstr "Location" -#: src/protocols/msn/msn.c:1539 src/protocols/yahoo/yahoo_profile.c:1032 +#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo_profile.c:1032 msgid "Occupation" msgstr "Occupation" -#: src/protocols/msn/msn.c:1556 src/protocols/msn/msn.c:1562 -#: src/protocols/msn/msn.c:1569 src/protocols/msn/msn.c:1577 -#: src/protocols/msn/msn.c:1584 +#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516 +#: src/protocols/msn/msn.c:1523 src/protocols/msn/msn.c:1531 +#: src/protocols/msn/msn.c:1538 msgid "A Little About Me" msgstr "A Little About Me" -#: src/protocols/msn/msn.c:1593 src/protocols/msn/msn.c:1599 -#: src/protocols/msn/msn.c:1606 src/protocols/msn/msn.c:1613 +#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1553 +#: src/protocols/msn/msn.c:1560 src/protocols/msn/msn.c:1567 msgid "Favorite Things" msgstr "Favourite Things" -#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628 -#: src/protocols/msn/msn.c:1635 +#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582 +#: src/protocols/msn/msn.c:1589 msgid "Hobbies and Interests" msgstr "Hobbies and Interests" -#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1650 +#: src/protocols/msn/msn.c:1598 src/protocols/msn/msn.c:1604 #: src/protocols/yahoo/yahoo_profile.c:1074 msgid "Favorite Quote" msgstr "Favuorite Quote" -#: src/protocols/msn/msn.c:1658 src/protocols/yahoo/yahoo_profile.c:1125 +#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo_profile.c:1125 msgid "Last Updated" msgstr "Last Updated" #. Homepage -#: src/protocols/msn/msn.c:1669 src/protocols/silc/ops.c:846 +#: src/protocols/msn/msn.c:1623 src/protocols/silc/ops.c:846 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420 msgid "Homepage" msgstr "Homepage" -#: src/protocols/msn/msn.c:1691 +#: src/protocols/msn/msn.c:1645 msgid "The user has not created a public profile." msgstr "The user has not created a public profile." -#: src/protocols/msn/msn.c:1692 +#: src/protocols/msn/msn.c:1646 msgid "" "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 " @@ -6912,7 +6945,7 @@ "that the user does not exist, or that the user exists but has not created a " "public profile." -#: src/protocols/msn/msn.c:1696 +#: src/protocols/msn/msn.c:1650 msgid "" "Gaim could not find any information in the user's profile. The user most " "likely does not exist." @@ -6920,18 +6953,10 @@ "Gaim could not find any information in the user's profile. The user most " "likely does not exist." -#: src/protocols/msn/msn.c:1702 src/protocols/yahoo/yahoo_profile.c:1170 +#: src/protocols/msn/msn.c:1656 src/protocols/yahoo/yahoo_profile.c:1170 msgid "Profile URL" msgstr "Profile URL" -#: src/protocols/msn/msn.c:1843 -msgid "Display conversation closed notices" -msgstr "Display conversation closed notices" - -#: src/protocols/msn/msn.c:1848 -msgid "Display timeout notices" -msgstr "Display timeout notices" - #. *< type #. *< ui_requirement #. *< flags @@ -6942,49 +6967,72 @@ #. *< version #. * summary #. * description -#: src/protocols/msn/msn.c:1935 src/protocols/msn/msn.c:1937 +#: src/protocols/msn/msn.c:1861 src/protocols/msn/msn.c:1863 msgid "MSN Protocol Plugin" msgstr "MSN Protocol Plugin" -#: src/protocols/msn/msn.c:1956 src/protocols/trepia/trepia.c:1298 +#: src/protocols/msn/msn.c:1882 src/protocols/trepia/trepia.c:1298 msgid "Login server" msgstr "Login server" -#: src/protocols/msn/msn.c:1965 +#: src/protocols/msn/msn.c:1891 msgid "Use HTTP Method" msgstr "Use HTTP Method" -#: 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:85 -msgid "Requesting to send password" -msgstr "Requesting to send password" - -#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636 -msgid "Retrieving buddy list" -msgstr "Retrieving buddy list" - -#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174 -#: src/protocols/oscar/oscar.c:2483 -msgid "Password sent" -msgstr "Password sent" - -#: src/protocols/msn/notification.c:732 -#, c-format -msgid "" -"Your MSN buddy list for %s is temporarily unavailable. Please wait and try " -"again." -msgstr "" -"Your MSN buddy list for %s is temporarily unavailable. Please wait and try " -"again." - -#: src/protocols/msn/notification.c:1128 +#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127 +#: src/protocols/yahoo/yahoochat.c:1312 +msgid "Unable to connect" +msgstr "Unable to connect" + +#: src/protocols/msn/notification.c:178 +#, c-format +msgid "%s is not a valid group." +msgstr "%s is not a valid group." + +#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:522 +#: src/protocols/msn/session.c:323 +msgid "Unknown error." +msgstr "Unknown error." + +#: src/protocols/msn/notification.c:187 +#, c-format +msgid "%s on %s (%s)" +msgstr "%s on %s (%s)" + +#: src/protocols/msn/notification.c:492 +#, c-format +msgid "Unable to add user on %s (%s)" +msgstr "Unable to add user on %s (%s)" + +#: src/protocols/msn/notification.c:496 +#, c-format +msgid "Unable to block user on %s (%s)" +msgstr "Unable to block user on %s (%s)" + +#: src/protocols/msn/notification.c:500 +#, c-format +msgid "Unable to permit user on %s (%s)" +msgstr "Unable to permit user on %s (%s)" + +#: src/protocols/msn/notification.c:508 +#, c-format +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:517 +#, c-format +msgid "%s is not a valid passport account." +msgstr "%s is not a valid passport account." + +#: src/protocols/msn/notification.c:774 +msgid "Unable to rename group" +msgstr "Unable to rename group" + +#: src/protocols/msn/notification.c:829 +msgid "Unable to delete group" +msgstr "Unable to delete group" + +#: src/protocols/msn/notification.c:1232 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -7015,69 +7063,118 @@ "After the maintenance has been completed, you will be able to successfully " "sign in." -#: src/protocols/msn/servconn.c:93 -#, c-format -msgid "Unable to connect to %s server" -msgstr "Unable to connect to %s server" - -#: src/protocols/msn/servconn.c:97 -#, c-format -msgid "Error writing to %s server" -msgstr "Error writing to %s server" - -#: src/protocols/msn/servconn.c:101 -#, c-format -msgid "Error reading from %s server" -msgstr "Error reading from %s server" - -#: src/protocols/msn/servconn.c:105 -#, c-format -msgid "Unknown error from %s server" -msgstr "Unknown error from %s server" - -#: src/protocols/msn/servconn.c:334 -msgid "Received HTTP error. Please report this." -msgstr "Received HTTP error. Please report this." +#: src/protocols/msn/servconn.c:129 +msgid "Writing error" +msgstr "Writing error" + +#: src/protocols/msn/servconn.c:131 +msgid "Reading error" +msgstr "Reading error" + +#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:315 +#: src/protocols/oscar/oscar.c:4173 +msgid "Unknown error" +msgstr "Unknown error" + +#: src/protocols/msn/servconn.c:136 +#, c-format +msgid "" +"Connection error from %s server (%s):\n" +"%s" +msgstr "" +"Connection error from %s server (%s):\n" +"%s" + +#: src/protocols/msn/session.c:293 +msgid "Our protocol is not supported by the server." +msgstr "Our protocol is not supported by the server." + +#: src/protocols/msn/session.c:297 +msgid "Error parsing HTTP." +msgstr "Error parsing HTTP." + +#: src/protocols/msn/session.c:301 +msgid "You have signed on from another location." +msgstr "You have signed on from another location." + +#: src/protocols/msn/session.c:304 +msgid "The MSN servers are temporarily unavailable. Please wait and try again." +msgstr "The MSN servers are temporarily unavailable. Please wait and try again." + +#: src/protocols/msn/session.c:309 +msgid "The MSN servers are going down temporarily." +msgstr "The MSN servers are going down temporarily." + +#: src/protocols/msn/session.c:313 +#, c-format +msgid "Unable to authenticate: %s" +msgstr "Unable to authenticate: %s" + +#: src/protocols/msn/session.c:318 +msgid "" +"Your MSN buddy list is temporarily unavailable. Please wait and try again." +msgstr "" +"Your MSN buddy list is temporarily unavailable. Please wait and try again." + +#: src/protocols/msn/session.c:339 src/protocols/msn/session.c:341 +msgid "Handshaking" +msgstr "Handshaking" + +#: src/protocols/msn/session.c:340 +msgid "Transferring" +msgstr "Transferring" + +#: src/protocols/msn/session.c:342 +msgid "Starting authentication" +msgstr "Starting authentication" + +#: src/protocols/msn/session.c:343 +msgid "Getting cookie" +msgstr "Getting cookie" + +#: src/protocols/msn/session.c:345 +msgid "Sending cookie" +msgstr "Sending cookie" + +#: src/protocols/msn/session.c:346 src/protocols/trepia/trepia.c:636 +msgid "Retrieving buddy list" +msgstr "Retrieving buddy list" #: src/protocols/msn/state.c:34 msgid "Away From Computer" msgstr "Away From Computer" -#: src/protocols/msn/switchboard.c:197 -msgid "The conversation has become inactive and timed out." -msgstr "The conversation has become inactive and timed out." - -#: src/protocols/msn/switchboard.c:216 +#: src/protocols/msn/switchboard.c:377 +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:385 +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:389 +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:393 +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:397 +msgid "" +"Message could not be sent because an error with the switchboard occurred:" +msgstr "" +"Message could not be sent because an error with the switchboard occurred:" + +#: src/protocols/msn/switchboard.c:405 +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:647 #, c-format msgid "%s has closed the conversation window." msgstr "%s has closed the conversation window." -#: src/protocols/msn/switchboard.c:485 -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:488 -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:491 -msgid "Message could not be sent because a connection error occured" -msgstr "Message could not be sent because a connection error occurred" - -#: src/protocols/msn/switchboard.c:494 -#, fuzzy -msgid "Message could not be sent for an unknown reason" -msgstr "Message could not be sent for an unknown reason" - -#: src/protocols/msn/switchboard.c:499 -#, c-format -msgid "" -"%s:\n" -"%s" -msgstr "" -"%s:\n" -"%s" - #: src/protocols/msn/userlist.c:86 #, c-format msgid "The user %s (%s) wants to add %s to his or her buddy list." @@ -7133,7 +7230,7 @@ msgid "%s requested a PING" msgstr "%s requested a PING" -#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275 +#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1277 msgid "_Group:" msgstr "_Group:" @@ -7389,8 +7486,8 @@ msgid "Mailstop" msgstr "Mailstop" -#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051 -#: src/protocols/oscar/oscar.c:5058 +#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5191 +#: src/protocols/oscar/oscar.c:5198 msgid "Email Address" msgstr "Email Address" @@ -7494,10 +7591,6 @@ msgid "Appear Offline" msgstr "Appear Offline" -#: src/protocols/novell/novell.c:3380 -msgid "Initiate _Chat" -msgstr "Initiate _Chat" - #. *< type #. *< ui_requirement #. *< flags @@ -7520,103 +7613,103 @@ msgid "Server port" msgstr "Server port" -#: src/protocols/oscar/oscar.c:190 +#: src/protocols/oscar/oscar.c:193 msgid "Invalid error" msgstr "Invalid error" -#: src/protocols/oscar/oscar.c:191 +#: src/protocols/oscar/oscar.c:194 msgid "Invalid SNAC" msgstr "Invalid SNAC" -#: src/protocols/oscar/oscar.c:192 +#: src/protocols/oscar/oscar.c:195 msgid "Rate to host" msgstr "Rate to host" -#: src/protocols/oscar/oscar.c:193 +#: src/protocols/oscar/oscar.c:196 msgid "Rate to client" msgstr "Rate to client" -#: src/protocols/oscar/oscar.c:195 +#: src/protocols/oscar/oscar.c:198 msgid "Service unavailable" msgstr "Service unavailable" -#: src/protocols/oscar/oscar.c:196 +#: src/protocols/oscar/oscar.c:199 msgid "Service not defined" msgstr "Service not defined" -#: src/protocols/oscar/oscar.c:197 +#: src/protocols/oscar/oscar.c:200 msgid "Obsolete SNAC" msgstr "Obsolete SNAC" -#: src/protocols/oscar/oscar.c:198 +#: src/protocols/oscar/oscar.c:201 msgid "Not supported by host" msgstr "Not supported by host" -#: src/protocols/oscar/oscar.c:199 +#: src/protocols/oscar/oscar.c:202 msgid "Not supported by client" msgstr "Not supported by client" -#: src/protocols/oscar/oscar.c:200 -msgid "Refused by client" -msgstr "Refused by client" - -#: src/protocols/oscar/oscar.c:201 -msgid "Reply too big" -msgstr "Reply too big" - -#: src/protocols/oscar/oscar.c:202 -msgid "Responses lost" -msgstr "Responses lost" - #: src/protocols/oscar/oscar.c:203 -msgid "Request denied" -msgstr "Request denied" +msgid "Refused by client" +msgstr "Refused by client" #: src/protocols/oscar/oscar.c:204 +msgid "Reply too big" +msgstr "Reply too big" + +#: src/protocols/oscar/oscar.c:205 +msgid "Responses lost" +msgstr "Responses lost" + +#: src/protocols/oscar/oscar.c:206 +msgid "Request denied" +msgstr "Request denied" + +#: src/protocols/oscar/oscar.c:207 msgid "Busted SNAC payload" msgstr "Busted SNAC payload" -#: src/protocols/oscar/oscar.c:205 +#: src/protocols/oscar/oscar.c:208 msgid "Insufficient rights" msgstr "Insufficient rights" -#: src/protocols/oscar/oscar.c:206 -msgid "In local permit/deny" -msgstr "In local permit/deny" - -#: src/protocols/oscar/oscar.c:207 -msgid "Too evil (sender)" -msgstr "Too evil (sender)" - -#: src/protocols/oscar/oscar.c:208 -msgid "Too evil (receiver)" -msgstr "Too evil (receiver)" - #: src/protocols/oscar/oscar.c:209 -msgid "User temporarily unavailable" -msgstr "User temporarily unavailable" +msgid "In local permit/deny" +msgstr "In local permit/deny" #: src/protocols/oscar/oscar.c:210 -msgid "No match" -msgstr "No match" +msgid "Too evil (sender)" +msgstr "Too evil (sender)" #: src/protocols/oscar/oscar.c:211 -msgid "List overflow" -msgstr "List overflow" +msgid "Too evil (receiver)" +msgstr "Too evil (receiver)" #: src/protocols/oscar/oscar.c:212 +msgid "User temporarily unavailable" +msgstr "User temporarily unavailable" + +#: src/protocols/oscar/oscar.c:213 +msgid "No match" +msgstr "No match" + +#: src/protocols/oscar/oscar.c:214 +msgid "List overflow" +msgstr "List overflow" + +#: src/protocols/oscar/oscar.c:215 msgid "Request ambiguous" msgstr "Request ambiguous" -#: src/protocols/oscar/oscar.c:213 +#: src/protocols/oscar/oscar.c:216 msgid "Queue full" msgstr "Queue full" -#: src/protocols/oscar/oscar.c:214 +#: src/protocols/oscar/oscar.c:217 msgid "Not while on AOL" msgstr "Not while on AOL" -#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484 +#: src/protocols/oscar/oscar.c:406 src/protocols/oscar/oscar.c:489 msgid "" "(There was an error receiving this message. The buddy you are speaking to " "most likely has a buggy client.)" @@ -7624,154 +7717,154 @@ "(There was an error receiving this message. The buddy you are speaking to " "most likely has a buggy client.)" -#: src/protocols/oscar/oscar.c:586 +#: src/protocols/oscar/oscar.c:600 msgid "Voice" msgstr "Voice" -#: src/protocols/oscar/oscar.c:589 +#: src/protocols/oscar/oscar.c:603 msgid "AIM Direct IM" msgstr "AIM Direct IM" -#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660 +#: src/protocols/oscar/oscar.c:606 src/protocols/silc/silc.c:649 #: src/protocols/silc/util.c:506 msgid "Chat" msgstr "Chat" -#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017 +#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7158 msgid "Get File" msgstr "Get File" -#: src/protocols/oscar/oscar.c:602 +#: src/protocols/oscar/oscar.c:616 msgid "Games" msgstr "Games" -#: src/protocols/oscar/oscar.c:605 +#: src/protocols/oscar/oscar.c:619 msgid "Add-Ins" msgstr "Add-Ins" -#: src/protocols/oscar/oscar.c:608 +#: src/protocols/oscar/oscar.c:622 msgid "Send Buddy List" msgstr "Send Buddy List" -#: src/protocols/oscar/oscar.c:611 +#: src/protocols/oscar/oscar.c:625 msgid "ICQ Direct Connect" msgstr "ICQ Direct Connect" -#: src/protocols/oscar/oscar.c:614 +#: src/protocols/oscar/oscar.c:628 msgid "AP User" msgstr "AP User" -#: src/protocols/oscar/oscar.c:617 +#: src/protocols/oscar/oscar.c:631 msgid "ICQ RTF" msgstr "ICQ RTF" -#: src/protocols/oscar/oscar.c:620 +#: src/protocols/oscar/oscar.c:634 msgid "Nihilist" msgstr "Nihilist" -#: src/protocols/oscar/oscar.c:623 +#: src/protocols/oscar/oscar.c:637 msgid "ICQ Server Relay" msgstr "ICQ Server Relay" -#: src/protocols/oscar/oscar.c:626 +#: src/protocols/oscar/oscar.c:640 msgid "Old ICQ UTF8" msgstr "Old ICQ UTF8" -#: src/protocols/oscar/oscar.c:629 +#: src/protocols/oscar/oscar.c:643 msgid "Trillian Encryption" msgstr "Trillian Encryption" -#: src/protocols/oscar/oscar.c:632 +#: src/protocols/oscar/oscar.c:646 msgid "ICQ UTF8" msgstr "ICQ UTF8" -#: src/protocols/oscar/oscar.c:635 +#: src/protocols/oscar/oscar.c:649 msgid "Hiptop" msgstr "Hiptop" -#: src/protocols/oscar/oscar.c:638 +#: src/protocols/oscar/oscar.c:652 msgid "Security Enabled" msgstr "Security Enabled" -#: src/protocols/oscar/oscar.c:641 +#: src/protocols/oscar/oscar.c:655 msgid "Video Chat" msgstr "Video Chat" -#: src/protocols/oscar/oscar.c:645 +#: src/protocols/oscar/oscar.c:659 msgid "iChat AV" msgstr "iChat AV" -#: src/protocols/oscar/oscar.c:648 +#: src/protocols/oscar/oscar.c:662 msgid "Live Video" msgstr "Live Video" -#: src/protocols/oscar/oscar.c:651 +#: src/protocols/oscar/oscar.c:665 msgid "Camera" msgstr "Camera" -#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900 +#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7041 msgid "Free For Chat" msgstr "Free For Chat" -#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915 +#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7056 msgid "Not Available" msgstr "Not Available" -#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905 +#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7046 msgid "Occupied" msgstr "Occupied" -#: src/protocols/oscar/oscar.c:679 +#: src/protocols/oscar/oscar.c:693 msgid "Web Aware" msgstr "Web Aware" -#: src/protocols/oscar/oscar.c:755 +#: src/protocols/oscar/oscar.c:771 msgid "Capabilities" msgstr "Capabilities" -#: src/protocols/oscar/oscar.c:764 +#: src/protocols/oscar/oscar.c:780 msgid "Buddy Comment" msgstr "Buddy Comment" -#: src/protocols/oscar/oscar.c:899 +#: src/protocols/oscar/oscar.c:937 #, c-format msgid "Direct IM with %s closed" msgstr "Direct IM with %s closed" -#: src/protocols/oscar/oscar.c:901 +#: src/protocols/oscar/oscar.c:939 #, c-format msgid "Direct IM with %s failed" msgstr "Direct IM with %s failed" -#: src/protocols/oscar/oscar.c:909 +#: src/protocols/oscar/oscar.c:947 msgid "Direct Connect failed" msgstr "Direct Connect failed" -#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117 +#: src/protocols/oscar/oscar.c:1024 src/protocols/oscar/oscar.c:1155 #, c-format msgid "Direct IM with %s established" msgstr "Direct IM with %s established" -#: src/protocols/oscar/oscar.c:1067 +#: src/protocols/oscar/oscar.c:1105 #, c-format 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:1485 +#: src/protocols/oscar/oscar.c:1531 #, c-format 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:1490 +#: src/protocols/oscar/oscar.c:1536 msgid "Unable to open Direct IM" msgstr "Unable to open Direct IM" -#: src/protocols/oscar/oscar.c:1525 +#: src/protocols/oscar/oscar.c:1571 #, c-format 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:1529 +#: src/protocols/oscar/oscar.c:1575 msgid "" "Because this reveals your IP address, it may be considered a privacy risk. " "Do you wish to continue?" @@ -7779,24 +7872,24 @@ "Because this reveals your IP address, it may be considered a privacy risk. " "Do you wish to continue?" -#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490 +#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3607 msgid "Connect" msgstr "Connect" -#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881 -#, c-format -msgid "You have been disconnected from chat room %s." -msgstr "You have been disconnected from chat room %s." - -#: src/protocols/oscar/oscar.c:1619 +#: src/protocols/oscar/oscar.c:1643 +#, c-format +msgid "You have lost your connection to chat room %s." +msgstr "You have lost your connection to chat room %s." + +#: src/protocols/oscar/oscar.c:1666 msgid "Chat is currently unavailable" msgstr "Chat is currently unavailable" -#: src/protocols/oscar/oscar.c:1700 +#: src/protocols/oscar/oscar.c:1747 msgid "Screen name sent" msgstr "Screen name sent" -#: src/protocols/oscar/oscar.c:1714 +#: src/protocols/oscar/oscar.c:1771 #, c-format msgid "" "Unable to login: Could not sign on as %s because the screen name is " @@ -7807,46 +7900,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:1745 +#: src/protocols/oscar/oscar.c:1801 msgid "Unable to login to AIM" msgstr "Unable to login to AIM" -#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286 +#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:2350 msgid "Could Not Connect" msgstr "Could Not Connect" -#: src/protocols/oscar/oscar.c:1856 +#: src/protocols/oscar/oscar.c:1913 msgid "Connection established, cookie sent" msgstr "Connection established, cookie sent" -#: src/protocols/oscar/oscar.c:1969 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:2026 src/protocols/yahoo/yahoo_filexfer.c:179 +#: src/protocols/yahoo/yahoo_filexfer.c:188 +#: src/protocols/yahoo/yahoo_filexfer.c:198 msgid "Unable to establish file descriptor." msgstr "Unable to establish file descriptor." -#: src/protocols/oscar/oscar.c:1974 +#: src/protocols/oscar/oscar.c:2031 msgid "Unable to create new connection." msgstr "Unable to create new connection." -#: src/protocols/oscar/oscar.c:2046 +#: src/protocols/oscar/oscar.c:2110 msgid "Unable to establish listener socket." msgstr "Unable to establish listener socket." -#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542 +#: src/protocols/oscar/oscar.c:2235 src/protocols/toc/toc.c:542 msgid "Incorrect nickname or password." msgstr "Incorrect nickname or password." -#: src/protocols/oscar/oscar.c:2176 +#: src/protocols/oscar/oscar.c:2240 msgid "Your account is currently suspended." msgstr "Your account is currently suspended." #. service temporarily unavailable -#: src/protocols/oscar/oscar.c:2180 +#: src/protocols/oscar/oscar.c:2244 msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "The AOL Instant Messenger service is temporarily unavailable." -#: src/protocols/oscar/oscar.c:2185 +#: src/protocols/oscar/oscar.c:2249 msgid "" "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." @@ -7854,21 +7947,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:2190 +#: src/protocols/oscar/oscar.c:2254 #, c-format 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:2221 +#: src/protocols/oscar/oscar.c:2285 msgid "Internal Error" msgstr "Internal Error" -#: src/protocols/oscar/oscar.c:2293 +#: src/protocols/oscar/oscar.c:2357 msgid "Received authorization" msgstr "Received authorization" -#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359 -#: src/protocols/oscar/oscar.c:2448 +#: src/protocols/oscar/oscar.c:2381 +msgid "The SecurID key entered is invalid." +msgstr "The SecurID key entered is invalid." + +#: src/protocols/oscar/oscar.c:2395 +msgid "Enter SecurID" +msgstr "Enter SecurID" + +#: src/protocols/oscar/oscar.c:2396 +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:2436 src/protocols/oscar/oscar.c:2466 +#: src/protocols/oscar/oscar.c:2555 #, c-format msgid "" "You may be disconnected shortly. You may want to use TOC until this is " @@ -7877,20 +7982,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:2332 src/protocols/oscar/oscar.c:2362 +#: src/protocols/oscar/oscar.c:2439 src/protocols/oscar/oscar.c:2469 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:2451 +#: src/protocols/oscar/oscar.c:2558 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:3481 +#: src/protocols/oscar/oscar.c:2590 +msgid "Password sent" +msgstr "Password sent" + +#: src/protocols/oscar/oscar.c:3598 #, c-format 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:3484 +#: src/protocols/oscar/oscar.c:3601 msgid "" "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 " @@ -7900,19 +8009,19 @@ "for IM Images. Because your IP address will be revealed, this may be " "considered a privacy risk." -#: src/protocols/oscar/oscar.c:3523 +#: src/protocols/oscar/oscar.c:3640 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:3531 +#: src/protocols/oscar/oscar.c:3648 msgid "Authorization Request Message:" msgstr "Authorization Request Message:" -#: src/protocols/oscar/oscar.c:3532 +#: src/protocols/oscar/oscar.c:3649 msgid "Please authorize me!" msgstr "Please authorize me!" -#: src/protocols/oscar/oscar.c:3562 +#: src/protocols/oscar/oscar.c:3679 #, c-format msgid "" "The user %s requires authorization before being added to a buddy list. Do " @@ -7921,22 +8030,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:3567 src/protocols/oscar/oscar.c:3569 +#: src/protocols/oscar/oscar.c:3684 src/protocols/oscar/oscar.c:3686 msgid "Request Authorization" msgstr "Request Authorization" -#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619 -#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723 -#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292 -#: src/protocols/oscar/oscar.c:6338 +#: src/protocols/oscar/oscar.c:3734 src/protocols/oscar/oscar.c:3736 +#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:3840 +#: src/protocols/oscar/oscar.c:3860 src/protocols/oscar/oscar.c:6453 +#: src/protocols/oscar/oscar.c:6499 msgid "No reason given." msgstr "No reason given." -#: src/protocols/oscar/oscar.c:3625 +#: src/protocols/oscar/oscar.c:3742 msgid "Authorization Denied Message:" msgstr "Authorization Denied Message:" -#: src/protocols/oscar/oscar.c:3723 +#: src/protocols/oscar/oscar.c:3840 #, c-format msgid "" "The user %u wants to add you to their buddy list for the following reason:\n" @@ -7945,11 +8054,11 @@ "The user %u wants to add you to their buddy list for the following reason:\n" "%s" -#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298 +#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:6459 msgid "Authorization Request" msgstr "Authorization Request" -#: src/protocols/oscar/oscar.c:3743 +#: src/protocols/oscar/oscar.c:3860 #, c-format msgid "" "The user %u has denied your request to add them to your buddy list for the " @@ -7960,17 +8069,17 @@ "following reason:\n" "%s" -#: src/protocols/oscar/oscar.c:3744 +#: src/protocols/oscar/oscar.c:3861 msgid "ICQ authorization denied." msgstr "ICQ authorization denied." #. Someone has granted you authorization -#: src/protocols/oscar/oscar.c:3751 +#: src/protocols/oscar/oscar.c:3868 #, c-format 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:3759 +#: src/protocols/oscar/oscar.c:3876 #, c-format msgid "" "You have received a special message\n" @@ -7983,7 +8092,7 @@ "From: %s [%s]\n" "%s" -#: src/protocols/oscar/oscar.c:3767 +#: src/protocols/oscar/oscar.c:3884 #, c-format msgid "" "You have received an ICQ page\n" @@ -7996,7 +8105,7 @@ "From: %s [%s]\n" "%s" -#: src/protocols/oscar/oscar.c:3775 +#: src/protocols/oscar/oscar.c:3892 #, c-format msgid "" "You have received an ICQ email from %s [%s]\n" @@ -8009,34 +8118,34 @@ "Message is:\n" "%s" -#: src/protocols/oscar/oscar.c:3796 +#: src/protocols/oscar/oscar.c:3913 #, c-format 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:3802 +#: src/protocols/oscar/oscar.c:3919 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:3806 +#: src/protocols/oscar/oscar.c:3923 msgid "Decline" msgstr "Decline" -#: src/protocols/oscar/oscar.c:3890 +#: src/protocols/oscar/oscar.c:4007 #, c-format 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:3899 +#: src/protocols/oscar/oscar.c:4016 #, c-format 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:3908 +#: src/protocols/oscar/oscar.c:4025 #, c-format msgid "" "You missed %hu message from %s because the rate limit has been exceeded." @@ -8047,86 +8156,82 @@ msgstr[1] "" "You missed %hu messages from %s because the rate limit has been exceeded." -#: src/protocols/oscar/oscar.c:3917 +#: src/protocols/oscar/oscar.c:4034 #, c-format 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:3926 +#: src/protocols/oscar/oscar.c:4043 #, c-format 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:3935 +#: src/protocols/oscar/oscar.c:4052 #, c-format 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:3989 src/protocols/oscar/oscar.c:4222 +#: src/protocols/oscar/oscar.c:4106 src/protocols/oscar/oscar.c:4340 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149 #, c-format msgid "Info for %s" msgstr "Info for %s" -#: src/protocols/oscar/oscar.c:4055 +#: src/protocols/oscar/oscar.c:4172 #, c-format msgid "SNAC threw error: %s\n" msgstr "SNAC threw error: %s\n" -#: src/protocols/oscar/oscar.c:4056 -msgid "Unknown error" -msgstr "Unknown error" - #. Data is assumed to be the destination sn -#: src/protocols/oscar/oscar.c:4092 +#: src/protocols/oscar/oscar.c:4209 #, c-format msgid "Unable to send message: %s" msgstr "Unable to send message: %s" -#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097 -#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159 +#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4214 +#: src/protocols/oscar/oscar.c:4272 src/protocols/oscar/oscar.c:4276 msgid "Unknown reason." msgstr "Unknown reason." -#: src/protocols/oscar/oscar.c:4095 +#: src/protocols/oscar/oscar.c:4212 #, c-format msgid "Unable to send message to %s:" msgstr "Unable to send message to %s:" -#: src/protocols/oscar/oscar.c:4155 +#: src/protocols/oscar/oscar.c:4272 #, c-format msgid "User information not available: %s" msgstr "User information not available: %s" -#: src/protocols/oscar/oscar.c:4158 +#: src/protocols/oscar/oscar.c:4275 #, c-format msgid "User information for %s unavailable:" msgstr "User information for %s unavailable:" -#: src/protocols/oscar/oscar.c:4180 +#: src/protocols/oscar/oscar.c:4298 msgid "Warning Level" msgstr "Warning Level" -#: src/protocols/oscar/oscar.c:4184 +#: src/protocols/oscar/oscar.c:4302 msgid "Online Since" msgstr "Online Since" -#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120 +#: src/protocols/oscar/oscar.c:4307 src/protocols/yahoo/yahoo_profile.c:1120 msgid "Member Since" msgstr "Member Since" -#: src/protocols/oscar/oscar.c:4273 +#: src/protocols/oscar/oscar.c:4391 msgid "Your AIM connection may be lost." msgstr "Your AIM connection may be lost." #. The conversion failed! -#: src/protocols/oscar/oscar.c:4459 +#: src/protocols/oscar/oscar.c:4577 msgid "" "[Unable to display a message from this user because it contained invalid " "characters.]" @@ -8134,11 +8239,11 @@ "[Unable to display a message from this user because it contained invalid " "characters.]" -#: src/protocols/oscar/oscar.c:4679 +#: src/protocols/oscar/oscar.c:4797 msgid "Rate limiting error." msgstr "Rate limiting error." -#: src/protocols/oscar/oscar.c:4680 +#: src/protocols/oscar/oscar.c:4798 msgid "" "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." @@ -8146,7 +8251,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:4747 +#: src/protocols/oscar/oscar.c:4867 msgid "" "You have been disconnected because you have signed on with this screen name " "at another location." @@ -8154,105 +8259,107 @@ "You have been disconnected because you have signed on with this screen name " "at another location." -#: src/protocols/oscar/oscar.c:4749 +#: src/protocols/oscar/oscar.c:4869 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:4780 +#: src/protocols/oscar/oscar.c:4882 src/protocols/toc/toc.c:881 +#, c-format +msgid "You have been disconnected from chat room %s." +msgstr "You have been disconnected from chat room %s." + +#: src/protocols/oscar/oscar.c:4916 msgid "Finalizing connection" msgstr "Finalizing connection" -#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538 +#: src/protocols/oscar/oscar.c:5203 src/protocols/silc/util.c:538 msgid "Mobile Phone" msgstr "Mobile Phone" -#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282 +#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:282 #: src/protocols/trepia/trepia.c:408 msgid "Female" msgstr "Female" -#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281 +#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:281 #: src/protocols/trepia/trepia.c:408 msgid "Male" msgstr "Male" -#: src/protocols/oscar/oscar.c:5081 +#: src/protocols/oscar/oscar.c:5221 msgid "Personal Web Page" msgstr "Personal Web Page" -#: src/protocols/oscar/oscar.c:5085 +#: src/protocols/oscar/oscar.c:5225 msgid "Additional Information" msgstr "Additional Information" -#: src/protocols/oscar/oscar.c:5090 +#: src/protocols/oscar/oscar.c:5230 msgid "Home Address" msgstr "Home Address" -#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102 +#: src/protocols/oscar/oscar.c:5234 src/protocols/oscar/oscar.c:5242 msgid "Zip Code" msgstr "Postal Code" -#: src/protocols/oscar/oscar.c:5098 +#: src/protocols/oscar/oscar.c:5238 msgid "Work Address" msgstr "Work Address" -#: src/protocols/oscar/oscar.c:5106 +#: src/protocols/oscar/oscar.c:5246 msgid "Work Information" msgstr "Work Information" -#: src/protocols/oscar/oscar.c:5107 +#: src/protocols/oscar/oscar.c:5247 msgid "Company" msgstr "Company" -#: src/protocols/oscar/oscar.c:5108 +#: src/protocols/oscar/oscar.c:5248 msgid "Division" msgstr "Division" -#: src/protocols/oscar/oscar.c:5109 +#: src/protocols/oscar/oscar.c:5249 msgid "Position" msgstr "Position" -#: src/protocols/oscar/oscar.c:5111 +#: src/protocols/oscar/oscar.c:5251 msgid "Web Page" msgstr "Web Page" -#: src/protocols/oscar/oscar.c:5121 +#: src/protocols/oscar/oscar.c:5261 #, c-format msgid "ICQ Info for %s" msgstr "ICQ Info for %s" -#: src/protocols/oscar/oscar.c:5170 +#: src/protocols/oscar/oscar.c:5310 msgid "Pop-Up Message" msgstr "Pop-Up Message" -#: src/protocols/oscar/oscar.c:5191 +#. TODO: Need to use ngettext() here +#: src/protocols/oscar/oscar.c:5332 #, c-format msgid "The following screen names are associated with %s" msgstr "The following screen names are associated with %s" -#: src/protocols/oscar/oscar.c:5195 -msgid "Search Results" -msgstr "Search Results" - -#: src/protocols/oscar/oscar.c:5212 +#: src/protocols/oscar/oscar.c:5357 #, c-format msgid "No results found for email address %s" msgstr "No results found for email address %s" -#: src/protocols/oscar/oscar.c:5233 +#: src/protocols/oscar/oscar.c:5378 #, c-format 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:5235 +#: src/protocols/oscar/oscar.c:5380 msgid "Account Confirmation Requested" msgstr "Account Confirmation Requested" -#: src/protocols/oscar/oscar.c:5266 +#: src/protocols/oscar/oscar.c:5411 msgid "Error Changing Account Info" msgstr "Error Changing Account Info" -#: src/protocols/oscar/oscar.c:5269 +#: src/protocols/oscar/oscar.c:5414 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -8261,7 +8368,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "differs from the original." -#: src/protocols/oscar/oscar.c:5272 +#: src/protocols/oscar/oscar.c:5417 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -8270,7 +8377,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "ends in a space." -#: src/protocols/oscar/oscar.c:5275 +#: src/protocols/oscar/oscar.c:5420 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -8279,7 +8386,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "is too long." -#: src/protocols/oscar/oscar.c:5278 +#: src/protocols/oscar/oscar.c:5423 #, c-format msgid "" "Error 0x%04x: Unable to change email address because there is already a " @@ -8288,7 +8395,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:5281 +#: src/protocols/oscar/oscar.c:5426 #, c-format msgid "" "Error 0x%04x: Unable to change email address because the given address has " @@ -8297,7 +8404,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:5284 +#: src/protocols/oscar/oscar.c:5429 #, c-format msgid "" "Error 0x%04x: Unable to change email address because the given address is " @@ -8306,12 +8413,12 @@ "Error 0x%04x: Unable to change email address because the given address is " "invalid." -#: src/protocols/oscar/oscar.c:5287 +#: src/protocols/oscar/oscar.c:5432 #, c-format msgid "Error 0x%04x: Unknown error." msgstr "Error 0x%04x: Unknown error." -#: src/protocols/oscar/oscar.c:5297 +#: src/protocols/oscar/oscar.c:5442 #, c-format msgid "" "Your screen name is currently formatted as follows:\n" @@ -8320,26 +8427,26 @@ "Your screen name is currently formatted as follows:\n" "%s" -#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305 +#: src/protocols/oscar/oscar.c:5443 src/protocols/oscar/oscar.c:5450 msgid "Account Info" msgstr "Account Info" -#: src/protocols/oscar/oscar.c:5303 +#: src/protocols/oscar/oscar.c:5448 #, c-format msgid "The email address for %s is %s" msgstr "The email address for %s is %s" -#: src/protocols/oscar/oscar.c:5370 +#: src/protocols/oscar/oscar.c:5515 msgid "" "Your IM Image was not sent. You must be Direct Connected to send IM Images." msgstr "" "Your IM Image was not sent. You must be Direct Connected to send IM Images." -#: src/protocols/oscar/oscar.c:5505 +#: src/protocols/oscar/oscar.c:5650 msgid "Unable to set AIM profile." msgstr "Unable to set AIM profile." -#: src/protocols/oscar/oscar.c:5506 +#: src/protocols/oscar/oscar.c:5651 msgid "" "You have probably requested to set your profile before the login procedure " "completed. Your profile remains unset; try setting it again when you are " @@ -8349,7 +8456,7 @@ "completed. Your profile remains unset; try setting it again when you are " "fully connected." -#: src/protocols/oscar/oscar.c:5533 +#: src/protocols/oscar/oscar.c:5678 #, c-format msgid "" "The maximum profile length of %d byte has been exceeded. Gaim has truncated " @@ -8364,15 +8471,15 @@ "The maximum profile length of %d bytes has been exceeded. Gaim has " "truncated it for you." -#: src/protocols/oscar/oscar.c:5538 +#: src/protocols/oscar/oscar.c:5683 msgid "Profile too long." msgstr "Profile too long." -#: src/protocols/oscar/oscar.c:5569 +#: src/protocols/oscar/oscar.c:5717 msgid "Unable to set AIM away message." msgstr "Unable to set AIM away message." -#: src/protocols/oscar/oscar.c:5570 +#: src/protocols/oscar/oscar.c:5718 msgid "" "You have probably requested to set your away message before the login " "procedure completed. You remain in a \"present\" state; try setting it " @@ -8382,7 +8489,7 @@ "procedure completed. You remain in a \"present\" state; try setting it " "again when you are fully connected." -#: src/protocols/oscar/oscar.c:5615 +#: src/protocols/oscar/oscar.c:5765 #, c-format msgid "" "The maximum away message length of %d byte has been exceeded. Gaim has " @@ -8397,11 +8504,11 @@ "The maximum away message length of %d bytes has been exceeded. Gaim has " "truncated it for you." -#: src/protocols/oscar/oscar.c:5620 +#: src/protocols/oscar/oscar.c:5770 msgid "Away message too long." msgstr "Away message too long." -#: src/protocols/oscar/oscar.c:5700 +#: src/protocols/oscar/oscar.c:5861 #, c-format msgid "" "Could not add the buddy %s because the screen name is invalid. Screen names " @@ -8412,16 +8519,16 @@ "must either start with a letter and contain only letters, numbers and " "spaces, or contain only numbers." -#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158 -#: src/protocols/oscar/oscar.c:6172 +#: src/protocols/oscar/oscar.c:5863 src/protocols/oscar/oscar.c:6319 +#: src/protocols/oscar/oscar.c:6333 msgid "Unable To Add" msgstr "Unable To Add" -#: src/protocols/oscar/oscar.c:5864 +#: src/protocols/oscar/oscar.c:6025 msgid "Unable To Retrieve Buddy List" msgstr "Unable To Retrieve Buddy List" -#: src/protocols/oscar/oscar.c:5865 +#: src/protocols/oscar/oscar.c:6026 msgid "" "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 " @@ -8431,13 +8538,13 @@ "servers. Your buddy list is not lost, and will probably become available in " "a few hours." -#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050 -#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216 -#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222 +#: src/protocols/oscar/oscar.c:6210 src/protocols/oscar/oscar.c:6211 +#: src/protocols/oscar/oscar.c:6216 src/protocols/oscar/oscar.c:6377 +#: src/protocols/oscar/oscar.c:6378 src/protocols/oscar/oscar.c:6383 msgid "Orphans" msgstr "Orphans" -#: src/protocols/oscar/oscar.c:6156 +#: src/protocols/oscar/oscar.c:6317 #, c-format msgid "" "Could not add the buddy %s because you have too many buddies in your buddy " @@ -8446,11 +8553,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:6156 src/protocols/oscar/oscar.c:6170 +#: src/protocols/oscar/oscar.c:6317 src/protocols/oscar/oscar.c:6331 msgid "(no name)" msgstr "(no name)" -#: src/protocols/oscar/oscar.c:6170 +#: src/protocols/oscar/oscar.c:6331 #, c-format msgid "" "Could not add the buddy %s for an unknown reason. The most common reason " @@ -8461,7 +8568,7 @@ "for this is that you have the maximum number of allowed buddies in your " "buddy list." -#: src/protocols/oscar/oscar.c:6253 +#: src/protocols/oscar/oscar.c:6414 #, c-format msgid "" "The user %s has given you permission to add you to their buddy list. Do you " @@ -8470,11 +8577,11 @@ "The user %s has given you permission to add you to their buddy list. Do you " "want to add them?" -#: src/protocols/oscar/oscar.c:6259 +#: src/protocols/oscar/oscar.c:6420 msgid "Authorization Given" msgstr "Authorization Given" -#: src/protocols/oscar/oscar.c:6292 +#: src/protocols/oscar/oscar.c:6453 #, c-format msgid "" "The user %s wants to add you to their buddy list for the following reason:\n" @@ -8484,17 +8591,17 @@ "%s" #. Granted -#: src/protocols/oscar/oscar.c:6334 +#: src/protocols/oscar/oscar.c:6495 #, c-format 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:6335 +#: src/protocols/oscar/oscar.c:6496 msgid "Authorization Granted" msgstr "Authorization Granted" #. Denied -#: src/protocols/oscar/oscar.c:6338 +#: src/protocols/oscar/oscar.c:6499 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the " @@ -8505,76 +8612,92 @@ "following reason:\n" "%s" -#: src/protocols/oscar/oscar.c:6339 +#: src/protocols/oscar/oscar.c:6500 msgid "Authorization Denied" msgstr "Authorization Denied" -#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280 +#: src/protocols/oscar/oscar.c:6538 src/protocols/toc/toc.c:1282 msgid "_Exchange:" msgstr "_Exchange:" -#: src/protocols/oscar/oscar.c:6414 +#: src/protocols/oscar/oscar.c:6577 msgid "Invalid chat name specified." msgstr "Invalid chat name specified." -#: src/protocols/oscar/oscar.c:6503 +#: src/protocols/oscar/oscar.c:6644 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:6638 +#: src/protocols/oscar/oscar.c:6779 msgid "Away Message" msgstr "Away Message" -#: src/protocols/oscar/oscar.c:6973 +#: src/protocols/oscar/oscar.c:7114 #, c-format msgid "Buddy Comment for %s" msgstr "Buddy Comment for %s" -#: src/protocols/oscar/oscar.c:6974 +#: src/protocols/oscar/oscar.c:7115 msgid "Buddy Comment:" msgstr "Buddy Comment:" -#: src/protocols/oscar/oscar.c:6993 +#: src/protocols/oscar/oscar.c:7134 msgid "Edit Buddy Comment" msgstr "Edit Buddy Comment" -#: src/protocols/oscar/oscar.c:6999 +#: src/protocols/oscar/oscar.c:7140 msgid "Get Status Msg" msgstr "Get Status Msg" -#: src/protocols/oscar/oscar.c:7011 +#: src/protocols/oscar/oscar.c:7152 msgid "Direct IM" msgstr "Direct IM" -#: src/protocols/oscar/oscar.c:7028 +#: src/protocols/oscar/oscar.c:7169 msgid "Re-request Authorization" msgstr "Re-request Authorization" -#: src/protocols/oscar/oscar.c:7058 +#: src/protocols/oscar/oscar.c:7229 +msgid "Require authorization" +msgstr "Require authorization" + +#: src/protocols/oscar/oscar.c:7232 +msgid "Hide IP address" +msgstr "Hide IP address" + +#: src/protocols/oscar/oscar.c:7235 +msgid "Web aware" +msgstr "Web aware" + +#: src/protocols/oscar/oscar.c:7240 +msgid "ICQ Privacy Options" +msgstr "ICQ Privacy Options" + +#: src/protocols/oscar/oscar.c:7257 msgid "The new formatting is invalid." msgstr "The new formatting is invalid." -#: src/protocols/oscar/oscar.c:7059 +#: src/protocols/oscar/oscar.c:7258 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:7066 +#: src/protocols/oscar/oscar.c:7265 msgid "New screen name formatting:" msgstr "New screen name formatting:" -#: src/protocols/oscar/oscar.c:7118 +#: src/protocols/oscar/oscar.c:7317 msgid "Change Address To:" msgstr "Change Address To:" -#: src/protocols/oscar/oscar.c:7163 +#: src/protocols/oscar/oscar.c:7362 msgid "<i>you are not waiting for authorization</i>" msgstr "<i>you are not waiting for authorization</i>" -#: src/protocols/oscar/oscar.c:7166 +#: src/protocols/oscar/oscar.c:7365 msgid "You are awaiting authorization from the following buddies" msgstr "You are awaiting authorization from the following buddies" -#: src/protocols/oscar/oscar.c:7167 +#: src/protocols/oscar/oscar.c:7366 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -8582,71 +8705,77 @@ "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" -#: src/protocols/oscar/oscar.c:7184 +#: src/protocols/oscar/oscar.c:7383 msgid "Find Buddy by E-mail" msgstr "Find Buddy by E-mail" -#: src/protocols/oscar/oscar.c:7185 +#: src/protocols/oscar/oscar.c:7384 msgid "Search for a buddy by e-mail address" msgstr "Search for a buddy by e-mail address" -#: src/protocols/oscar/oscar.c:7186 +#: src/protocols/oscar/oscar.c:7385 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:7267 src/protocols/silc/silc.c:814 +#: src/protocols/oscar/oscar.c:7466 src/protocols/silc/silc.c:803 msgid "Set User Info..." msgstr "Set User Info..." -#: src/protocols/oscar/oscar.c:7272 +#: src/protocols/oscar/oscar.c:7472 msgid "Set User Info (URL)..." msgstr "Set User Info (URL)..." -#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810 +#: src/protocols/oscar/oscar.c:7477 src/protocols/silc/silc.c:799 msgid "Change Password..." msgstr "Change Password..." -#: src/protocols/oscar/oscar.c:7282 +#: src/protocols/oscar/oscar.c:7483 msgid "Change Password (URL)" msgstr "Change Password (URL)" -#: src/protocols/oscar/oscar.c:7286 +#: src/protocols/oscar/oscar.c:7487 msgid "Configure IM Forwarding (URL)" msgstr "Configure IM Forwarding (URL)" -#: src/protocols/oscar/oscar.c:7295 +#. ICQ actions +#: src/protocols/oscar/oscar.c:7497 +msgid "Show privacy options..." +msgstr "Show privacy options..." + +#. AIM actions +#: src/protocols/oscar/oscar.c:7504 msgid "Format Screen Name..." msgstr "Format Screen Name..." -#: src/protocols/oscar/oscar.c:7299 +#: src/protocols/oscar/oscar.c:7508 msgid "Confirm Account" msgstr "Confirm Account" -#: src/protocols/oscar/oscar.c:7303 +#: src/protocols/oscar/oscar.c:7512 msgid "Display Currently Registered Address" msgstr "Display Currently Registered Address" -#: src/protocols/oscar/oscar.c:7307 +#: src/protocols/oscar/oscar.c:7516 msgid "Change Currently Registered Address..." msgstr "Change Currently Registered Address..." -#: src/protocols/oscar/oscar.c:7314 +#: src/protocols/oscar/oscar.c:7523 msgid "Show Buddies Awaiting Authorization" msgstr "Show Buddies Awaiting Authorization" -#: src/protocols/oscar/oscar.c:7320 +#: src/protocols/oscar/oscar.c:7529 msgid "Search for Buddy by Email..." msgstr "Search for Buddy by Email..." -#: src/protocols/oscar/oscar.c:7325 +#: src/protocols/oscar/oscar.c:7534 msgid "Search for Buddy by Information" msgstr "Search for Buddy by Information" -#: src/protocols/oscar/oscar.c:7394 +#: src/protocols/oscar/oscar.c:7603 msgid "Use recent buddies group" msgstr "Use recent buddies group" -#: src/protocols/oscar/oscar.c:7397 +#: src/protocols/oscar/oscar.c:7606 msgid "Show how long you have been idle" msgstr "Show how long you have been idle" @@ -8660,19 +8789,19 @@ #. *< version #. * summary #. * description -#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492 +#: src/protocols/oscar/oscar.c:7699 src/protocols/oscar/oscar.c:7701 msgid "AIM/ICQ Protocol Plugin" msgstr "AIM/ICQ Protocol Plugin" -#: src/protocols/oscar/oscar.c:7511 +#: src/protocols/oscar/oscar.c:7720 msgid "Auth host" msgstr "Auth host" -#: src/protocols/oscar/oscar.c:7514 +#: src/protocols/oscar/oscar.c:7723 msgid "Auth port" msgstr "Auth port" -#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2859 +#: src/protocols/oscar/oscar.c:7726 src/protocols/zephyr/zephyr.c:2859 msgid "Encoding" msgstr "Encoding" @@ -8770,12 +8899,12 @@ msgid "Cannot fetch the public key" msgstr "Cannot fetch the public key" -#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1549 +#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1558 msgid "Show Public Key" msgstr "Show Public Key" #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989 -#: src/protocols/silc/chat.c:234 +#: src/protocols/silc/chat.c:235 msgid "Could not load public key" msgstr "Could not load public key" @@ -8845,213 +8974,213 @@ "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:1382 +#: src/protocols/silc/buddy.c:1391 msgid "Detached" msgstr "Detached" -#: src/protocols/silc/buddy.c:1386 src/protocols/silc/silc.c:56 +#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:56 msgid "Indisposed" msgstr "Indisposed" -#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:58 +#: src/protocols/silc/buddy.c:1399 src/protocols/silc/silc.c:58 msgid "Wake Me Up" msgstr "Wake Me Up" -#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:50 +#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:50 msgid "Hyper Active" msgstr "Hyper Active" -#: src/protocols/silc/buddy.c:1394 +#: src/protocols/silc/buddy.c:1403 msgid "Robot" msgstr "Robot" -#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635 +#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624 #: src/protocols/silc/util.c:469 msgid "Happy" msgstr "Happy" -#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637 +#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626 #: src/protocols/silc/util.c:471 msgid "Sad" msgstr "Sad" -#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639 +#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628 #: src/protocols/silc/util.c:473 msgid "Angry" msgstr "Angry" -#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641 +#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630 #: src/protocols/silc/util.c:475 msgid "Jealous" msgstr "Jealous" -#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643 +#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:632 #: src/protocols/silc/util.c:477 msgid "Ashamed" msgstr "Ashamed" -#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645 +#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:634 #: src/protocols/silc/util.c:479 msgid "Invincible" msgstr "Invincible" -#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647 +#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:636 #: src/protocols/silc/util.c:481 msgid "In Love" msgstr "In Love" -#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649 +#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:638 #: src/protocols/silc/util.c:483 msgid "Sleepy" msgstr "Sleepy" -#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651 +#: src/protocols/silc/buddy.c:1426 src/protocols/silc/silc.c:640 #: src/protocols/silc/util.c:485 msgid "Bored" msgstr "Bored" -#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653 +#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:642 #: src/protocols/silc/util.c:487 msgid "Excited" msgstr "Excited" -#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655 +#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:644 #: src/protocols/silc/util.c:489 msgid "Anxious" msgstr "Anxious" -#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982 +#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:982 msgid "User Modes" msgstr "User Modes" -#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991 +#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:991 msgid "Mood" msgstr "Mood" -#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997 +#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:997 msgid "Status Text" msgstr "Status Text" -#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003 +#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1003 msgid "Preferred Contact" msgstr "Preferred Contact" -#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008 +#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1008 msgid "Preferred Language" msgstr "Preferred Language" -#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013 +#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1013 msgid "Device" msgstr "Device" -#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018 -#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705 +#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1018 +#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:694 msgid "Timezone" msgstr "Time Zone" -#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023 +#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1023 msgid "Geolocation" msgstr "Geolocation" -#: src/protocols/silc/buddy.c:1534 +#: src/protocols/silc/buddy.c:1543 msgid "Reset IM Key" msgstr "Reset IM Key" -#: src/protocols/silc/buddy.c:1539 +#: src/protocols/silc/buddy.c:1548 msgid "IM with Key Exchange" msgstr "IM with Key Exchange" -#: src/protocols/silc/buddy.c:1543 +#: src/protocols/silc/buddy.c:1552 msgid "IM with Password" msgstr "IM with Password" -#: src/protocols/silc/buddy.c:1554 +#: src/protocols/silc/buddy.c:1563 msgid "Get Public Key..." msgstr "Get Public Key..." -#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407 +#: src/protocols/silc/buddy.c:1569 src/protocols/silc/ops.c:1407 msgid "Kill User" msgstr "Kill User" -#: src/protocols/silc/chat.c:37 +#: src/protocols/silc/chat.c:38 msgid "_Passphrase:" msgstr "_Passphrase:" -#: src/protocols/silc/chat.c:78 +#: src/protocols/silc/chat.c:79 #, c-format msgid "Channel %s does not exist in the network" msgstr "Channel %s does not exist in the network" -#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171 +#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172 msgid "Channel Information" msgstr "Channel Information" -#: src/protocols/silc/chat.c:80 +#: src/protocols/silc/chat.c:81 msgid "Cannot get channel information" msgstr "Cannot get channel information" -#: src/protocols/silc/chat.c:117 +#: src/protocols/silc/chat.c:118 #, c-format msgid "<b>Channel Name:</b> %s" msgstr "<b>Channel Name:</b> %s" -#: src/protocols/silc/chat.c:120 +#: src/protocols/silc/chat.c:121 #, c-format msgid "<br><b>User Count:</b> %d" msgstr "<br><b>User Count:</b> %d" -#: src/protocols/silc/chat.c:127 +#: src/protocols/silc/chat.c:128 #, c-format msgid "<br><b>Channel Founder:</b> %s" msgstr "<br><b>Channel Founder:</b> %s" -#: src/protocols/silc/chat.c:136 +#: src/protocols/silc/chat.c:137 #, c-format msgid "<br><b>Channel Cipher:</b> %s" msgstr "<br><b>Channel Cipher:</b> %s" -#: src/protocols/silc/chat.c:139 +#: src/protocols/silc/chat.c:140 #, c-format msgid "<br><b>Channel HMAC:</b> %s" msgstr "<br><b>Channel HMAC:</b> %s" -#: src/protocols/silc/chat.c:144 +#: src/protocols/silc/chat.c:145 #, c-format msgid "<br><b>Channel Topic:</b><br>%s" msgstr "<br><b>Channel Topic:</b><br>%s" -#: src/protocols/silc/chat.c:149 +#: src/protocols/silc/chat.c:150 msgid "<br><b>Channel Modes:</b> " msgstr "<br><b>Channel Modes:</b> " -#: src/protocols/silc/chat.c:162 +#: src/protocols/silc/chat.c:163 #, c-format msgid "<br><b>Founder Key Fingerprint:</b><br>%s" msgstr "<br><b>Founder Key Fingerprint:</b><br>%s" -#: src/protocols/silc/chat.c:163 +#: src/protocols/silc/chat.c:164 #, c-format msgid "<br><b>Founder Key Babbleprint:</b><br>%s" msgstr "<br><b>Founder Key Babbleprint:</b><br>%s" -#: src/protocols/silc/chat.c:233 +#: src/protocols/silc/chat.c:234 msgid "Add Channel Public Key" msgstr "Add Channel Public Key" #. Add new public key -#: src/protocols/silc/chat.c:288 +#: src/protocols/silc/chat.c:289 msgid "Open Public Key..." msgstr "Open Public Key..." -#: src/protocols/silc/chat.c:397 +#: src/protocols/silc/chat.c:398 msgid "Channel Passphrase" msgstr "Channel Passphrase" -#: src/protocols/silc/chat.c:404 +#: src/protocols/silc/chat.c:405 msgid "Channel Public Keys List" msgstr "Channel Public Keys List" -#: src/protocols/silc/chat.c:409 +#: src/protocols/silc/chat.c:410 msgid "" "Channel authentication is used to secure the channel from unauthorized " "access. The authentication may be based on passphrase and digital " @@ -9065,123 +9194,123 @@ "channel public keys are set then only users whose public keys are listed are " "able to join." -#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419 -#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457 -#: src/protocols/silc/chat.c:886 +#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420 +#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458 +#: src/protocols/silc/chat.c:887 msgid "Channel Authentication" msgstr "Channel Authentication" -#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458 +#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459 msgid "Add / Remove" msgstr "Add / Remove" -#: src/protocols/silc/chat.c:575 +#: src/protocols/silc/chat.c:576 msgid "Group Name" msgstr "Group Name" -#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687 +#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1687 msgid "Passphrase" msgstr "Passphrase" -#: src/protocols/silc/chat.c:590 +#: src/protocols/silc/chat.c:591 #, c-format msgid "Please enter the %s channel private group name and passphrase." msgstr "Please enter the %s channel private group name and passphrase." -#: src/protocols/silc/chat.c:592 +#: src/protocols/silc/chat.c:593 msgid "Add Channel Private Group" msgstr "Add Channel Private Group" -#: src/protocols/silc/chat.c:719 +#: src/protocols/silc/chat.c:720 msgid "User Limit" msgstr "User Limit" -#: src/protocols/silc/chat.c:720 +#: src/protocols/silc/chat.c:721 msgid "Set user limit on channel. Set to zero to reset user limit." msgstr "Set user limit on channel. Set to zero to reset user limit." -#: src/protocols/silc/chat.c:862 +#: src/protocols/silc/chat.c:863 msgid "Get Info" msgstr "Get Info" -#: src/protocols/silc/chat.c:869 +#: src/protocols/silc/chat.c:870 msgid "Invite List" msgstr "Invite List" -#: src/protocols/silc/chat.c:873 +#: src/protocols/silc/chat.c:874 msgid "Ban List" msgstr "Ban List" -#: src/protocols/silc/chat.c:880 +#: src/protocols/silc/chat.c:881 msgid "Add Private Group" msgstr "Add Private Group" -#: src/protocols/silc/chat.c:891 +#: src/protocols/silc/chat.c:892 msgid "Reset Permanent" msgstr "Reset Permanent" -#: src/protocols/silc/chat.c:895 +#: src/protocols/silc/chat.c:896 msgid "Set Permanent" msgstr "Set Permanent" -#: src/protocols/silc/chat.c:902 +#: src/protocols/silc/chat.c:903 msgid "Set User Limit" msgstr "Set User Limit" -#: src/protocols/silc/chat.c:907 +#: src/protocols/silc/chat.c:908 msgid "Reset Topic Restriction" msgstr "Reset Topic Restriction" -#: src/protocols/silc/chat.c:911 +#: src/protocols/silc/chat.c:912 msgid "Set Topic Restriction" msgstr "Set Topic Restriction" -#: src/protocols/silc/chat.c:917 +#: src/protocols/silc/chat.c:918 msgid "Reset Private Channel" msgstr "Reset Private Channel" -#: src/protocols/silc/chat.c:921 +#: src/protocols/silc/chat.c:922 msgid "Set Private Channel" msgstr "Set Private Channel" -#: src/protocols/silc/chat.c:927 +#: src/protocols/silc/chat.c:928 msgid "Reset Secret Channel" msgstr "Reset Secret Channel" -#: src/protocols/silc/chat.c:931 +#: src/protocols/silc/chat.c:932 msgid "Set Secret Channel" msgstr "Set Secret Channel" -#: src/protocols/silc/chat.c:993 +#: src/protocols/silc/chat.c:994 #, c-format msgid "You are channel founder on <I>%s</I>" msgstr "You are channel founder on <I>%s</I>" -#: src/protocols/silc/chat.c:997 +#: src/protocols/silc/chat.c:998 #, c-format msgid "Channel founder on <I>%s</I> is <I>%s</I>" msgstr "Channel founder on <I>%s</I> is <I>%s</I>" -#: src/protocols/silc/chat.c:1056 +#: src/protocols/silc/chat.c:1057 #, c-format msgid "" "You have to join the %s channel before you are able to join the private group" msgstr "" "You have to join the %s channel before you are able to join the private group" -#: src/protocols/silc/chat.c:1058 +#: src/protocols/silc/chat.c:1059 msgid "Join Private Group" msgstr "Join Private Group" -#: src/protocols/silc/chat.c:1059 +#: src/protocols/silc/chat.c:1060 msgid "Cannot join private group" msgstr "Cannot join private group" -#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914 +#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:903 msgid "Cannot call command" msgstr "Cannot call command" -#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915 +#: src/protocols/silc/chat.c:1254 src/protocols/silc/silc.c:904 msgid "Unknown command" msgstr "Unknown command" @@ -9326,7 +9455,7 @@ msgid "More..." msgstr "More..." -#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802 +#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:791 msgid "Detach From Server" msgstr "Detach From Server" @@ -9556,15 +9685,15 @@ msgid "Connecting to SILC Server" msgstr "Connecting to SILC Server" -#: src/protocols/silc/silc.c:631 +#: src/protocols/silc/silc.c:620 msgid "Your Current Mood" msgstr "Your Current Mood" -#: src/protocols/silc/silc.c:633 +#: src/protocols/silc/silc.c:622 msgid "Normal" msgstr "Normal" -#: src/protocols/silc/silc.c:658 +#: src/protocols/silc/silc.c:647 msgid "" "\n" "Your Preferred Contact Methods" @@ -9572,43 +9701,43 @@ "\n" "Your Preferred Contact Methods" -#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514 +#: src/protocols/silc/silc.c:655 src/protocols/silc/util.c:514 msgid "SMS" msgstr "SMS" -#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516 +#: src/protocols/silc/silc.c:657 src/protocols/silc/util.c:516 msgid "MMS" msgstr "MMS" -#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518 +#: src/protocols/silc/silc.c:659 src/protocols/silc/util.c:518 msgid "Video Conferencing" msgstr "Video Conferencing" -#: src/protocols/silc/silc.c:675 +#: src/protocols/silc/silc.c:664 msgid "Your Current Status" msgstr "Your Current Status" -#: src/protocols/silc/silc.c:682 +#: src/protocols/silc/silc.c:671 msgid "Online Services" msgstr "Online Services" -#: src/protocols/silc/silc.c:685 +#: src/protocols/silc/silc.c:674 msgid "Let others see what services you are using" msgstr "Let others see what services you are using" -#: src/protocols/silc/silc.c:691 +#: src/protocols/silc/silc.c:680 msgid "Let others see what computer you are using" msgstr "Let others see what computer you are using" -#: src/protocols/silc/silc.c:698 +#: src/protocols/silc/silc.c:687 msgid "Your VCard File" msgstr "Your VCard File" -#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712 +#: src/protocols/silc/silc.c:700 src/protocols/silc/silc.c:701 msgid "User Online Status Attributes" msgstr "User Online Status Attributes" -#: src/protocols/silc/silc.c:713 +#: src/protocols/silc/silc.c:702 msgid "" "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 " @@ -9618,127 +9747,127 @@ "information. Please fill the information you would like other users to see " "about yourself." -#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759 -#: src/protocols/silc/silc.c:1159 +#: src/protocols/silc/silc.c:742 src/protocols/silc/silc.c:748 +#: src/protocols/silc/silc.c:1148 msgid "Message of the Day" msgstr "Message of the Day" -#: src/protocols/silc/silc.c:753 +#: src/protocols/silc/silc.c:742 msgid "No Message of the Day available" msgstr "No Message of the Day available" -#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154 +#: src/protocols/silc/silc.c:743 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:797 +#: src/protocols/silc/silc.c:786 msgid "Online Status" msgstr "Online Status" -#: src/protocols/silc/silc.c:806 +#: src/protocols/silc/silc.c:795 msgid "View Message of the Day" msgstr "View Message of the Day" -#: src/protocols/silc/silc.c:879 +#: src/protocols/silc/silc.c:868 #, c-format 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:1030 +#: src/protocols/silc/silc.c:1019 msgid "Topic too long" msgstr "Topic too long" -#: src/protocols/silc/silc.c:1111 +#: src/protocols/silc/silc.c:1100 msgid "You must specify a nick" msgstr "You must specify a nick" -#: src/protocols/silc/silc.c:1213 +#: src/protocols/silc/silc.c:1202 #, c-format msgid "channel %s not found" msgstr "channel %s not found" -#: src/protocols/silc/silc.c:1218 +#: src/protocols/silc/silc.c:1207 #, c-format msgid "channel modes for %s: %s" msgstr "channel modes for %s: %s" -#: src/protocols/silc/silc.c:1220 +#: src/protocols/silc/silc.c:1209 #, c-format msgid "no channel modes are set on %s" msgstr "no channel modes are set on %s" -#: src/protocols/silc/silc.c:1233 +#: src/protocols/silc/silc.c:1222 #, c-format msgid "Failed to set cmodes for %s" msgstr "Failed to set cmodes for %s" -#: src/protocols/silc/silc.c:1263 +#: src/protocols/silc/silc.c:1252 #, c-format msgid "Unknown command: %s, (may be a Gaim bug)" msgstr "Unknown command: %s, (may be a Gaim bug)" -#: src/protocols/silc/silc.c:1326 +#: src/protocols/silc/silc.c:1315 msgid "part [channel]: Leave the chat" msgstr "part [channel]: Leave the chat" -#: src/protocols/silc/silc.c:1330 +#: src/protocols/silc/silc.c:1319 msgid "leave [channel]: Leave the chat" msgstr "leave [channel]: Leave the chat" -#: src/protocols/silc/silc.c:1334 +#: 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:1339 +#: 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:1343 +#: 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:1347 +#: 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:1351 src/protocols/zephyr/zephyr.c:2563 +#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2563 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:1355 +#: src/protocols/silc/silc.c:1344 msgid "query <nick> [<message>]: Send a private message to a user" msgstr "" "query <nick> [<message>]: Send a private message to a user" -#: src/protocols/silc/silc.c:1359 +#: 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:1363 +#: src/protocols/silc/silc.c:1352 msgid "detach: Detach this session" msgstr "detach: Detach this session" -#: src/protocols/silc/silc.c:1367 +#: 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:1371 +#: 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:1377 +#: 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:1381 +#: src/protocols/silc/silc.c:1370 msgid "nick <newnick>: Change your nickname" msgstr "nick <newnick>: Change your nickname" -#: src/protocols/silc/silc.c:1385 +#: 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:1389 +#: src/protocols/silc/silc.c:1378 msgid "" "cmode <channel> [+|-<modes>] [arguments]: Change or display " "channel modes" @@ -9746,7 +9875,7 @@ "cmode <channel> [+|-<modes>] [arguments]: Change or display " "channel modes" -#: src/protocols/silc/silc.c:1393 +#: src/protocols/silc/silc.c:1382 msgid "" "cumode <channel> +|-<modes> <nick>: Change nick's modes " "on channel" @@ -9754,15 +9883,15 @@ "cumode <channel> +|-<modes> <nick>: Change nick's modes " "on channel" -#: src/protocols/silc/silc.c:1397 +#: 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:1401 +#: 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:1405 +#: src/protocols/silc/silc.c:1394 msgid "" "invite <channel> [-|+]<nick>: invite nick or add/remove from " "channel invite list" @@ -9770,35 +9899,35 @@ "invite <channel> [-|+]<nick>: invite nick or add/remove from " "channel invite list" -#: src/protocols/silc/silc.c:1409 +#: 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:1413 +#: 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:1417 +#: 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:1421 +#: 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:1425 +#: 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:1429 +#: 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:1434 +#: 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:1438 +#: src/protocols/silc/silc.c:1427 msgid "" "names [-count|-ops|-halfops|-voices|-normal] <channel(s)>: List " "specific users in channel(s)" @@ -9806,39 +9935,39 @@ "names [-count|-ops|-halfops|-voices|-normal] <channel(s)>: List " "specific users in channel(s)" -#: src/protocols/silc/silc.c:1450 +#: src/protocols/silc/silc.c:1439 msgid "Instant Messages" msgstr "Instant Messages" -#: src/protocols/silc/silc.c:1455 +#: src/protocols/silc/silc.c:1444 msgid "Digitally sign all IM messages" msgstr "Digitally sign all IM messages" -#: src/protocols/silc/silc.c:1460 +#: src/protocols/silc/silc.c:1449 msgid "Verify all IM message signatures" msgstr "Verify all IM message signatures" -#: src/protocols/silc/silc.c:1463 +#: src/protocols/silc/silc.c:1452 msgid "Channel Messages" msgstr "Channel Messages" -#: src/protocols/silc/silc.c:1468 +#: src/protocols/silc/silc.c:1457 msgid "Digitally sign all channel messages" msgstr "Digitally sign all channel messages" -#: src/protocols/silc/silc.c:1473 +#: src/protocols/silc/silc.c:1462 msgid "Verify all channel message signatures" msgstr "Verify all channel message signatures" -#: src/protocols/silc/silc.c:1476 +#: src/protocols/silc/silc.c:1465 msgid "Default SILC Key Pair" msgstr "Default SILC Key Pair" -#: src/protocols/silc/silc.c:1481 +#: src/protocols/silc/silc.c:1470 msgid "SILC Public Key" msgstr "SILC Public Key" -#: src/protocols/silc/silc.c:1486 +#: src/protocols/silc/silc.c:1475 msgid "SILC Private Key" msgstr "SILC Private Key" @@ -9851,40 +9980,40 @@ #. *< name #. *< version #. * summary -#: src/protocols/silc/silc.c:1575 +#: src/protocols/silc/silc.c:1564 msgid "SILC Protocol Plugin" msgstr "SILC Protocol Plugin" #. * description -#: src/protocols/silc/silc.c:1577 +#: 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:1607 +#: src/protocols/silc/silc.c:1596 msgid "Public key authentication" msgstr "Public key authentication" -#: src/protocols/silc/silc.c:1613 +#: src/protocols/silc/silc.c:1602 msgid "Public Key File" msgstr "Public Key File" -#: src/protocols/silc/silc.c:1617 +#: src/protocols/silc/silc.c:1606 msgid "Private Key File" msgstr "Private Key File" -#: src/protocols/silc/silc.c:1622 +#: src/protocols/silc/silc.c:1611 msgid "Reject watching by other users" msgstr "Reject watching by other users" -#: src/protocols/silc/silc.c:1625 +#: src/protocols/silc/silc.c:1614 msgid "Block invites" msgstr "Block invites" -#: src/protocols/silc/silc.c:1628 +#: src/protocols/silc/silc.c:1617 msgid "Block IMs without Key Exchange" msgstr "Block IMs without Key Exchange" -#: src/protocols/silc/silc.c:1631 +#: src/protocols/silc/silc.c:1620 msgid "Reject online status attribute requests" msgstr "Reject online status attribute requests" @@ -10131,44 +10260,44 @@ "if you send a message. Gaim will prevent anything from going through. This " "is only temporary, please be patient." -#: src/protocols/toc/toc.c:1430 +#: src/protocols/toc/toc.c:1432 msgid "Get Dir Info" msgstr "Get Dir Info" -#: src/protocols/toc/toc.c:1566 +#: src/protocols/toc/toc.c:1572 msgid "Set Dir Info" msgstr "Set Dir Info" -#: src/protocols/toc/toc.c:1688 +#: src/protocols/toc/toc.c:1694 #, c-format msgid "Could not open %s for writing!" msgstr "Could not open %s for writing!" -#: src/protocols/toc/toc.c:1724 +#: src/protocols/toc/toc.c:1730 msgid "File transfer failed; other side probably canceled." msgstr "File transfer failed; other side probably cancelled." -#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809 -#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021 +#: src/protocols/toc/toc.c:1775 src/protocols/toc/toc.c:1815 +#: src/protocols/toc/toc.c:1939 src/protocols/toc/toc.c:2027 msgid "Could not connect for transfer." msgstr "Could not connect for transfer." -#: src/protocols/toc/toc.c:1966 +#: src/protocols/toc/toc.c:1972 msgid "Could not write file header. The file will not be transferred." msgstr "Could not write file header. The file will not be transferred." -#: src/protocols/toc/toc.c:2066 +#: src/protocols/toc/toc.c:2072 msgid "Gaim - Save As..." msgstr "Gaim - Save As..." -#: src/protocols/toc/toc.c:2100 +#: src/protocols/toc/toc.c:2106 #, c-format msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s" msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s" msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s" msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s" -#: src/protocols/toc/toc.c:2107 +#: src/protocols/toc/toc.c:2113 #, c-format msgid "%s requests you to send them a file" msgstr "%s requests you to send them a file" @@ -10183,15 +10312,15 @@ #. *< version #. * summary #. * description -#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196 +#: src/protocols/toc/toc.c:2200 src/protocols/toc/toc.c:2202 msgid "TOC Protocol Plugin" msgstr "TOC Protocol Plugin" -#: src/protocols/toc/toc.c:2215 +#: src/protocols/toc/toc.c:2221 msgid "TOC host" msgstr "TOC host" -#: src/protocols/toc/toc.c:2219 +#: src/protocols/toc/toc.c:2225 msgid "TOC port" msgstr "TOC port" @@ -10278,7 +10407,7 @@ msgid "Trepia Protocol Plugin" msgstr "Trepia Protocol Plugin" -#: src/protocols/yahoo/yahoo.c:400 +#: src/protocols/yahoo/yahoo.c:141 msgid "" "You have been logged off as you have logged in on a different machine or " "device." @@ -10286,25 +10415,25 @@ "You have been logged off as you have logged in on a different machine or " "device." -#: src/protocols/yahoo/yahoo.c:884 +#: src/protocols/yahoo/yahoo.c:626 msgid "Your Yahoo! message did not get sent." msgstr "Your Yahoo! message did not get sent." -#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429 +#: src/protocols/yahoo/yahoo.c:645 src/protocols/yahoo/yahoo.c:3169 msgid "Buzz!!" msgstr "Buzz!!" -#: src/protocols/yahoo/yahoo.c:948 +#: src/protocols/yahoo/yahoo.c:690 #, c-format msgid "Yahoo! system message for %s:" msgstr "Yahoo! system message for %s:" -#: src/protocols/yahoo/yahoo.c:1015 +#: src/protocols/yahoo/yahoo.c:757 #, c-format 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:1018 +#: src/protocols/yahoo/yahoo.c:760 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -10313,11 +10442,11 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." -#: src/protocols/yahoo/yahoo.c:1021 +#: src/protocols/yahoo/yahoo.c:763 msgid "Add buddy rejected" msgstr "Add buddy rejected" -#: src/protocols/yahoo/yahoo.c:1782 +#: src/protocols/yahoo/yahoo.c:1511 #, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -10328,11 +10457,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:1785 +#: src/protocols/yahoo/yahoo.c:1514 msgid "Failed Yahoo! Authentication" msgstr "Failed Yahoo! Authentication" -#: src/protocols/yahoo/yahoo.c:1858 +#: src/protocols/yahoo/yahoo.c:1587 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -10341,19 +10470,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:1861 +#: src/protocols/yahoo/yahoo.c:1590 msgid "Ignore buddy?" msgstr "Ignore buddy?" -#: src/protocols/yahoo/yahoo.c:1895 +#: src/protocols/yahoo/yahoo.c:1624 msgid "Invalid username." msgstr "Invalid username." -#: src/protocols/yahoo/yahoo.c:1906 +#: src/protocols/yahoo/yahoo.c:1635 msgid "Normal authentication failed!" msgstr "Normal authentication failed!" -#: src/protocols/yahoo/yahoo.c:1907 +#: src/protocols/yahoo/yahoo.c:1636 msgid "" "The normal authentication method has failed. This means either your password " "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now " @@ -10365,93 +10494,93 @@ "attempt to log in using Web Messenger authentication, which will result in " "reduced functionality and features." -#: src/protocols/yahoo/yahoo.c:1915 +#: src/protocols/yahoo/yahoo.c:1644 msgid "Incorrect password." msgstr "Incorrect password." -#: src/protocols/yahoo/yahoo.c:1918 +#: src/protocols/yahoo/yahoo.c:1647 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:1921 +#: src/protocols/yahoo/yahoo.c:1650 #, c-format 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:1975 +#: src/protocols/yahoo/yahoo.c:1704 #, c-format 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:1978 +#: src/protocols/yahoo/yahoo.c:1707 msgid "Could not add buddy to server list" msgstr "Could not add buddy to server list" -#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340 -#: src/protocols/yahoo/ycht.c:414 +#: src/protocols/yahoo/yahoo.c:1941 src/protocols/yahoo/yahoo.c:2067 +#: src/protocols/yahoo/ycht.c:415 msgid "Unable to read" msgstr "Unable to read" -#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472 -#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532 -#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476 -#: src/protocols/yahoo/ycht.c:518 +#: src/protocols/yahoo/yahoo.c:2089 src/protocols/yahoo/yahoo.c:2199 +#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2291 +#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433 +#: src/protocols/yahoo/ycht.c:519 msgid "Connection problem" msgstr "Connection problem" -#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145 +#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2905 msgid "Not At Home" msgstr "Not At Home" -#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148 +#: src/protocols/yahoo/yahoo.c:2396 src/protocols/yahoo/yahoo.c:2908 msgid "Not At Desk" msgstr "Not At Desk" -#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151 +#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2911 msgid "Not In Office" msgstr "Not In Office" -#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157 +#: src/protocols/yahoo/yahoo.c:2402 src/protocols/yahoo/yahoo.c:2917 msgid "On Vacation" msgstr "On Vacation" -#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163 +#: src/protocols/yahoo/yahoo.c:2406 src/protocols/yahoo/yahoo.c:2923 msgid "Stepped Out" msgstr "Stepped Out" -#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754 +#: src/protocols/yahoo/yahoo.c:2487 src/protocols/yahoo/yahoo.c:2513 msgid "Not on server list" msgstr "Not on server list" -#: src/protocols/yahoo/yahoo.c:2833 +#: src/protocols/yahoo/yahoo.c:2592 msgid "Join in Chat" msgstr "Join in Chat" -#: src/protocols/yahoo/yahoo.c:2838 +#: src/protocols/yahoo/yahoo.c:2597 msgid "Initiate Conference" msgstr "Initiate Conference" -#: src/protocols/yahoo/yahoo.c:2890 +#: src/protocols/yahoo/yahoo.c:2648 msgid "Active which ID?" msgstr "Active which ID?" -#: src/protocols/yahoo/yahoo.c:2899 +#: src/protocols/yahoo/yahoo.c:2657 msgid "Join who in chat?" msgstr "Join who in chat?" -#: src/protocols/yahoo/yahoo.c:2909 +#: src/protocols/yahoo/yahoo.c:2667 msgid "Activate ID..." msgstr "Activate ID..." -#: src/protocols/yahoo/yahoo.c:2913 +#: src/protocols/yahoo/yahoo.c:2671 msgid "Join user in chat..." msgstr "Join user in chat..." -#: src/protocols/yahoo/yahoo.c:3473 +#: src/protocols/yahoo/yahoo.c:3213 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "join <room>: Join a chat room on the Yahoo network" -#: src/protocols/yahoo/yahoo.c:3477 +#: src/protocols/yahoo/yahoo.c:3217 msgid "buzz: Buzz a contact to get their attention" msgstr "buzz: Buzz a contact to get their attention" @@ -10465,51 +10594,51 @@ #. *< version #. * summary #. * description -#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559 +#: src/protocols/yahoo/yahoo.c:3297 src/protocols/yahoo/yahoo.c:3299 msgid "Yahoo Protocol Plugin" msgstr "Yahoo Protocol Plugin" -#: src/protocols/yahoo/yahoo.c:3578 +#: src/protocols/yahoo/yahoo.c:3318 msgid "Yahoo Japan" msgstr "Yahoo Japan" -#: src/protocols/yahoo/yahoo.c:3581 +#: src/protocols/yahoo/yahoo.c:3321 msgid "Pager host" msgstr "Pager host" -#: src/protocols/yahoo/yahoo.c:3584 +#: src/protocols/yahoo/yahoo.c:3324 msgid "Japan Pager host" msgstr "Japan Pager host" -#: src/protocols/yahoo/yahoo.c:3587 +#: src/protocols/yahoo/yahoo.c:3327 msgid "Pager port" msgstr "Pager port" -#: src/protocols/yahoo/yahoo.c:3590 +#: src/protocols/yahoo/yahoo.c:3330 msgid "File transfer host" msgstr "File transfer host" -#: src/protocols/yahoo/yahoo.c:3593 +#: src/protocols/yahoo/yahoo.c:3333 msgid "Japan File transfer host" msgstr "Japan File transfer host" -#: src/protocols/yahoo/yahoo.c:3596 +#: src/protocols/yahoo/yahoo.c:3336 msgid "File transfer port" msgstr "File transfer port" -#: src/protocols/yahoo/yahoo.c:3599 +#: src/protocols/yahoo/yahoo.c:3339 msgid "Chat Room List Url" msgstr "Chat Room List Url" -#: src/protocols/yahoo/yahoo.c:3602 +#: src/protocols/yahoo/yahoo.c:3342 msgid "YCHT Host" msgstr "YCHT Host" -#: src/protocols/yahoo/yahoo.c:3605 +#: src/protocols/yahoo/yahoo.c:3345 msgid "YCHT Port" msgstr "YCHT Port" -#: src/protocols/yahoo/yahoo_filexfer.c:170 +#: src/protocols/yahoo/yahoo_filexfer.c:169 msgid "" "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " "(1,048,576 bytes)." @@ -10612,61 +10741,57 @@ msgid "The user's profile is empty." msgstr "The user's profile is empty." -#: src/protocols/yahoo/yahoochat.c:193 +#: src/protocols/yahoo/yahoochat.c:190 #, c-format msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"." -#: src/protocols/yahoo/yahoochat.c:195 +#: src/protocols/yahoo/yahoochat.c:192 msgid "Invitation Rejected" msgstr "Invitation Rejected" -#: src/protocols/yahoo/yahoochat.c:347 +#: src/protocols/yahoo/yahoochat.c:344 msgid "Failed to join chat" msgstr "Failed to join chat" -#: src/protocols/yahoo/yahoochat.c:347 +#: src/protocols/yahoo/yahoochat.c:344 msgid "Maybe the room is full?" msgstr "Maybe the room is full?" -#: src/protocols/yahoo/yahoochat.c:425 +#: src/protocols/yahoo/yahoochat.c:422 #, c-format msgid "You are now chatting in %s." msgstr "You are now chatting in %s." -#: src/protocols/yahoo/yahoochat.c:579 +#: src/protocols/yahoo/yahoochat.c:576 msgid "Failed to join buddy in chat" msgstr "Failed to join buddy in chat" -#: src/protocols/yahoo/yahoochat.c:580 +#: src/protocols/yahoo/yahoochat.c:577 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:1312 msgid "Fetching the room list failed." msgstr "Fetching the room list failed." -#: src/protocols/yahoo/yahoochat.c:1401 +#: src/protocols/yahoo/yahoochat.c:1358 msgid "Voices" msgstr "Voices" -#: src/protocols/yahoo/yahoochat.c:1404 +#: src/protocols/yahoo/yahoochat.c:1361 msgid "Webcams" msgstr "Webcams" -#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476 +#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433 msgid "Unable to fetch room list." msgstr "Unable to fetch room list." -#: src/protocols/yahoo/yahoochat.c:1469 +#: src/protocols/yahoo/yahoochat.c:1426 msgid "User Rooms" msgstr "User Rooms" -#: src/protocols/yahoo/ycht.c:401 +#: src/protocols/yahoo/ycht.c:402 msgid "Connection problem with the YCHT server." msgstr "Connection problem with the YCHT server." @@ -10824,21 +10949,21 @@ #. XXX: why in the hell are we calling gaim_connection_error() here? #. Forbidden -#: src/proxy.c:953 +#: src/proxy.c:959 #, c-format msgid "Access denied: proxy server forbids port %d tunnelling." msgstr "Access denied: proxy server forbids port %d tunnelling." -#: src/proxy.c:957 +#: src/proxy.c:963 #, c-format msgid "Proxy connection error %d" msgstr "Proxy connection error %d" -#: src/proxy.c:1612 +#: src/proxy.c:1784 msgid "Invalid proxy settings" msgstr "Invalid proxy settings" -#: src/proxy.c:1612 +#: src/proxy.c:1784 msgid "" "Either the host name or port number specified for your given proxy type is " "invalid." @@ -10873,7 +10998,7 @@ msgid "(1 message)" msgstr "(1 message)" -#: src/server.c:1164 +#: src/server.c:1166 #, c-format msgid "" "%s has invited %s to the chat room %s:\n" @@ -10882,70 +11007,85 @@ "%s has invited %s to the chat room %s:\n" "<b>%s</b>" -#: src/server.c:1168 +#: src/server.c:1172 #, c-format msgid "%s has invited %s to the chat room %s\n" msgstr "%s has invited %s to the chat room %s\n" -#: src/server.c:1174 +#: src/server.c:1178 msgid "Accept chat invitation?" msgstr "Accept chat invitation?" -#: src/status.c:553 +#: src/status.c:154 +msgid "Unset" +msgstr "Unset" + +#: src/status.c:614 #, c-format msgid "%s came back" msgstr "%s came back" -#: src/status.c:558 +#: src/status.c:619 #, c-format msgid "%s went away" msgstr "%s went away" -#: src/status.c:1269 +#: src/status.c:1314 #, c-format msgid "%s became idle" msgstr "%s became idle" -#: src/status.c:1285 +#: src/status.c:1330 #, c-format msgid "%s became unidle" msgstr "%s became unidle" -#: src/util.c:2354 +#: src/util.c:2121 +#, c-format +msgid "Error Reading %s" +msgstr "Error Reading %s" + +#: src/util.c:2122 +#, c-format +msgid "" +"An error was encountered reading your %s. They have not been loaded, and " +"the old file been renamed to %s~." +msgstr "" +"An error was encountered reading your %s. They have not been loaded, and " +"the old file been renamed to %s~." + +#: src/util.c:2557 msgid "Calculating..." msgstr "Calculating..." -#: src/util.c:2357 +#: src/util.c:2560 msgid "Unknown." msgstr "Unknown." -#: src/util.c:2387 +#: src/util.c:2590 msgid "second" msgid_plural "seconds" msgstr[0] "second" msgstr[1] "seconds" -#: src/util.c:2401 +#: src/util.c:2604 msgid "day" msgid_plural "days" msgstr[0] "day" msgstr[1] "days" -#: src/util.c:2409 +#: src/util.c:2612 msgid "hour" msgid_plural "hours" msgstr[0] "hour" msgstr[1] "hours" -#: src/util.c:2417 +#: src/util.c:2620 msgid "minute" msgid_plural "minutes" msgstr[0] "minute" msgstr[1] "minutes" -#: src/util.c:2834 +#: src/util.c:3037 msgid "g003: Error opening connection.\n" msgstr "g003: Error opening connection.\n" - -#~ msgid "Syncing with server" -#~ msgstr "Syncing with server"