Mercurial > pidgin.yaz
changeset 9402:bf7f66d1ea30
[gaim-migrate @ 10216]
updated
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 26 Jun 2004 12:12:48 +0000 |
| parents | 7ff4c53bc788 |
| children | 5fac39b20a72 |
| files | po/ChangeLog po/en_CA.po |
| diffstat | 2 files changed, 2410 insertions(+), 2010 deletions(-) [+] |
line wrap: on
line diff
--- a/po/ChangeLog Sat Jun 26 12:07:49 2004 +0000 +++ b/po/ChangeLog Sat Jun 26 12:12:48 2004 +0000 @@ -1,7 +1,7 @@ Gaim: The Pimpin' Penguin IM Clone that's good for the soul! version 0.80cvs: - * Ninja + * English (Canadian) translation updated (Adam Weinberger) version 0.79 (06/24/2004) * Chinese (Simplified) translation updated (Funda Wang)
--- a/po/en_CA.po Sat Jun 26 12:07:49 2004 +0000 +++ b/po/en_CA.po Sat Jun 26 12:12:48 2004 +0000 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: gaim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-05-31 18:39-0400\n" -"PO-Revision-Date: 2004-05-31 19:20-0700\n" +"POT-Creation-Date: 2004-06-25 19:38-0400\n" +"PO-Revision-Date: 2004-06-25 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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);" #: plugins/autorecon.c:174 msgid "Error Message Suppression" @@ -147,7 +147,7 @@ msgid "Gaim - Away" msgstr "Gaim - Away" -#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891 +#: plugins/docklet/docklet.c:114 src/gtkaccount.c:673 src/gtkaccount.c:2095 msgid "Auto-login" msgstr "Auto-login" @@ -163,21 +163,21 @@ msgid "New..." msgstr "New..." -#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1836 src/protocols/gg/gg.c:51 -#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:958 +#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51 +#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63 -#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723 -#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892 -#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5461 -#: src/protocols/oscar/oscar.c:6443 src/protocols/oscar/oscar.c:6642 -#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:46 +#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724 +#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893 +#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465 +#: src/protocols/oscar/oscar.c:6464 src/protocols/oscar/oscar.c:6663 +#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46 #: src/protocols/silc/silc.c:76 msgid "Away" msgstr "Away" #. else... #: plugins/docklet/docklet.c:159 src/away.c:550 -#: src/protocols/oscar/oscar.c:5379 src/protocols/oscar/oscar.c:6650 +#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6671 msgid "Back" msgstr "Back" @@ -189,11 +189,11 @@ msgid "File Transfers" msgstr "File Transfers" -#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 +#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2274 msgid "Accounts" msgstr "Accounts" -#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2526 +#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490 msgid "Preferences" msgstr "Preferences" @@ -243,6 +243,43 @@ "and to toggle display of the buddy list or login window. Also allows " "messages to be queued until the icon is clicked, similar to ICQ." +#: plugins/extplacement.c:68 +msgid "By conversation count" +msgstr "By conversation count" + +#: plugins/extplacement.c:89 +msgid "Conversation Placement" +msgstr "Conversation Placement" + +#: plugins/extplacement.c:94 +msgid "Number of conversations per window" +msgstr "Number of conversations per window" + +#. *< api_version +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: plugins/extplacement.c:114 +msgid "ExtPlacement" +msgstr "ExtPlacement" + +#. *< name +#. *< version +#: plugins/extplacement.c:116 +msgid "Extra conversation placement options." +msgstr "Extra conversation placement options." + +#: plugins/extplacement.c:118 +msgid "" +"Either restrict the number of conversations per windows or use separate " +"windows for IMs and Chats" +msgstr "" +"Either restrict the number of conversations per windows or use separate " +"windows for IMs and Chats" + #. *< api_version #. *< type #. *< ui_requirement @@ -399,58 +436,58 @@ "Drag up and then to the left to switch to the previous conversation.\n" "Drag up and then to the right to switch to the next conversation." -#: plugins/gevolution/add_buddy_dialog.c:136 -#: plugins/gevolution/assoc-buddy.c:74 +#: plugins/gevolution/add_buddy_dialog.c:133 +#: plugins/gevolution/assoc-buddy.c:71 msgid "Local Addressbook" msgstr "Local Addressbook" -#: plugins/gevolution/add_buddy_dialog.c:146 -#: plugins/gevolution/add_buddy_dialog.c:157 -#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95 -#: src/gtkblist.c:2958 src/gtkprefs.c:914 src/gtkprefs.c:978 -#: src/gtkprefs.c:1849 src/protocols/jabber/jabber.c:922 +#: plugins/gevolution/add_buddy_dialog.c:143 +#: plugins/gevolution/add_buddy_dialog.c:154 +#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92 +#: src/gtkblist.c:2967 src/gtkprefs.c:913 src/gtkprefs.c:966 +#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923 msgid "None" msgstr "None" -#: plugins/gevolution/add_buddy_dialog.c:190 -#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2198 -#: src/gtkroomlist.c:551 src/protocols/jabber/jabber.c:597 -#: src/protocols/msn/msn.c:1408 src/protocols/trepia/trepia.c:398 +#: plugins/gevolution/add_buddy_dialog.c:187 +#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2162 +#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597 +#: src/protocols/msn/msn.c:1305 src/protocols/trepia/trepia.c:398 msgid "Name" msgstr "Name" -#: plugins/gevolution/add_buddy_dialog.c:201 +#: plugins/gevolution/add_buddy_dialog.c:198 msgid "Instant Messaging" msgstr "Instant Messaging" -#: plugins/gevolution/add_buddy_dialog.c:482 +#: plugins/gevolution/add_buddy_dialog.c:479 msgid "Select a person from your address book below, or add a new person." msgstr "Select a person from your address book below, or add a new person." #. "Search" -#: plugins/gevolution/add_buddy_dialog.c:495 -#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6929 +#: plugins/gevolution/add_buddy_dialog.c:492 +#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6950 msgid "Search" msgstr "Search" -#: plugins/gevolution/add_buddy_dialog.c:566 -#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3985 -#: src/gtkblist.c:4314 +#: plugins/gevolution/add_buddy_dialog.c:563 +#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:3996 +#: src/gtkblist.c:4324 msgid "Group:" msgstr "Group:" #. "New Person" button -#: plugins/gevolution/add_buddy_dialog.c:592 -#: plugins/gevolution/assoc-buddy.c:486 +#: plugins/gevolution/add_buddy_dialog.c:589 +#: plugins/gevolution/assoc-buddy.c:483 msgid "New Person" msgstr "New Person" #. "Select Buddy" button -#: plugins/gevolution/add_buddy_dialog.c:609 +#: plugins/gevolution/add_buddy_dialog.c:606 msgid "Select Buddy" msgstr "Select Buddy" -#: plugins/gevolution/assoc-buddy.c:370 +#: plugins/gevolution/assoc-buddy.c:367 msgid "" "Select a person from your address book to add this buddy to, or create a new " "person." @@ -459,39 +496,39 @@ "person." #. Add the disclosure -#: plugins/gevolution/assoc-buddy.c:449 +#: plugins/gevolution/assoc-buddy.c:446 msgid "Show user details" msgstr "Show user details" -#: plugins/gevolution/assoc-buddy.c:450 +#: plugins/gevolution/assoc-buddy.c:447 msgid "Hide user details" msgstr "Hide user details" #. "Associate Buddy" button -#: plugins/gevolution/assoc-buddy.c:503 +#: plugins/gevolution/assoc-buddy.c:500 msgid "_Associate Buddy" msgstr "_Associate Buddy" -#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90 -#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3809 -#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799 +#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89 +#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3817 +#: src/protocols/jabber/roster.c:66 msgid "Buddies" msgstr "Buddies" -#: plugins/gevolution/gevolution.c:221 +#: plugins/gevolution/gevolution.c:220 msgid "Add to Address Book" msgstr "Add to Address Book" #. Configuration frame -#: plugins/gevolution/gevolution.c:352 +#: plugins/gevolution/gevolution.c:351 msgid "Evolution Integration Configuration" msgstr "Evolution Integration Configuration" -#: plugins/gevolution/gevolution.c:355 +#: plugins/gevolution/gevolution.c:354 msgid "Select all accounts that buddies should be auto-added to." msgstr "Select all accounts that buddies should be auto-added to." -#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620 +#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620 msgid "Account" msgstr "Account" @@ -502,7 +539,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/gevolution/gevolution.c:466 +#: plugins/gevolution/gevolution.c:465 msgid "Evolution Integration" msgstr "Evolution Integration" @@ -510,46 +547,46 @@ #. *< version #. * summary #. * description -#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471 +#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470 msgid "Provides integration with Ximian Evolution." msgstr "Provides integration with Ximian Evolution." -#: plugins/gevolution/new_person_dialog.c:270 +#: plugins/gevolution/new_person_dialog.c:267 msgid "Please enter the person's information below." msgstr "Please enter the person's information below." -#: plugins/gevolution/new_person_dialog.c:274 +#: plugins/gevolution/new_person_dialog.c:271 msgid "Please enter the buddy's screen name and account type below." msgstr "Please enter the buddy's screen name and account type below." -#: plugins/gevolution/new_person_dialog.c:294 +#: plugins/gevolution/new_person_dialog.c:291 msgid "Account type:" msgstr "Account type:" -#: plugins/gevolution/new_person_dialog.c:298 +#: plugins/gevolution/new_person_dialog.c:295 msgid "Screenname:" msgstr "Screenname:" #. Optional Information section -#: plugins/gevolution/new_person_dialog.c:318 +#: plugins/gevolution/new_person_dialog.c:315 msgid "Optional information:" msgstr "Optional information:" #. Label -#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320 +#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:340 #: src/protocols/oscar/oscar.c:433 msgid "Buddy Icon" msgstr "Buddy Icon" -#: plugins/gevolution/new_person_dialog.c:353 +#: plugins/gevolution/new_person_dialog.c:350 msgid "First name:" msgstr "First name:" -#: plugins/gevolution/new_person_dialog.c:365 +#: plugins/gevolution/new_person_dialog.c:362 msgid "Last name:" msgstr "Last name:" -#: plugins/gevolution/new_person_dialog.c:385 +#: plugins/gevolution/new_person_dialog.c:382 msgid "E-mail:" msgstr "E-mail:" @@ -604,7 +641,7 @@ msgid "_Set" msgstr "_Set" -#: plugins/idle.c:67 src/dialogs.c:795 +#: plugins/idle.c:67 src/dialogs.c:786 msgid "_Cancel" msgstr "_Cancel" @@ -673,70 +710,70 @@ msgstr "Adds a small box to the buddy list that shows if you have new mail." #. ---------- "Notify For" ---------- -#: plugins/notify.c:572 +#: plugins/notify.c:599 msgid "Notify For" msgstr "Notify For" -#: plugins/notify.c:576 +#: plugins/notify.c:603 msgid "_IM windows" msgstr "_IM windows" -#: plugins/notify.c:583 +#: plugins/notify.c:610 msgid "C_hat windows" msgstr "C_hat windows" -#: plugins/notify.c:590 +#: plugins/notify.c:617 msgid "_Focused windows" msgstr "_Focused windows" #. ---------- "Notification Methods" ---------- -#: plugins/notify.c:598 +#: plugins/notify.c:625 msgid "Notification Methods" msgstr "Notification Methods" -#: plugins/notify.c:605 +#: plugins/notify.c:632 msgid "Prepend _string into window title:" msgstr "Prepend _string into window title:" #. Count method button -#: plugins/notify.c:624 +#: plugins/notify.c:651 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:633 +#: plugins/notify.c:659 msgid "Set window manager \"_URGENT\" hint" msgstr "Set window manager \"_URGENT\" hint" #. ---------- "Notification Removals" ---------- -#: plugins/notify.c:640 +#: plugins/notify.c:667 msgid "Notification Removal" msgstr "Notification Removal" #. Remove on focus button -#: plugins/notify.c:646 +#: plugins/notify.c:672 msgid "Remove when conversation window _gains focus" msgstr "Remove when conversation window _gains focus" #. Remove on click button -#: plugins/notify.c:654 +#: plugins/notify.c:679 msgid "Remove when conversation window _receives click" msgstr "Remove when conversation window _receives click" #. Remove on type button -#: plugins/notify.c:662 +#: plugins/notify.c:687 msgid "Remove when _typing in conversation window" msgstr "Remove when _typing in conversation window" #. Remove on message send button -#: plugins/notify.c:670 +#: plugins/notify.c:695 msgid "Remove when a _message gets sent" msgstr "Remove when a _message gets sent" #. Remove on conversation switch button -#: plugins/notify.c:679 -msgid "Remove on conversation ta_b switch" -msgstr "Remove on conversation ta_b switch" +#: plugins/notify.c:704 +msgid "Remove on switch to conversation ta_b" +msgstr "Remove on switch to conversation ta_b" #. *< api_version #. *< type @@ -745,7 +782,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/notify.c:762 +#: plugins/notify.c:792 msgid "Message Notification" msgstr "Message Notification" @@ -753,7 +790,7 @@ #. *< version #. * summary #. * description -#: plugins/notify.c:765 plugins/notify.c:767 +#: plugins/notify.c:795 plugins/notify.c:797 msgid "Provides a variety of ways of notifying you of unread messages." msgstr "Provides a variety of ways of notifying you of unread messages." @@ -971,7 +1008,7 @@ msgid "Provides a wrapper around SSL support libraries." msgstr "Provides a wrapper around SSL support libraries." -#: plugins/statenotify.c:30 src/gtkpounce.c:910 +#: plugins/statenotify.c:30 #, c-format msgid "%s has gone away." msgstr "%s has gone away." @@ -1037,19 +1074,19 @@ msgid "A horizontal scrolling version of the buddy list." msgstr "A horizontal scrolling version of the buddy list." -#: plugins/timestamp.c:95 +#: plugins/timestamp.c:185 msgid "iChat Timestamp" msgstr "iChat Timestamp" -#: plugins/timestamp.c:102 +#: plugins/timestamp.c:192 msgid "Delay" msgstr "Delay" -#: plugins/timestamp.c:109 +#: plugins/timestamp.c:199 msgid "minutes." msgstr "minutes." -#: plugins/timestamp.c:115 +#: plugins/timestamp.c:205 msgid "_Apply" msgstr "_Apply" @@ -1060,7 +1097,7 @@ #. *< dependencies #. *< priority #. *< id -#: plugins/timestamp.c:173 +#: plugins/timestamp.c:268 msgid "Timestamp" msgstr "Timestamp" @@ -1068,7 +1105,7 @@ #. *< version #. * summary #. * description -#: plugins/timestamp.c:176 plugins/timestamp.c:178 +#: plugins/timestamp.c:271 plugins/timestamp.c:273 msgid "Adds iChat-style timestamps to conversations every N minutes." msgstr "Adds iChat-style timestamps to conversations every N minutes." @@ -1092,7 +1129,7 @@ msgstr "_Show slider bar in IM window" #. Buddy List trans options -#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:908 +#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907 msgid "Buddy List Window" msgstr "Buddy List Window" @@ -1144,8 +1181,8 @@ msgstr "_Start Gaim on Windows startup" #. Buddy List -#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999 -#: src/gtkprefs.c:2438 +#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3008 +#: src/gtkprefs.c:2399 msgid "Buddy List" msgstr "Buddy List" @@ -1164,8 +1201,8 @@ msgstr "_Keep Buddy List window on top" #. Conversations -#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:962 -#: src/gtkprefs.c:2439 src/protocols/msn/msn.c:1650 +#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958 +#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1630 msgid "Conversations" msgstr "Conversations" @@ -1192,223 +1229,223 @@ #: src/about.c:95 msgid "" -"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, " -"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once. It is " -"written using Gtk+ and is licensed under the GPL.<BR><BR>" -msgstr "" -"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, " -"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once. It is " -"written using Gtk+ and is licenced under the GPL.<BR><BR>" - -#: src/about.c:105 +"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " +"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " +"at once. It is written using Gtk+ and is licensed under the GPL.<BR><BR>" +msgstr "" +"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " +"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/about.c:106 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/about.c:110 +#: src/about.c:111 msgid "Active Developers" msgstr "Active Developers" -#: src/about.c:111 +#: src/about.c:112 msgid "maintainer" msgstr "maintainer" -#: src/about.c:113 +#: src/about.c:114 msgid "lead developer" msgstr "lead developer" -#: src/about.c:116 +#: src/about.c:117 msgid "developer & webmaster" msgstr "developer & webmaster" -#: src/about.c:117 +#: src/about.c:118 msgid "win32 port" msgstr "win32 port" -#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123 +#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124 msgid "developer" msgstr "developer" -#: src/about.c:124 +#: src/about.c:125 msgid "support" msgstr "support" -#: src/about.c:131 +#: src/about.c:132 msgid "Crazy Patch Writers" msgstr "Crazy Patch Writers" -#: src/about.c:146 +#: src/about.c:147 msgid "Retired Developers" msgstr "Retired Developers" -#: src/about.c:147 -msgid "former libfaim maintainer" -msgstr "former libfaim maintainer" - #: src/about.c:148 +msgid "former libfaim maintainer" +msgstr "former libfaim maintainer" + +#: src/about.c:149 msgid "former lead developer" msgstr "former lead developer" -#: src/about.c:151 +#: src/about.c:152 msgid "former maintainer" msgstr "former maintainer" -#: src/about.c:152 -msgid "former Jabber developer" -msgstr "former Jabber developer" - #: src/about.c:153 +msgid "former Jabber developer" +msgstr "former Jabber developer" + +#: src/about.c:154 msgid "original author" msgstr "original author" -#: src/about.c:156 +#: src/about.c:157 msgid "hacker and designated driver [lazy bum]" msgstr "hacker and designated driver [lazy bum]" -#: src/about.c:164 +#: src/about.c:165 msgid "Current Translators" msgstr "Current Translators" -#: src/about.c:165 src/about.c:203 +#: src/about.c:166 src/about.c:204 msgid "Catalan" msgstr "Catalan" -#: src/about.c:166 src/about.c:204 +#: src/about.c:167 src/about.c:205 msgid "Czech" msgstr "Czech" -#: src/about.c:167 +#: src/about.c:168 msgid "Danish" msgstr "Danish" -#: src/about.c:168 -msgid "British English" -msgstr "British English" - #: src/about.c:169 +msgid "British English" +msgstr "British English" + +#: src/about.c:170 msgid "Canadian English" msgstr "Canadian English" -#: src/about.c:170 src/about.c:205 +#: src/about.c:171 src/about.c:206 msgid "German" msgstr "German" -#: src/about.c:171 src/about.c:206 +#: src/about.c:172 src/about.c:207 msgid "Spanish" msgstr "Spanish" -#: src/about.c:172 src/about.c:207 -msgid "Finnish" -msgstr "Finnish" - #: src/about.c:173 src/about.c:208 +msgid "Finnish" +msgstr "Finnish" + +#: src/about.c:174 src/about.c:209 msgid "French" msgstr "French" -#: src/about.c:174 +#: src/about.c:175 msgid "Hebrew" msgstr "Hebrew" -#: src/about.c:175 -msgid "Hindi" -msgstr "Hindi" - #: src/about.c:176 +msgid "Hindi" +msgstr "Hindi" + +#: src/about.c:177 msgid "Hungarian" msgstr "Hungarian" -#: src/about.c:177 src/about.c:209 +#: src/about.c:178 src/about.c:210 msgid "Italian" msgstr "Italian" -#: src/about.c:178 src/about.c:211 +#: src/about.c:179 src/about.c:212 msgid "Korean" msgstr "Korean" -#: src/about.c:179 +#: src/about.c:180 msgid "Dutch; Flemish" msgstr "Dutch; Flemish" -#: src/about.c:180 +#: src/about.c:181 msgid "Macedonian" msgstr "Macedonian" -#: src/about.c:181 +#: src/about.c:182 msgid "Norwegian" msgstr "Norwegian" -#: src/about.c:182 src/about.c:212 +#: src/about.c:183 src/about.c:213 msgid "Polish" msgstr "Polish" -#: src/about.c:183 +#: src/about.c:184 msgid "Portuguese" msgstr "Portuguese" -#: src/about.c:184 +#: src/about.c:185 msgid "Portuguese-Brazil" msgstr "Portuguese-Brazil" -#: src/about.c:185 +#: src/about.c:186 msgid "Romanian" msgstr "Romanian" -#: src/about.c:186 src/about.c:213 +#: src/about.c:187 src/about.c:214 src/about.c:215 msgid "Russian" msgstr "Russian" -#: src/about.c:187 +#: src/about.c:188 msgid "Serbian" msgstr "Serbian" -#: src/about.c:188 +#: src/about.c:189 msgid "Slovenian" msgstr "Slovenian" -#: src/about.c:189 src/about.c:215 +#: src/about.c:190 src/about.c:217 msgid "Swedish" msgstr "Swedish" -#: src/about.c:190 +#: src/about.c:191 msgid "Vietnamese" msgstr "Vietnamese" -#: src/about.c:190 +#: src/about.c:191 msgid "Gnome Vi Team" msgstr "Gnome Vi Team" -#: src/about.c:192 +#: src/about.c:193 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: src/about.c:193 +#: src/about.c:194 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: src/about.c:200 +#: src/about.c:201 msgid "Past Translators" msgstr "Past Translators" -#: src/about.c:201 +#: src/about.c:202 msgid "Amharic" msgstr "Amharic" -#: src/about.c:202 +#: src/about.c:203 msgid "Bulgarian" msgstr "Bulgarian" -#: src/about.c:210 +#: src/about.c:211 msgid "Japanese" msgstr "Japanese" -#: src/about.c:214 +#: src/about.c:216 msgid "Slovak" msgstr "Slovak" -#: src/about.c:216 +#: src/about.c:218 msgid "Chinese" msgstr "Chinese" -#: src/account.c:278 src/protocols/jabber/jabber.c:999 +#: src/account.c:278 src/protocols/jabber/jabber.c:1000 msgid "New passwords do not match." msgstr "New passwords do not match." @@ -1440,45 +1477,47 @@ #. * #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons. #. -#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527 -#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235 -#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/xdata.c:337 -#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:208 -#: src/protocols/msn/msn.c:220 src/protocols/msn/msn.c:232 -#: src/protocols/oscar/oscar.c:3352 src/protocols/oscar/oscar.c:3446 -#: src/protocols/oscar/oscar.c:6711 src/protocols/oscar/oscar.c:6808 -#: src/protocols/oscar/oscar.c:6860 src/protocols/oscar/oscar.c:6946 -#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1134 -#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994 -#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688 -#: src/protocols/yahoo/yahoo.c:2638 src/protocols/yahoo/yahoo.c:2647 +#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518 +#: src/dialogs.c:571 src/gtkblist.c:2343 src/gtkrequest.c:235 +#: src/protocols/jabber/jabber.c:1047 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:3353 src/protocols/oscar/oscar.c:3447 +#: src/protocols/oscar/oscar.c:6732 src/protocols/oscar/oscar.c:6829 +#: src/protocols/oscar/oscar.c:6881 src/protocols/oscar/oscar.c:6967 +#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132 +#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444 +#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:1004 +#: src/protocols/silc/ops.c:1465 src/protocols/silc/silc.c:692 +#: src/protocols/yahoo/yahoo.c:2757 src/protocols/yahoo/yahoo.c:2766 #: src/request.h:1242 msgid "OK" msgstr "OK" #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198 -#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 -#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:818 -#: src/dialogs.c:835 src/dialogs.c:854 src/gtkaccount.c:1744 -#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4353 -#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588 -#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637 +#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345 +#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808 +#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1948 +#: src/gtkaccount.c:2439 src/gtkblist.c:2344 src/gtkblist.c:4362 +#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587 +#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277 -#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710 -#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1047 -#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:197 -#: src/protocols/msn/msn.c:209 src/protocols/msn/msn.c:221 -#: src/protocols/msn/msn.c:233 src/protocols/msn/msn.c:247 -#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3312 -#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3390 -#: src/protocols/oscar/oscar.c:3447 src/protocols/oscar/oscar.c:6712 -#: src/protocols/oscar/oscar.c:6809 src/protocols/oscar/oscar.c:6861 -#: src/protocols/oscar/oscar.c:6930 src/protocols/oscar/oscar.c:6947 -#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1039 -#: src/protocols/silc/buddy.c:1135 src/protocols/silc/chat.c:710 -#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689 -#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2639 -#: src/protocols/yahoo/yahoo.c:2648 src/request.h:1242 src/request.h:1252 +#: src/protocols/jabber/buddy.c:516 src/protocols/jabber/chat.c:710 +#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048 +#: 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:1371 src/protocols/oscar/oscar.c:3313 +#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391 +#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6733 +#: src/protocols/oscar/oscar.c:6830 src/protocols/oscar/oscar.c:6882 +#: src/protocols/oscar/oscar.c:6951 src/protocols/oscar/oscar.c:6968 +#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037 +#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579 +#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1466 +#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347 +#: src/protocols/yahoo/yahoo.c:2758 src/protocols/yahoo/yahoo.c:2767 +#: src/request.h:1242 src/request.h:1252 msgid "Cancel" msgstr "Cancel" @@ -1487,7 +1526,7 @@ msgid "Change user information for %s" msgstr "Change user information for %s" -#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514 +#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:515 #: src/protocols/trepia/trepia.c:346 msgid "Save" msgstr "Save" @@ -1510,7 +1549,7 @@ msgstr "Remove Away Message" #. Remove button -#: src/away.c:333 src/gtkconv.c:1235 src/gtkconv.c:3416 src/gtkconv.c:3515 +#: src/away.c:333 src/gtkconv.c:1373 src/gtkconv.c:3591 src/gtkconv.c:3690 #: src/gtkrequest.c:241 msgid "Remove" msgstr "Remove" @@ -1523,39 +1562,37 @@ msgid "Set All Away" msgstr "Set All Away" -#: src/blist.c:590 +#: src/blist.c:681 msgid "Chats" msgstr "Chats" -#: src/blist.c:1192 +#: src/blist.c:1321 #, c-format msgid "" "%d buddy from group %s was not removed because its account was not logged " "in. This buddy and the group were not removed.\n" -msgid_plural "" "%d buddies from group %s were not removed because their accounts were not " "logged in. These buddies and the group were not removed.\n" -msgstr[0] "" +msgstr "" "%d buddy from group %s was not removed because its account was not logged " "in. This buddy and the group were not removed.\n" -msgstr[1] "" "%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:1201 +#: src/blist.c:1330 msgid "Group not removed" msgstr "Group not removed" -#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:721 -#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735 +#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721 +#: src/protocols/jabber/buddy.c:571 src/protocols/novell/novell.c:2736 msgid "Unknown" msgstr "Unknown" -#: src/blist.c:1579 +#: src/blist.c:1721 msgid "Invalid Groupname" msgstr "Invalid Groupname" -#: src/blist.c:2236 +#: src/blist.c:2192 msgid "" "An error was encountered parsing your buddy list. It has not been loaded, " "and the old file has moved to blist.xml~." @@ -1563,7 +1600,7 @@ "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:2239 +#: src/blist.c:2195 msgid "Buddy List Error" msgstr "Buddy List Error" @@ -1585,75 +1622,79 @@ msgid "Enter password for %s" msgstr "Enter password for %s" -#: src/conversation.c:293 +#: src/conversation.c:261 msgid "Unable to send message. The message is too large." msgstr "Unable to send message. The message is too large." -#: src/conversation.c:301 +#: src/conversation.c:269 msgid "Unable to send message." msgstr "Unable to send message." -#: src/conversation.c:1953 +#: src/conversation.c:1950 #, c-format msgid "%s entered the room." msgstr "%s entered the room." -#: src/conversation.c:1956 +#: src/conversation.c:1953 #, c-format msgid "%s [<I>%s</I>] entered the room." msgstr "%s [<I>%s</I>] entered the room." -#: src/conversation.c:2047 +#: src/conversation.c:2044 #, c-format msgid "You are now known as %s" msgstr "You are now known as %s" -#: src/conversation.c:2050 +#: src/conversation.c:2047 #, c-format msgid "%s is now known as %s" msgstr "%s is now known as %s" -#: src/conversation.c:2092 +#: src/conversation.c:2089 #, c-format msgid "%s left the room (%s)." msgstr "%s left the room (%s)." -#: src/conversation.c:2094 +#: src/conversation.c:2091 #, c-format msgid "%s left the room." msgstr "%s left the room." -#: src/conversation.c:2165 +#: src/conversation.c:2162 #, c-format msgid "(+%d more)" msgstr "(+%d more)" -#: src/conversation.c:2167 +#: src/conversation.c:2164 #, c-format msgid " left the room (%s)." msgstr " left the room (%s)." -#: src/conversation.c:2491 +#: src/conversation.c:2454 msgid "Last created window" msgstr "Last created window" -#: src/conversation.c:2493 src/gtkprefs.c:1375 +#: src/conversation.c:2456 +msgid "Separate IM and Chat windows" +msgstr "Separate IM and Chat windows" + +#: src/conversation.c:2458 src/gtkprefs.c:1335 msgid "New window" msgstr "New window" -#: src/conversation.c:2495 +#: src/conversation.c:2460 msgid "By group" msgstr "By group" -#: src/conversation.c:2497 +#: src/conversation.c:2462 msgid "By account" msgstr "By account" -#: src/dialogs.c:154 +#: src/dialogs.c:149 msgid "Warn User" msgstr "Warn User" -#: src/dialogs.c:173 +#: src/dialogs.c:168 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n" @@ -1666,26 +1707,26 @@ "This will increase %s's warning level and he or she will be subject to " "harsher rate limiting.\n" -#: src/dialogs.c:182 +#: src/dialogs.c:177 msgid "Warn _anonymously?" msgstr "Warn _anonymously?" -#: src/dialogs.c:189 +#: src/dialogs.c:184 msgid "<b>Anonymous warnings are less severe.</b>" msgstr "<b>Anonymous warnings are less severe.</b>" -#: src/dialogs.c:301 +#: src/dialogs.c:295 #, 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/dialogs.c:303 src/dialogs.c:304 +#: src/dialogs.c:297 src/dialogs.c:298 msgid "Remove Buddy" msgstr "Remove Buddy" -#: src/dialogs.c:313 +#: src/dialogs.c:307 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " @@ -1694,11 +1735,11 @@ "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" -#: src/dialogs.c:315 src/dialogs.c:316 +#: src/dialogs.c:309 src/dialogs.c:310 msgid "Remove Chat" msgstr "Remove Chat" -#: src/dialogs.c:325 +#: src/dialogs.c:319 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " @@ -1707,11 +1748,11 @@ "You are about to remove the group %s and all its members from your buddy " "list. Do you want to continue?" -#: src/dialogs.c:328 src/dialogs.c:329 +#: src/dialogs.c:322 src/dialogs.c:323 msgid "Remove Group" msgstr "Remove Group" -#: src/dialogs.c:346 +#: src/dialogs.c:340 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddies from " @@ -1720,107 +1761,107 @@ "You are about to remove the contact containing %s and %d other buddies from " "your buddy list. Do you want to continue?" -#: src/dialogs.c:349 src/dialogs.c:350 +#: src/dialogs.c:343 src/dialogs.c:344 msgid "Remove Contact" msgstr "Remove Contact" -#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561 +#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552 msgid "_Screen name" msgstr "_Screen name" -#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567 +#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558 msgid "_Account" msgstr "_Account" -#: src/dialogs.c:466 +#: src/dialogs.c:457 msgid "New Instant Message" msgstr "New Instant Message" -#: src/dialogs.c:468 +#: src/dialogs.c:459 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/dialogs.c:522 +#: src/dialogs.c:513 msgid "Get User Info" msgstr "Get User Info" -#: src/dialogs.c:524 +#: src/dialogs.c:515 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/dialogs.c:575 +#: src/dialogs.c:566 msgid "Get User Log" msgstr "Get User Log" -#: src/dialogs.c:577 +#: src/dialogs.c:568 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/dialogs.c:632 +#: src/dialogs.c:623 msgid "You cannot save an away message with a blank title" msgstr "You cannot save an away message with a blank title" -#: src/dialogs.c:634 +#: src/dialogs.c:625 msgid "" "Please give the message a title, or choose \"Use\" to use without saving." msgstr "" "Please give the message a title, or choose \"Use\" to use without saving." -#: src/dialogs.c:644 +#: src/dialogs.c:635 msgid "You cannot create an empty away message" msgstr "You cannot create an empty away message" -#: src/dialogs.c:706 +#: src/dialogs.c:697 msgid "New away message" msgstr "New away message" -#: src/dialogs.c:727 +#: src/dialogs.c:718 msgid "Away title: " msgstr "Away title: " -#: src/dialogs.c:783 +#: src/dialogs.c:774 msgid "_Save" msgstr "_Save" -#: src/dialogs.c:787 +#: src/dialogs.c:778 msgid "Sa_ve & Use" msgstr "Sa_ve & Use" -#: src/dialogs.c:791 +#: src/dialogs.c:782 msgid "_Use" msgstr "_Use" -#: src/dialogs.c:814 +#: src/dialogs.c:804 msgid "Alias Chat" msgstr "Alias Chat" -#: src/dialogs.c:815 +#: src/dialogs.c:805 msgid "Enter an alias for this chat." msgstr "Enter an alias for this chat." -#: src/dialogs.c:817 src/dialogs.c:834 src/dialogs.c:853 src/gtkrequest.c:243 -#: src/protocols/silc/chat.c:571 +#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243 +#: src/protocols/silc/chat.c:569 msgid "Alias" msgstr "Alias" -#: src/dialogs.c:831 +#: src/dialogs.c:820 msgid "Alias Contact" msgstr "Alias Contact" -#: src/dialogs.c:832 +#: src/dialogs.c:821 msgid "Enter an alias for this contact." msgstr "Enter an alias for this contact." -#: src/dialogs.c:849 +#: src/dialogs.c:837 #, c-format msgid "Enter an alias for %s." msgstr "Enter an alias for %s." -#: src/dialogs.c:851 +#: src/dialogs.c:839 msgid "Alias Buddy" msgstr "Alias Buddy" @@ -1862,7 +1903,7 @@ " quit Close running copy of Gaim\n" "\n" " OPTIONS:\n" -" -h, --help [command] Show help for command\n" +" -h, --help [command] Show help for command\n" msgstr "" "Usage: %s command [OPTIONS] [URI]\n" "\n" @@ -1871,7 +1912,7 @@ " quit Close running copy of Gaim\n" "\n" " OPTIONS:\n" -" -h, --help [command] Show help for command\n" +" -h, --help [command] Show help for command\n" #: src/gaim-remote.c:174 src/gaim-remote.c:190 msgid "Gaim not running (on session 0)\n" @@ -1932,23 +1973,23 @@ msgid "sorry, i ran out for a while. bbl" msgstr "sorry, i ran out for a while. bbl" -#: src/gaimrc.c:372 src/gaimrc.c:1411 +#: src/gaimrc.c:372 src/gaimrc.c:1409 msgid "boring default" msgstr "boring default" -#: src/gaimrc.c:1221 src/gtkblist.c:2960 +#: src/gaimrc.c:1219 src/gtkblist.c:2969 msgid "Alphabetical" msgstr "Alphabetical" -#: src/gaimrc.c:1223 src/gtkblist.c:2961 +#: src/gaimrc.c:1221 src/gtkblist.c:2970 msgid "By status" msgstr "By status" -#: src/gaimrc.c:1225 src/gtkblist.c:2962 +#: src/gaimrc.c:1223 src/gtkblist.c:2971 msgid "By log size" msgstr "By log size" -#: src/gtkaccount.c:289 +#: src/gtkaccount.c:309 #, c-format msgid "" "<b>File:</b> %s\n" @@ -1960,172 +2001,164 @@ "<b>Image size:</b> %dx%d" #. Build the login options frame. -#: src/gtkaccount.c:384 +#: src/gtkaccount.c:560 msgid "Login Options" msgstr "Login Options" -#: src/gtkaccount.c:401 +#: src/gtkaccount.c:577 msgid "Protocol:" msgstr "Protocol:" -#: src/gtkaccount.c:406 src/gtkblist.c:3957 +#: src/gtkaccount.c:582 src/gtkblist.c:3968 msgid "Screen Name:" msgstr "Screen Name:" -#: src/gtkaccount.c:479 +#: src/gtkaccount.c:655 msgid "Password:" msgstr "Password:" -#: src/gtkaccount.c:484 src/gtkblist.c:3971 src/gtkblist.c:4300 +#: src/gtkaccount.c:660 src/gtkblist.c:3982 src/gtkblist.c:4310 msgid "Alias:" msgstr "Alias:" -#: src/gtkaccount.c:488 +#: src/gtkaccount.c:664 msgid "Remember password" msgstr "Remember password" #. Build the user options frame. -#: src/gtkaccount.c:542 +#: src/gtkaccount.c:720 msgid "User Options" msgstr "User Options" -#: src/gtkaccount.c:555 +#: src/gtkaccount.c:733 msgid "New mail notifications" msgstr "New mail notifications" -#: src/gtkaccount.c:564 -msgid "Buddy icon file:" -msgstr "Buddy icon file:" - -#: src/gtkaccount.c:574 -msgid "_Browse" -msgstr "_Browse" - -#: src/gtkaccount.c:580 -msgid "_Reset" -msgstr "_Reset" +#: src/gtkaccount.c:742 +msgid "Buddy icon:" +msgstr "Buddy icon:" #. Build the protocol options frame. -#: src/gtkaccount.c:642 +#: src/gtkaccount.c:831 #, c-format msgid "%s Options" msgstr "%s Options" #. Use Global Proxy Settings -#: src/gtkaccount.c:778 src/gtkaccount.c:825 +#: src/gtkaccount.c:967 src/gtkaccount.c:1014 msgid "Use Global Proxy Settings" msgstr "Use Global Proxy Settings" #. No Proxy -#: src/gtkaccount.c:784 src/gtkaccount.c:832 +#: src/gtkaccount.c:973 src/gtkaccount.c:1021 msgid "No Proxy" msgstr "No Proxy" #. HTTP -#: src/gtkaccount.c:790 src/gtkaccount.c:839 +#: src/gtkaccount.c:979 src/gtkaccount.c:1028 msgid "HTTP" msgstr "HTTP" #. SOCKS 4 -#: src/gtkaccount.c:796 src/gtkaccount.c:846 +#: src/gtkaccount.c:985 src/gtkaccount.c:1035 msgid "SOCKS 4" msgstr "SOCKS 4" #. SOCKS 5 -#: src/gtkaccount.c:802 src/gtkaccount.c:853 +#: src/gtkaccount.c:991 src/gtkaccount.c:1042 msgid "SOCKS 5" msgstr "SOCKS 5" #. Use Environmental Settings -#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1179 +#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1139 msgid "Use Environmental Settings" msgstr "Use Environmental Settings" -#: src/gtkaccount.c:899 +#: src/gtkaccount.c:1088 msgid "you can see the butterflies mating" msgstr "you can see the butterflies mating" -#: src/gtkaccount.c:903 +#: src/gtkaccount.c:1092 msgid "If you look real closely" msgstr "If you look real closely" -#: src/gtkaccount.c:919 +#: src/gtkaccount.c:1108 msgid "Proxy Options" msgstr "Proxy Options" -#: src/gtkaccount.c:937 src/gtkprefs.c:1173 +#: src/gtkaccount.c:1126 src/gtkprefs.c:1133 msgid "Proxy _type:" msgstr "Proxy _type:" -#: src/gtkaccount.c:946 src/gtkprefs.c:1200 +#: src/gtkaccount.c:1135 src/gtkprefs.c:1160 msgid "_Host:" msgstr "_Host:" -#: src/gtkaccount.c:950 src/gtkprefs.c:1218 +#: src/gtkaccount.c:1139 src/gtkprefs.c:1178 msgid "_Port:" msgstr "_Port:" -#: src/gtkaccount.c:958 +#: src/gtkaccount.c:1147 msgid "_Username:" msgstr "_Username:" -#: src/gtkaccount.c:963 src/gtkprefs.c:1255 +#: src/gtkaccount.c:1152 src/gtkprefs.c:1215 msgid "Pa_ssword:" msgstr "Pa_ssword:" -#: src/gtkaccount.c:1331 +#: src/gtkaccount.c:1524 msgid "Add Account" msgstr "Add Account" -#: src/gtkaccount.c:1333 +#: src/gtkaccount.c:1526 msgid "Modify Account" msgstr "Modify Account" #. Add the disclosure -#: src/gtkaccount.c:1357 +#: src/gtkaccount.c:1550 msgid "Show more options" msgstr "Show more options" -#: src/gtkaccount.c:1358 +#: src/gtkaccount.c:1551 msgid "Show fewer options" msgstr "Show fewer options" #. Register button -#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:665 +#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:665 msgid "Register" msgstr "Register" -#: src/gtkaccount.c:1739 +#: src/gtkaccount.c:1943 #, c-format msgid "Are you sure you want to delete %s?" msgstr "Are you sure you want to delete %s?" -#: src/gtkaccount.c:1743 src/gtkrequest.c:239 +#: src/gtkaccount.c:1947 src/gtkrequest.c:239 msgid "Delete" msgstr "Delete" -#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3977 +#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3981 msgid "Screen Name" msgstr "Screen Name" -#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:956 -#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5459 -#: src/protocols/oscar/oscar.c:6641 src/protocols/silc/silc.c:44 -#: src/protocols/yahoo/yahoo.c:2375 src/protocols/zephyr/zephyr.c:1167 -#: src/protocols/zephyr/zephyr.c:1177 +#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:957 +#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463 +#: src/protocols/oscar/oscar.c:6662 src/protocols/silc/silc.c:44 +#: src/protocols/yahoo/yahoo.c:2501 src/protocols/zephyr/zephyr.c:1208 +#: src/protocols/zephyr/zephyr.c:1218 msgid "Online" msgstr "Online" -#: src/gtkaccount.c:1898 +#: src/gtkaccount.c:2102 msgid "Protocol" msgstr "Protocol" -#: src/gtkaccount.c:2210 +#: src/gtkaccount.c:2414 #, 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:2224 +#: src/gtkaccount.c:2428 msgid "" "\n" "\n" @@ -2135,26 +2168,27 @@ "\n" "Do you wish to add him or her to your buddy list?" -#: src/gtkaccount.c:2228 +#: src/gtkaccount.c:2432 msgid "Information" msgstr "Information" -#: src/gtkaccount.c:2232 +#: src/gtkaccount.c:2436 msgid "Add buddy to your list?" msgstr "Add buddy to your list?" #. Add button -#: src/gtkaccount.c:2234 src/gtkblist.c:4352 src/gtkconv.c:1237 -#: src/gtkconv.c:3409 src/gtkconv.c:3508 src/gtkrequest.c:240 -#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3609 +#: src/gtkaccount.c:2438 src/gtkblist.c:4361 src/gtkconv.c:1375 +#: src/gtkconv.c:3584 src/gtkconv.c:3683 src/gtkrequest.c:240 +#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610 +#: src/protocols/silc/chat.c:578 msgid "Add" msgstr "Add" -#: src/gtkblist.c:812 +#: src/gtkblist.c:810 msgid "Join a Chat" msgstr "Join a Chat" -#: src/gtkblist.c:833 +#: src/gtkblist.c:831 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -2162,199 +2196,199 @@ "Please enter the appropriate information about the chat you would like to " "join.\n" -#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352 +#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354 msgid "_Account:" msgstr "_Account:" -#: src/gtkblist.c:1132 src/gtkblist.c:3152 +#: src/gtkblist.c:1128 src/gtkblist.c:3162 msgid "Get _Info" msgstr "Get _Info" -#: src/gtkblist.c:1135 src/gtkblist.c:3143 +#: src/gtkblist.c:1131 src/gtkblist.c:3153 msgid "I_M" msgstr "I_M" -#: src/gtkblist.c:1137 +#: src/gtkblist.c:1133 msgid "Add Buddy _Pounce" msgstr "Add Buddy _Pounce" -#: src/gtkblist.c:1139 +#: src/gtkblist.c:1135 msgid "View _Log" msgstr "View _Log" -#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247 +#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243 msgid "_Alias..." msgstr "_Alias..." -#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252 +#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248 #: src/gtkconn.c:361 msgid "_Remove" msgstr "_Remove" -#: src/gtkblist.c:1195 +#: src/gtkblist.c:1191 msgid "Add a _Buddy" msgstr "Add a _Buddy" -#: src/gtkblist.c:1197 +#: src/gtkblist.c:1193 msgid "Add a C_hat" msgstr "Add a C_hat" -#: src/gtkblist.c:1199 +#: src/gtkblist.c:1195 msgid "_Delete Group" msgstr "_Delete Group" -#: src/gtkblist.c:1201 +#: src/gtkblist.c:1197 msgid "_Rename" msgstr "_Rename" #. join button -#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:407 +#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409 #: src/stock.c:87 msgid "_Join" msgstr "_Join" -#: src/gtkblist.c:1225 +#: src/gtkblist.c:1221 msgid "Auto-Join" msgstr "Auto-Join" -#: src/gtkblist.c:1249 src/gtkblist.c:1278 +#: src/gtkblist.c:1245 src/gtkblist.c:1274 msgid "_Collapse" msgstr "_Collapse" -#: src/gtkblist.c:1283 +#: src/gtkblist.c:1279 msgid "_Expand" msgstr "_Expand" -#: src/gtkblist.c:1941 src/gtkconv.c:4041 src/gtkpounce.c:333 +#: src/gtkblist.c:1937 src/gtkconv.c:4220 src/gtkpounce.c:347 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:2292 +#: src/gtkblist.c:2288 msgid "/_Buddies" msgstr "/_Buddies" -#: src/gtkblist.c:2293 +#: src/gtkblist.c:2289 msgid "/Buddies/New Instant _Message..." msgstr "/Buddies/New Instant _Message..." -#: src/gtkblist.c:2294 +#: src/gtkblist.c:2290 msgid "/Buddies/Join a _Chat..." msgstr "/Buddies/Join a _Chat..." -#: src/gtkblist.c:2295 +#: src/gtkblist.c:2291 msgid "/Buddies/Get User _Info..." msgstr "/Buddies/Get User _Info..." -#: src/gtkblist.c:2296 +#: src/gtkblist.c:2292 msgid "/Buddies/View User _Log..." msgstr "/Buddies/View User _Log..." -#: src/gtkblist.c:2298 +#: src/gtkblist.c:2294 msgid "/Buddies/Show _Offline Buddies" msgstr "/Buddies/Show _Offline Buddies" -#: src/gtkblist.c:2299 +#: src/gtkblist.c:2295 msgid "/Buddies/Show _Empty Groups" msgstr "/Buddies/Show _Empty Groups" -#: src/gtkblist.c:2300 +#: src/gtkblist.c:2296 msgid "/Buddies/_Add Buddy..." msgstr "/Buddies/_Add Buddy..." -#: src/gtkblist.c:2301 +#: src/gtkblist.c:2297 msgid "/Buddies/Add C_hat..." msgstr "/Buddies/Add C_hat..." -#: src/gtkblist.c:2302 +#: src/gtkblist.c:2298 msgid "/Buddies/Add _Group..." msgstr "/Buddies/Add _Group..." -#: src/gtkblist.c:2304 +#: src/gtkblist.c:2300 msgid "/Buddies/_Signoff" msgstr "/Buddies/_Signoff" -#: src/gtkblist.c:2305 +#: src/gtkblist.c:2301 msgid "/Buddies/_Quit" msgstr "/Buddies/_Quit" #. Tools -#: src/gtkblist.c:2308 +#: src/gtkblist.c:2304 msgid "/_Tools" msgstr "/_Tools" -#: src/gtkblist.c:2309 +#: src/gtkblist.c:2305 msgid "/Tools/_Away" msgstr "/Tools/_Away" +#: src/gtkblist.c:2306 +msgid "/Tools/Buddy _Pounce" +msgstr "/Tools/Buddy _Pounce" + +#: src/gtkblist.c:2307 +msgid "/Tools/Account Ac_tions" +msgstr "/Tools/Account Ac_tions" + +#: src/gtkblist.c:2308 +msgid "/Tools/Pl_ugin Actions" +msgstr "/Tools/Pl_ugin Actions" + #: src/gtkblist.c:2310 -msgid "/Tools/Buddy _Pounce" -msgstr "/Tools/Buddy _Pounce" +msgid "/Tools/A_ccounts" +msgstr "/Tools/A_ccounts" #: src/gtkblist.c:2311 -msgid "/Tools/Account Ac_tions" -msgstr "/Tools/Account Ac_tions" +msgid "/Tools/_File Transfers" +msgstr "/Tools/_File Transfers" #: src/gtkblist.c:2312 -msgid "/Tools/Pl_ugin Actions" -msgstr "/Tools/Pl_ugin Actions" +msgid "/Tools/R_oom List" +msgstr "/Tools/R_oom List" + +#: src/gtkblist.c:2313 +msgid "/Tools/Pr_eferences" +msgstr "/Tools/Pr_eferences" #: src/gtkblist.c:2314 -msgid "/Tools/A_ccounts" -msgstr "/Tools/A_ccounts" - -#: src/gtkblist.c:2315 -msgid "/Tools/_File Transfers" -msgstr "/Tools/_File Transfers" +msgid "/Tools/Pr_ivacy" +msgstr "/Tools/Pr_ivacy" #: src/gtkblist.c:2316 -msgid "/Tools/R_oom List" -msgstr "/Tools/R_oom List" - -#: src/gtkblist.c:2317 -msgid "/Tools/Pr_eferences" -msgstr "/Tools/Pr_eferences" - -#: src/gtkblist.c:2318 -msgid "/Tools/Pr_ivacy" -msgstr "/Tools/Pr_ivacy" - -#: src/gtkblist.c:2320 msgid "/Tools/View System _Log" msgstr "/Tools/View System _Log" #. Help -#: src/gtkblist.c:2323 +#: src/gtkblist.c:2319 msgid "/_Help" msgstr "/_Help" -#: src/gtkblist.c:2324 +#: src/gtkblist.c:2320 msgid "/Help/Online _Help" msgstr "/Help/Online _Help" -#: src/gtkblist.c:2325 +#: src/gtkblist.c:2321 msgid "/Help/_Debug Window" msgstr "/Help/_Debug Window" -#: src/gtkblist.c:2326 +#: src/gtkblist.c:2322 msgid "/Help/_About" msgstr "/Help/_About" -#: src/gtkblist.c:2342 +#: src/gtkblist.c:2340 msgid "Rename Group" msgstr "Rename Group" -#: src/gtkblist.c:2342 +#: src/gtkblist.c:2340 msgid "New group name" msgstr "New group name" -#: src/gtkblist.c:2343 +#: src/gtkblist.c:2341 msgid "Please enter a new name for the selected group." msgstr "Please enter a new name for the selected group." -#: src/gtkblist.c:2371 +#: src/gtkblist.c:2369 #, c-format msgid "" "\n" @@ -2363,7 +2397,7 @@ "\n" "<b>Account:</b> %s" -#: src/gtkblist.c:2435 +#: src/gtkblist.c:2433 msgid "" "\n" "<b>Status:</b> Offline" @@ -2371,12 +2405,12 @@ "\n" "<b>Status:</b> Offline" -#: src/gtkblist.c:2450 +#: src/gtkblist.c:2448 #, c-format msgid "%d%%" msgstr "%d%%" -#: src/gtkblist.c:2466 +#: src/gtkblist.c:2464 msgid "" "\n" "<b>Account:</b>" @@ -2384,7 +2418,7 @@ "\n" "<b>Account:</b>" -#: src/gtkblist.c:2467 +#: src/gtkblist.c:2465 msgid "" "\n" "<b>Contact Alias:</b>" @@ -2392,7 +2426,7 @@ "\n" "<b>Contact Alias:</b>" -#: src/gtkblist.c:2468 +#: src/gtkblist.c:2466 msgid "" "\n" "<b>Alias:</b>" @@ -2400,7 +2434,7 @@ "\n" "<b>Alias:</b>" -#: src/gtkblist.c:2469 +#: src/gtkblist.c:2467 msgid "" "\n" "<b>Nickname:</b>" @@ -2408,7 +2442,7 @@ "\n" "<b>Nickname:</b>" -#: src/gtkblist.c:2470 +#: src/gtkblist.c:2468 msgid "" "\n" "<b>Logged In:</b>" @@ -2416,7 +2450,7 @@ "\n" "<b>Logged In:</b>" -#: src/gtkblist.c:2471 +#: src/gtkblist.c:2469 msgid "" "\n" "<b>Idle:</b>" @@ -2424,7 +2458,7 @@ "\n" "<b>Idle:</b>" -#: src/gtkblist.c:2472 +#: src/gtkblist.c:2470 msgid "" "\n" "<b>Warned:</b>" @@ -2432,7 +2466,7 @@ "\n" "<b>Warned:</b>" -#: src/gtkblist.c:2474 +#: src/gtkblist.c:2472 msgid "" "\n" "<b>Description:</b> Spooky" @@ -2440,7 +2474,7 @@ "\n" "<b>Description:</b> Spooky" -#: src/gtkblist.c:2475 +#: src/gtkblist.c:2473 msgid "" "\n" "<b>Status</b>: Awesome" @@ -2448,7 +2482,7 @@ "\n" "<b>Status</b>: Awesome" -#: src/gtkblist.c:2476 +#: src/gtkblist.c:2474 msgid "" "\n" "<b>Status</b>: Rockin'" @@ -2456,96 +2490,96 @@ "\n" "<b>Status</b>: Rockin'" -#: src/gtkblist.c:2747 +#: src/gtkblist.c:2756 #, c-format msgid "Idle (%dh%02dm) " msgstr "Idle (%dh%02dm) " -#: src/gtkblist.c:2749 +#: src/gtkblist.c:2758 #, c-format msgid "Idle (%dm) " msgstr "Idle (%dm) " -#: src/gtkblist.c:2754 +#: src/gtkblist.c:2763 #, c-format msgid "Warned (%d%%) " msgstr "Warned (%d%%) " -#: src/gtkblist.c:2757 +#: src/gtkblist.c:2766 msgid "Offline " msgstr "Offline " #. Make menu items sensitive/insensitive where appropriate -#: src/gtkblist.c:2875 +#: src/gtkblist.c:2884 msgid "/Buddies/Join a Chat..." msgstr "/Buddies/Join a Chat..." -#: src/gtkblist.c:2878 +#: src/gtkblist.c:2887 msgid "/Tools/Room List" msgstr "/Tools/Room List" -#: src/gtkblist.c:2881 +#: src/gtkblist.c:2890 msgid "/Tools/Privacy" msgstr "/Tools/Privacy" -#: src/gtkblist.c:3026 +#: src/gtkblist.c:3035 msgid "/Tools/Away" msgstr "/Tools/Away" -#: src/gtkblist.c:3029 +#: src/gtkblist.c:3038 msgid "/Tools/Buddy Pounce" msgstr "/Tools/Buddy Pounce" -#: src/gtkblist.c:3032 +#: src/gtkblist.c:3041 msgid "/Tools/Account Actions" msgstr "/Tools/Account Actions" -#: src/gtkblist.c:3035 +#: src/gtkblist.c:3044 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:3123 +#: src/gtkblist.c:3133 msgid "/Buddies/Show Offline Buddies" msgstr "/Buddies/Show Offline Buddies" -#: src/gtkblist.c:3125 +#: src/gtkblist.c:3135 msgid "/Buddies/Show Empty Groups" msgstr "/Buddies/Show Empty Groups" -#: src/gtkblist.c:3149 +#: src/gtkblist.c:3159 msgid "Send a message to the selected buddy" msgstr "Send a message to the selected buddy" -#: src/gtkblist.c:3158 +#: src/gtkblist.c:3168 msgid "Get information on the selected buddy" msgstr "Get information on the selected buddy" -#: src/gtkblist.c:3161 +#: src/gtkblist.c:3171 msgid "_Chat" msgstr "_Chat" -#: src/gtkblist.c:3166 +#: src/gtkblist.c:3176 msgid "Join a chat room" msgstr "Join a chat room" -#: src/gtkblist.c:3169 +#: src/gtkblist.c:3179 msgid "_Away" msgstr "_Away" -#: src/gtkblist.c:3174 +#: src/gtkblist.c:3184 msgid "Set an away message" msgstr "Set an away message" -#: src/gtkblist.c:3911 src/protocols/silc/buddy.c:731 -#: src/protocols/silc/buddy.c:991 src/protocols/silc/buddy.c:1036 -#: src/protocols/silc/buddy.c:1126 src/protocols/yahoo/yahoo.c:2562 +#: src/gtkblist.c:3922 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:2682 msgid "Add Buddy" msgstr "Add Buddy" -#: src/gtkblist.c:3935 +#: src/gtkblist.c:3946 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. " @@ -2556,11 +2590,11 @@ "The alias will be displayed in place of the screen name whenever possible.\n" #. Set up stuff for the account box -#: src/gtkblist.c:3995 src/gtkblist.c:4280 +#: src/gtkblist.c:4006 src/gtkblist.c:4290 msgid "Account:" msgstr "Account:" -#: src/gtkblist.c:4239 +#: src/gtkblist.c:4249 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." @@ -2568,11 +2602,11 @@ "You are not currently signed on with any protocols that have the ability to " "chat." -#: src/gtkblist.c:4246 +#: src/gtkblist.c:4256 msgid "Add Chat" msgstr "Add Chat" -#: src/gtkblist.c:4270 +#: src/gtkblist.c:4280 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" @@ -2580,15 +2614,15 @@ "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" -#: src/gtkblist.c:4349 +#: src/gtkblist.c:4358 msgid "Add Group" msgstr "Add Group" -#: src/gtkblist.c:4350 +#: src/gtkblist.c:4359 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:4917 src/gtkblist.c:5014 +#: src/gtkblist.c:4926 src/gtkblist.c:5023 msgid "No actions available" msgstr "No actions available" @@ -2637,48 +2671,81 @@ msgid "Time" msgstr "Time" -#: src/gtkconv.c:173 +#: src/gtkconv.c:168 #, c-format msgid "<h1>Conversation with %s</h1>\n" msgstr "<h1>Conversation with %s</h1>\n" -#: src/gtkconv.c:191 src/gtkdebug.c:212 +#: src/gtkconv.c:186 src/gtkdebug.c:212 msgid "That file already exists" msgstr "That file already exists" -#: src/gtkconv.c:192 src/gtkdebug.c:213 src/gtkft.c:1123 +#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1122 msgid "Would you like to overwrite it?" msgstr "Would you like to overwrite it?" -#: src/gtkconv.c:376 -msgid "No such command" -msgstr "No such command" - -#: src/gtkconv.c:380 -msgid "Syntax error" -msgstr "Syntax error" - -#: src/gtkconv.c:384 -msgid "Command failed" -msgstr "Command failed" - -#: src/gtkconv.c:391 +#: src/gtkconv.c:365 +#, c-format +msgid "me is using Gaim v%s." +msgstr "me is using Gaim v%s." + +#: src/gtkconv.c:374 +msgid "Supported debug options are: version" +msgstr "Supported debug options are: version" + +#: src/gtkconv.c:387 +msgid "" +"Use \"/help <command>\" for help on a specific command.\n" +"The following commands are available in this context:\n" +msgstr "" +"Use \"/help <command>\" for help on a specific command.\n" +"The following commands are available in this context:\n" + +#: src/gtkconv.c:421 +msgid "No such command (in this context)." +msgstr "No such command (in this context)." + +#: src/gtkconv.c:487 +msgid "" +"No such command. If you didn't mean to type a command, you can turn commands " +"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" " +"commands." +msgstr "" +"No such command. If you didn't mean to type a command, you can turn commands " +"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" " +"commands." + +#: src/gtkconv.c:495 +msgid "" +"Syntax Error: You typed the wrong number of arguments to that command. If " +"you didn't mean to type a command, you can turn commands off from Tools-" +">Preferences->Interface->Conversation->Enable \"slash\" commands." +msgstr "" +"Syntax Error: You typed the wrong number of arguments to that command. If " +"you didn't mean to type a command, you can turn commands off from Tools-" +">Preferences->Interface->Conversation->Enable \"slash\" commands." + +#: src/gtkconv.c:502 +msgid "Your command failed for an unknown reason." +msgstr "Your command failed for an unknown reason." + +#: src/gtkconv.c:509 msgid "That command only works in Chats, not IMs." msgstr "That command only works in Chats, not IMs." -#: src/gtkconv.c:394 +#: src/gtkconv.c:512 msgid "That command only works in IMs, not Chats." msgstr "That command only works in IMs, not Chats." -#: src/gtkconv.c:398 +#: src/gtkconv.c:516 msgid "That command doesn't work on this protocol." msgstr "That command doesn't work on this protocol." -#: src/gtkconv.c:614 +#: src/gtkconv.c:734 msgid "Invite Buddy Into Chat Room" msgstr "Invite Buddy Into Chat Room" -#: src/gtkconv.c:642 +#: src/gtkconv.c:762 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." @@ -2686,300 +2753,328 @@ "Please enter the name of the user you wish to invite, along with an optional " "invite message." -#: src/gtkconv.c:663 +#: src/gtkconv.c:783 msgid "_Buddy:" msgstr "_Buddy:" -#: src/gtkconv.c:683 +#: src/gtkconv.c:803 msgid "_Message:" msgstr "_Message:" -#: src/gtkconv.c:791 src/gtkdebug.c:127 +#: src/gtkconv.c:911 src/gtkdebug.c:127 msgid "Find" msgstr "Find" -#: src/gtkconv.c:817 src/gtkdebug.c:155 +#: src/gtkconv.c:937 src/gtkdebug.c:155 msgid "_Search for:" msgstr "_Search for:" -#: src/gtkconv.c:1195 +#: src/gtkconv.c:1333 msgid "IM" msgstr "IM" -#: src/gtkconv.c:1203 +#: src/gtkconv.c:1341 msgid "Un-Ignore" msgstr "Un-Ignore" -#: src/gtkconv.c:1205 src/gtkprefs.c:779 +#: src/gtkconv.c:1343 src/gtkprefs.c:778 msgid "Ignore" msgstr "Ignore" #. Info button -#: src/gtkconv.c:1214 src/gtkconv.c:3423 +#: src/gtkconv.c:1352 src/gtkconv.c:3598 msgid "Info" msgstr "Info" -#: src/gtkconv.c:1223 +#: src/gtkconv.c:1361 msgid "Get Away Msg" msgstr "Get Away Msg" -#: src/gtkconv.c:2317 +#: src/gtkconv.c:2488 msgid "Animate" msgstr "Animate" -#: src/gtkconv.c:2322 +#: src/gtkconv.c:2493 msgid "Hide Icon" msgstr "Hide Icon" -#: src/gtkconv.c:2328 +#: src/gtkconv.c:2499 msgid "Save Icon As..." msgstr "Save Icon As..." -#: src/gtkconv.c:2697 +#: src/gtkconv.c:2868 msgid "User is typing..." msgstr "User is typing..." -#: src/gtkconv.c:2705 +#: src/gtkconv.c:2876 msgid "User has typed something and paused" msgstr "User has typed something and paused" #. Build the Send As menu -#: src/gtkconv.c:2808 +#: src/gtkconv.c:2979 msgid "_Send As" msgstr "_Send As" -#: src/gtkconv.c:3185 +#: src/gtkconv.c:3356 msgid "Save Conversation" msgstr "Save Conversation" #. Conversation menu -#: src/gtkconv.c:3202 +#: src/gtkconv.c:3373 msgid "/_Conversation" msgstr "/_Conversation" -#: src/gtkconv.c:3204 +#: src/gtkconv.c:3375 msgid "/Conversation/New Instant _Message..." msgstr "/Conversation/New Instant _Message..." -#: src/gtkconv.c:3209 +#: src/gtkconv.c:3380 msgid "/Conversation/_Find..." msgstr "/Conversation/_Find..." -#: src/gtkconv.c:3211 +#: src/gtkconv.c:3382 msgid "/Conversation/View _Log" msgstr "/Conversation/View _Log" -#: src/gtkconv.c:3212 +#: src/gtkconv.c:3383 msgid "/Conversation/_Save As..." msgstr "/Conversation/_Save As..." -#: src/gtkconv.c:3214 +#: src/gtkconv.c:3385 msgid "/Conversation/Clear" msgstr "/Conversation/Clear" -#: src/gtkconv.c:3218 +#: src/gtkconv.c:3389 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/Conversation/Add Buddy _Pounce..." -#: src/gtkconv.c:3220 +#: src/gtkconv.c:3391 msgid "/Conversation/_Get Info" msgstr "/Conversation/_Get Info" -#: src/gtkconv.c:3222 +#: src/gtkconv.c:3393 msgid "/Conversation/_Warn..." msgstr "/Conversation/_Warn..." -#: src/gtkconv.c:3224 +#: src/gtkconv.c:3395 msgid "/Conversation/In_vite..." msgstr "/Conversation/In_vite..." -#: src/gtkconv.c:3229 +#: src/gtkconv.c:3400 msgid "/Conversation/A_lias..." msgstr "/Conversation/A_lias..." -#: src/gtkconv.c:3231 +#: src/gtkconv.c:3402 msgid "/Conversation/_Block..." msgstr "/Conversation/_Block..." -#: src/gtkconv.c:3233 +#: src/gtkconv.c:3404 msgid "/Conversation/_Add..." msgstr "/Conversation/_Add..." -#: src/gtkconv.c:3235 +#: src/gtkconv.c:3406 msgid "/Conversation/_Remove..." msgstr "/Conversation/_Remove..." -#: src/gtkconv.c:3240 +#: src/gtkconv.c:3411 msgid "/Conversation/Insert Lin_k..." msgstr "/Conversation/Insert Lin_k..." -#: src/gtkconv.c:3242 +#: src/gtkconv.c:3413 msgid "/Conversation/Insert Imag_e..." msgstr "/Conversation/Insert Imag_e..." -#: src/gtkconv.c:3247 +#: src/gtkconv.c:3418 msgid "/Conversation/_Close" msgstr "/Conversation/_Close" #. Options -#: src/gtkconv.c:3251 +#: src/gtkconv.c:3422 msgid "/_Options" msgstr "/_Options" -#: src/gtkconv.c:3252 +#: src/gtkconv.c:3423 msgid "/Options/Enable _Logging" msgstr "/Options/Enable _Logging" -#: src/gtkconv.c:3253 +#: src/gtkconv.c:3424 msgid "/Options/Enable _Sounds" msgstr "/Options/Enable _Sounds" -#: src/gtkconv.c:3254 +#: src/gtkconv.c:3425 msgid "/Options/Show Formatting _Toolbar" msgstr "/Options/Show Formatting _Toolbar" -#: src/gtkconv.c:3296 +#: src/gtkconv.c:3426 +msgid "/Options/Show T_imestamps" +msgstr "/Options/Show T_imestamps" + +#: src/gtkconv.c:3468 msgid "/Conversation/View Log" msgstr "/Conversation/View Log" -#: src/gtkconv.c:3301 +#: src/gtkconv.c:3473 msgid "/Conversation/Add Buddy Pounce..." msgstr "/Conversation/Add Buddy Pounce..." -#: src/gtkconv.c:3307 +#: src/gtkconv.c:3479 msgid "/Conversation/Get Info" msgstr "/Conversation/Get Info" -#: src/gtkconv.c:3311 +#: src/gtkconv.c:3483 msgid "/Conversation/Warn..." msgstr "/Conversation/Warn..." -#: src/gtkconv.c:3315 +#: src/gtkconv.c:3487 msgid "/Conversation/Invite..." msgstr "/Conversation/Invite..." -#: src/gtkconv.c:3321 +#: src/gtkconv.c:3493 msgid "/Conversation/Alias..." msgstr "/Conversation/Alias..." -#: src/gtkconv.c:3325 +#: src/gtkconv.c:3497 msgid "/Conversation/Block..." msgstr "/Conversation/Block..." -#: src/gtkconv.c:3329 +#: src/gtkconv.c:3501 msgid "/Conversation/Add..." msgstr "/Conversation/Add..." -#: src/gtkconv.c:3333 +#: src/gtkconv.c:3505 msgid "/Conversation/Remove..." msgstr "/Conversation/Remove..." -#: src/gtkconv.c:3339 +#: src/gtkconv.c:3511 msgid "/Conversation/Insert Link..." msgstr "/Conversation/Insert Link..." -#: src/gtkconv.c:3343 +#: src/gtkconv.c:3515 msgid "/Conversation/Insert Image..." msgstr "/Conversation/Insert Image..." -#: src/gtkconv.c:3349 +#: src/gtkconv.c:3521 msgid "/Options/Enable Logging" msgstr "/Options/Enable Logging" -#: src/gtkconv.c:3352 +#: src/gtkconv.c:3524 msgid "/Options/Enable Sounds" msgstr "/Options/Enable Sounds" -#: src/gtkconv.c:3355 +#: src/gtkconv.c:3527 msgid "/Options/Show Formatting Toolbar" msgstr "/Options/Show Formatting Toolbar" +#: src/gtkconv.c:3530 +msgid "/Options/Show Timestamps" +msgstr "/Options/Show Timestamps" + #. From right to left... #. Send button -#: src/gtkconv.c:3379 src/gtkconv.c:3381 src/gtkconv.c:3487 src/gtkconv.c:3489 +#: src/gtkconv.c:3554 src/gtkconv.c:3556 src/gtkconv.c:3662 src/gtkconv.c:3664 msgid "Send" msgstr "Send" #. Now, um, just kind of all over the place. Huh? #. Warn button -#: src/gtkconv.c:3395 +#: src/gtkconv.c:3570 msgid "Warn" msgstr "Warn" -#: src/gtkconv.c:3398 +#: src/gtkconv.c:3573 msgid "Warn the user" msgstr "Warn the user" #. Block button -#: src/gtkconv.c:3402 src/gtkprivacy.c:625 src/gtkprivacy.c:636 +#: src/gtkconv.c:3577 src/gtkprivacy.c:624 src/gtkprivacy.c:635 msgid "Block" msgstr "Block" -#: src/gtkconv.c:3405 +#: src/gtkconv.c:3580 msgid "Block the user" msgstr "Block the user" -#: src/gtkconv.c:3412 +#: src/gtkconv.c:3587 msgid "Add the user to your buddy list" msgstr "Add the user to your buddy list" -#: src/gtkconv.c:3419 +#: src/gtkconv.c:3594 msgid "Remove the user from your buddy list" msgstr "Remove the user from your buddy list" -#: src/gtkconv.c:3426 src/gtkconv.c:3770 +#: src/gtkconv.c:3601 src/gtkconv.c:3944 msgid "Get the user's information" msgstr "Get the user's information" #. Invite -#: src/gtkconv.c:3501 +#: src/gtkconv.c:3676 msgid "Invite" msgstr "Invite" -#: src/gtkconv.c:3504 +#: src/gtkconv.c:3679 msgid "Invite a user" msgstr "Invite a user" -#: src/gtkconv.c:3511 +#: src/gtkconv.c:3686 msgid "Add the chat to your buddy list" msgstr "Add the chat to your buddy list" -#: src/gtkconv.c:3518 +#: src/gtkconv.c:3693 msgid "Remove the chat from your buddy list" msgstr "Remove the chat from your buddy list" -#: src/gtkconv.c:3628 +#: src/gtkconv.c:3803 msgid "Topic:" msgstr "Topic:" #. Setup the label telling how many people are in the room. -#: src/gtkconv.c:3692 +#: src/gtkconv.c:3866 msgid "0 people in room" msgstr "0 people in room" -#: src/gtkconv.c:3747 +#: src/gtkconv.c:3921 msgid "IM the user" msgstr "IM the user" -#: src/gtkconv.c:3759 +#: src/gtkconv.c:3933 msgid "Ignore the user" msgstr "Ignore the user" -#: src/gtkconv.c:4326 +#: src/gtkconv.c:4511 msgid "Close conversation" msgstr "Close conversation" -#: src/gtkconv.c:4854 src/gtkconv.c:4886 src/gtkconv.c:5007 src/gtkconv.c:5074 +#: src/gtkconv.c:5056 src/gtkconv.c:5088 src/gtkconv.c:5209 src/gtkconv.c:5276 #, 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:5573 src/gtkconv.c:5576 +#: src/gtkconv.c:5778 src/gtkconv.c:5781 msgid "<main>/Conversation/Close" msgstr "<main>/Conversation/Close" +#: src/gtkconv.c:6153 +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:6156 +msgid "" +"debug <option>: Send various debug information to the current " +"conversation." +msgstr "" +"debug <option>: Send various debug information to the current " +"conversation." + +#: src/gtkconv.c:6160 +msgid "help: List available commands." +msgstr "help: List available commands." + +#: src/gtkconv.c:6164 +msgid "help <command>: Help on a specific command." +msgstr "help <command>: Help on a specific command." + #: src/gtkdebug.c:226 msgid "Save Debug Log" msgstr "Save Debug Log" @@ -3096,38 +3191,38 @@ msgid "Failed" msgstr "Failed" -#: src/gtkft.c:1099 +#: src/gtkft.c:1098 msgid "That file does not exist." msgstr "That file does not exist." -#: src/gtkft.c:1108 +#: src/gtkft.c:1107 msgid "Cannot send a file of 0 bytes." msgstr "Cannot send a file of 0 bytes." -#: src/gtkft.c:1122 +#: src/gtkft.c:1121 msgid "That file already exists." msgstr "That file already exists." #. Open file selector to select the public key. -#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1025 +#: src/gtkft.c:1147 src/protocols/silc/buddy.c:1023 msgid "Open..." msgstr "Open..." -#: src/gtkft.c:1150 +#: src/gtkft.c:1149 msgid "Save As..." msgstr "Save As..." -#: src/gtkft.c:1200 +#: src/gtkft.c:1199 #, c-format msgid "%s wants to send you %s (%s)" msgstr "%s wants to send you %s (%s)" -#: src/gtkft.c:1233 +#: src/gtkft.c:1232 #, c-format msgid "Accept file transfer request from %s?" msgstr "Accept file transfer request from %s?" -#: src/gtkft.c:1237 +#: src/gtkft.c:1236 #, c-format msgid "" "A file is available for download from:\n" @@ -3138,31 +3233,31 @@ "Remote host: %s\n" "Remote port: %d" -#: src/gtkimhtml.c:559 +#: src/gtkimhtml.c:567 msgid "Pa_ste As Text" msgstr "Pa_ste As Text" -#: src/gtkimhtml.c:1004 +#: src/gtkimhtml.c:1012 msgid "Hyperlink color" msgstr "Hyperlink colour" -#: src/gtkimhtml.c:1005 +#: src/gtkimhtml.c:1013 msgid "Color to draw hyperlinks." msgstr "Colour to draw hyperlinks." -#: src/gtkimhtml.c:1211 +#: src/gtkimhtml.c:1218 msgid "_Copy E-Mail Address" msgstr "_Copy E-Mail Address" -#: src/gtkimhtml.c:1223 +#: src/gtkimhtml.c:1230 msgid "_Copy Link Location" msgstr "_Copy Link Location" -#: src/gtkimhtml.c:1233 +#: src/gtkimhtml.c:1240 msgid "_Open Link in Browser" msgstr "_Open Link in Browser" -#: src/gtkimhtml.c:2667 +#: src/gtkimhtml.c:2761 msgid "" "Unable to guess the image type based on the file extension supplied. " "Defaulting to PNG." @@ -3170,16 +3265,16 @@ "Unable to guess the image type based on the file extension supplied. " "Defaulting to PNG." -#: src/gtkimhtml.c:2675 +#: src/gtkimhtml.c:2769 #, c-format msgid "Error saving image: %s" msgstr "Error saving image: %s" -#: src/gtkimhtml.c:2684 +#: src/gtkimhtml.c:2778 msgid "Save Image" msgstr "Save Image" -#: src/gtkimhtml.c:2707 +#: src/gtkimhtml.c:2801 msgid "_Save Image..." msgstr "_Save Image..." @@ -3223,65 +3318,65 @@ msgid "_Insert" msgstr "_Insert" -#: src/gtkimhtmltoolbar.c:473 +#: src/gtkimhtmltoolbar.c:472 #, c-format msgid "Failed to store image: %s\n" msgstr "Failed to store image: %s\n" -#: src/gtkimhtmltoolbar.c:499 +#: src/gtkimhtmltoolbar.c:498 msgid "Insert Image" msgstr "Insert Image" -#: src/gtkimhtmltoolbar.c:638 +#: src/gtkimhtmltoolbar.c:637 msgid "This theme has no available smileys." msgstr "This theme has no available smileys." #. show everything -#: src/gtkimhtmltoolbar.c:653 +#: src/gtkimhtmltoolbar.c:652 msgid "Smile!" msgstr "Smile!" -#: src/gtkimhtmltoolbar.c:871 +#: src/gtkimhtmltoolbar.c:870 msgid "Bold" msgstr "Bold" -#: src/gtkimhtmltoolbar.c:882 +#: src/gtkimhtmltoolbar.c:881 msgid "Italic" msgstr "Italic" -#: src/gtkimhtmltoolbar.c:893 +#: src/gtkimhtmltoolbar.c:892 msgid "Underline" msgstr "Underline" -#: src/gtkimhtmltoolbar.c:909 +#: src/gtkimhtmltoolbar.c:908 msgid "Larger font size" msgstr "Larger font size" -#: src/gtkimhtmltoolbar.c:921 +#: src/gtkimhtmltoolbar.c:920 msgid "Smaller font size" msgstr "Smaller font size" -#: src/gtkimhtmltoolbar.c:938 +#: src/gtkimhtmltoolbar.c:937 msgid "Font Face" msgstr "Font Face" -#: src/gtkimhtmltoolbar.c:950 +#: src/gtkimhtmltoolbar.c:949 msgid "Foreground font color" msgstr "Foreground font colour" -#: src/gtkimhtmltoolbar.c:962 +#: src/gtkimhtmltoolbar.c:961 msgid "Background color" msgstr "Background colour" -#: src/gtkimhtmltoolbar.c:977 +#: src/gtkimhtmltoolbar.c:976 msgid "Insert link" msgstr "Insert link" -#: src/gtkimhtmltoolbar.c:987 +#: src/gtkimhtmltoolbar.c:986 msgid "Insert image" msgstr "Insert image" -#: src/gtkimhtmltoolbar.c:998 +#: src/gtkimhtmltoolbar.c:997 msgid "Insert smiley" msgstr "Insert smiley" @@ -3290,7 +3385,7 @@ msgstr "Conversations with" #. Window ********** -#: src/gtklog.c:370 src/gtklog.c:386 +#: src/gtklog.c:372 src/gtklog.c:388 msgid "System Log" msgstr "System Log" @@ -3340,7 +3435,7 @@ msgstr "The browser command \"%s\" is invalid." #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461 -#: src/gtknotify.c:569 +#: src/gtknotify.c:570 msgid "Unable to open URL" msgstr "Unable to open URL" @@ -3349,7 +3444,7 @@ msgid "Error launching \"%s\": %s" msgstr "Error launching \"%s\": %s" -#: src/gtknotify.c:570 +#: src/gtknotify.c:571 msgid "" "The 'Manual' browser command has been chosen, but no command has been set." msgstr "" @@ -3359,159 +3454,164 @@ msgid "Select a file" msgstr "Select a file" -#: src/gtkpounce.c:193 +#: src/gtkpounce.c:194 msgid "Please enter a buddy to pounce." msgstr "Please enter a buddy to pounce." #. "New Buddy Pounce" -#: src/gtkpounce.c:406 src/gtkpounce.c:846 +#: src/gtkpounce.c:420 src/gtkpounce.c:923 msgid "New Buddy Pounce" msgstr "New Buddy Pounce" -#: src/gtkpounce.c:406 +#: src/gtkpounce.c:420 msgid "Edit Buddy Pounce" msgstr "Edit Buddy Pounce" #. Create the "Pounce Who" frame. -#: src/gtkpounce.c:424 +#: src/gtkpounce.c:438 msgid "Pounce Who" msgstr "Pounce Who" -#: src/gtkpounce.c:451 +#: src/gtkpounce.c:465 msgid "_Buddy name:" msgstr "_Buddy name:" #. Create the "Pounce When" frame. -#: src/gtkpounce.c:475 +#: src/gtkpounce.c:489 msgid "Pounce When" msgstr "Pounce When" -#: src/gtkpounce.c:483 src/main.c:296 +#: src/gtkpounce.c:497 src/main.c:296 msgid "_Sign on" msgstr "_Sign on" -#: src/gtkpounce.c:485 +#: src/gtkpounce.c:499 msgid "Sign _off" msgstr "Sign _off" -#: src/gtkpounce.c:487 +#: src/gtkpounce.c:501 msgid "A_way" msgstr "A_way" -#: src/gtkpounce.c:489 +#: src/gtkpounce.c:503 msgid "Re_turn from away" msgstr "Re_turn from away" -#: src/gtkpounce.c:491 +#: src/gtkpounce.c:505 msgid "_Idle" msgstr "_Idle" -#: src/gtkpounce.c:493 +#: src/gtkpounce.c:507 msgid "Retur_n from idle" msgstr "Retur_n from idle" -#: src/gtkpounce.c:495 +#: src/gtkpounce.c:509 msgid "Buddy starts _typing" msgstr "Buddy starts _typing" -#: src/gtkpounce.c:497 +#: src/gtkpounce.c:511 msgid "Buddy stops t_yping" msgstr "Buddy stops t_yping" #. Create the "Pounce Action" frame. -#: src/gtkpounce.c:526 +#: src/gtkpounce.c:540 msgid "Pounce Action" msgstr "Pounce Action" -#: src/gtkpounce.c:533 +#: src/gtkpounce.c:548 msgid "Op_en an IM window" msgstr "Op_en an IM window" -#: src/gtkpounce.c:534 +#: src/gtkpounce.c:550 msgid "_Popup notification" msgstr "_Popup notification" -#: src/gtkpounce.c:535 +#: src/gtkpounce.c:552 msgid "Send a _message" msgstr "Send a _message" -#: src/gtkpounce.c:536 +#: src/gtkpounce.c:554 msgid "E_xecute a command" msgstr "E_xecute a command" -#: src/gtkpounce.c:537 +#: src/gtkpounce.c:556 msgid "P_lay a sound" msgstr "P_lay a sound" -#: src/gtkpounce.c:541 +#: src/gtkpounce.c:560 msgid "B_rowse..." msgstr "B_rowse..." -#: src/gtkpounce.c:543 +#: src/gtkpounce.c:562 msgid "Bro_wse..." msgstr "Bro_wse..." -#: src/gtkpounce.c:544 +#: src/gtkpounce.c:563 msgid "Pre_view" msgstr "Pre_view" -#: src/gtkpounce.c:627 +#: src/gtkpounce.c:646 msgid "Sav_e this pounce after activation" msgstr "Sav_e this pounce after activation" #. "Remove Buddy Pounce" -#: src/gtkpounce.c:853 +#: src/gtkpounce.c:930 msgid "Remove Buddy Pounce" msgstr "Remove Buddy Pounce" -#: src/gtkpounce.c:903 -#, c-format -msgid "%s has started typing to you" -msgstr "%s has started typing to you" - -#: src/gtkpounce.c:904 -#, c-format -msgid "%s has signed on" -msgstr "%s has signed on" - -#: src/gtkpounce.c:905 -#, c-format -msgid "%s has returned from being idle" -msgstr "%s has returned from being idle" - -#: src/gtkpounce.c:906 -#, c-format -msgid "%s has returned from being away" -msgstr "%s has returned from being away" - -#: src/gtkpounce.c:907 -#, c-format -msgid "%s has stopped typing to you" -msgstr "%s has stopped typing to you" - -#: src/gtkpounce.c:908 -#, c-format -msgid "%s has signed off" -msgstr "%s has signed off" - -#: src/gtkpounce.c:909 -#, c-format -msgid "%s has become idle" -msgstr "%s has become idle" - -#: src/gtkpounce.c:911 +#: src/gtkpounce.c:994 +#, c-format +msgid "%s has started typing to you (%s)" +msgstr "%s has started typing to you (%s)" + +#: src/gtkpounce.c:996 +#, c-format +msgid "%s has signed on (%s)" +msgstr "%s has signed on (%s)" + +#: src/gtkpounce.c:998 +#, c-format +msgid "%s has returned from being idle (%s)" +msgstr "%s has returned from being idle (%s)" + +#: src/gtkpounce.c:1000 +#, c-format +msgid "%s has returned from being away (%s)" +msgstr "%s has returned from being away (%s)" + +#: src/gtkpounce.c:1002 +#, c-format +msgid "%s has stopped typing to you (%s)" +msgstr "%s has stopped typing to you (%s)" + +#: src/gtkpounce.c:1004 +#, c-format +msgid "%s has signed off (%s)" +msgstr "%s has signed off (%s)" + +#: src/gtkpounce.c:1006 +#, c-format +msgid "%s has become idle (%s)" +msgstr "%s has become idle (%s)" + +#: src/gtkpounce.c:1008 +#, c-format +msgid "%s has gone away. (%s)" +msgstr "%s has gone away. (%s)" + +#: src/gtkpounce.c:1009 msgid "Unknown pounce event. Please report this!" msgstr "Unknown pounce event. Please report this!" -#: src/gtkprefs.c:402 +#: src/gtkprefs.c:401 msgid "Interface Options" msgstr "Interface Options" -#: src/gtkprefs.c:404 +#: src/gtkprefs.c:403 msgid "D_isplay remote nicknames if no alias is set" msgstr "D_isplay remote nicknames if no alias is set" -#: src/gtkprefs.c:628 +#: src/gtkprefs.c:627 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." @@ -3519,52 +3619,52 @@ "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:668 +#: src/gtkprefs.c:667 msgid "Icon" msgstr "Icon" -#: src/gtkprefs.c:675 src/gtkprefs.c:2235 src/protocols/jabber/buddy.c:265 +#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265 #: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701 msgid "Description" msgstr "Description" -#: src/gtkprefs.c:771 +#: src/gtkprefs.c:770 msgid "Display" msgstr "Display" -#: src/gtkprefs.c:772 +#: src/gtkprefs.c:771 msgid "Show _timestamp on messages" msgstr "Show _timestamp on messages" -#: src/gtkprefs.c:775 +#: src/gtkprefs.c:774 msgid "_Highlight misspelled words" msgstr "_Highlight misspelled words" -#: src/gtkprefs.c:780 +#: src/gtkprefs.c:779 msgid "Ignore c_olors" msgstr "Ignore c_olours" -#: src/gtkprefs.c:782 +#: src/gtkprefs.c:781 msgid "Ignore font _faces" msgstr "Ignore font _faces" -#: src/gtkprefs.c:784 +#: src/gtkprefs.c:783 msgid "Ignore font si_zes" msgstr "Ignore font si_zes" -#: src/gtkprefs.c:787 +#: src/gtkprefs.c:786 msgid "_Ignore formatting on incoming messages" msgstr "_Ignore formatting on incoming messages" -#: src/gtkprefs.c:791 +#: src/gtkprefs.c:790 msgid "Default Formatting" msgstr "Default Formatting" -#: src/gtkprefs.c:793 +#: src/gtkprefs.c:792 msgid "_Send default formatting with outgoing messages" msgstr "_Send default formatting with outgoing messages" -#: src/gtkprefs.c:825 +#: src/gtkprefs.c:824 msgid "" "This is how your outgoing message text will appear when you use protocols " "that support formatting. :)" @@ -3572,265 +3672,265 @@ "This is how your outgoing message text will appear when you use protocols " "that support formatting. :)" -#: src/gtkprefs.c:828 +#: src/gtkprefs.c:827 msgid "_Clear Formatting" msgstr "_Clear Formatting" -#: src/gtkprefs.c:865 +#: src/gtkprefs.c:864 msgid "Send Message" msgstr "Send Message" -#: src/gtkprefs.c:866 +#: src/gtkprefs.c:865 msgid "Enter _sends message" msgstr "Enter _sends message" -#: src/gtkprefs.c:868 +#: src/gtkprefs.c:867 msgid "C_ontrol-Enter sends message" msgstr "C_ontrol-Enter sends message" -#: src/gtkprefs.c:871 +#: src/gtkprefs.c:870 msgid "Window Closing" msgstr "Window Closing" -#: src/gtkprefs.c:872 +#: src/gtkprefs.c:871 msgid "_Escape closes window" msgstr "_Escape closes window" -#: src/gtkprefs.c:875 +#: src/gtkprefs.c:874 msgid "Insertions" msgstr "Insertions" -#: src/gtkprefs.c:876 +#: src/gtkprefs.c:875 msgid "Control-{B/I/U} changes _formatting" msgstr "Control-{B/I/U} changes _formatting" -#: src/gtkprefs.c:878 +#: src/gtkprefs.c:877 msgid "Control-(number) _inserts smileys" msgstr "Control-(number) _inserts smileys" -#: src/gtkprefs.c:894 +#: src/gtkprefs.c:893 msgid "Buddy List Sorting" msgstr "Buddy List Sorting" -#: src/gtkprefs.c:903 +#: src/gtkprefs.c:902 msgid "_Sorting:" msgstr "_Sorting:" -#: src/gtkprefs.c:909 src/gtkprefs.c:973 +#: src/gtkprefs.c:908 src/gtkprefs.c:961 msgid "Show _buttons as:" msgstr "Show _buttons as:" -#: src/gtkprefs.c:911 src/gtkprefs.c:975 +#: src/gtkprefs.c:910 src/gtkprefs.c:963 msgid "Pictures" msgstr "Pictures" -#: src/gtkprefs.c:912 src/gtkprefs.c:976 +#: src/gtkprefs.c:911 src/gtkprefs.c:964 msgid "Text" msgstr "Text" -#: src/gtkprefs.c:913 src/gtkprefs.c:977 +#: src/gtkprefs.c:912 src/gtkprefs.c:965 msgid "Pictures and text" msgstr "Pictures and text" -#: src/gtkprefs.c:916 src/gtkprefs.c:1003 +#: src/gtkprefs.c:915 msgid "_Raise window on events" msgstr "_Raise window on events" -#: src/gtkprefs.c:919 +#: src/gtkprefs.c:918 msgid "Buddy Display" msgstr "Buddy Display" -#: src/gtkprefs.c:920 src/gtkprefs.c:1009 +#: src/gtkprefs.c:919 src/gtkprefs.c:979 msgid "Show buddy _icons" msgstr "Show buddy _icons" -#: src/gtkprefs.c:922 +#: src/gtkprefs.c:921 msgid "Show _warning levels" msgstr "Show _warning levels" -#: src/gtkprefs.c:924 +#: src/gtkprefs.c:923 msgid "Show idle _times" msgstr "Show idle _times" -#: src/gtkprefs.c:926 +#: src/gtkprefs.c:925 msgid "Dim i_dle buddies" msgstr "Dim i_dle buddies" -#: src/gtkprefs.c:928 +#: src/gtkprefs.c:927 msgid "_Automatically expand contacts" msgstr "_Automatically expand contacts" -#: src/gtkprefs.c:966 -msgid "_Placement:" -msgstr "_Placement:" +#: src/gtkprefs.c:972 +msgid "Enable \"_slash\" commands" +msgstr "Enable \"_slash\" commands" + +#: src/gtkprefs.c:975 +msgid "Show _formatting toolbar" +msgstr "Show _formatting toolbar" + +#: src/gtkprefs.c:977 +msgid "Show _aliases in tabs/titles" +msgstr "Show _aliases in tabs/titles" + +#: src/gtkprefs.c:981 +msgid "Enable buddy ic_on animation" +msgstr "Enable buddy ic_on animation" + +#: src/gtkprefs.c:983 +msgid "_Notify buddies that you are typing to them" +msgstr "_Notify buddies that you are typing to them" #: src/gtkprefs.c:985 -msgid "Number of conversations per window" -msgstr "Number of conversations per window" - +msgid "_Raise IM window on events" +msgstr "_Raise IM window on events" + +#: src/gtkprefs.c:988 +msgid "Raise chat _window on events" +msgstr "Raise chat _window on events" + +#: src/gtkprefs.c:990 +msgid "Use _multi-colored screen names in chats" +msgstr "Use _multi-coloured screen names in chats" + +#. All the tab options! #: src/gtkprefs.c:994 -msgid "Show _formatting toolbar" -msgstr "Show _formatting toolbar" - -#: src/gtkprefs.c:997 -msgid "Show a_liases in tabs/titles" -msgstr "Show a_liases in tabs/titles" - -#: src/gtkprefs.c:1000 -msgid "Enable _Commands" -msgstr "Enable _Commands" - -#. XXX This caption totally sucks but I can't break the string freeze. -#: src/gtkprefs.c:1007 -msgid "Co_lorize screen names" -msgstr "Co_lourize screen names" - -#: src/gtkprefs.c:1011 -msgid "Enable buddy icon a_nimation" -msgstr "Enable buddy icon a_nimation" - -#: src/gtkprefs.c:1013 -msgid "Notify buddies that you are _typing to them" -msgstr "Notify buddies that you are _typing to them" - -#: src/gtkprefs.c:1016 msgid "Tab Options" msgstr "Tab Options" -#: src/gtkprefs.c:1018 +#: src/gtkprefs.c:996 msgid "Show IMs and chats in _tabbed windows" msgstr "Show IMs and chats in _tabbed windows" -#: src/gtkprefs.c:1024 -msgid "Show IMs and chats in _same tabbed window" -msgstr "Show IMs and chats in _same tabbed window" - -#: src/gtkprefs.c:1038 +#: src/gtkprefs.c:1011 msgid "Show _close button on tabs" msgstr "Show _close button on tabs" -#: src/gtkprefs.c:1051 -msgid "_Tab Placement:" -msgstr "_Tab Placement:" - -#: src/gtkprefs.c:1053 +#: src/gtkprefs.c:1014 +msgid "Tab p_lacement:" +msgstr "Tab p_lacement:" + +#: src/gtkprefs.c:1016 msgid "Top" msgstr "Top" -#: src/gtkprefs.c:1054 +#: src/gtkprefs.c:1017 msgid "Bottom" msgstr "Bottom" -#: src/gtkprefs.c:1055 +#: src/gtkprefs.c:1018 msgid "Left" msgstr "Left" -#: src/gtkprefs.c:1056 +#: src/gtkprefs.c:1019 msgid "Right" msgstr "Right" -#: src/gtkprefs.c:1116 src/protocols/oscar/oscar.c:592 -#: src/protocols/oscar/oscar.c:4832 +#: src/gtkprefs.c:1025 +msgid "New conversation _placement:" +msgstr "New conversation _placement:" + +#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592 +#: src/protocols/oscar/oscar.c:4837 msgid "IP Address" msgstr "IP Address" -#: src/gtkprefs.c:1118 +#: src/gtkprefs.c:1078 msgid "_Autodetect IP Address" msgstr "_Autodetect IP Address" -#: src/gtkprefs.c:1127 +#: src/gtkprefs.c:1087 msgid "Public _IP:" msgstr "Public _IP:" -#: src/gtkprefs.c:1151 +#: src/gtkprefs.c:1111 msgid "Ports" msgstr "Ports" -#: src/gtkprefs.c:1154 +#: src/gtkprefs.c:1114 msgid "_Manually specify range of ports to listen on" msgstr "_Manually specify range of ports to listen on" -#: src/gtkprefs.c:1157 +#: src/gtkprefs.c:1117 msgid "_Start Port:" msgstr "_Start Port:" -#: src/gtkprefs.c:1164 +#: src/gtkprefs.c:1124 msgid "_End Port:" msgstr "_End Port:" -#: src/gtkprefs.c:1171 +#: src/gtkprefs.c:1131 msgid "Proxy Server" msgstr "Proxy Server" -#: src/gtkprefs.c:1175 +#: src/gtkprefs.c:1135 msgid "No proxy" msgstr "No proxy" -#: src/gtkprefs.c:1237 +#: src/gtkprefs.c:1197 msgid "_User:" msgstr "_User:" -#: src/gtkprefs.c:1293 +#: src/gtkprefs.c:1253 msgid "Opera" msgstr "Opera" -#: src/gtkprefs.c:1294 +#: src/gtkprefs.c:1254 msgid "Netscape" msgstr "Netscape" -#: src/gtkprefs.c:1295 +#: src/gtkprefs.c:1255 msgid "Mozilla" msgstr "Mozilla" -#: src/gtkprefs.c:1296 +#: src/gtkprefs.c:1256 msgid "Konqueror" msgstr "Konqueror" -#: src/gtkprefs.c:1297 +#: src/gtkprefs.c:1257 msgid "Galeon" msgstr "Galeon" -#: src/gtkprefs.c:1298 +#: src/gtkprefs.c:1258 msgid "Firebird" msgstr "Firebird" -#: src/gtkprefs.c:1299 +#: src/gtkprefs.c:1259 msgid "Firefox" msgstr "Firefox" -#: src/gtkprefs.c:1300 +#: src/gtkprefs.c:1260 msgid "Gnome Default" msgstr "Gnome Default" -#: src/gtkprefs.c:1309 +#: src/gtkprefs.c:1269 msgid "Manual" msgstr "Manual" -#: src/gtkprefs.c:1360 +#: src/gtkprefs.c:1320 msgid "Browser Selection" msgstr "Browser Selection" -#: src/gtkprefs.c:1364 +#: src/gtkprefs.c:1324 msgid "_Browser:" msgstr "_Browser:" -#: src/gtkprefs.c:1371 +#: src/gtkprefs.c:1331 msgid "_Open link in:" msgstr "_Open link in:" -#: src/gtkprefs.c:1373 +#: src/gtkprefs.c:1333 msgid "Browser default" msgstr "Browser default" -#: src/gtkprefs.c:1374 +#: src/gtkprefs.c:1334 msgid "Existing window" msgstr "Existing window" -#: src/gtkprefs.c:1376 +#: src/gtkprefs.c:1336 msgid "New tab" msgstr "New tab" -#: src/gtkprefs.c:1390 +#: src/gtkprefs.c:1350 #, c-format msgid "" "_Manual:\n" @@ -3839,83 +3939,83 @@ "_Manual:\n" "(%s for URL)" -#: src/gtkprefs.c:1427 +#: src/gtkprefs.c:1387 msgid "Message Logs" msgstr "Message Logs" -#: src/gtkprefs.c:1430 +#: src/gtkprefs.c:1390 msgid "Log _Format:" msgstr "Log _Format:" -#: src/gtkprefs.c:1433 +#: src/gtkprefs.c:1393 msgid "_Log all instant messages" msgstr "_Log all instant messages" -#: src/gtkprefs.c:1435 +#: src/gtkprefs.c:1395 msgid "Log all c_hats" msgstr "Log all c_hats" -#: src/gtkprefs.c:1438 +#: src/gtkprefs.c:1398 msgid "System Logs" msgstr "System Logs" -#: src/gtkprefs.c:1440 +#: src/gtkprefs.c:1400 msgid "_Enable system log" msgstr "_Enable system log" -#: src/gtkprefs.c:1443 +#: src/gtkprefs.c:1403 msgid "Log when buddies _sign on/sign off" msgstr "Log when buddies _sign on/sign off" -#: src/gtkprefs.c:1449 +#: src/gtkprefs.c:1409 msgid "Log when buddies become _idle/un-idle" msgstr "Log when buddies become _idle/un-idle" -#: src/gtkprefs.c:1455 +#: src/gtkprefs.c:1415 msgid "Log when buddies go away/come _back" msgstr "Log when buddies go away/come _back" -#: src/gtkprefs.c:1461 +#: src/gtkprefs.c:1421 msgid "Log your _own signons/idleness/awayness" msgstr "Log your _own signons/idleness/awayness" -#: src/gtkprefs.c:1599 +#: src/gtkprefs.c:1559 msgid "Sound Selection" msgstr "Sound Selection" -#: src/gtkprefs.c:1674 +#: src/gtkprefs.c:1634 msgid "Sound Options" msgstr "Sound Options" -#: src/gtkprefs.c:1675 +#: src/gtkprefs.c:1635 msgid "Sounds when conversation has _focus" msgstr "Sounds when conversation has _focus" -#: src/gtkprefs.c:1677 +#: src/gtkprefs.c:1637 msgid "_Sounds while away" msgstr "_Sounds while away" -#: src/gtkprefs.c:1681 +#: src/gtkprefs.c:1641 msgid "Sound Method" msgstr "Sound Method" -#: src/gtkprefs.c:1682 +#: src/gtkprefs.c:1642 msgid "_Method:" msgstr "_Method:" -#: src/gtkprefs.c:1684 +#: src/gtkprefs.c:1644 msgid "Console beep" msgstr "Console beep" -#: src/gtkprefs.c:1686 +#: src/gtkprefs.c:1646 msgid "Automatic" msgstr "Automatic" -#: src/gtkprefs.c:1693 +#: src/gtkprefs.c:1653 msgid "Command" msgstr "Command" -#: src/gtkprefs.c:1701 +#: src/gtkprefs.c:1661 #, c-format msgid "" "Sound c_ommand:\n" @@ -3924,85 +4024,86 @@ "Sound c_ommand:\n" "(%s for filename)" -#: src/gtkprefs.c:1728 +#: src/gtkprefs.c:1688 msgid "Sound Events" msgstr "Sound Events" -#: src/gtkprefs.c:1779 +#: src/gtkprefs.c:1739 msgid "Play" msgstr "Play" -#: src/gtkprefs.c:1786 +#: src/gtkprefs.c:1746 msgid "Event" msgstr "Event" -#: src/gtkprefs.c:1805 +#: src/gtkprefs.c:1765 msgid "Test" msgstr "Test" -#: src/gtkprefs.c:1809 +#: src/gtkprefs.c:1769 msgid "Reset" msgstr "Reset" -#: src/gtkprefs.c:1813 +#: src/gtkprefs.c:1773 msgid "Choose..." msgstr "Choose..." -#: src/gtkprefs.c:1837 +#: src/gtkprefs.c:1797 msgid "_Queue new messages when away" msgstr "_Queue new messages when away" -#: src/gtkprefs.c:1840 +#: src/gtkprefs.c:1800 msgid "Auto-response" msgstr "Auto-response" -#: src/gtkprefs.c:1841 +#: src/gtkprefs.c:1801 msgid "_Send auto-response" msgstr "_Send auto-response" -#: src/gtkprefs.c:1843 +#: src/gtkprefs.c:1803 msgid "_Only send auto-response when idle" msgstr "_Only send auto-response when idle" -#: src/gtkprefs.c:1846 src/protocols/msn/state.c:30 -#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3990 -#: src/protocols/yahoo/yahoo.c:2371 +#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1175 +#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730 +#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2497 +#: src/protocols/yahoo/yahoo_profile.c:653 msgid "Idle" msgstr "Idle" -#: src/gtkprefs.c:1847 +#: src/gtkprefs.c:1807 msgid "Idle _time reporting:" msgstr "Idle _time reporting:" -#: src/gtkprefs.c:1850 +#: src/gtkprefs.c:1810 msgid "Gaim usage" msgstr "Gaim usage" -#: src/gtkprefs.c:1853 +#: src/gtkprefs.c:1813 msgid "X usage" msgstr "X usage" -#: src/gtkprefs.c:1855 +#: src/gtkprefs.c:1815 msgid "Windows usage" msgstr "Windows usage" -#: src/gtkprefs.c:1863 +#: src/gtkprefs.c:1823 msgid "Auto-away" msgstr "Auto-away" -#: src/gtkprefs.c:1864 +#: src/gtkprefs.c:1824 msgid "Set away _when idle" msgstr "Set away _when idle" -#: src/gtkprefs.c:1868 +#: src/gtkprefs.c:1828 msgid "_Minutes before setting away:" msgstr "_Minutes before setting away:" -#: src/gtkprefs.c:1876 +#: src/gtkprefs.c:1836 msgid "Away m_essage:" msgstr "Away m_essage:" -#: src/gtkprefs.c:1953 +#: src/gtkprefs.c:1917 #, c-format msgid "" "<span size=\"larger\">%s %s</span>\n" @@ -4017,7 +4118,7 @@ "<span weight=\"bold\">Web site:</span>\t\t%s\n" "<span weight=\"bold\">File name:</span>\t%s" -#: src/gtkprefs.c:1958 +#: src/gtkprefs.c:1922 #, c-format msgid "" "<span size=\"larger\">%s %s</span>\n" @@ -4032,64 +4133,64 @@ "<span weight=\"bold\">URL:</span> %s\n" "<span weight=\"bold\">File name:</span> %s" -#: src/gtkprefs.c:2191 +#: src/gtkprefs.c:2155 msgid "Load" msgstr "Load" -#: src/gtkprefs.c:2205 +#: src/gtkprefs.c:2169 msgid "Summary" msgstr "Summary" -#: src/gtkprefs.c:2253 +#: src/gtkprefs.c:2217 msgid "Details" msgstr "Details" +#: src/gtkprefs.c:2362 +msgid "_Edit" +msgstr "_Edit" + #: src/gtkprefs.c:2398 -msgid "_Edit" -msgstr "_Edit" - -#: src/gtkprefs.c:2434 msgid "Interface" msgstr "Interface" -#: src/gtkprefs.c:2435 -msgid "Smiley Themes" -msgstr "Smiley Themes" - -#: src/gtkprefs.c:2436 +#: src/gtkprefs.c:2401 msgid "Message Text" msgstr "Message Text" -#: src/gtkprefs.c:2437 +#: src/gtkprefs.c:2402 msgid "Shortcuts" msgstr "Shortcuts" -#: src/gtkprefs.c:2440 +#: src/gtkprefs.c:2403 +msgid "Smiley Themes" +msgstr "Smiley Themes" + +#: src/gtkprefs.c:2404 msgid "Sounds" msgstr "Sounds" -#: src/gtkprefs.c:2441 +#: src/gtkprefs.c:2405 msgid "Network" msgstr "Network" #. We use the registered default browser in windows -#: src/gtkprefs.c:2444 +#: src/gtkprefs.c:2408 msgid "Browser" msgstr "Browser" -#: src/gtkprefs.c:2446 +#: src/gtkprefs.c:2410 msgid "Logging" msgstr "Logging" -#: src/gtkprefs.c:2447 +#: src/gtkprefs.c:2411 msgid "Away / Idle" msgstr "Away / Idle" -#: src/gtkprefs.c:2448 +#: src/gtkprefs.c:2412 msgid "Away Messages" msgstr "Away Messages" -#: src/gtkprefs.c:2451 +#: src/gtkprefs.c:2415 msgid "Plugins" msgstr "Plugins" @@ -4113,63 +4214,63 @@ msgid "Block only the users below" msgstr "Block only the users below" -#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1447 +#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448 msgid "Privacy" msgstr "Privacy" -#: src/gtkprivacy.c:401 +#: src/gtkprivacy.c:400 msgid "Changes to privacy settings take effect immediately." msgstr "Changes to privacy settings take effect immediately." #. "Set privacy for:" label -#: src/gtkprivacy.c:413 +#: src/gtkprivacy.c:412 msgid "Set privacy for:" msgstr "Set privacy for:" -#: src/gtkprivacy.c:582 src/gtkprivacy.c:598 +#: src/gtkprivacy.c:581 src/gtkprivacy.c:597 msgid "Permit User" msgstr "Permit User" -#: src/gtkprivacy.c:583 +#: src/gtkprivacy.c:582 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:583 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:586 src/gtkprivacy.c:599 msgid "Permit" msgstr "Permit" -#: src/gtkprivacy.c:592 +#: src/gtkprivacy.c:591 #, c-format msgid "Allow %s to contact you?" msgstr "Allow %s to contact you?" -#: src/gtkprivacy.c:594 +#: src/gtkprivacy.c:593 #, 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:620 src/gtkprivacy.c:633 msgid "Block User" msgstr "Block User" -#: src/gtkprivacy.c:622 +#: src/gtkprivacy.c:621 msgid "Type a user to block." msgstr "Type a user to block." -#: src/gtkprivacy.c:623 +#: src/gtkprivacy.c:622 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:629 #, c-format msgid "Block %s?" msgstr "Block %s?" -#: src/gtkprivacy.c:632 +#: src/gtkprivacy.c:631 #, c-format msgid "Are you sure you want to block %s?" msgstr "Are you sure you want to block %s?" @@ -4177,13 +4278,13 @@ #. * #. * A wrapper for gaim_request_action() that uses Yes and No buttons. #. -#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866 +#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867 #: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307 #: src/protocols/silc/pk.c:116 src/request.h:1233 msgid "Yes" msgstr "Yes" -#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866 +#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867 #: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308 #: src/protocols/silc/pk.c:117 src/request.h:1233 msgid "No" @@ -4193,17 +4294,17 @@ msgid "Apply" msgstr "Apply" -#: src/gtkrequest.c:238 src/protocols/msn/msn.c:274 -#: src/protocols/silc/util.c:299 +#: src/gtkrequest.c:238 src/protocols/msn/msn.c:314 +#: src/protocols/silc/util.c:332 msgid "Close" msgstr "Close" -#: src/gtkroomlist.c:328 +#: src/gtkroomlist.c:330 msgid "Room List" msgstr "Room List" #. list button -#: src/gtkroomlist.c:400 +#: src/gtkroomlist.c:402 msgid "_Get List" msgstr "_Get List" @@ -4412,12 +4513,12 @@ msgstr "Slightly less boring default" #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44 -#: src/protocols/msn/msn.c:381 src/protocols/msn/state.c:27 -#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35 -#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720 -#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890 -#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2734 -#: src/protocols/yahoo/yahoo.c:2849 +#: src/protocols/msn/msn.c:466 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:2721 +#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891 +#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2856 +#: src/protocols/yahoo/yahoo.c:2972 msgid "Available" msgstr "Available" @@ -4429,12 +4530,12 @@ msgid "Away for friends only" msgstr "Away for friends only" -#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:962 +#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532 -#: src/protocols/oscar/oscar.c:5374 src/protocols/oscar/oscar.c:5452 -#: src/protocols/oscar/oscar.c:5476 src/protocols/oscar/oscar.c:6647 -#: src/protocols/oscar/oscar.c:6652 src/protocols/yahoo/yahoo.c:2369 -#: src/protocols/yahoo/yahoo.c:2754 src/protocols/yahoo/yahoo.c:2859 +#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456 +#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6668 +#: src/protocols/oscar/oscar.c:6673 src/protocols/yahoo/yahoo.c:2495 +#: src/protocols/yahoo/yahoo.c:2876 src/protocols/yahoo/yahoo.c:2984 msgid "Invisible" msgstr "Invisible" @@ -4450,7 +4551,7 @@ msgid "Unable to resolve hostname." msgstr "Unable to resolve hostname." -#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667 +#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665 msgid "Unable to connect to server." msgstr "Unable to connect to server." @@ -4482,68 +4583,67 @@ msgid "Status: %s" msgstr "Status: %s" -#: src/protocols/gg/gg.c:407 +#: src/protocols/gg/gg.c:406 msgid "Could not connect" msgstr "Could not connect" -#: src/protocols/gg/gg.c:414 +#: src/protocols/gg/gg.c:413 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:601 src/protocols/icq/gaim_icq.c:344 -#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:527 -#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505 -#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2034 -#: src/protocols/yahoo/yahoo.c:2065 src/protocols/yahoo/yahoo.c:2128 +#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344 +#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506 +#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2136 +#: src/protocols/yahoo/yahoo.c:2165 src/protocols/yahoo/yahoo.c:2228 #: src/protocols/yahoo/yahoo_filexfer.c:68 -#: src/protocols/yahoo/yahoo_filexfer.c:139 +#: src/protocols/yahoo/yahoo_filexfer.c:109 msgid "Unable to connect." msgstr "Unable to connect." -#: src/protocols/gg/gg.c:617 +#: src/protocols/gg/gg.c:616 msgid "Reading data" msgstr "Reading data" -#: src/protocols/gg/gg.c:620 +#: src/protocols/gg/gg.c:619 msgid "Balancer handshake" msgstr "Balancer handshake" -#: src/protocols/gg/gg.c:623 +#: src/protocols/gg/gg.c:622 msgid "Reading server key" msgstr "Reading server key" -#: src/protocols/gg/gg.c:626 +#: src/protocols/gg/gg.c:625 msgid "Exchanging key hash" msgstr "Exchanging key hash" -#: src/protocols/gg/gg.c:636 +#: src/protocols/gg/gg.c:635 msgid "Critical error in GG library\n" msgstr "Critical error in GG library\n" -#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745 +#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744 #: src/protocols/toc/toc.c:146 #, c-format msgid "Connect to %s failed" msgstr "Connect to %s failed" -#: src/protocols/gg/gg.c:702 +#: src/protocols/gg/gg.c:701 msgid "Unable to ping server" msgstr "Unable to ping server" -#: src/protocols/gg/gg.c:714 +#: src/protocols/gg/gg.c:713 msgid "Send as message" msgstr "Send as message" -#: src/protocols/gg/gg.c:719 +#: src/protocols/gg/gg.c:718 msgid "Looking up GG server" msgstr "Looking up GG server" -#: src/protocols/gg/gg.c:722 +#: src/protocols/gg/gg.c:721 msgid "Invalid Gadu-Gadu UIN specified" msgstr "Invalid Gadu-Gadu UIN specified" -#: src/protocols/gg/gg.c:769 +#: src/protocols/gg/gg.c:768 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." @@ -4555,64 +4655,66 @@ msgid "Gadu-Gadu Search Engine" msgstr "Gadu-Gadu Search Engine" -#: src/protocols/gg/gg.c:865 +#: src/protocols/gg/gg.c:866 msgid "Active" msgstr "Active" -#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4824 +#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829 msgid "UIN" msgstr "UIN" #. First Name -#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:612 -#: src/protocols/oscar/oscar.c:4835 src/protocols/silc/ops.c:774 +#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612 +#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:784 #: src/protocols/trepia/trepia.c:267 msgid "First Name" msgstr "First Name" #. Last Name -#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:617 -#: src/protocols/oscar/oscar.c:4836 src/protocols/trepia/trepia.c:274 +#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617 +#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274 msgid "Last Name" msgstr "Last Name" -#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622 -#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4825 +#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623 +#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830 msgid "Nick" msgstr "Nick" -#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893 +#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894 msgid "Birth Year" msgstr "Birth Year" -#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901 -#: src/protocols/gg/gg.c:903 +#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902 +#: src/protocols/gg/gg.c:904 msgid "Sex" msgstr "Sex" #. City -#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:627 -#: src/protocols/oscar/oscar.c:4879 src/protocols/oscar/oscar.c:4887 +#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627 +#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410 msgid "City" msgstr "City" #. res[0] == username #. show it to the user -#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1344 -#: src/protocols/msn/msn.c:1588 src/protocols/napster/napster.c:392 -#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4018 -#: src/protocols/toc/toc.c:468 src/protocols/yahoo/yahoo.c:3033 -#: src/protocols/yahoo/yahoo.c:3055 src/protocols/yahoo/yahoo.c:3078 -#: src/protocols/yahoo/yahoo.c:3236 src/protocols/zephyr/zephyr.c:568 +#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1244 +#: src/protocols/msn/msn.c:1552 src/protocols/msn/msn.c:1568 +#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807 +#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468 +#: src/protocols/yahoo/yahoo_profile.c:748 +#: src/protocols/yahoo/yahoo_profile.c:785 +#: src/protocols/yahoo/yahoo_profile.c:837 +#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610 msgid "Buddy Information" msgstr "Buddy Information" -#: src/protocols/gg/gg.c:950 +#: src/protocols/gg/gg.c:951 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:958 +#: src/protocols/gg/gg.c:959 msgid "Couldn't Import Buddy List from Server" msgstr "Couldn't Import Buddy List from Server" @@ -4707,8 +4809,8 @@ msgstr "Directory Search" #. if (js->protocol_options & CHANGE_PASSWORD) { -#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1060 -#: src/protocols/toc/toc.c:1543 +#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061 +#: src/protocols/toc/toc.c:1550 msgid "Change Password" msgstr "Change Password" @@ -4747,7 +4849,7 @@ #. *< version #. * summary #. * description -#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603 +#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604 msgid "Gadu-Gadu Protocol Plugin" msgstr "Gadu-Gadu Protocol Plugin" @@ -4760,17 +4862,15 @@ msgid "The user %s (%s%s%s%s%s) wants you to authorize them." msgstr "The user %s (%s%s%s%s%s) wants you to authorize them." -#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:231 -#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917 -#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3537 -#: src/protocols/oscar/oscar.c:6080 +#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232 +#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538 +#: src/protocols/oscar/oscar.c:6101 msgid "Authorize" msgstr "Authorize" -#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232 -#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919 -#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3539 -#: src/protocols/oscar/oscar.c:6081 +#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233 +#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540 +#: src/protocols/oscar/oscar.c:6102 msgid "Deny" msgstr "Deny" @@ -4782,11 +4882,11 @@ msgid "Connecting..." msgstr "Connecting..." -#: src/protocols/icq/gaim_icq.c:497 +#: src/protocols/icq/gaim_icq.c:498 msgid "Nick:" msgstr "Nick:" -#: src/protocols/icq/gaim_icq.c:498 +#: src/protocols/icq/gaim_icq.c:499 msgid "Gaim User" msgstr "Gaim User" @@ -4795,36 +4895,19 @@ msgid "Unknown command: %s" msgstr "Unknown command: %s" -#: src/protocols/irc/cmds.c:141 -msgid "" -"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG " -"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC " -"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>" -msgstr "" -"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG " -"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC " -"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>" - -#: src/protocols/irc/cmds.c:150 -msgid "" -"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL " -"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS" -msgstr "" -"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL " -"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS" - -#: src/protocols/irc/cmds.c:473 src/protocols/jabber/chat.c:544 +#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544 #, c-format msgid "current topic is: %s" msgstr "current topic is: %s" -#: src/protocols/irc/cmds.c:476 src/protocols/jabber/chat.c:546 +#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546 msgid "No topic is set" msgstr "No topic is set" -#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199 -#: src/protocols/yahoo/yahoo_filexfer.c:208 -#: src/protocols/yahoo/yahoo_filexfer.c:217 +#: 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 msgid "File Transfer Aborted" msgstr "File Transfer Aborted" @@ -4855,8 +4938,8 @@ #. FIXME: remove this when the ui does it for us. #: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929 -#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6751 -#: src/protocols/yahoo/yahoo.c:2581 +#: src/protocols/msn/msn.c:544 src/protocols/oscar/oscar.c:448 +#: src/protocols/oscar/oscar.c:6772 src/protocols/yahoo/yahoo.c:2703 msgid "Send File" msgstr "Send File" @@ -4886,17 +4969,17 @@ msgid "Couldn't connect to host" msgstr "Couldn't connect to host" -#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926 +#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926 msgid "Read error" msgstr "Read error" -#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345 -#: src/protocols/yahoo/yahoochat.c:1343 +#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1360 +#: src/protocols/yahoo/yahoochat.c:1380 msgid "Users" msgstr "Users" -#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348 -#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352 +#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1363 +#: src/protocols/silc/ops.c:1027 src/protocols/yahoo/yahoochat.c:1389 msgid "Topic" msgstr "Topic" @@ -4909,34 +4992,34 @@ #. *< id #. *< name #. *< version -#: src/protocols/irc/irc.c:624 +#: src/protocols/irc/irc.c:643 msgid "IRC Protocol Plugin" msgstr "IRC Protocol Plugin" #. * summary -#: src/protocols/irc/irc.c:625 +#: src/protocols/irc/irc.c:644 msgid "The IRC Protocol Plugin that Sucks Less" msgstr "The IRC Protocol Plugin that Sucks Less" -#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197 -#: src/protocols/jabber/jabber.c:1554 src/protocols/napster/napster.c:640 -#: src/protocols/silc/ops.c:935 +#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197 +#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642 +#: src/protocols/silc/ops.c:945 msgid "Server" msgstr "Server" -#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1575 -#: src/protocols/msn/msn.c:1767 src/protocols/napster/napster.c:645 -#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304 +#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577 +#: src/protocols/msn/msn.c:1748 src/protocols/napster/napster.c:647 +#: src/protocols/silc/silc.c:1484 src/protocols/trepia/trepia.c:1295 msgid "Port" msgstr "Port" -#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383 +#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442 msgid "Encoding" msgstr "Encoding" -#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191 -#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1477 -#: src/protocols/silc/ops.c:931 +#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191 +#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449 +#: src/protocols/silc/ops.c:941 msgid "Username" msgstr "Username" @@ -4961,8 +5044,8 @@ msgid " <i>(identified)</i>" msgstr " <i>(identified)</i>" -#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929 -#: src/protocols/yahoo/yahoo.c:3136 +#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:939 +#: src/protocols/yahoo/yahoo_profile.c:1000 msgid "Realname" msgstr "Realname" @@ -5011,6 +5094,11 @@ 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:323 +#, c-format +msgid "Users on %s: %s" +msgstr "Users on %s: %s" + #: src/protocols/irc/msgs.c:405 msgid "No such channel" msgstr "No such channel" @@ -5041,62 +5129,240 @@ msgid "Invitation only" msgstr "Invitation only" -#: src/protocols/irc/msgs.c:597 +#: src/protocols/irc/msgs.c:604 #, c-format msgid "You have been kicked by %s: (%s)" msgstr "You have been kicked by %s: (%s)" -#: src/protocols/irc/msgs.c:602 +#: src/protocols/irc/msgs.c:609 #, c-format msgid "Kicked by %s (%s)" msgstr "Kicked by %s (%s)" -#: src/protocols/irc/msgs.c:623 +#: src/protocols/irc/msgs.c:630 #, c-format msgid "mode (%s %s) by %s" msgstr "mode (%s %s) by %s" -#: src/protocols/irc/msgs.c:702 +#: src/protocols/irc/msgs.c:709 msgid "Could not change nick" msgstr "Could not change nick" -#: src/protocols/irc/msgs.c:703 +#: src/protocols/irc/msgs.c:710 msgid "Cannot change nick" msgstr "Cannot change nick" -#: src/protocols/irc/msgs.c:724 +#: src/protocols/irc/msgs.c:731 #, c-format msgid "You have parted the channel%s%s" msgstr "You have parted the channel%s%s" -#: src/protocols/irc/msgs.c:764 +#: src/protocols/irc/msgs.c:771 msgid "Error: invalid PONG from server" msgstr "Error: invalid PONG from server" -#: src/protocols/irc/msgs.c:766 +#: src/protocols/irc/msgs.c:773 #, c-format msgid "PING reply -- Lag: %lu seconds" msgstr "PING reply -- Lag: %lu seconds" -#: src/protocols/irc/msgs.c:841 +#: src/protocols/irc/msgs.c:848 #, c-format msgid "Cannot join %s:" msgstr "Cannot join %s:" -#: src/protocols/irc/msgs.c:842 src/protocols/silc/ops.c:878 +#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:888 msgid "Cannot join channel" msgstr "Cannot join channel" -#: src/protocols/irc/msgs.c:872 +#: src/protocols/irc/msgs.c:885 #, c-format msgid "Wallops from %s" msgstr "Wallops from %s" -#: src/protocols/irc/parse.c:189 -msgid "No help is available at this time for this command." -msgstr "No help is available at this time for this command." - -#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:199 +#: src/protocols/irc/parse.c:109 +msgid "action <action to perform>: Perform an action." +msgstr "action <action to perform>: Perform an action." + +#: src/protocols/irc/parse.c:110 +msgid "" +"away [message]: Set an away message, or use no message to return from being " +"away." +msgstr "" +"away [message]: Set an away message, or use no message to return from being " +"away." + +#: src/protocols/irc/parse.c:111 +msgid "" +"deop <nick1> [nick2] ...: Remove channel operator status from " +"someone. You must be a channel operator to do this." +msgstr "" +"deop <nick1> [nick2] ...: Remove channel operator status from " +"someone. You must be a channel operator to do this." + +#: src/protocols/irc/parse.c:112 +msgid "" +"devoice <nick1> [nick2] ...: Remove channel voice status from " +"someone, preventing them from speaking if the channel is moderated (+m). You " +"must be a channel operator to do this." +msgstr "" +"devoice <nick1> [nick2] ...: Remove channel voice status from " +"someone, preventing them from speaking if the channel is moderated (+m). You " +"must be a channel operator to do this." + +#: src/protocols/irc/parse.c:113 +msgid "" +"invite <nick> [room]: Invite someone to join you in the specified " +"channel, or the current channel." +msgstr "" +"invite <nick> [room]: Invite someone to join you in the specified " +"channel, or the current channel." + +#: src/protocols/irc/parse.c:114 +msgid "" +"j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " +"channels, optionally providing a channel key for each if needed." +msgstr "" +"j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " +"channels, optionally providing a channel key for each if needed." + +#: src/protocols/irc/parse.c:115 +msgid "" +"join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " +"channels, optionally providing a channel key for each if needed." +msgstr "" +"join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more " +"channels, optionally providing a channel key for each if needed." + +#: src/protocols/irc/parse.c:116 +msgid "" +"kick <nick> [message]: Remove someone from a channel. You must be a " +"channel operator to do this." +msgstr "" +"kick <nick> [message]: Remove someone from a channel. You must be a " +"channel operator to do this." + +#: src/protocols/irc/parse.c:117 +msgid "" +"list: Display a list of chat rooms on the network. <i>Warning, some servers " +"may disconnect you upon doing this.</i>" +msgstr "" +"list: Display a list of chat rooms on the network. <i>Warning, some servers " +"may disconnect you upon doing this.</i>" + +#: src/protocols/irc/parse.c:118 +msgid "me <action to perform>: Perform an action." +msgstr "me <action to perform>: Perform an action." + +#: src/protocols/irc/parse.c:119 +msgid "" +"mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel " +"or user mode." +msgstr "" +"mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel " +"or user mode." + +#: src/protocols/irc/parse.c:120 +msgid "" +"msg <nick> <message>: Send a private message to a user (as " +"opposed to a channel)." +msgstr "" +"msg <nick> <message>: Send a private message to a user (as " +"opposed to a channel)." + +#: src/protocols/irc/parse.c:121 +msgid "names [channel]: List the users currently in a channel." +msgstr "names [channel]: List the users currently in a channel." + +#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406 +msgid "nick <new nickname>: Change your nickname." +msgstr "nick <new nickname>: Change your nickname." + +#: src/protocols/irc/parse.c:123 +msgid "" +"op <nick1> [nick2] ...: Grant channel operator status to someone. You " +"must be a channel operator to do this." +msgstr "" +"op <nick1> [nick2] ...: Grant channel operator status to someone. You " +"must be a channel operator to do this." + +#: src/protocols/irc/parse.c:124 +msgid "" +"operwall <message>: If you don't know what this is, you probably " +"can't use it." +msgstr "" +"operwall <message>: If you don't know what this is, you probably " +"can't use it." + +#: src/protocols/irc/parse.c:125 +msgid "" +"part [room] [message]: Leave the current channel, or a specified channel, " +"with an optional message." +msgstr "" +"part [room] [message]: Leave the current channel, or a specified channel, " +"with an optional message." + +#: src/protocols/irc/parse.c:126 +msgid "" +"ping [nick]: Asks how much lag a user (or the server if no user specified) " +"has." +msgstr "" +"ping [nick]: Asks how much lag a user (or the server if no user specified) " +"has." + +#: src/protocols/irc/parse.c:127 +msgid "" +"query <nick> <message>: Send a private message to a user (as " +"opposed to a channel)." +msgstr "" +"query <nick> <message>: Send a private message to a user (as " +"opposed to a channel)." + +#: src/protocols/irc/parse.c:128 +msgid "quit [message]: Disconnect from the server, with an optional message." +msgstr "quit [message]: Disconnect from the server, with an optional message." + +#: src/protocols/irc/parse.c:129 +msgid "quote [...]: Send a raw command to the server." +msgstr "quote [...]: Send a raw command to the server." + +#: src/protocols/irc/parse.c:130 +msgid "" +"remove <nick> [message]: Remove someone from a room. You must be a " +"channel operator to do this." +msgstr "" +"remove <nick> [message]: Remove someone from a room. You must be a " +"channel operator to do this." + +#: src/protocols/irc/parse.c:131 +msgid "topic [new topic]: View or change the channel topic." +msgstr "topic [new topic]: View or change the channel topic." + +#: src/protocols/irc/parse.c:132 +msgid "umode <+|-><A-Za-z>: Set or unset a user mode." +msgstr "umode <+|-><A-Za-z>: Set or unset a user mode." + +#: src/protocols/irc/parse.c:133 +msgid "" +"voice <nick1> [nick2] ...: Grant channel voice status to someone. You " +"must be a channel operator to do this." +msgstr "" +"voice <nick1> [nick2] ...: Grant channel voice status to someone. You " +"must be a channel operator to do this." + +#: src/protocols/irc/parse.c:134 +msgid "" +"wallops <message>: If you don't know what this is, you probably can't " +"use it." +msgstr "" +"wallops <message>: If you don't know what this is, you probably can't " +"use it." + +#: src/protocols/irc/parse.c:135 +msgid "whois <nick>: Get information on a user." +msgstr "whois <nick>: Get information on a user." + +#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236 msgid "" "(There was an error converting this message. Check the 'Encoding' option in " "the Account Editor)" @@ -5119,7 +5385,7 @@ #: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596 -#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:686 +#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689 msgid "Disconnected." msgstr "Disconnected." @@ -5152,24 +5418,24 @@ msgid "Invalid challenge from server" msgstr "Invalid challenge from server" -#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604 -#: src/protocols/silc/ops.c:770 +#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:605 +#: src/protocols/silc/ops.c:780 msgid "Full Name" msgstr "Full Name" -#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617 -#: src/protocols/silc/ops.c:782 +#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:618 +#: src/protocols/silc/ops.c:792 msgid "Family Name" msgstr "Family Name" -#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621 +#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:622 msgid "Given Name" msgstr "Given Name" #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636 -#: src/protocols/jabber/jabber.c:607 src/protocols/silc/buddy.c:1474 -#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927 -#: src/protocols/yahoo/yahoo.c:3132 +#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1169 +#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:796 +#: src/protocols/silc/ops.c:937 src/protocols/yahoo/yahoo_profile.c:995 msgid "Nickname" msgstr "Nickname" @@ -5200,8 +5466,7 @@ #. Country #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681 -#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339 -#: src/protocols/trepia/trepia.c:416 +#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416 msgid "Country" msgstr "Country" @@ -5211,8 +5476,8 @@ msgstr "Telephone" #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710 -#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1529 -#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3128 +#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1499 +#: src/protocols/silc/silc.c:637 src/protocols/yahoo/yahoo_profile.c:990 msgid "Email" msgstr "Email" @@ -5233,15 +5498,15 @@ msgstr "Role" #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639 -#: src/protocols/oscar/oscar.c:4860 +#: src/protocols/oscar/oscar.c:4865 msgid "Birthday" msgstr "Birthday" -#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510 +#: src/protocols/jabber/buddy.c:510 src/protocols/jabber/buddy.c:511 msgid "Edit Jabber vCard" msgstr "Edit Jabber vCard" -#: src/protocols/jabber/buddy.c:511 +#: src/protocols/jabber/buddy.c:512 msgid "" "All items below are optional. Enter only the information with which you feel " "comfortable." @@ -5249,30 +5514,30 @@ "All items below are optional. Enter only the information with which you feel " "comfortable." -#: src/protocols/jabber/buddy.c:553 +#: src/protocols/jabber/buddy.c:554 msgid "Jabber ID" msgstr "Jabber ID" -#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570 -#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:936 -#: src/protocols/msn/msn.c:369 src/protocols/novell/novell.c:2742 -#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574 +#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571 +#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:937 +#: src/protocols/msn/msn.c:454 src/protocols/novell/novell.c:2743 +#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:574 #: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582 -#: src/protocols/yahoo/yahoo.c:2500 +#: src/protocols/yahoo/yahoo.c:2620 msgid "Status" msgstr "Status" -#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1557 +#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1559 msgid "Resource" msgstr "Resource" -#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778 +#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:788 msgid "Middle Name" msgstr "Middle Name" #: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622 -#: src/protocols/oscar/oscar.c:4878 src/protocols/oscar/oscar.c:4886 -#: src/protocols/silc/ops.c:814 +#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891 +#: src/protocols/silc/ops.c:824 msgid "Address" msgstr "Address" @@ -5316,7 +5581,7 @@ msgid "Unsubscribe" msgstr "Unsubscribe" -#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965 +#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002 msgid "_Room:" msgstr "_Room:" @@ -5407,10 +5672,10 @@ msgid "Error initializing session" msgstr "Error initializing session" -#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:254 +#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031 -#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186 +#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176 msgid "Write error" msgstr "Write error" @@ -5448,7 +5713,7 @@ msgid "Registration Successful" msgstr "Registration Successful" -#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1179 +#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180 msgid "Unknown Error" msgstr "Unknown Error" @@ -5460,7 +5725,7 @@ msgid "Already Registered" msgstr "Already Registered" -#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1034 +#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035 msgid "Password" msgstr "Password" @@ -5469,14 +5734,14 @@ msgstr "E-Mail" #. State -#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4880 -#: src/protocols/oscar/oscar.c:4888 src/protocols/trepia/trepia.c:335 +#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885 +#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335 #: src/protocols/trepia/trepia.c:413 msgid "State" msgstr "Province/Territory" -#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1531 -#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635 +#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501 +#: src/protocols/silc/ops.c:829 src/protocols/silc/silc.c:639 msgid "Phone" msgstr "Phone" @@ -5492,353 +5757,358 @@ msgid "Register New Jabber Account" msgstr "Register New Jabber Account" +#: src/protocols/jabber/jabber.c:743 +msgid "Logged out" +msgstr "Logged out" + #. connect to the server -#: src/protocols/jabber/jabber.c:781 src/protocols/msn/dispatch.c:212 -#: src/protocols/msn/msn.c:517 src/protocols/napster/napster.c:498 -#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591 -#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2253 -#: src/protocols/zephyr/zephyr.c:865 +#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:617 +#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105 +#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064 +#: src/protocols/yahoo/yahoo.c:2359 src/protocols/zephyr/zephyr.c:906 msgid "Connecting" msgstr "Connecting" -#: src/protocols/jabber/jabber.c:785 +#: src/protocols/jabber/jabber.c:786 msgid "Initializing Stream" msgstr "Initializing Stream" -#: src/protocols/jabber/jabber.c:791 +#: src/protocols/jabber/jabber.c:792 msgid "Authenticating" msgstr "Authenticating" -#: src/protocols/jabber/jabber.c:800 +#: src/protocols/jabber/jabber.c:801 msgid "Re-initializing Stream" msgstr "Re-initializing Stream" -#: src/protocols/jabber/jabber.c:880 src/protocols/jabber/jabber.c:1157 -#: src/protocols/jabber/jabber.c:1198 src/protocols/jabber/jabber.c:1231 -#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6451 +#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158 +#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232 +#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6472 msgid "Not Authorized" msgstr "Not Authorized" -#: src/protocols/jabber/jabber.c:911 +#: src/protocols/jabber/jabber.c:912 msgid "Both" msgstr "Both" -#: src/protocols/jabber/jabber.c:913 +#: src/protocols/jabber/jabber.c:914 msgid "From (To pending)" msgstr "From (To pending)" -#: src/protocols/jabber/jabber.c:915 +#: src/protocols/jabber/jabber.c:916 msgid "From" msgstr "From" -#: src/protocols/jabber/jabber.c:918 +#: src/protocols/jabber/jabber.c:919 msgid "To" msgstr "To" -#: src/protocols/jabber/jabber.c:920 +#: src/protocols/jabber/jabber.c:921 msgid "None (To pending)" msgstr "None (To pending)" -#: src/protocols/jabber/jabber.c:924 +#: src/protocols/jabber/jabber.c:925 msgid "Subscription" msgstr "Subscription" -#: src/protocols/jabber/jabber.c:944 +#: src/protocols/jabber/jabber.c:945 msgid "Error" msgstr "Error" -#: src/protocols/jabber/jabber.c:957 src/protocols/jabber/jutil.c:35 +#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117 msgid "Chatty" msgstr "Chatty" -#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:38 +#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122 msgid "Extended Away" msgstr "Extended Away" -#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:41 +#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124 -#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5464 -#: src/protocols/oscar/oscar.c:6643 +#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468 +#: src/protocols/oscar/oscar.c:6664 msgid "Do Not Disturb" msgstr "Do Not Disturb" -#: src/protocols/jabber/jabber.c:977 -msgid "Password Changed" -msgstr "Password Changed" - #: src/protocols/jabber/jabber.c:978 +msgid "Password Changed" +msgstr "Password Changed" + +#: src/protocols/jabber/jabber.c:979 msgid "Your password has been changed." msgstr "Your password has been changed." -#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:983 +#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984 msgid "Error changing password" msgstr "Error changing password" -#: src/protocols/jabber/jabber.c:1039 +#: src/protocols/jabber/jabber.c:1040 msgid "Password (again)" msgstr "Password (again)" -#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045 +#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046 msgid "Change Jabber Password" msgstr "Change Jabber Password" -#: src/protocols/jabber/jabber.c:1045 +#: src/protocols/jabber/jabber.c:1046 msgid "Please enter your new password" msgstr "Please enter your new password" -#: src/protocols/jabber/jabber.c:1055 src/protocols/toc/toc.c:1533 +#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540 msgid "Set User Info" msgstr "Set User Info" -#: src/protocols/jabber/jabber.c:1137 +#: src/protocols/jabber/jabber.c:1138 msgid "Bad Request" msgstr "Bad Request" -#: src/protocols/jabber/jabber.c:1139 +#: src/protocols/jabber/jabber.c:1140 msgid "Conflict" msgstr "Conflict" -#: src/protocols/jabber/jabber.c:1141 +#: src/protocols/jabber/jabber.c:1142 msgid "Feature Not Implemented" msgstr "Feature Not Implemented" -#: src/protocols/jabber/jabber.c:1143 +#: src/protocols/jabber/jabber.c:1144 msgid "Forbidden" msgstr "Forbidden" -#: src/protocols/jabber/jabber.c:1145 +#: src/protocols/jabber/jabber.c:1146 msgid "Gone" msgstr "Gone" -#: src/protocols/jabber/jabber.c:1147 src/protocols/jabber/jabber.c:1221 +#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222 msgid "Internal Server Error" msgstr "Internal Server Error" -#: src/protocols/jabber/jabber.c:1149 +#: src/protocols/jabber/jabber.c:1150 msgid "Item Not Found" msgstr "Item Not Found" -#: src/protocols/jabber/jabber.c:1151 +#: src/protocols/jabber/jabber.c:1152 msgid "Malformed Jabber ID" msgstr "Malformed Jabber ID" -#: src/protocols/jabber/jabber.c:1153 +#: src/protocols/jabber/jabber.c:1154 msgid "Not Acceptable" msgstr "Not Acceptable" -#: src/protocols/jabber/jabber.c:1155 +#: src/protocols/jabber/jabber.c:1156 msgid "Not Allowed" msgstr "Not Allowed" -#: src/protocols/jabber/jabber.c:1159 +#: src/protocols/jabber/jabber.c:1160 msgid "Payment Required" msgstr "Payment Required" -#: src/protocols/jabber/jabber.c:1161 +#: src/protocols/jabber/jabber.c:1162 msgid "Recipient Unavailable" msgstr "Recipient Unavailable" -#: src/protocols/jabber/jabber.c:1165 +#: src/protocols/jabber/jabber.c:1166 msgid "Registration Required" msgstr "Registration Required" -#: src/protocols/jabber/jabber.c:1167 +#: src/protocols/jabber/jabber.c:1168 msgid "Remote Server Not Found" msgstr "Remote Server Not Found" -#: src/protocols/jabber/jabber.c:1169 +#: src/protocols/jabber/jabber.c:1170 msgid "Remote Server Timeout" msgstr "Remote Server Timeout" -#: src/protocols/jabber/jabber.c:1171 +#: src/protocols/jabber/jabber.c:1172 msgid "Server Overloaded" msgstr "Server Overloaded" -#: src/protocols/jabber/jabber.c:1173 +#: src/protocols/jabber/jabber.c:1174 msgid "Service Unavailable" msgstr "Service Unavailable" -#: src/protocols/jabber/jabber.c:1175 +#: src/protocols/jabber/jabber.c:1176 msgid "Subscription Required" msgstr "Subscription Required" -#: src/protocols/jabber/jabber.c:1177 +#: src/protocols/jabber/jabber.c:1178 msgid "Unexpected Request" msgstr "Unexpected Request" -#: src/protocols/jabber/jabber.c:1184 +#: src/protocols/jabber/jabber.c:1185 msgid "Authorization Aborted" msgstr "Authorization Aborted" -#: src/protocols/jabber/jabber.c:1186 +#: src/protocols/jabber/jabber.c:1187 msgid "Incorrect encoding in authorization" msgstr "Incorrect encoding in authorization" -#: src/protocols/jabber/jabber.c:1189 +#: src/protocols/jabber/jabber.c:1190 msgid "Invalid authzid" msgstr "Invalid authzid" -#: src/protocols/jabber/jabber.c:1192 +#: src/protocols/jabber/jabber.c:1193 msgid "Invalid Authorization Mechanism" msgstr "Invalid Authorization Mechanism" -#: src/protocols/jabber/jabber.c:1195 +#: src/protocols/jabber/jabber.c:1196 msgid "Authorization mechanism too weak" msgstr "Authorization mechanism too weak" -#: src/protocols/jabber/jabber.c:1200 +#: src/protocols/jabber/jabber.c:1201 msgid "Temporary Authentication Failure" msgstr "Temporary Authentication Failure" -#: src/protocols/jabber/jabber.c:1202 +#: src/protocols/jabber/jabber.c:1203 msgid "Authentication Failure" msgstr "Authentication Failure" -#: src/protocols/jabber/jabber.c:1206 +#: src/protocols/jabber/jabber.c:1207 msgid "Bad Format" msgstr "Bad Format" -#: src/protocols/jabber/jabber.c:1208 +#: src/protocols/jabber/jabber.c:1209 msgid "Bad Namespace Prefix" msgstr "Bad Namespace Prefix" -#: src/protocols/jabber/jabber.c:1211 +#: src/protocols/jabber/jabber.c:1212 msgid "Resource Conflict" msgstr "Resource Conflict" -#: src/protocols/jabber/jabber.c:1213 src/protocols/silc/ops.c:1225 +#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1285 msgid "Connection Timeout" msgstr "Connection Timeout" -#: src/protocols/jabber/jabber.c:1215 +#: src/protocols/jabber/jabber.c:1216 msgid "Host Gone" msgstr "Host Gone" -#: src/protocols/jabber/jabber.c:1217 +#: src/protocols/jabber/jabber.c:1218 msgid "Host Unknown" msgstr "Host Unknown" -#: src/protocols/jabber/jabber.c:1219 +#: src/protocols/jabber/jabber.c:1220 msgid "Improper Addressing" msgstr "Improper Addressing" -#: src/protocols/jabber/jabber.c:1223 +#: src/protocols/jabber/jabber.c:1224 msgid "Invalid ID" msgstr "Invalid ID" -#: src/protocols/jabber/jabber.c:1225 +#: src/protocols/jabber/jabber.c:1226 msgid "Invalid Namespace" msgstr "Invalid Namespace" -#: src/protocols/jabber/jabber.c:1227 +#: src/protocols/jabber/jabber.c:1228 msgid "Invalid XML" msgstr "Invalid XML" -#: src/protocols/jabber/jabber.c:1229 +#: src/protocols/jabber/jabber.c:1230 msgid "Non-matching Hosts" msgstr "Non-matching Hosts" -#: src/protocols/jabber/jabber.c:1233 +#: src/protocols/jabber/jabber.c:1234 msgid "Policy Violation" msgstr "Policy Violation" -#: src/protocols/jabber/jabber.c:1235 +#: src/protocols/jabber/jabber.c:1236 msgid "Remote Connection Failed" msgstr "Remote Connection Failed" -#: src/protocols/jabber/jabber.c:1237 +#: src/protocols/jabber/jabber.c:1238 msgid "Resource Constraint" msgstr "Resource Constraint" -#: src/protocols/jabber/jabber.c:1239 +#: src/protocols/jabber/jabber.c:1240 msgid "Restricted XML" msgstr "Restricted XML" -#: src/protocols/jabber/jabber.c:1241 +#: src/protocols/jabber/jabber.c:1242 msgid "See Other Host" msgstr "See Other Host" -#: src/protocols/jabber/jabber.c:1243 +#: src/protocols/jabber/jabber.c:1244 msgid "System Shutdown" msgstr "System Shutdown" -#: src/protocols/jabber/jabber.c:1245 +#: src/protocols/jabber/jabber.c:1246 msgid "Undefined Condition" msgstr "Undefined Condition" -#: src/protocols/jabber/jabber.c:1247 +#: src/protocols/jabber/jabber.c:1248 msgid "Unsupported Encoding" msgstr "Unsupported Encoding" -#: src/protocols/jabber/jabber.c:1249 +#: src/protocols/jabber/jabber.c:1250 msgid "Unsupported Stanza Type" msgstr "Unsupported Stanza Type" -#: src/protocols/jabber/jabber.c:1251 +#: src/protocols/jabber/jabber.c:1252 msgid "Unsupported Version" msgstr "Unsupported Version" -#: src/protocols/jabber/jabber.c:1253 +#: src/protocols/jabber/jabber.c:1254 msgid "XML Not Well Formed" msgstr "XML Not Well Formed" -#: src/protocols/jabber/jabber.c:1255 +#: src/protocols/jabber/jabber.c:1256 msgid "Stream Error" msgstr "Stream Error" -#: src/protocols/jabber/jabber.c:1322 +#: src/protocols/jabber/jabber.c:1323 #, c-format msgid "Unable to ban user %s" msgstr "Unable to ban user %s" -#: src/protocols/jabber/jabber.c:1374 +#: src/protocols/jabber/jabber.c:1375 #, c-format msgid "Unable to kick user %s" msgstr "Unable to kick user %s" -#: src/protocols/jabber/jabber.c:1399 src/protocols/jabber/jabber.c:1402 -msgid "Configure a chat room" -msgstr "Configure a chat room" - -#: src/protocols/jabber/jabber.c:1405 -msgid "Change your nickname" -msgstr "Change your nickname" - -#: src/protocols/jabber/jabber.c:1409 -msgid "Leave the room" -msgstr "Leave the room" - -#: src/protocols/jabber/jabber.c:1412 -msgid "Register with a chat room" -msgstr "Register with a chat room" - -#: src/protocols/jabber/jabber.c:1417 -msgid "View or change the topic" -msgstr "View or change the topic" - -#: src/protocols/jabber/jabber.c:1421 -msgid "Ban a user from the room" -msgstr "Ban a user from the room" - -#: src/protocols/jabber/jabber.c:1425 -msgid "Invite a user to the room" -msgstr "Invite a user to the room" - -#: src/protocols/jabber/jabber.c:1429 -msgid "Join a chat on this server" -msgstr "Join a chat on this server" - -#: src/protocols/jabber/jabber.c:1433 -msgid "Kick a user from the room" -msgstr "Kick a user from the room" - -#: src/protocols/jabber/jabber.c:1437 -msgid "Send a private message to another user" -msgstr "Send a private message to another user" - -#: src/protocols/jabber/jabber.c:1451 +#: src/protocols/jabber/jabber.c:1400 +msgid "config: Configure a chat room." +msgstr "config: Configure a chat room." + +#: src/protocols/jabber/jabber.c:1403 +msgid "configure: Configure a chat room." +msgstr "configure: Configure a chat room." + +#: src/protocols/jabber/jabber.c:1410 +msgid "part [room]: Leave the room." +msgstr "part [room]: Leave the room." + +#: src/protocols/jabber/jabber.c:1413 +msgid "register: Register with a chat room." +msgstr "register: Register with a chat room." + +#: src/protocols/jabber/jabber.c:1418 +msgid "topic [new topic]: View or change the topic." +msgstr "topic [new topic]: View or change the topic." + +#: src/protocols/jabber/jabber.c:1422 +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:1426 +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:1430 +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:1434 +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:1438 +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:1452 msgid "Hide Operating System" msgstr "Hide Operating System" @@ -5853,24 +6123,24 @@ #. *< version #. * summary #. * description -#: src/protocols/jabber/jabber.c:1532 src/protocols/jabber/jabber.c:1534 +#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536 msgid "Jabber Protocol Plugin" msgstr "Jabber Protocol Plugin" -#: src/protocols/jabber/jabber.c:1560 +#: src/protocols/jabber/jabber.c:1562 msgid "Use TLS if available" msgstr "Use TLS if available" -#: src/protocols/jabber/jabber.c:1565 +#: src/protocols/jabber/jabber.c:1567 msgid "Force old SSL" msgstr "Force old SSL" -#: src/protocols/jabber/jabber.c:1570 +#: src/protocols/jabber/jabber.c:1572 msgid "Allow plaintext auth over unencrypted streams" msgstr "Allow plaintext auth over unencrypted streams" #. Account options -#: src/protocols/jabber/jabber.c:1579 src/protocols/silc/silc.c:1051 +#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1480 msgid "Connect server" msgstr "Connect server" @@ -5907,20 +6177,20 @@ msgid "XML Parse error" msgstr "XML Parse error" -#: src/protocols/jabber/presence.c:223 +#: src/protocols/jabber/presence.c:224 msgid "Unknown Error in presence" msgstr "Unknown Error in presence" -#: src/protocols/jabber/presence.c:226 +#: src/protocols/jabber/presence.c:227 #, 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:279 src/protocols/jabber/presence.c:280 +#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281 msgid "Create New Room" msgstr "Create New Room" -#: src/protocols/jabber/presence.c:281 +#: src/protocols/jabber/presence.c:282 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" @@ -5928,20 +6198,20 @@ "You are creating a new room. Would you like to configure it, or accept the " "default settings?" -#: src/protocols/jabber/presence.c:283 +#: src/protocols/jabber/presence.c:284 msgid "Configure Room" msgstr "Configure Room" -#: src/protocols/jabber/presence.c:285 +#: src/protocols/jabber/presence.c:286 msgid "Accept Defaults" msgstr "Accept Defaults" -#: src/protocols/jabber/presence.c:307 +#: src/protocols/jabber/presence.c:308 #, c-format msgid "Error in chat %s" msgstr "Error in chat %s" -#: src/protocols/jabber/presence.c:310 +#: src/protocols/jabber/presence.c:311 #, c-format msgid "Error joining chat %s" msgstr "Error joining chat %s" @@ -5955,311 +6225,271 @@ msgid "File Send Failed" msgstr "File Send Failed" -#: src/protocols/msn/dispatch.c:42 -msgid "Unable to request USR\n" -msgstr "Unable to request USR\n" - -#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219 -msgid "Unable to login using MD5" -msgstr "Unable to login using MD5" - -#: src/protocols/msn/dispatch.c:68 -msgid "Unable to send USR" -msgstr "Unable to send USR" - -#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230 -msgid "Requesting to send password" -msgstr "Requesting to send password" - -#: src/protocols/msn/dispatch.c:104 -msgid "Protocol version not supported" -msgstr "Protocol version not supported" - -#: src/protocols/msn/dispatch.c:117 -msgid "Unable to request CVR\n" -msgstr "Unable to request CVR\n" - -#: src/protocols/msn/dispatch.c:126 -msgid "Unable to request INF\n" -msgstr "Unable to request INF\n" - -#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564 -msgid "Got invalid XFR" -msgstr "Got invalid XFR" - -#: src/protocols/msn/dispatch.c:178 -msgid "Unable to transfer" -msgstr "Unable to transfer" - -#: src/protocols/msn/dispatch.c:192 -msgid "Unable to parse message." -msgstr "Unable to parse message." - -#: src/protocols/msn/dispatch.c:232 -msgid "Unable to write to server" -msgstr "Unable to write to server" - -#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861 -msgid "Syncing with server" -msgstr "Syncing with server" - -#: src/protocols/msn/dispatch.c:250 -msgid "Error reading from server" -msgstr "Error reading from server" - -#: src/protocols/msn/error.c:33 +#: src/protocols/msn/cmdproc.c:336 +msgid "Miscellaneous error" +msgstr "Miscellaneous error" + +#: src/protocols/msn/cmdproc.c:338 +msgid "You have signed on from another location." +msgstr "You have signed on from another location." + +#: src/protocols/msn/cmdproc.c:340 +msgid "The MSN servers are going down temporarily." +msgstr "The MSN servers are going down temporarily." + +#: src/protocols/msn/error.c:35 msgid "Unable to parse message" msgstr "Unable to parse message" -#: src/protocols/msn/error.c:36 +#: src/protocols/msn/error.c:38 msgid "Syntax Error (probably a Gaim bug)" msgstr "Syntax Error (probably a Gaim bug)" -#: src/protocols/msn/error.c:40 +#: src/protocols/msn/error.c:42 msgid "Invalid email address" msgstr "Invalid email address" -#: src/protocols/msn/error.c:43 +#: src/protocols/msn/error.c:45 msgid "User does not exist" msgstr "User does not exist" -#: src/protocols/msn/error.c:47 +#: src/protocols/msn/error.c:49 msgid "Fully Qualified Domain Name missing" msgstr "Fully Qualified Domain Name missing" -#: src/protocols/msn/error.c:50 +#: src/protocols/msn/error.c:52 msgid "Already Logged In" msgstr "Already Logged In" -#: src/protocols/msn/error.c:53 +#: src/protocols/msn/error.c:55 msgid "Invalid Username" msgstr "Invalid Username" -#: src/protocols/msn/error.c:56 +#: src/protocols/msn/error.c:58 msgid "Invalid Friendly Name" msgstr "Invalid Friendly Name" -#: src/protocols/msn/error.c:59 +#: src/protocols/msn/error.c:61 msgid "List Full" msgstr "List Full" -#: src/protocols/msn/error.c:62 +#: src/protocols/msn/error.c:64 msgid "Already there" msgstr "Already there" -#: src/protocols/msn/error.c:65 +#: src/protocols/msn/error.c:67 msgid "Not on list" msgstr "Not on list" -#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528 +#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570 msgid "User is offline" msgstr "User is offline" -#: src/protocols/msn/error.c:71 +#: src/protocols/msn/error.c:73 msgid "Already in the mode" msgstr "Already in the mode" -#: src/protocols/msn/error.c:74 +#: src/protocols/msn/error.c:76 msgid "Already in opposite list" msgstr "Already in opposite list" -#: src/protocols/msn/error.c:77 +#: src/protocols/msn/error.c:79 msgid "Too many groups" msgstr "Too many groups" -#: src/protocols/msn/error.c:80 +#: src/protocols/msn/error.c:82 msgid "Invalid group" msgstr "Invalid group" -#: src/protocols/msn/error.c:83 +#: src/protocols/msn/error.c:85 msgid "User not in group" msgstr "User not in group" -#: src/protocols/msn/error.c:86 +#: src/protocols/msn/error.c:88 msgid "Group name too long" msgstr "Group name too long" -#: src/protocols/msn/error.c:89 +#: src/protocols/msn/error.c:91 msgid "Cannot remove group zero" msgstr "Cannot remove group zero" -#: src/protocols/msn/error.c:93 +#: src/protocols/msn/error.c:95 msgid "Tried to add a contact to a group that doesn't exist" msgstr "Tried to add a contact to a group that doesn't exist" -#: src/protocols/msn/error.c:97 +#: src/protocols/msn/error.c:99 msgid "Switchboard failed" msgstr "Switchboard failed" -#: src/protocols/msn/error.c:100 +#: src/protocols/msn/error.c:102 msgid "Notify Transfer failed" msgstr "Notify Transfer failed" -#: src/protocols/msn/error.c:104 +#: src/protocols/msn/error.c:106 msgid "Required fields missing" msgstr "Required fields missing" -#: src/protocols/msn/error.c:107 +#: src/protocols/msn/error.c:109 msgid "Too many hits to a FND" msgstr "Too many hits to a FND" -#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190 +#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190 msgid "Not logged in" msgstr "Not logged in" -#: src/protocols/msn/error.c:114 +#: src/protocols/msn/error.c:116 msgid "Service Temporarily Unavailable" msgstr "Service Temporarily Unavailable" -#: src/protocols/msn/error.c:117 +#: src/protocols/msn/error.c:119 msgid "Database server error" msgstr "Database server error" -#: src/protocols/msn/error.c:120 +#: src/protocols/msn/error.c:122 msgid "Command disabled" msgstr "Command disabled" -#: src/protocols/msn/error.c:123 +#: src/protocols/msn/error.c:125 msgid "File operation error" msgstr "File operation error" -#: src/protocols/msn/error.c:126 +#: src/protocols/msn/error.c:128 msgid "Memory allocation error" msgstr "Memory allocation error" -#: src/protocols/msn/error.c:129 +#: src/protocols/msn/error.c:131 msgid "Wrong CHL value sent to server" msgstr "Wrong CHL value sent to server" -#: src/protocols/msn/error.c:133 +#: src/protocols/msn/error.c:135 msgid "Server busy" msgstr "Server busy" -#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149 -#: src/protocols/msn/error.c:204 +#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151 +#: src/protocols/msn/error.c:206 msgid "Server unavailable" msgstr "Server unavailable" -#: src/protocols/msn/error.c:139 +#: src/protocols/msn/error.c:141 msgid "Peer Notification server down" msgstr "Peer Notification server down" -#: src/protocols/msn/error.c:142 +#: src/protocols/msn/error.c:144 msgid "Database connect error" msgstr "Database connect error" -#: src/protocols/msn/error.c:146 +#: src/protocols/msn/error.c:148 msgid "Server is going down (abandon ship)" msgstr "Server is going down (abandon ship)" -#: src/protocols/msn/error.c:153 +#: src/protocols/msn/error.c:155 msgid "Error creating connection" msgstr "Error creating connection" -#: src/protocols/msn/error.c:157 +#: src/protocols/msn/error.c:159 msgid "CVR parameters are either unknown or not allowed" msgstr "CVR parameters are either unknown or not allowed" -#: src/protocols/msn/error.c:160 +#: src/protocols/msn/error.c:162 msgid "Unable to write" msgstr "Unable to write" -#: src/protocols/msn/error.c:163 +#: src/protocols/msn/error.c:165 msgid "Session overload" msgstr "Session overload" -#: src/protocols/msn/error.c:166 +#: src/protocols/msn/error.c:168 msgid "User is too active" msgstr "User is too active" -#: src/protocols/msn/error.c:169 +#: src/protocols/msn/error.c:171 msgid "Too many sessions" msgstr "Too many sessions" -#: src/protocols/msn/error.c:172 +#: src/protocols/msn/error.c:174 msgid "Passport not verified" msgstr "Passport not verified" -#: src/protocols/msn/error.c:175 +#: src/protocols/msn/error.c:177 msgid "Bad friend file" msgstr "Bad friend file" -#: src/protocols/msn/error.c:178 +#: src/protocols/msn/error.c:180 msgid "Not expected" msgstr "Not expected" -#: src/protocols/msn/error.c:183 +#: src/protocols/msn/error.c:185 msgid "Friendly name changes too rapidly" msgstr "Friendly name changes too rapidly" -#: src/protocols/msn/error.c:192 +#: src/protocols/msn/error.c:194 msgid "Server too busy" msgstr "Server too busy" -#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010 -#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630 +#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010 +#: src/protocols/silc/ops.c:1274 src/protocols/toc/toc.c:630 msgid "Authentication failed" msgstr "Authentication failed" -#: src/protocols/msn/error.c:199 +#: src/protocols/msn/error.c:201 msgid "Not allowed when offline" msgstr "Not allowed when offline" -#: src/protocols/msn/error.c:207 +#: src/protocols/msn/error.c:209 msgid "Not accepting new users" msgstr "Not accepting new users" -#: src/protocols/msn/error.c:211 +#: src/protocols/msn/error.c:213 msgid "Kids Passport without parental consent" msgstr "Kids Passport without parental consent" -#: src/protocols/msn/error.c:215 +#: src/protocols/msn/error.c:217 msgid "Passport account not yet verified" msgstr "Passport account not yet verified" -#: src/protocols/msn/error.c:218 +#: src/protocols/msn/error.c:220 msgid "Bad ticket" msgstr "Bad ticket" -#: src/protocols/msn/error.c:222 +#: src/protocols/msn/error.c:224 #, c-format msgid "Unknown Error Code %d" msgstr "Unknown Error Code %d" -#: src/protocols/msn/error.c:234 +#: src/protocols/msn/error.c:236 #, c-format msgid "MSN Error: %s\n" msgstr "MSN Error: %s\n" -#: src/protocols/msn/msn.c:80 +#: 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:192 +#: src/protocols/msn/msn.c:222 msgid "Set your friendly name." msgstr "Set your friendly name." -#: src/protocols/msn/msn.c:193 +#: 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:206 +#: src/protocols/msn/msn.c:239 msgid "Set your home phone number." msgstr "Set your home phone number." -#: src/protocols/msn/msn.c:218 +#: src/protocols/msn/msn.c:254 msgid "Set your work phone number." msgstr "Set your work phone number." -#: src/protocols/msn/msn.c:230 +#: src/protocols/msn/msn.c:269 msgid "Set your mobile phone number." msgstr "Set your mobile phone number." -#: src/protocols/msn/msn.c:240 +#: src/protocols/msn/msn.c:282 msgid "Allow MSN Mobile pages?" msgstr "Allow MSN Mobile pages?" -#: src/protocols/msn/msn.c:241 +#: 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?" @@ -6267,92 +6497,96 @@ "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:245 +#: src/protocols/msn/msn.c:287 msgid "Allow" msgstr "Allow" -#: src/protocols/msn/msn.c:246 +#: src/protocols/msn/msn.c:288 msgid "Disallow" msgstr "Disallow" -#: src/protocols/msn/msn.c:271 +#: src/protocols/msn/msn.c:311 msgid "Send a mobile message." msgstr "Send a mobile message." -#: src/protocols/msn/msn.c:273 +#: src/protocols/msn/msn.c:313 msgid "Page" msgstr "Page" -#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:681 -#: src/protocols/msn/state.c:32 +#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:765 +#: src/protocols/msn/state.c:34 msgid "Away From Computer" msgstr "Away From Computer" -#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:683 -#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2351 -#: src/protocols/yahoo/yahoo.c:2736 src/protocols/yahoo/yahoo.c:2850 +#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:767 +#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2477 +#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2974 msgid "Be Right Back" msgstr "Be Right Back" -#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:685 -#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726 -#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895 -#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:47 -#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2353 -#: src/protocols/yahoo/yahoo.c:2738 src/protocols/yahoo/yahoo.c:2851 +#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:769 +#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727 +#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896 +#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47 +#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2479 +#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2975 msgid "Busy" msgstr "Busy" -#: src/protocols/msn/msn.c:385 src/protocols/msn/msn.c:687 -#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2361 -#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2855 +#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:771 +#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2487 +#: src/protocols/yahoo/yahoo.c:2868 src/protocols/yahoo/yahoo.c:2979 msgid "On The Phone" msgstr "On The Phone" -#: src/protocols/msn/msn.c:386 src/protocols/msn/msn.c:689 -#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2365 -#: src/protocols/yahoo/yahoo.c:2750 src/protocols/yahoo/yahoo.c:2857 +#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:773 +#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2491 +#: src/protocols/yahoo/yahoo.c:2872 src/protocols/yahoo/yahoo.c:2981 msgid "Out To Lunch" msgstr "Out To Lunch" -#: src/protocols/msn/msn.c:387 src/protocols/msn/msn.c:691 -#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179 +#: src/protocols/msn/msn.c:472 src/protocols/msn/msn.c:775 +#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220 msgid "Hidden" msgstr "Hidden" -#: src/protocols/msn/msn.c:398 +#: src/protocols/msn/msn.c:483 msgid "Set Friendly Name" msgstr "Set Friendly Name" -#: src/protocols/msn/msn.c:403 +#: src/protocols/msn/msn.c:488 msgid "Set Home Phone Number" msgstr "Set Home Phone Number" -#: src/protocols/msn/msn.c:407 +#: src/protocols/msn/msn.c:492 msgid "Set Work Phone Number" msgstr "Set Work Phone Number" -#: src/protocols/msn/msn.c:411 +#: src/protocols/msn/msn.c:496 msgid "Set Mobile Phone Number" msgstr "Set Mobile Phone Number" -#: src/protocols/msn/msn.c:417 +#: src/protocols/msn/msn.c:502 msgid "Enable/Disable Mobile Devices" msgstr "Enable/Disable Mobile Devices" -#: src/protocols/msn/msn.c:422 +#: src/protocols/msn/msn.c:507 msgid "Allow/Disallow Mobile Pages" msgstr "Allow/Disallow Mobile Pages" -#: src/protocols/msn/msn.c:442 +#: src/protocols/msn/msn.c:530 msgid "Send to Mobile" msgstr "Send to Mobile" -#: src/protocols/msn/msn.c:450 +#: src/protocols/msn/msn.c:540 msgid "Initiate Chat" msgstr "Initiate Chat" -#: src/protocols/msn/msn.c:485 +#: src/protocols/msn/msn.c:549 +msgid "Update Buddy Icon" +msgstr "Update Buddy Icon" + +#: src/protocols/msn/msn.c:586 msgid "" "SSL support is needed for MSN. Please install a supported SSL library. See " "http://gaim.sf.net/faq-ssl.php for more information." @@ -6360,103 +6594,106 @@ "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:842 -#, c-format -msgid "" -"An MSN screen name must be in the form \"user@server.com\". Perhaps you " -"meant %s@hotmail.com. No changes were made to your allow list." -msgstr "" -"An MSN screen name must be in the form \"user@server.com\". Perhaps you " -"meant %s@hotmail.com. No changes were made to your allow list." - -#: src/protocols/msn/msn.c:846 src/protocols/msn/msn.c:883 -msgid "Invalid MSN screen name" -msgstr "Invalid MSN screen name" - -#: src/protocols/msn/msn.c:879 -#, c-format -msgid "" -"An MSN screen name must be in the form \"user@server.com\". Perhaps you " -"meant %s@hotmail.com. No changes were made to your block list." -msgstr "" -"An MSN screen name must be in the form \"user@server.com\". Perhaps you " -"meant %s@hotmail.com. No changes were made to your block list." - -#: src/protocols/msn/msn.c:1345 src/protocols/yahoo/yahoo.c:3034 -msgid "<html><body><b>Error retrieving profile</b></body></html>" -msgstr "<html><body><b>Error retrieving profile</b></body></html>" +#: src/protocols/msn/msn.c:1156 src/protocols/msn/msn.c:1169 +#: src/protocols/msn/msn.c:1175 src/protocols/yahoo/yahoo_profile.c:640 +#: src/protocols/yahoo/yahoo_profile.c:653 +#, c-format +msgid "<b>%s:</b> %s<br>" +msgstr "<b>%s:</b> %s<br>" + +#: src/protocols/msn/msn.c:1156 +msgid "MSN ID" +msgstr "MSN ID" + +#: src/protocols/msn/msn.c:1164 src/protocols/yahoo/yahoo_profile.c:648 +#: src/protocols/zephyr/zephyr.c:602 +#, c-format +msgid "<b>Alias:</b> %s<br>" +msgstr "<b>Alias:</b> %s<br>" + +#: src/protocols/msn/msn.c:1241 src/protocols/msn/msn.c:1565 +#: src/protocols/yahoo/yahoo_profile.c:746 +#: src/protocols/yahoo/yahoo_profile.c:834 +msgid "Error retrieving profile" +msgstr "Error retrieving profile" #. Age -#: src/protocols/msn/msn.c:1415 src/protocols/oscar/oscar.c:4865 +#: src/protocols/msn/msn.c:1312 src/protocols/oscar/oscar.c:4870 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404 -#: src/protocols/yahoo/yahoo.c:3144 +#: src/protocols/yahoo/yahoo_profile.c:1010 msgid "Age" msgstr "Age" #. Gender -#: src/protocols/msn/msn.c:1422 src/protocols/oscar/oscar.c:4851 +#: src/protocols/msn/msn.c:1319 src/protocols/oscar/oscar.c:4856 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406 -#: src/protocols/yahoo/yahoo.c:3152 +#: src/protocols/yahoo/yahoo_profile.c:1020 msgid "Gender" msgstr "Gender" -#: src/protocols/msn/msn.c:1430 src/protocols/yahoo/yahoo.c:3148 +#: src/protocols/msn/msn.c:1328 src/protocols/yahoo/yahoo_profile.c:1015 msgid "Marital Status" msgstr "Marital Status" -#: src/protocols/msn/msn.c:1437 src/protocols/yahoo/yahoo.c:3140 +#: src/protocols/msn/msn.c:1335 src/protocols/yahoo/yahoo_profile.c:1005 msgid "Location" msgstr "Location" -#: src/protocols/msn/msn.c:1445 src/protocols/yahoo/yahoo.c:3156 +#: src/protocols/msn/msn.c:1343 src/protocols/yahoo/yahoo_profile.c:1025 msgid "Occupation" msgstr "Occupation" -#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1468 -#: src/protocols/msn/msn.c:1475 src/protocols/msn/msn.c:1482 -#: src/protocols/msn/msn.c:1489 +#: src/protocols/msn/msn.c:1360 src/protocols/msn/msn.c:1366 +#: src/protocols/msn/msn.c:1373 src/protocols/msn/msn.c:1381 +#: src/protocols/msn/msn.c:1388 msgid "A Little About Me" msgstr "A Little About Me" -#: src/protocols/msn/msn.c:1498 src/protocols/msn/msn.c:1511 -#: src/protocols/msn/msn.c:1518 +#: src/protocols/msn/msn.c:1397 src/protocols/msn/msn.c:1403 +#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1417 msgid "Favorite Things" msgstr "Favourite Things" -#: src/protocols/msn/msn.c:1527 src/protocols/msn/msn.c:1533 -#: src/protocols/msn/msn.c:1540 +#: src/protocols/msn/msn.c:1426 src/protocols/msn/msn.c:1432 +#: src/protocols/msn/msn.c:1439 msgid "Hobbies and Interests" msgstr "Hobbies and Interests" -#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555 -#: src/protocols/yahoo/yahoo.c:3191 +#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454 +#: src/protocols/yahoo/yahoo_profile.c:1067 msgid "Favorite Quote" msgstr "Favuorite Quote" -#: src/protocols/msn/msn.c:1563 src/protocols/yahoo/yahoo.c:3227 +#: src/protocols/msn/msn.c:1462 src/protocols/yahoo/yahoo_profile.c:1118 msgid "Last Updated" msgstr "Last Updated" #. Homepage -#: src/protocols/msn/msn.c:1574 src/protocols/silc/ops.c:810 +#: src/protocols/msn/msn.c:1473 src/protocols/silc/ops.c:820 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419 msgid "Homepage" msgstr "Homepage" -#: src/protocols/msn/msn.c:1596 src/protocols/yahoo/yahoo.c:3242 -#, c-format -msgid "User information for %s unavailable" -msgstr "User information for %s unavailable" - -#: src/protocols/msn/msn.c:1598 src/protocols/yahoo/yahoo.c:3244 +#. put a link to the actual profile URL +#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121 +#: src/util.c:792 +#, c-format +msgid "<b>%s:</b> " +msgstr "<b>%s:</b> " + +#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121 +msgid "Profile URL" +msgstr "Profile URL" + +#: src/protocols/msn/msn.c:1566 src/protocols/yahoo/yahoo_profile.c:1140 msgid "The user's profile is empty." msgstr "The user's profile is empty." -#: src/protocols/msn/msn.c:1655 +#: src/protocols/msn/msn.c:1635 msgid "Display conversation closed notices" msgstr "Display conversation closed notices" -#: src/protocols/msn/msn.c:1660 +#: src/protocols/msn/msn.c:1640 msgid "Display timeout notices" msgstr "Display timeout notices" @@ -6471,80 +6708,40 @@ #. *< version #. * summary #. * description -#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1743 +#: src/protocols/msn/msn.c:1722 src/protocols/msn/msn.c:1724 msgid "MSN Protocol Plugin" msgstr "MSN Protocol Plugin" -#: src/protocols/msn/msn.c:1762 src/protocols/trepia/trepia.c:1299 +#: src/protocols/msn/msn.c:1743 src/protocols/trepia/trepia.c:1290 msgid "Login server" msgstr "Login server" -#: src/protocols/msn/msn.c:1771 +#: src/protocols/msn/msn.c:1752 msgid "Use HTTP Method" msgstr "Use HTTP Method" -#: src/protocols/msn/nexus.c:56 +#: src/protocols/msn/nexus.c:79 msgid "Unable to connect to server" msgstr "Unable to connect to server" -#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130 -msgid "Unable to write to MSN Nexus server." -msgstr "Unable to write to MSN Nexus server." - -#: src/protocols/msn/nexus.c:147 -msgid "MSN Nexus server returned invalid redirect information." -msgstr "MSN Nexus server returned invalid redirect information." - -#: src/protocols/msn/nexus.c:204 +#: src/protocols/msn/nexus.c:215 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:267 src/protocols/trepia/trepia.c:635 +#: src/protocols/msn/notification.c:84 +msgid "Requesting to send password" +msgstr "Requesting to send password" + +#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635 msgid "Retrieving buddy list" msgstr "Retrieving buddy list" -#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323 +#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173 #: src/protocols/oscar/oscar.c:2299 msgid "Password sent" msgstr "Password sent" -#: src/protocols/msn/notification.c:355 -msgid "Protocol not supported" -msgstr "Protocol not supported" - -#: src/protocols/msn/notification.c:386 -msgid "You have been disconnected. You have signed on from another location." -msgstr "You have been disconnected. You have signed on from another location." - -#: src/protocols/msn/notification.c:392 -msgid "You have been disconnected. The MSN servers are going down temporarily." -msgstr "" -"You have been disconnected. The MSN servers are going down temporarily." - -#: src/protocols/msn/notification.c:527 -#, c-format -msgid "The user %s (%s) wants to add %s to his or her buddy list." -msgstr "The user %s (%s) wants to add %s to his or her buddy list." - -#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078 -#, c-format -msgid "The user %s (%s) wants to add you to their buddy list." -msgstr "The user %s (%s) wants to add you to their buddy list." - -#: src/protocols/msn/notification.c:1351 -#, 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:1612 -msgid "Unable to transfer to notification server" -msgstr "Unable to transfer to notification server" - -#: src/protocols/msn/notification.c:1799 +#: src/protocols/msn/notification.c:1071 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -6553,21 +6750,19 @@ "\n" "After the maintenance has been completed, you will be able to successfully " "sign in." -msgid_plural "" "The MSN server will shut down for maintenance in %d minutes. You will " "automatically be signed out at that time. Please finish any conversations " "in progress.\n" "\n" "After the maintenance has been completed, you will be able to successfully " "sign in." -msgstr[0] "" +msgstr "" "The MSN server will shut down for maintenance in %d minute. You will " "automatically be signed out at that time. Please finish any conversations " "in progress.\n" "\n" "After the maintenance has been completed, you will be able to successfully " "sign in." -msgstr[1] "" "The MSN server will shut down for maintenance in %d minutes. You will " "automatically be signed out at that time. Please finish any conversations " "in progress.\n" @@ -6575,79 +6770,90 @@ "After the maintenance has been completed, you will be able to successfully " "sign in." -#: src/protocols/msn/servconn.c:44 +#: src/protocols/msn/notification.c:1136 +msgid "Syncing with server" +msgstr "Syncing with server" + +#: src/protocols/msn/servconn.c:46 #, c-format msgid "Unable to connect to %s server" msgstr "Unable to connect to %s server" -#: src/protocols/msn/servconn.c:48 +#: src/protocols/msn/servconn.c:50 #, c-format msgid "Error writing to %s server" msgstr "Error writing to %s server" -#: src/protocols/msn/servconn.c:52 -#, c-format -msgid "" -"Error reading from %s server. Lastcommand was:\n" -" %s" -msgstr "" -"Error reading from %s server. Lastcommand was:\n" -" %s" - -#: src/protocols/msn/servconn.c:57 +#: src/protocols/msn/servconn.c:54 +#, c-format +msgid "Error reading from %s server" +msgstr "Error reading from %s server" + +#: src/protocols/msn/servconn.c:58 #, c-format msgid "Unknown error from %s server" msgstr "Unknown error from %s server" -#: src/protocols/msn/servconn.c:316 +#: src/protocols/msn/servconn.c:72 +#, c-format +msgid "MSN error for account %s" +msgstr "MSN error for account %s" + +#: src/protocols/msn/servconn.c:346 msgid "Received HTTP error. Please report this." msgstr "Received HTTP error. Please report this." -#: src/protocols/msn/switchboard.c:121 +#: src/protocols/msn/switchboard.c:191 msgid "The conversation has become inactive and timed out." msgstr "The conversation has become inactive and timed out." -#: src/protocols/msn/switchboard.c:130 +#: src/protocols/msn/switchboard.c:199 #, c-format msgid "%s has closed the conversation window." msgstr "%s has closed the conversation window." -#: src/protocols/msn/switchboard.c:264 -msgid "An MSN message may not have been received." -msgstr "An MSN message may not have been received." - -#: src/protocols/napster/napster.c:229 +#: src/protocols/msn/userlist.c:86 +#, c-format +msgid "The user %s (%s) wants to add %s to his or her buddy list." +msgstr "The user %s (%s) wants to add %s to his or her buddy list." + +#: src/protocols/msn/userlist.c:94 +#, c-format +msgid "The user %s wants to add %s to his or her buddy list." +msgstr "The user %s wants to add %s to his or her buddy list." + +#: src/protocols/napster/napster.c:230 msgid "Unable to read header from server" msgstr "Unable to read header from server" -#: src/protocols/napster/napster.c:243 +#: src/protocols/napster/napster.c:244 #, c-format msgid "Unable to read message from server: %s. Command is %hd, length is %hd." msgstr "" "Unable to read message from server: %s. Command is %hd, length is %hd." -#: src/protocols/napster/napster.c:306 +#: src/protocols/napster/napster.c:307 #, c-format msgid "users: %s, files: %s, size: %sGB" msgstr "users: %s, files: %s, size: %sGB" #. MSG_SERVER_HOTLIST_ERROR -#: src/protocols/napster/napster.c:317 +#: src/protocols/napster/napster.c:318 #, c-format msgid "Unable to add \"%s\" to your Napster hotlist" msgstr "Unable to add \"%s\" to your Napster hotlist" -#: src/protocols/napster/napster.c:325 +#: src/protocols/napster/napster.c:326 msgid "You were disconnected from the server." msgstr "You were disconnected from the server." #. MSG_CLIENT_WHOIS -#: src/protocols/napster/napster.c:383 +#: src/protocols/napster/napster.c:384 #, c-format msgid "%s requested your information" msgstr "%s requested your information" -#: src/protocols/napster/napster.c:421 +#: src/protocols/napster/napster.c:422 msgid "" "You were disconnected from the server, because you logged on from a " "different location" @@ -6656,13 +6862,13 @@ "different location" #. MSG_CLIENT_PING -#: src/protocols/napster/napster.c:427 +#: src/protocols/napster/napster.c:428 #, c-format msgid "%s requested a PING" msgstr "%s requested a PING" -#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6151 -#: src/protocols/toc/toc.c:1259 +#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6172 +#: src/protocols/toc/toc.c:1266 msgid "_Group:" msgstr "_Group:" @@ -6677,91 +6883,91 @@ #. *< version #. * summary #. * description -#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622 +#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624 msgid "NAPSTER Protocol Plugin" msgstr "NAPSTER Protocol Plugin" -#: src/protocols/novell/nmuser.c:2027 +#: src/protocols/novell/nmuser.c:1868 msgid "Required parameters not passed in" msgstr "Required parameters not passed in" -#: src/protocols/novell/nmuser.c:2030 +#: src/protocols/novell/nmuser.c:1871 msgid "Unable to write to network" msgstr "Unable to write to network" -#: src/protocols/novell/nmuser.c:2033 +#: src/protocols/novell/nmuser.c:1874 msgid "Unable to read from network" msgstr "Unable to read from network" -#: src/protocols/novell/nmuser.c:2036 +#: src/protocols/novell/nmuser.c:1877 msgid "Error communicating with server" msgstr "Error communicating with server" -#: src/protocols/novell/nmuser.c:2040 +#: src/protocols/novell/nmuser.c:1881 msgid "Conference not found" msgstr "Conference not found" -#: src/protocols/novell/nmuser.c:2043 +#: src/protocols/novell/nmuser.c:1884 msgid "Conference does not exist" msgstr "Conference does not exist" -#: src/protocols/novell/nmuser.c:2047 +#: src/protocols/novell/nmuser.c:1888 msgid "A folder with that name already exists" msgstr "A folder with that name already exists" -#: src/protocols/novell/nmuser.c:2050 +#: src/protocols/novell/nmuser.c:1891 msgid "Not supported" msgstr "Not supported" -#: src/protocols/novell/nmuser.c:2054 +#: src/protocols/novell/nmuser.c:1895 msgid "Password has expired" msgstr "Password has expired" -#: src/protocols/novell/nmuser.c:2057 +#: src/protocols/novell/nmuser.c:1898 msgid "Invalid password" msgstr "Invalid password" -#: src/protocols/novell/nmuser.c:2060 +#: src/protocols/novell/nmuser.c:1901 msgid "User not found" msgstr "User not found" -#: src/protocols/novell/nmuser.c:2063 +#: src/protocols/novell/nmuser.c:1904 msgid "Account has been disabled" msgstr "Account has been disabled" -#: src/protocols/novell/nmuser.c:2066 +#: src/protocols/novell/nmuser.c:1907 msgid "The server could not access the directory" msgstr "The server could not access the directory" -#: src/protocols/novell/nmuser.c:2069 +#: src/protocols/novell/nmuser.c:1910 msgid "Your system administrator has disabled this operation" msgstr "Your system administrator has disabled this operation" -#: src/protocols/novell/nmuser.c:2072 +#: src/protocols/novell/nmuser.c:1913 msgid "The server is unavailable; try again later" msgstr "The server is unavailable; try again later" -#: src/protocols/novell/nmuser.c:2075 +#: src/protocols/novell/nmuser.c:1916 msgid "Cannot add a contact to the same folder twice" msgstr "Cannot add a contact to the same folder twice" -#: src/protocols/novell/nmuser.c:2078 +#: src/protocols/novell/nmuser.c:1919 msgid "Cannot add yourself" msgstr "Cannot add yourself" -#: src/protocols/novell/nmuser.c:2081 +#: src/protocols/novell/nmuser.c:1922 msgid "Master archive is misconfigured" msgstr "Master archive is misconfigured" -#: src/protocols/novell/nmuser.c:2085 +#: src/protocols/novell/nmuser.c:1926 msgid "Invalid username or password" msgstr "Invalid username or password" -#: src/protocols/novell/nmuser.c:2088 +#: src/protocols/novell/nmuser.c:1929 msgid "Could not recognize the host of the username you entered" msgstr "Could not recognize the host of the username you entered" -#: src/protocols/novell/nmuser.c:2091 +#: src/protocols/novell/nmuser.c:1932 msgid "" "Your account has been disabled because too many invalid passwords were " "entered" @@ -6769,31 +6975,31 @@ "Your account has been disabled because too many invalid passwords were " "entered" -#: src/protocols/novell/nmuser.c:2094 +#: src/protocols/novell/nmuser.c:1935 msgid "You cannot add the same person twice to a conversation" msgstr "You cannot add the same person twice to a conversation" -#: src/protocols/novell/nmuser.c:2098 +#: src/protocols/novell/nmuser.c:1939 msgid "You have reached your limit for the number of contacts allowed" msgstr "You have reached your limit for the number of contacts allowed" -#: src/protocols/novell/nmuser.c:2101 +#: src/protocols/novell/nmuser.c:1942 msgid "You have entered an invalid username" msgstr "You have entered an invalid username" -#: src/protocols/novell/nmuser.c:2104 +#: src/protocols/novell/nmuser.c:1945 msgid "An error occurred while updating the directory" msgstr "An error occurred while updating the directory" -#: src/protocols/novell/nmuser.c:2107 +#: src/protocols/novell/nmuser.c:1948 msgid "Incompatible protocol version" msgstr "Incompatible protocol version" -#: src/protocols/novell/nmuser.c:2110 +#: src/protocols/novell/nmuser.c:1951 msgid "The user has blocked you" msgstr "The user has blocked you" -#: src/protocols/novell/nmuser.c:2113 +#: src/protocols/novell/nmuser.c:1954 msgid "" "This evaluation version does not allow more than ten users to log in at one " "time" @@ -6801,52 +7007,52 @@ "This evaluation version does not allow more than ten users to log in at one " "time" -#: src/protocols/novell/nmuser.c:2116 +#: src/protocols/novell/nmuser.c:1957 msgid "The user is either offline or you are blocked" msgstr "The user is either offline or you are blocked" -#: src/protocols/novell/nmuser.c:2119 +#: src/protocols/novell/nmuser.c:1960 #, c-format msgid "Unknown error: 0x%X" msgstr "Unknown error: 0x%X" -#: src/protocols/novell/novell.c:119 +#: src/protocols/novell/novell.c:116 #, c-format msgid "Login failed (%s)." msgstr "Login failed (%s)." -#: src/protocols/novell/novell.c:232 +#: src/protocols/novell/novell.c:229 #, c-format msgid "Unable to send message. Could not get details for user (%s)." msgstr "Unable to send message. Could not get details for user (%s)." -#: src/protocols/novell/novell.c:378 +#: src/protocols/novell/novell.c:375 #, c-format msgid "Unable to add %s to your buddy list (%s)." msgstr "Unable to add %s to your buddy list (%s)." #. TODO: Improve this! message to who or for what conference? -#: src/protocols/novell/novell.c:404 +#: src/protocols/novell/novell.c:401 #, c-format msgid "Unable to send message (%s)." msgstr "Unable to send message (%s)." -#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968 +#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965 #, c-format msgid "Unable to invite user (%s)." msgstr "Unable to invite user (%s)." -#: src/protocols/novell/novell.c:514 +#: src/protocols/novell/novell.c:511 #, c-format msgid "Unable to send message to %s. Could not create the conference (%s)." msgstr "Unable to send message to %s. Could not create the conference (%s)." -#: src/protocols/novell/novell.c:519 +#: src/protocols/novell/novell.c:516 #, c-format msgid "Unable to send message. Could not create the conference (%s)." msgstr "Unable to send message. Could not create the conference (%s)." -#: src/protocols/novell/novell.c:566 +#: src/protocols/novell/novell.c:563 #, c-format msgid "" "Unable to move user %s to folder %s in the server side list. Error while " @@ -6855,7 +7061,7 @@ "Unable to move user %s to folder %s in the server side list. Error while " "creating folder (%s)." -#: src/protocols/novell/novell.c:614 +#: src/protocols/novell/novell.c:611 #, c-format msgid "" "Unable to add %s to your buddy list. Error creating folder in server side " @@ -6864,46 +7070,46 @@ "Unable to add %s to your buddy list. Error creating folder in server side " "list (%s)." -#: src/protocols/novell/novell.c:686 +#: src/protocols/novell/novell.c:683 #, c-format msgid "Could not get details for user %s (%s)." msgstr "Could not get details for user %s (%s)." -#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878 +#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875 #, c-format msgid "Unable to add user to privacy list (%s)." msgstr "Unable to add user to privacy list (%s)." -#: src/protocols/novell/novell.c:779 +#: src/protocols/novell/novell.c:776 #, c-format msgid "Unable to add %s to deny list (%s)." msgstr "Unable to add %s to deny list (%s)." -#: src/protocols/novell/novell.c:832 +#: src/protocols/novell/novell.c:829 #, c-format msgid "Unable to add %s to permit list (%s)." msgstr "Unable to add %s to permit list (%s)." -#: src/protocols/novell/novell.c:900 +#: src/protocols/novell/novell.c:897 #, c-format msgid "Unable to remove %s from privacy list (%s)." msgstr "Unable to remove %s from privacy list (%s)." -#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576 +#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574 #, c-format msgid "Unable to change server side privacy settings (%s)." msgstr "Unable to change server side privacy settings (%s)." -#: src/protocols/novell/novell.c:995 +#: src/protocols/novell/novell.c:992 #, c-format msgid "Unable to create conference (%s)." msgstr "Unable to create conference (%s)." -#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615 +#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613 msgid "Error communicating with server. Closing connection." msgstr "Error communicating with server. Closing connection." -#: src/protocols/novell/novell.c:1428 +#: src/protocols/novell/novell.c:1426 msgid "Userid" msgstr "Userid" @@ -6914,33 +7120,33 @@ #. tag, value); #. } #. -#: src/protocols/novell/novell.c:1442 +#: src/protocols/novell/novell.c:1440 msgid "Full name" msgstr "Full name" -#: src/protocols/novell/novell.c:1462 +#: src/protocols/novell/novell.c:1460 msgid "User Properties" msgstr "User Properties" -#: src/protocols/novell/novell.c:1566 +#: src/protocols/novell/novell.c:1564 #, c-format msgid "GroupWise Conference %d" msgstr "GroupWise Conference %d" -#: src/protocols/novell/novell.c:1591 +#: src/protocols/novell/novell.c:1589 msgid "Unable to make SSL connection to server." msgstr "Unable to make SSL connection to server." -#: src/protocols/novell/novell.c:1621 +#: src/protocols/novell/novell.c:1619 #, c-format msgid "Error processing event or response (%s)." msgstr "Error processing event or response (%s)." -#: src/protocols/novell/novell.c:1655 +#: src/protocols/novell/novell.c:1653 msgid "Authenticating..." msgstr "Authenticating..." -#: src/protocols/novell/novell.c:1670 +#: src/protocols/novell/novell.c:1668 msgid "Waiting for response..." msgstr "Waiting for response..." @@ -6995,20 +7201,20 @@ msgid "This conference has been closed. No more messages can be sent." msgstr "This conference has been closed. No more messages can be sent." -#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582 -#: src/protocols/oscar/oscar.c:6453 src/protocols/yahoo/yahoo.c:2373 +#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:582 +#: src/protocols/oscar/oscar.c:6474 src/protocols/yahoo/yahoo.c:2499 msgid "Offline" msgstr "Offline" -#: src/protocols/novell/novell.c:2743 +#: src/protocols/novell/novell.c:2744 msgid "Message" msgstr "Message" -#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898 +#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899 msgid "Appear Offline" msgstr "Appear Offline" -#: src/protocols/novell/novell.c:3291 +#: src/protocols/novell/novell.c:3293 msgid "Initiate _Chat" msgstr "Initiate _Chat" @@ -7023,15 +7229,15 @@ #. *< version #. * summary #. * description -#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369 +#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389 msgid "Novell GroupWise Messenger Protocol Plugin" msgstr "Novell GroupWise Messenger Protocol Plugin" -#: src/protocols/novell/novell.c:3388 +#: src/protocols/novell/novell.c:3408 msgid "Server address" msgstr "Server address" -#: src/protocols/novell/novell.c:3392 +#: src/protocols/novell/novell.c:3412 msgid "Server port" msgstr "Server port" @@ -7139,12 +7345,12 @@ msgid "AIM Direct IM" msgstr "AIM Direct IM" -#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1527 -#: src/protocols/silc/silc.c:631 +#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497 +#: src/protocols/silc/silc.c:635 msgid "Chat" msgstr "Chat" -#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6757 +#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6778 msgid "Get File" msgstr "Get File" @@ -7216,18 +7422,18 @@ msgid "Camera" msgstr "Camera" -#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5473 -#: src/protocols/oscar/oscar.c:6646 +#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477 +#: src/protocols/oscar/oscar.c:6667 msgid "Free For Chat" msgstr "Free For Chat" -#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5467 -#: src/protocols/oscar/oscar.c:6644 +#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471 +#: src/protocols/oscar/oscar.c:6665 msgid "Not Available" msgstr "Not Available" -#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5470 -#: src/protocols/oscar/oscar.c:6645 +#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474 +#: src/protocols/oscar/oscar.c:6666 msgid "Occupied" msgstr "Occupied" @@ -7289,11 +7495,11 @@ "Because this reveals your IP address, it may be considered a privacy risk. " "Do you wish to continue?" -#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3311 +#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312 msgid "Connect" msgstr "Connect" -#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:869 +#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872 #, c-format msgid "You have been disconnected from chat room %s." msgstr "You have been disconnected from chat room %s." @@ -7329,8 +7535,9 @@ msgid "Connection established, cookie sent" msgstr "Connection established, cookie sent" -#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209 -#: src/protocols/yahoo/yahoo_filexfer.c:218 +#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180 +#: src/protocols/yahoo/yahoo_filexfer.c:189 +#: src/protocols/yahoo/yahoo_filexfer.c:199 msgid "Unable to establish file descriptor." msgstr "Unable to establish file descriptor." @@ -7394,16 +7601,16 @@ 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:3095 src/protocols/oscar/oscar.c:3117 +#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118 msgid "(There was an error receiving this message)" msgstr "(There was an error receiving this message)" -#: src/protocols/oscar/oscar.c:3303 +#: src/protocols/oscar/oscar.c:3304 #, 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:3306 +#: src/protocols/oscar/oscar.c:3307 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 " @@ -7413,19 +7620,19 @@ "for IM Images. Because your IP address will be revealed, this may be " "considered a privacy risk." -#: src/protocols/oscar/oscar.c:3342 +#: src/protocols/oscar/oscar.c:3343 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:3350 +#: src/protocols/oscar/oscar.c:3351 msgid "Authorization Request Message:" msgstr "Authorization Request Message:" -#: src/protocols/oscar/oscar.c:3351 +#: src/protocols/oscar/oscar.c:3352 msgid "Please authorize me!" msgstr "Please authorize me!" -#: src/protocols/oscar/oscar.c:3381 +#: src/protocols/oscar/oscar.c:3382 #, c-format msgid "" "The user %s requires authorization before being added to a buddy list. Do " @@ -7434,23 +7641,23 @@ "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:3386 src/protocols/oscar/oscar.c:3388 +#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389 msgid "Request Authorization" msgstr "Request Authorization" -#: src/protocols/oscar/oscar.c:3436 src/protocols/oscar/oscar.c:3438 -#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3527 -#: src/protocols/oscar/oscar.c:3547 src/protocols/oscar/oscar.c:3898 -#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:6072 -#: src/protocols/oscar/oscar.c:6118 +#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439 +#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528 +#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902 +#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6093 +#: src/protocols/oscar/oscar.c:6139 msgid "No reason given." msgstr "No reason given." -#: src/protocols/oscar/oscar.c:3444 +#: src/protocols/oscar/oscar.c:3445 msgid "Authorization Denied Message:" msgstr "Authorization Denied Message:" -#: src/protocols/oscar/oscar.c:3527 +#: src/protocols/oscar/oscar.c:3528 #, c-format msgid "" "The user %u wants to add you to their buddy list for the following reason:\n" @@ -7459,11 +7666,11 @@ "The user %u wants to add you to their buddy list for the following reason:\n" "%s" -#: src/protocols/oscar/oscar.c:3535 src/protocols/oscar/oscar.c:6078 +#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6099 msgid "Authorization Request" msgstr "Authorization Request" -#: src/protocols/oscar/oscar.c:3547 +#: src/protocols/oscar/oscar.c:3548 #, c-format msgid "" "The user %u has denied your request to add them to your buddy list for the " @@ -7474,17 +7681,17 @@ "following reason:\n" "%s" -#: src/protocols/oscar/oscar.c:3548 +#: src/protocols/oscar/oscar.c:3549 msgid "ICQ authorization denied." msgstr "ICQ authorization denied." #. Someone has granted you authorization -#: src/protocols/oscar/oscar.c:3555 +#: src/protocols/oscar/oscar.c:3556 #, 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:3563 +#: src/protocols/oscar/oscar.c:3564 #, c-format msgid "" "You have received a special message\n" @@ -7497,7 +7704,7 @@ "From: %s [%s]\n" "%s" -#: src/protocols/oscar/oscar.c:3571 +#: src/protocols/oscar/oscar.c:3572 #, c-format msgid "" "You have received an ICQ page\n" @@ -7510,7 +7717,7 @@ "From: %s [%s]\n" "%s" -#: src/protocols/oscar/oscar.c:3579 +#: src/protocols/oscar/oscar.c:3580 #, c-format msgid "" "You have received an ICQ email from %s [%s]\n" @@ -7523,108 +7730,111 @@ "Message is:\n" "%s" -#: src/protocols/oscar/oscar.c:3600 +#: src/protocols/oscar/oscar.c:3601 #, 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:3606 +#: src/protocols/oscar/oscar.c:3607 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:3610 +#: src/protocols/oscar/oscar.c:3611 msgid "Decline" msgstr "Decline" -#: src/protocols/oscar/oscar.c:3695 +#: src/protocols/oscar/oscar.c:3696 #, 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:3704 +#: src/protocols/oscar/oscar.c:3705 #, 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:3713 +#: src/protocols/oscar/oscar.c:3714 #, c-format msgid "" "You missed %hu message from %s because the rate limit has been exceeded." -msgid_plural "" "You missed %hu messages from %s because the rate limit has been exceeded." -msgstr[0] "" +msgstr "" "You missed %hu message from %s because the rate limit has been exceeded." -msgstr[1] "" "You missed %hu messages from %s because the rate limit has been exceeded." -#: src/protocols/oscar/oscar.c:3722 +#: src/protocols/oscar/oscar.c:3723 #, 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:3731 +#: src/protocols/oscar/oscar.c:3732 #, 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:3740 +#: src/protocols/oscar/oscar.c:3741 #, 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:3801 +#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022 +#, c-format +msgid "Info for %s" +msgstr "Info for %s" + +#: src/protocols/oscar/oscar.c:3803 #, 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" -#: src/protocols/oscar/oscar.c:3860 +#: src/protocols/oscar/oscar.c:3864 #, c-format msgid "SNAC threw error: %s\n" msgstr "SNAC threw error: %s\n" -#: src/protocols/oscar/oscar.c:3861 +#: src/protocols/oscar/oscar.c:3865 msgid "Unknown error" msgstr "Unknown error" #. Data is assumed to be the destination sn -#: src/protocols/oscar/oscar.c:3896 +#: src/protocols/oscar/oscar.c:3900 #, c-format msgid "Your message to %s did not get sent:" msgstr "Your message to %s did not get sent:" -#: src/protocols/oscar/oscar.c:3955 +#: src/protocols/oscar/oscar.c:3959 #, c-format msgid "User information for %s unavailable:" msgstr "User information for %s unavailable:" -#: src/protocols/oscar/oscar.c:3978 +#: src/protocols/oscar/oscar.c:3982 msgid "Warning Level" msgstr "Warning Level" -#: src/protocols/oscar/oscar.c:3981 +#: src/protocols/oscar/oscar.c:3985 msgid "Online Since" msgstr "Online Since" -#: src/protocols/oscar/oscar.c:3985 src/protocols/yahoo/yahoo.c:3223 +#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113 msgid "Member Since" msgstr "Member Since" -#: src/protocols/oscar/oscar.c:4067 +#: src/protocols/oscar/oscar.c:4073 msgid "Your AIM connection may be lost." msgstr "Your AIM connection may be lost." #. The conversion failed! -#: src/protocols/oscar/oscar.c:4253 +#: src/protocols/oscar/oscar.c:4259 msgid "" "[Unable to display a message from this user because it contained invalid " "characters.]" @@ -7632,11 +7842,11 @@ "[Unable to display a message from this user because it contained invalid " "characters.]" -#: src/protocols/oscar/oscar.c:4471 +#: src/protocols/oscar/oscar.c:4476 msgid "Rate limiting error." msgstr "Rate limiting error." -#: src/protocols/oscar/oscar.c:4472 +#: src/protocols/oscar/oscar.c:4477 msgid "" "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." @@ -7644,7 +7854,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:4535 +#: src/protocols/oscar/oscar.c:4540 msgid "" "You have been disconnected because you have signed on with this screen name " "at another location." @@ -7652,113 +7862,113 @@ "You have been disconnected because you have signed on with this screen name " "at another location." -#: src/protocols/oscar/oscar.c:4537 +#: src/protocols/oscar/oscar.c:4542 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:4568 +#: src/protocols/oscar/oscar.c:4573 msgid "Finalizing connection" msgstr "Finalizing connection" -#: src/protocols/oscar/oscar.c:4838 src/protocols/oscar/oscar.c:4845 +#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850 msgid "Email Address" msgstr "Email Address" -#: src/protocols/oscar/oscar.c:4850 src/protocols/silc/buddy.c:1555 +#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524 msgid "Mobile Phone" msgstr "Mobile Phone" -#: src/protocols/oscar/oscar.c:4851 +#: src/protocols/oscar/oscar.c:4856 msgid "Not specified" msgstr "Not specified" -#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:281 +#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281 #: src/protocols/trepia/trepia.c:407 msgid "Female" msgstr "Female" -#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:280 +#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280 #: src/protocols/trepia/trepia.c:407 msgid "Male" msgstr "Male" -#: src/protocols/oscar/oscar.c:4868 +#: src/protocols/oscar/oscar.c:4873 msgid "Personal Web Page" msgstr "Personal Web Page" -#: src/protocols/oscar/oscar.c:4872 -msgid "Additional Information" -msgstr "Additional Information" - #: src/protocols/oscar/oscar.c:4877 +msgid "Additional Information" +msgstr "Additional Information" + +#: src/protocols/oscar/oscar.c:4882 msgid "Home Address" msgstr "Home Address" -#: src/protocols/oscar/oscar.c:4881 src/protocols/oscar/oscar.c:4889 +#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894 msgid "Zip Code" msgstr "Postal Code" -#: src/protocols/oscar/oscar.c:4885 +#: src/protocols/oscar/oscar.c:4890 msgid "Work Address" msgstr "Work Address" -#: src/protocols/oscar/oscar.c:4893 +#: src/protocols/oscar/oscar.c:4898 msgid "Work Information" msgstr "Work Information" -#: src/protocols/oscar/oscar.c:4894 +#: src/protocols/oscar/oscar.c:4899 msgid "Company" msgstr "Company" -#: src/protocols/oscar/oscar.c:4895 +#: src/protocols/oscar/oscar.c:4900 msgid "Division" msgstr "Division" -#: src/protocols/oscar/oscar.c:4896 +#: src/protocols/oscar/oscar.c:4901 msgid "Position" msgstr "Position" -#: src/protocols/oscar/oscar.c:4898 +#: src/protocols/oscar/oscar.c:4903 msgid "Web Page" msgstr "Web Page" -#: src/protocols/oscar/oscar.c:4904 +#: src/protocols/oscar/oscar.c:4909 #, c-format msgid "ICQ Info for %s" msgstr "ICQ Info for %s" -#: src/protocols/oscar/oscar.c:4954 +#: src/protocols/oscar/oscar.c:4958 msgid "Pop-Up Message" msgstr "Pop-Up Message" -#: src/protocols/oscar/oscar.c:4975 +#: src/protocols/oscar/oscar.c:4979 #, 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:4979 +#: src/protocols/oscar/oscar.c:4983 msgid "Search Results" msgstr "Search Results" -#: src/protocols/oscar/oscar.c:4996 +#: src/protocols/oscar/oscar.c:5000 #, c-format msgid "No results found for email address %s" msgstr "No results found for email address %s" -#: src/protocols/oscar/oscar.c:5017 +#: src/protocols/oscar/oscar.c:5021 #, 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:5019 +#: src/protocols/oscar/oscar.c:5023 msgid "Account Confirmation Requested" msgstr "Account Confirmation Requested" -#: src/protocols/oscar/oscar.c:5047 +#: src/protocols/oscar/oscar.c:5051 msgid "Error Changing Account Info" msgstr "Error Changing Account Info" -#: src/protocols/oscar/oscar.c:5050 +#: src/protocols/oscar/oscar.c:5054 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -7767,7 +7977,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "differs from the original." -#: src/protocols/oscar/oscar.c:5053 +#: src/protocols/oscar/oscar.c:5057 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -7776,7 +7986,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "ends in a space." -#: src/protocols/oscar/oscar.c:5056 +#: src/protocols/oscar/oscar.c:5060 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -7785,7 +7995,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "is too long." -#: src/protocols/oscar/oscar.c:5059 +#: src/protocols/oscar/oscar.c:5063 #, c-format msgid "" "Error 0x%04x: Unable to change email address because there is already a " @@ -7794,7 +8004,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:5062 +#: src/protocols/oscar/oscar.c:5066 #, c-format msgid "" "Error 0x%04x: Unable to change email address because the given address has " @@ -7803,7 +8013,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:5065 +#: src/protocols/oscar/oscar.c:5069 #, c-format msgid "" "Error 0x%04x: Unable to change email address because the given address is " @@ -7812,12 +8022,12 @@ "Error 0x%04x: Unable to change email address because the given address is " "invalid." -#: src/protocols/oscar/oscar.c:5068 +#: src/protocols/oscar/oscar.c:5072 #, c-format msgid "Error 0x%04x: Unknown error." msgstr "Error 0x%04x: Unknown error." -#: src/protocols/oscar/oscar.c:5078 +#: src/protocols/oscar/oscar.c:5082 #, c-format msgid "" "Your screen name is currently formatted as follows:\n" @@ -7826,26 +8036,26 @@ "Your screen name is currently formatted as follows:\n" "%s" -#: src/protocols/oscar/oscar.c:5079 src/protocols/oscar/oscar.c:5086 +#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090 msgid "Account Info" msgstr "Account Info" -#: src/protocols/oscar/oscar.c:5084 +#: src/protocols/oscar/oscar.c:5088 #, c-format msgid "The email address for %s is %s" msgstr "The email address for %s is %s" -#: src/protocols/oscar/oscar.c:5149 +#: src/protocols/oscar/oscar.c:5153 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:5322 +#: src/protocols/oscar/oscar.c:5326 msgid "Unable to set AIM profile." msgstr "Unable to set AIM profile." -#: src/protocols/oscar/oscar.c:5323 +#: src/protocols/oscar/oscar.c:5327 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 " @@ -7855,34 +8065,32 @@ "completed. Your profile remains unset; try setting it again when you are " "fully connected." -#: src/protocols/oscar/oscar.c:5350 +#: src/protocols/oscar/oscar.c:5354 #, c-format msgid "" "The maximum profile length of %d byte has been exceeded. Gaim has truncated " "it for you." -msgid_plural "" "The maximum profile length of %d bytes has been exceeded. Gaim has " "truncated it for you." -msgstr[0] "" +msgstr "" "The maximum profile length of %d byte has been exceeded. Gaim has truncated " "it for you." -msgstr[1] "" "The maximum profile length of %d bytes has been exceeded. Gaim has " "truncated it for you." -#: src/protocols/oscar/oscar.c:5355 +#: src/protocols/oscar/oscar.c:5359 msgid "Profile too long." msgstr "Profile too long." -#: src/protocols/oscar/oscar.c:5371 src/protocols/oscar/oscar.c:6651 +#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6672 msgid "Visible" msgstr "Visible" -#: src/protocols/oscar/oscar.c:5389 +#: src/protocols/oscar/oscar.c:5393 msgid "Unable to set AIM away message." msgstr "Unable to set AIM away message." -#: src/protocols/oscar/oscar.c:5390 +#: src/protocols/oscar/oscar.c:5394 msgid "" "You have probably requested to set your away message before the login " "procedure completed. You remain in a \"present\" state; try setting it " @@ -7892,26 +8100,24 @@ "procedure completed. You remain in a \"present\" state; try setting it " "again when you are fully connected." -#: src/protocols/oscar/oscar.c:5430 +#: src/protocols/oscar/oscar.c:5434 #, c-format msgid "" "The maximum away message length of %d byte has been exceeded. Gaim has " "truncated it for you." -msgid_plural "" "The maximum away message length of %d bytes has been exceeded. Gaim has " "truncated it for you." -msgstr[0] "" +msgstr "" "The maximum away message length of %d byte has been exceeded. Gaim has " "truncated it for you." -msgstr[1] "" "The maximum away message length of %d bytes has been exceeded. Gaim has " "truncated it for you." -#: src/protocols/oscar/oscar.c:5435 +#: src/protocols/oscar/oscar.c:5439 msgid "Away message too long." msgstr "Away message too long." -#: src/protocols/oscar/oscar.c:5521 +#: src/protocols/oscar/oscar.c:5517 #, c-format msgid "" "Could not add the buddy %s because the screen name is invalid. Screen names " @@ -7922,16 +8128,16 @@ "must either start with a letter and contain only letters, numbers and " "spaces, or contain only numbers." -#: src/protocols/oscar/oscar.c:5522 src/protocols/oscar/oscar.c:5939 -#: src/protocols/oscar/oscar.c:5952 +#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5960 +#: src/protocols/oscar/oscar.c:5973 msgid "Unable To Add" msgstr "Unable To Add" -#: src/protocols/oscar/oscar.c:5658 +#: src/protocols/oscar/oscar.c:5679 msgid "Unable To Retrieve Buddy List" msgstr "Unable To Retrieve Buddy List" -#: src/protocols/oscar/oscar.c:5659 +#: src/protocols/oscar/oscar.c:5680 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 " @@ -7941,13 +8147,13 @@ "servers. Your buddy list is not lost, and will probably become available in " "a few hours." -#: src/protocols/oscar/oscar.c:5835 src/protocols/oscar/oscar.c:5836 -#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:5996 -#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6002 +#: src/protocols/oscar/oscar.c:5856 src/protocols/oscar/oscar.c:5857 +#: src/protocols/oscar/oscar.c:5862 src/protocols/oscar/oscar.c:6017 +#: src/protocols/oscar/oscar.c:6018 src/protocols/oscar/oscar.c:6023 msgid "Orphans" msgstr "Orphans" -#: src/protocols/oscar/oscar.c:5938 +#: src/protocols/oscar/oscar.c:5959 #, c-format msgid "" "Could not add the buddy %s because you have too many buddies in your buddy " @@ -7956,11 +8162,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:5938 src/protocols/oscar/oscar.c:5951 +#: src/protocols/oscar/oscar.c:5959 src/protocols/oscar/oscar.c:5972 msgid "(no name)" msgstr "(no name)" -#: src/protocols/oscar/oscar.c:5951 +#: src/protocols/oscar/oscar.c:5972 #, c-format msgid "" "Could not add the buddy %s for an unknown reason. The most common reason " @@ -7971,7 +8177,7 @@ "for this is that you have the maximum number of allowed buddies in your " "buddy list." -#: src/protocols/oscar/oscar.c:6033 +#: src/protocols/oscar/oscar.c:6054 #, c-format msgid "" "The user %s has given you permission to add you to their buddy list. Do you " @@ -7980,11 +8186,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:6039 +#: src/protocols/oscar/oscar.c:6060 msgid "Authorization Given" msgstr "Authorization Given" -#: src/protocols/oscar/oscar.c:6072 +#: src/protocols/oscar/oscar.c:6093 #, c-format msgid "" "The user %s wants to add you to their buddy list for the following reason:\n" @@ -7994,17 +8200,17 @@ "%s" #. Granted -#: src/protocols/oscar/oscar.c:6114 +#: src/protocols/oscar/oscar.c:6135 #, 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:6115 +#: src/protocols/oscar/oscar.c:6136 msgid "Authorization Granted" msgstr "Authorization Granted" #. Denied -#: src/protocols/oscar/oscar.c:6118 +#: src/protocols/oscar/oscar.c:6139 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the " @@ -8015,71 +8221,71 @@ "following reason:\n" "%s" -#: src/protocols/oscar/oscar.c:6119 +#: src/protocols/oscar/oscar.c:6140 msgid "Authorization Denied" msgstr "Authorization Denied" -#: src/protocols/oscar/oscar.c:6156 src/protocols/toc/toc.c:1264 +#: src/protocols/oscar/oscar.c:6177 src/protocols/toc/toc.c:1271 msgid "_Exchange:" msgstr "_Exchange:" -#: src/protocols/oscar/oscar.c:6178 +#: src/protocols/oscar/oscar.c:6199 msgid "Invalid chat name specified." msgstr "Invalid chat name specified." -#: src/protocols/oscar/oscar.c:6268 +#: src/protocols/oscar/oscar.c:6289 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:6425 +#: src/protocols/oscar/oscar.c:6446 msgid "Away Message" msgstr "Away Message" -#: src/protocols/oscar/oscar.c:6709 +#: src/protocols/oscar/oscar.c:6730 msgid "Buddy Comment:" msgstr "Buddy Comment:" -#: src/protocols/oscar/oscar.c:6727 +#: src/protocols/oscar/oscar.c:6748 msgid "Edit Buddy Comment" msgstr "Edit Buddy Comment" -#: src/protocols/oscar/oscar.c:6733 +#: src/protocols/oscar/oscar.c:6754 msgid "Get Status Msg" msgstr "Get Status Msg" -#: src/protocols/oscar/oscar.c:6745 +#: src/protocols/oscar/oscar.c:6766 msgid "Direct IM" msgstr "Direct IM" -#: src/protocols/oscar/oscar.c:6768 +#: src/protocols/oscar/oscar.c:6789 msgid "Re-request Authorization" msgstr "Re-request Authorization" -#: src/protocols/oscar/oscar.c:6798 +#: src/protocols/oscar/oscar.c:6819 msgid "The new formatting is invalid." msgstr "The new formatting is invalid." -#: src/protocols/oscar/oscar.c:6799 +#: src/protocols/oscar/oscar.c:6820 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:6806 +#: src/protocols/oscar/oscar.c:6827 msgid "New screen name formatting:" msgstr "New screen name formatting:" -#: src/protocols/oscar/oscar.c:6858 +#: src/protocols/oscar/oscar.c:6879 msgid "Change Address To:" msgstr "Change Address To:" -#: src/protocols/oscar/oscar.c:6903 +#: src/protocols/oscar/oscar.c:6924 msgid "<i>you are not waiting for authorization</i>" msgstr "<i>you are not waiting for authorization</i>" -#: src/protocols/oscar/oscar.c:6906 +#: src/protocols/oscar/oscar.c:6927 msgid "You are awaiting authorization from the following buddies" msgstr "You are awaiting authorization from the following buddies" -#: src/protocols/oscar/oscar.c:6907 +#: src/protocols/oscar/oscar.c:6928 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -8087,75 +8293,75 @@ "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" -#: src/protocols/oscar/oscar.c:6924 +#: src/protocols/oscar/oscar.c:6945 msgid "Find Buddy by E-mail" msgstr "Find Buddy by E-mail" -#: src/protocols/oscar/oscar.c:6925 +#: src/protocols/oscar/oscar.c:6946 msgid "Search for a buddy by e-mail address" msgstr "Search for a buddy by e-mail address" -#: src/protocols/oscar/oscar.c:6926 +#: src/protocols/oscar/oscar.c:6947 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:6943 +#: src/protocols/oscar/oscar.c:6964 msgid "Available Message:" msgstr "Available Message:" -#: src/protocols/oscar/oscar.c:6944 +#: src/protocols/oscar/oscar.c:6965 msgid "I'm doing work and hoping for a distraction--IM me!" msgstr "I'm doing work and hoping for a distraction--IM me!" -#: src/protocols/oscar/oscar.c:7025 +#: src/protocols/oscar/oscar.c:7046 src/protocols/silc/silc.c:786 msgid "Set User Info..." msgstr "Set User Info..." -#: src/protocols/oscar/oscar.c:7030 +#: src/protocols/oscar/oscar.c:7051 msgid "Set User Info (URL)..." msgstr "Set User Info (URL)..." -#: src/protocols/oscar/oscar.c:7036 +#: src/protocols/oscar/oscar.c:7057 msgid "Set Available Message..." msgstr "Set Available Message..." -#: src/protocols/oscar/oscar.c:7041 +#: src/protocols/oscar/oscar.c:7062 src/protocols/silc/silc.c:782 msgid "Change Password..." msgstr "Change Password..." -#: src/protocols/oscar/oscar.c:7046 +#: src/protocols/oscar/oscar.c:7067 msgid "Change Password (URL)" msgstr "Change Password (URL)" -#: src/protocols/oscar/oscar.c:7050 +#: src/protocols/oscar/oscar.c:7071 msgid "Configure IM Forwarding (URL)" msgstr "Configure IM Forwarding (URL)" -#: src/protocols/oscar/oscar.c:7059 +#: src/protocols/oscar/oscar.c:7080 msgid "Format Screen Name..." msgstr "Format Screen Name..." -#: src/protocols/oscar/oscar.c:7063 +#: src/protocols/oscar/oscar.c:7084 msgid "Confirm Account" msgstr "Confirm Account" -#: src/protocols/oscar/oscar.c:7067 +#: src/protocols/oscar/oscar.c:7088 msgid "Display Currently Registered Address" msgstr "Display Currently Registered Address" -#: src/protocols/oscar/oscar.c:7071 +#: src/protocols/oscar/oscar.c:7092 msgid "Change Currently Registered Address..." msgstr "Change Currently Registered Address..." -#: src/protocols/oscar/oscar.c:7078 +#: src/protocols/oscar/oscar.c:7099 msgid "Show Buddies Awaiting Authorization" msgstr "Show Buddies Awaiting Authorization" -#: src/protocols/oscar/oscar.c:7084 +#: src/protocols/oscar/oscar.c:7105 msgid "Search for Buddy by Email..." msgstr "Search for Buddy by Email..." -#: src/protocols/oscar/oscar.c:7089 +#: src/protocols/oscar/oscar.c:7110 msgid "Search for Buddy by Information" msgstr "Search for Buddy by Information" @@ -8170,15 +8376,15 @@ #. *< version #. * summary #. * description -#: src/protocols/oscar/oscar.c:7204 src/protocols/oscar/oscar.c:7206 +#: src/protocols/oscar/oscar.c:7226 src/protocols/oscar/oscar.c:7228 msgid "AIM/ICQ Protocol Plugin" msgstr "AIM/ICQ Protocol Plugin" -#: src/protocols/oscar/oscar.c:7225 +#: src/protocols/oscar/oscar.c:7247 msgid "Auth host" msgstr "Auth host" -#: src/protocols/oscar/oscar.c:7230 +#: src/protocols/oscar/oscar.c:7252 msgid "Auth port" msgstr "Auth port" @@ -8267,32 +8473,32 @@ msgstr "Set IM Password" #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541 -#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091 +#: src/protocols/silc/ops.c:1133 src/protocols/silc/ops.c:1144 msgid "Get Public Key" msgstr "Get Public Key" -#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081 -#: src/protocols/silc/ops.c:1092 +#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1134 +#: src/protocols/silc/ops.c:1145 msgid "Cannot fetch the public key" msgstr "Cannot fetch the public key" -#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1650 +#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619 msgid "Show Public Key" msgstr "Show Public Key" -#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:991 -#: src/protocols/silc/chat.c:218 +#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989 +#: src/protocols/silc/chat.c:219 msgid "Could not load public key" msgstr "Could not load public key" -#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837 -#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991 -#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998 -#: src/protocols/silc/ops.c:999 +#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:847 +#: src/protocols/silc/ops.c:918 src/protocols/silc/ops.c:1001 +#: src/protocols/silc/ops.c:1002 src/protocols/silc/ops.c:1008 +#: src/protocols/silc/ops.c:1009 msgid "User Information" msgstr "User Information" -#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909 +#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:919 msgid "Cannot get user information" msgstr "Cannot get user information" @@ -8309,12 +8515,12 @@ "You cannot receive buddy notifications until you import his/her public key. " "You can use the Get Public Key command to get the public key." -#: src/protocols/silc/buddy.c:1034 +#: src/protocols/silc/buddy.c:1032 #, c-format msgid "The %s buddy is not present in the network" msgstr "The %s buddy is not present in the network" -#: src/protocols/silc/buddy.c:1037 +#: src/protocols/silc/buddy.c:1035 msgid "" "To add the buddy you must import his/her public key. Press Import to import " "a public key." @@ -8322,15 +8528,15 @@ "To add the buddy you must import his/her public key. Press Import to import " "a public key." -#: src/protocols/silc/buddy.c:1040 +#: src/protocols/silc/buddy.c:1038 msgid "Import..." msgstr "Import..." +#: src/protocols/silc/buddy.c:1125 +msgid "Select correct user" +msgstr "Select correct user" + #: src/protocols/silc/buddy.c:1127 -msgid "Select correct user" -msgstr "Select correct user" - -#: src/protocols/silc/buddy.c:1129 msgid "" "More than one user was found with the same public key. Select the correct " "user from the list to add to the buddy list." @@ -8338,7 +8544,7 @@ "More than one user was found with the same public key. Select the correct " "user from the list to add to the buddy list." -#: src/protocols/silc/buddy.c:1131 +#: src/protocols/silc/buddy.c:1129 msgid "" "More than one user was found with the same name. Select the correct user " "from the list to add to the buddy list." @@ -8346,166 +8552,166 @@ "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:1405 +#: src/protocols/silc/buddy.c:1377 msgid "Detached" msgstr "Detached" -#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:48 +#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48 #: src/protocols/silc/silc.c:80 msgid "Indisposed" msgstr "Indisposed" -#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:49 +#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49 #: src/protocols/silc/silc.c:82 msgid "Wake Me Up" msgstr "Wake Me Up" -#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:45 +#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45 #: src/protocols/silc/silc.c:74 msgid "Hyper Active" msgstr "Hyper Active" -#: src/protocols/silc/buddy.c:1417 +#: src/protocols/silc/buddy.c:1389 msgid "Robot" msgstr "Robot" -#: src/protocols/silc/buddy.c:1424 src/protocols/silc/buddy.c:1492 -#: src/protocols/silc/silc.c:606 +#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464 +#: src/protocols/silc/silc.c:610 msgid "Happy" msgstr "Happy" -#: src/protocols/silc/buddy.c:1426 src/protocols/silc/buddy.c:1494 -#: src/protocols/silc/silc.c:608 +#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466 +#: src/protocols/silc/silc.c:612 msgid "Sad" msgstr "Sad" -#: src/protocols/silc/buddy.c:1428 src/protocols/silc/buddy.c:1496 -#: src/protocols/silc/silc.c:610 +#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468 +#: src/protocols/silc/silc.c:614 msgid "Angry" msgstr "Angry" -#: src/protocols/silc/buddy.c:1430 src/protocols/silc/buddy.c:1498 -#: src/protocols/silc/silc.c:612 +#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470 +#: src/protocols/silc/silc.c:616 msgid "Jealous" msgstr "Jealous" -#: src/protocols/silc/buddy.c:1432 src/protocols/silc/buddy.c:1500 -#: src/protocols/silc/silc.c:614 +#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472 +#: src/protocols/silc/silc.c:618 msgid "Ashamed" msgstr "Ashamed" -#: src/protocols/silc/buddy.c:1434 src/protocols/silc/buddy.c:1502 -#: src/protocols/silc/silc.c:616 +#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474 +#: src/protocols/silc/silc.c:620 msgid "Invincible" msgstr "Invincible" -#: src/protocols/silc/buddy.c:1436 src/protocols/silc/buddy.c:1504 -#: src/protocols/silc/silc.c:618 +#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476 +#: src/protocols/silc/silc.c:622 msgid "In Love" msgstr "In Love" -#: src/protocols/silc/buddy.c:1438 src/protocols/silc/buddy.c:1506 -#: src/protocols/silc/silc.c:620 +#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478 +#: src/protocols/silc/silc.c:624 msgid "Sleepy" msgstr "Sleepy" -#: src/protocols/silc/buddy.c:1440 src/protocols/silc/buddy.c:1508 -#: src/protocols/silc/silc.c:622 +#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480 +#: src/protocols/silc/silc.c:626 msgid "Bored" msgstr "Bored" -#: src/protocols/silc/buddy.c:1442 src/protocols/silc/buddy.c:1510 -#: src/protocols/silc/silc.c:624 +#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482 +#: src/protocols/silc/silc.c:628 msgid "Excited" msgstr "Excited" -#: src/protocols/silc/buddy.c:1444 src/protocols/silc/buddy.c:1512 -#: src/protocols/silc/silc.c:626 +#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484 +#: src/protocols/silc/silc.c:630 msgid "Anxious" msgstr "Anxious" -#: src/protocols/silc/buddy.c:1480 +#: src/protocols/silc/buddy.c:1452 msgid "Modes" msgstr "Modes" +#: src/protocols/silc/buddy.c:1462 +msgid "Mood" +msgstr "Mood" + #: src/protocols/silc/buddy.c:1490 -msgid "Mood" -msgstr "Mood" - -#: src/protocols/silc/buddy.c:1520 msgid "Status Text" msgstr "Status Text" -#: src/protocols/silc/buddy.c:1525 +#: src/protocols/silc/buddy.c:1495 msgid "Preferred Contact" msgstr "Preferred Contact" -#: src/protocols/silc/buddy.c:1533 +#: src/protocols/silc/buddy.c:1503 msgid "Paging" msgstr "Paging" -#: src/protocols/silc/buddy.c:1535 src/protocols/silc/silc.c:637 +#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:641 msgid "SMS" msgstr "SMS" -#: src/protocols/silc/buddy.c:1537 src/protocols/silc/silc.c:639 +#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:643 msgid "MMS" msgstr "MMS" -#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:641 +#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:645 msgid "Video Conferencing" msgstr "Video Conferencing" -#: src/protocols/silc/buddy.c:1546 +#: src/protocols/silc/buddy.c:1515 msgid "Preferred Language" msgstr "Preferred Language" -#: src/protocols/silc/buddy.c:1551 +#: src/protocols/silc/buddy.c:1520 msgid "Device" msgstr "Device" -#: src/protocols/silc/buddy.c:1553 +#: src/protocols/silc/buddy.c:1522 msgid "Computer" msgstr "Computer" -#: src/protocols/silc/buddy.c:1557 +#: src/protocols/silc/buddy.c:1526 msgid "PDA" msgstr "PDA" -#: src/protocols/silc/buddy.c:1559 +#: src/protocols/silc/buddy.c:1528 msgid "Terminal" msgstr "Terminal" -#: src/protocols/silc/buddy.c:1570 src/protocols/silc/silc.c:674 -#: src/protocols/silc/silc.c:676 +#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:678 +#: src/protocols/silc/silc.c:680 msgid "Timezone" msgstr "Time Zone" -#: src/protocols/silc/buddy.c:1576 +#: src/protocols/silc/buddy.c:1545 msgid "Geolocation" msgstr "Geolocation" -#: src/protocols/silc/buddy.c:1635 +#: src/protocols/silc/buddy.c:1604 msgid "Reset IM Key" msgstr "Reset IM Key" -#: src/protocols/silc/buddy.c:1640 +#: src/protocols/silc/buddy.c:1609 msgid "IM with Key Exchange" msgstr "IM with Key Exchange" -#: src/protocols/silc/buddy.c:1644 +#: src/protocols/silc/buddy.c:1613 msgid "IM with Password" msgstr "IM with Password" -#: src/protocols/silc/buddy.c:1655 +#: src/protocols/silc/buddy.c:1624 msgid "Get Public Key..." msgstr "Get Public Key..." -#: src/protocols/silc/buddy.c:1660 +#: src/protocols/silc/buddy.c:1629 msgid "Send File..." msgstr "Send File..." -#: src/protocols/silc/buddy.c:1665 src/protocols/silc/ops.c:1127 +#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1182 msgid "Kill User" msgstr "Kill User" @@ -8527,24 +8733,90 @@ msgid "Cannot get channel information" msgstr "Cannot get channel information" -#: src/protocols/silc/chat.c:217 +#: src/protocols/silc/chat.c:104 +#, c-format +msgid "Channel Name:\t\t%s\n" +msgstr "Channel Name:\t\t%s\n" + +#: src/protocols/silc/chat.c:106 +#, c-format +msgid "User Count:\t\t%d\n" +msgstr "User Count:\t\t%d\n" + +#: src/protocols/silc/chat.c:112 +#, c-format +msgid "Channel Founder:\t%s\n" +msgstr "Channel Founder:\t%s\n" + +#: src/protocols/silc/chat.c:120 +#, c-format +msgid "Channel Cipher:\t\t%s\n" +msgstr "Channel Cipher:\t\t%s\n" + +#: src/protocols/silc/chat.c:123 +#, c-format +msgid "Channel HMAC:\t\t%s\n" +msgstr "Channel HMAC:\t\t%s\n" + +#: src/protocols/silc/chat.c:127 +#, c-format +msgid "" +"\n" +"Channel Topic:\n" +"\t%s\n" +msgstr "" +"\n" +"Channel Topic:\n" +"\t%s\n" + +#: src/protocols/silc/chat.c:130 +msgid "" +"\n" +"Channel Modes:\n" +msgstr "" +"\n" +"Channel Modes:\n" + +#: src/protocols/silc/chat.c:144 +#, c-format +msgid "" +"\n" +"Founder Key Fingerprint:\n" +"%s\n" +"\n" +msgstr "" +"\n" +"Founder Key Fingerprint:\n" +"%s\n" +"\n" + +#: src/protocols/silc/chat.c:145 +#, c-format +msgid "" +"Founder Key Babbleprint:\n" +"%s" +msgstr "" +"Founder Key Babbleprint:\n" +"%s" + +#: src/protocols/silc/chat.c:218 msgid "Add Channel Public Key" msgstr "Add Channel Public Key" #. Add new public key -#: src/protocols/silc/chat.c:272 +#: src/protocols/silc/chat.c:273 msgid "Open Public Key..." msgstr "Open Public Key..." -#: src/protocols/silc/chat.c:383 +#: src/protocols/silc/chat.c:382 msgid "Channel Passphrase" msgstr "Channel Passphrase" -#: src/protocols/silc/chat.c:390 +#: src/protocols/silc/chat.c:389 msgid "Channel Public Keys List" msgstr "Channel Public Keys List" -#: src/protocols/silc/chat.c:395 +#: src/protocols/silc/chat.c:394 msgid "" "Channel authentication is used to secure the channel from unauthorized " "access. The authentication may be based on passphrase and digital " @@ -8558,119 +8830,123 @@ "channel public keys are set then only users whose public keys are listed are " "able to join." -#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405 -#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443 -#: src/protocols/silc/chat.c:873 +#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404 +#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442 +#: src/protocols/silc/chat.c:871 msgid "Channel Authentication" msgstr "Channel Authentication" -#: src/protocols/silc/chat.c:562 +#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443 +msgid "Add / Remove" +msgstr "Add / Remove" + +#: src/protocols/silc/chat.c:560 msgid "Group Name" msgstr "Group Name" -#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403 +#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1463 msgid "Passphrase" msgstr "Passphrase" -#: src/protocols/silc/chat.c:577 +#: src/protocols/silc/chat.c:575 #, 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:579 +#: src/protocols/silc/chat.c:577 msgid "Add Channel Private Group" msgstr "Add Channel Private Group" -#: src/protocols/silc/chat.c:706 +#: src/protocols/silc/chat.c:704 msgid "User Limit" msgstr "User Limit" -#: src/protocols/silc/chat.c:707 +#: src/protocols/silc/chat.c:705 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:849 +#: src/protocols/silc/chat.c:847 msgid "Get Info" msgstr "Get Info" -#: src/protocols/silc/chat.c:856 +#: src/protocols/silc/chat.c:854 msgid "Invite List" msgstr "Invite List" -#: src/protocols/silc/chat.c:860 +#: src/protocols/silc/chat.c:858 msgid "Ban List" msgstr "Ban List" -#: src/protocols/silc/chat.c:867 +#: src/protocols/silc/chat.c:865 msgid "Add Private Group" msgstr "Add Private Group" -#: src/protocols/silc/chat.c:878 +#: src/protocols/silc/chat.c:876 msgid "Reset Permanent" msgstr "Reset Permanent" -#: src/protocols/silc/chat.c:882 +#: src/protocols/silc/chat.c:880 msgid "Set Permanent" msgstr "Set Permanent" -#: src/protocols/silc/chat.c:889 +#: src/protocols/silc/chat.c:887 msgid "Set User Limit" msgstr "Set User Limit" -#: src/protocols/silc/chat.c:894 +#: src/protocols/silc/chat.c:892 msgid "Reset Topic Restriction" msgstr "Reset Topic Restriction" -#: src/protocols/silc/chat.c:898 +#: src/protocols/silc/chat.c:896 msgid "Set Topic Restriction" msgstr "Set Topic Restriction" -#: src/protocols/silc/chat.c:904 +#: src/protocols/silc/chat.c:902 msgid "Reset Private Channel" msgstr "Reset Private Channel" -#: src/protocols/silc/chat.c:908 +#: src/protocols/silc/chat.c:906 msgid "Set Private Channel" msgstr "Set Private Channel" -#: src/protocols/silc/chat.c:914 +#: src/protocols/silc/chat.c:912 msgid "Reset Secret Channel" msgstr "Reset Secret Channel" -#: src/protocols/silc/chat.c:918 +#: src/protocols/silc/chat.c:916 msgid "Set Secret Channel" msgstr "Set Secret Channel" -#: src/protocols/silc/chat.c:988 +#: src/protocols/silc/chat.c:986 #, 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:992 +#: src/protocols/silc/chat.c:990 #, 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:1042 +#: src/protocols/silc/chat.c:1043 #, 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:1044 +#: src/protocols/silc/chat.c:1045 msgid "Join Private Group" msgstr "Join Private Group" -#: src/protocols/silc/chat.c:1045 +#: src/protocols/silc/chat.c:1046 msgid "Cannot join private group" msgstr "Cannot join private group" -#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842 +#: src/protocols/silc/chat.c:1239 src/protocols/silc/silc.c:885 msgid "Cannot call command" msgstr "Cannot call command" -#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843 +#: src/protocols/silc/chat.c:1240 src/protocols/silc/silc.c:886 msgid "Unknown command" msgstr "Unknown command" @@ -8720,222 +8996,222 @@ msgid "Cannot send file" msgstr "Cannot send file" -#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331 -#: src/protocols/silc/ops.c:338 +#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:340 +#: src/protocols/silc/ops.c:347 #, c-format msgid "%s has changed the topic of <I>%s</I> to: %s" msgstr "%s has changed the topic of <I>%s</I> to: %s" -#: src/protocols/silc/ops.c:398 +#: src/protocols/silc/ops.c:407 #, c-format msgid "<I>%s</I> set channel <I>%s</I> modes to: %s" msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s" -#: src/protocols/silc/ops.c:402 +#: src/protocols/silc/ops.c:411 #, c-format msgid "<I>%s</I> removed all channel <I>%s</I> modes" msgstr "<I>%s</I> removed all channel <I>%s</I> modes" -#: src/protocols/silc/ops.c:433 +#: src/protocols/silc/ops.c:442 #, c-format msgid "<I>%s</I> set <I>%s's</I> modes to: %s" msgstr "<I>%s</I> set <I>%s's</I> modes to: %s" -#: src/protocols/silc/ops.c:437 +#: src/protocols/silc/ops.c:446 #, c-format msgid "<I>%s</I> removed all <I>%s's</I> modes" msgstr "<I>%s</I> removed all <I>%s's</I> modes" -#: src/protocols/silc/ops.c:464 +#: src/protocols/silc/ops.c:473 #, c-format msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)" msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)" -#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499 -#: src/protocols/silc/ops.c:504 +#: src/protocols/silc/ops.c:503 src/protocols/silc/ops.c:508 +#: src/protocols/silc/ops.c:513 #, c-format msgid "You have been killed by %s (%s)" msgstr "You have been killed by %s (%s)" -#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530 -#: src/protocols/silc/ops.c:535 +#: src/protocols/silc/ops.c:534 src/protocols/silc/ops.c:539 +#: src/protocols/silc/ops.c:544 #, c-format msgid "Killed by %s (%s)" msgstr "Killed by %s (%s)" -#: src/protocols/silc/ops.c:581 +#: src/protocols/silc/ops.c:590 msgid "Server signoff" msgstr "Server signoff" -#: src/protocols/silc/ops.c:767 +#: src/protocols/silc/ops.c:777 msgid "Personal Information" msgstr "Personal Information" -#: src/protocols/silc/ops.c:790 +#: src/protocols/silc/ops.c:800 msgid "Birth Day" msgstr "Birth Day" -#: src/protocols/silc/ops.c:794 +#: src/protocols/silc/ops.c:804 msgid "Job Title" msgstr "Job Title" -#: src/protocols/silc/ops.c:798 +#: src/protocols/silc/ops.c:808 msgid "Job Role" msgstr "Job Role" -#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285 +#: src/protocols/silc/ops.c:812 msgid "Organization" msgstr "Organization" -#: src/protocols/silc/ops.c:806 +#: src/protocols/silc/ops.c:816 msgid "Unit" msgstr "Unit" -#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281 +#: src/protocols/silc/ops.c:835 msgid "EMail" msgstr "EMail" -#: src/protocols/silc/ops.c:830 +#: src/protocols/silc/ops.c:840 msgid "Note" msgstr "Note" -#: src/protocols/silc/ops.c:878 +#: src/protocols/silc/ops.c:888 msgid "Join Chat" msgstr "Join Chat" -#: src/protocols/silc/ops.c:933 +#: src/protocols/silc/ops.c:943 msgid "Hostname" msgstr "Hostname" -#: src/protocols/silc/ops.c:940 +#: src/protocols/silc/ops.c:950 msgid "User Mode" msgstr "User Mode" -#: src/protocols/silc/ops.c:954 +#: src/protocols/silc/ops.c:964 msgid "Channels" msgstr "Channels" -#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291 +#: src/protocols/silc/ops.c:991 msgid "Public Key Fingerprint" msgstr "Public Key Fingerprint" -#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292 +#: src/protocols/silc/ops.c:992 msgid "Public Key Babbleprint" msgstr "Public Key Babbleprint" -#: src/protocols/silc/ops.c:995 +#: src/protocols/silc/ops.c:1005 msgid "More..." msgstr "More..." -#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745 +#: src/protocols/silc/ops.c:1016 src/protocols/silc/silc.c:774 msgid "Detach From Server" msgstr "Detach From Server" -#: src/protocols/silc/ops.c:1006 +#: src/protocols/silc/ops.c:1016 msgid "Cannot detach" msgstr "Cannot detach" -#: src/protocols/silc/ops.c:1017 +#: src/protocols/silc/ops.c:1027 msgid "Cannot set topic" msgstr "Cannot set topic" -#: src/protocols/silc/ops.c:1045 +#: src/protocols/silc/ops.c:1098 msgid "Roomlist" msgstr "Roomlist" -#: src/protocols/silc/ops.c:1045 +#: src/protocols/silc/ops.c:1098 msgid "Cannot get room list" msgstr "Cannot get room list" -#: src/protocols/silc/ops.c:1093 +#: src/protocols/silc/ops.c:1146 msgid "No public key was received" msgstr "No public key was received" -#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119 -#: src/protocols/silc/ops.c:1120 +#: src/protocols/silc/ops.c:1159 src/protocols/silc/ops.c:1173 +#: src/protocols/silc/ops.c:1174 msgid "Server Information" msgstr "Server Information" -#: src/protocols/silc/ops.c:1107 +#: src/protocols/silc/ops.c:1160 msgid "Cannot get server information" msgstr "Cannot get server information" -#: src/protocols/silc/ops.c:1128 +#: src/protocols/silc/ops.c:1183 msgid "Could not kill user" msgstr "Could not kill user" -#: src/protocols/silc/ops.c:1205 +#: src/protocols/silc/ops.c:1265 msgid "Error during connecting to SILC Server" msgstr "Error during connecting to SILC Server" -#: src/protocols/silc/ops.c:1210 +#: src/protocols/silc/ops.c:1270 msgid "Key Exchange failed" msgstr "Key Exchange failed" -#: src/protocols/silc/ops.c:1219 +#: src/protocols/silc/ops.c:1279 msgid "" "Resuming detached session failed. Press Reconnect to create new connection." msgstr "" "Resuming detached session failed. Press Reconnect to create new connection." -#: src/protocols/silc/ops.c:1254 +#: src/protocols/silc/ops.c:1314 msgid "Disconnected by server" msgstr "Disconnected by server" -#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361 +#: src/protocols/silc/ops.c:1374 src/protocols/silc/ops.c:1421 #: src/protocols/silc/silc.c:167 msgid "Resuming session" msgstr "Resuming session" -#: src/protocols/silc/ops.c:1316 +#: src/protocols/silc/ops.c:1376 msgid "Authenticating connection" msgstr "Authenticating connection" -#: src/protocols/silc/ops.c:1363 +#: src/protocols/silc/ops.c:1423 msgid "Verifying server public key" msgstr "Verifying server public key" -#: src/protocols/silc/ops.c:1404 +#: src/protocols/silc/ops.c:1464 msgid "Passphrase required" msgstr "Passphrase required" -#: src/protocols/silc/ops.c:1433 +#: src/protocols/silc/ops.c:1493 msgid "Failure: Version mismatch, upgrade your client" msgstr "Failure: Version mismatch; upgrade your client" -#: src/protocols/silc/ops.c:1436 +#: src/protocols/silc/ops.c:1496 msgid "Failure: Remote does not trust/support your public key" msgstr "Failure: Remote does not trust/support your public key" -#: src/protocols/silc/ops.c:1439 +#: src/protocols/silc/ops.c:1499 msgid "Failure: Remote does not support proposed KE group" msgstr "Failure: Remote does not support proposed KE group" -#: src/protocols/silc/ops.c:1442 +#: src/protocols/silc/ops.c:1502 msgid "Failure: Remote does not support proposed cipher" msgstr "Failure: Remote does not support proposed cipher" -#: src/protocols/silc/ops.c:1445 +#: src/protocols/silc/ops.c:1505 msgid "Failure: Remote does not support proposed PKCS" msgstr "Failure: Remote does not support proposed PKCS" -#: src/protocols/silc/ops.c:1448 +#: src/protocols/silc/ops.c:1508 msgid "Failure: Remote does not support proposed hash function" msgstr "Failure: Remote does not support proposed hash function" -#: src/protocols/silc/ops.c:1451 +#: src/protocols/silc/ops.c:1511 msgid "Failure: Remote does not support proposed HMAC" msgstr "Failure: Remote does not support proposed HMAC" -#: src/protocols/silc/ops.c:1453 +#: src/protocols/silc/ops.c:1513 msgid "Failure: Incorrect signature" msgstr "Failure: Incorrect signature" -#: src/protocols/silc/ops.c:1455 +#: src/protocols/silc/ops.c:1515 msgid "Failure: Invalid cookie" msgstr "Failure: Invalid cookie" -#: src/protocols/silc/ops.c:1466 +#: src/protocols/silc/ops.c:1526 msgid "Failure: Authentication failed" msgstr "Failure: Authentication failed" @@ -8999,15 +9275,15 @@ msgid "Connecting to SILC Server" msgstr "Connecting to SILC Server" -#: src/protocols/silc/silc.c:602 +#: src/protocols/silc/silc.c:606 msgid "Your Current Mood" msgstr "Your Current Mood" -#: src/protocols/silc/silc.c:604 +#: src/protocols/silc/silc.c:608 msgid "Normal" msgstr "Normal" -#: src/protocols/silc/silc.c:629 +#: src/protocols/silc/silc.c:633 msgid "" "\n" "Your Preferred Contact Methods" @@ -9015,31 +9291,31 @@ "\n" "Your Preferred Contact Methods" -#: src/protocols/silc/silc.c:646 +#: src/protocols/silc/silc.c:650 msgid "Your Current Status" msgstr "Your Current Status" -#: src/protocols/silc/silc.c:653 +#: src/protocols/silc/silc.c:657 msgid "Online Services" msgstr "Online Services" -#: src/protocols/silc/silc.c:656 +#: src/protocols/silc/silc.c:660 msgid "Let others see what services you are using" msgstr "Let others see what services you are using" -#: src/protocols/silc/silc.c:662 +#: src/protocols/silc/silc.c:666 msgid "Let others see what computer you are using" msgstr "Let others see what computer you are using" -#: src/protocols/silc/silc.c:669 +#: src/protocols/silc/silc.c:673 msgid "Your VCard File" msgstr "Your VCard File" -#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683 +#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687 msgid "User Online Status Attributes" msgstr "User Online Status Attributes" -#: src/protocols/silc/silc.c:684 +#: src/protocols/silc/silc.c:688 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 " @@ -9049,64 +9325,109 @@ "information. Please fill the information you would like other users to see " "about yourself." -#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728 +#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:732 +#: src/protocols/silc/silc.c:1101 src/protocols/silc/silc.c:1106 msgid "Message of the Day" msgstr "Message of the Day" -#: src/protocols/silc/silc.c:723 +#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:1101 msgid "No Message of the Day available" msgstr "No Message of the Day available" -#: src/protocols/silc/silc.c:724 +#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:1102 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:740 +#: src/protocols/silc/silc.c:769 msgid "Online Status" msgstr "Online Status" -#: src/protocols/silc/silc.c:749 +#: src/protocols/silc/silc.c:778 msgid "View Message of the Day" msgstr "View Message of the Day" -#: src/protocols/silc/silc.c:813 +#: src/protocols/silc/silc.c:850 #, 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:907 +#: src/protocols/silc/silc.c:1216 +msgid "part: Leave the chat" +msgstr "part: Leave the chat" + +#: src/protocols/silc/silc.c:1220 +msgid "leave: Leave the chat" +msgstr "leave: Leave the chat" + +#: src/protocols/silc/silc.c:1224 +msgid "topic [<new topic>]: View or change the topic" +msgstr "topic [<new topic>]: View or change the topic" + +#: src/protocols/silc/silc.c:1229 +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:1233 +msgid "list: List channels on this network" +msgstr "list: List channels on this network" + +#: src/protocols/silc/silc.c:1237 +msgid "whois <nick>: View nick's information" +msgstr "whois <nick>: View nick's information" + +#: src/protocols/silc/silc.c:1241 +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:1245 +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:1249 +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:1253 +msgid "detach: Detach this session" +msgstr "detach: Detach this session" + +#: src/protocols/silc/silc.c:1282 +msgid "umode <usermodes>: Set your user options" +msgstr "umode <usermodes>: Set your user options" + +#: src/protocols/silc/silc.c:1335 msgid "Instant Messages" msgstr "Instant Messages" -#: src/protocols/silc/silc.c:912 +#: src/protocols/silc/silc.c:1340 msgid "Digitally sign all IM messages" msgstr "Digitally sign all IM messages" -#: src/protocols/silc/silc.c:917 +#: src/protocols/silc/silc.c:1345 msgid "Verify all IM message signatures" msgstr "Verify all IM message signatures" -#: src/protocols/silc/silc.c:920 +#: src/protocols/silc/silc.c:1348 msgid "Channel Messages" msgstr "Channel Messages" -#: src/protocols/silc/silc.c:925 +#: src/protocols/silc/silc.c:1353 msgid "Digitally sign all channel messages" msgstr "Digitally sign all channel messages" -#: src/protocols/silc/silc.c:930 +#: src/protocols/silc/silc.c:1358 msgid "Verify all channel message signatures" msgstr "Verify all channel message signatures" -#: src/protocols/silc/silc.c:933 +#: src/protocols/silc/silc.c:1361 msgid "Default SILC Key Pair" msgstr "Default SILC Key Pair" -#: src/protocols/silc/silc.c:938 +#: src/protocols/silc/silc.c:1366 msgid "SILC Public Key" msgstr "SILC Public Key" -#: src/protocols/silc/silc.c:943 +#: src/protocols/silc/silc.c:1371 msgid "SILC Private Key" msgstr "SILC Private Key" @@ -9120,68 +9441,111 @@ #. *< name #. *< version #. * summary -#: src/protocols/silc/silc.c:1026 +#: src/protocols/silc/silc.c:1455 msgid "SILC Protocol Plugin" msgstr "SILC Protocol Plugin" #. * description -#: src/protocols/silc/silc.c:1028 +#: src/protocols/silc/silc.c:1457 msgid "Secure Internet Live Conferencing (SILC) Protocol" msgstr "Secure Internet Live Conferencing (SILC) Protocol" -#: src/protocols/silc/silc.c:1058 +#: src/protocols/silc/silc.c:1487 msgid "Public key authentication" msgstr "Public key authentication" -#: src/protocols/silc/silc.c:1064 +#: src/protocols/silc/silc.c:1493 msgid "Public Key File" msgstr "Public Key File" -#: src/protocols/silc/silc.c:1068 +#: src/protocols/silc/silc.c:1497 msgid "Private Key File" msgstr "Private Key File" -#: src/protocols/silc/silc.c:1073 +#: src/protocols/silc/silc.c:1502 msgid "Reject watching by other users" msgstr "Reject watching by other users" -#: src/protocols/silc/silc.c:1076 +#: src/protocols/silc/silc.c:1505 msgid "Block invites" msgstr "Block invites" -#: src/protocols/silc/silc.c:1079 +#: src/protocols/silc/silc.c:1508 msgid "Block IMs without Key Exchange" msgstr "Block IMs without Key Exchange" -#: src/protocols/silc/silc.c:1082 +#: src/protocols/silc/silc.c:1511 msgid "Reject online status attribute requests" msgstr "Reject online status attribute requests" -#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217 +#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227 msgid "Creating SILC key pair..." msgstr "Creating SILC key pair..." -#: src/protocols/silc/util.c:277 -msgid "Real Name" -msgstr "Real Name" - -#: src/protocols/silc/util.c:279 -msgid "User Name" -msgstr "User Name" - -#: src/protocols/silc/util.c:283 -msgid "Host Name" -msgstr "Host Name" - -#: src/protocols/silc/util.c:288 -msgid "Algorithm" -msgstr "Algorithm" - -#: src/protocols/silc/util.c:289 -msgid "Key Length" -msgstr "Key Length" - -#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297 +#. Hint for translators: Please check the tabulator width here and in +#. the next strings (short strings: 2 tabs, longer strings 1 tab, +#. sum: 3 tabs or 24 characters) +#: src/protocols/silc/util.c:310 +#, c-format +msgid "Real Name: \t%s\n" +msgstr "Real Name: \t%s\n" + +#: src/protocols/silc/util.c:312 +#, c-format +msgid "User Name: \t%s\n" +msgstr "User Name: \t%s\n" + +#: src/protocols/silc/util.c:314 +#, c-format +msgid "EMail: \t\t%s\n" +msgstr "EMail: \t\t%s\n" + +#: src/protocols/silc/util.c:316 +#, c-format +msgid "Host Name: \t%s\n" +msgstr "Host Name: \t%s\n" + +#: src/protocols/silc/util.c:318 +#, c-format +msgid "Organization: \t%s\n" +msgstr "Organization: \t%s\n" + +#: src/protocols/silc/util.c:320 +#, c-format +msgid "Country: \t%s\n" +msgstr "Country: \t%s\n" + +#: src/protocols/silc/util.c:321 +#, c-format +msgid "Algorithm: \t\t%s\n" +msgstr "Algorithm: \t\t%s\n" + +#: src/protocols/silc/util.c:322 +#, c-format +msgid "Key Length: \t%d bits\n" +msgstr "Key Length: \t%d bits\n" + +#: src/protocols/silc/util.c:324 +#, c-format +msgid "" +"Public Key Fingerprint:\n" +"%s\n" +"\n" +msgstr "" +"Public Key Fingerprint:\n" +"%s\n" +"\n" + +#: src/protocols/silc/util.c:325 +#, c-format +msgid "" +"Public Key Babbleprint:\n" +"%s" +msgstr "" +"Public Key Babbleprint:\n" +"%s" + +#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330 msgid "Public Key Information" msgstr "Public Key Information" @@ -9314,19 +9678,19 @@ msgid "Waiting for reply..." msgstr "Waiting for reply..." -#: src/protocols/toc/toc.c:692 +#: src/protocols/toc/toc.c:695 msgid "TOC has come back from its pause. You may now send messages again." msgstr "TOC has come back from its pause. You may now send messages again." -#: src/protocols/toc/toc.c:887 +#: src/protocols/toc/toc.c:890 msgid "Password Change Successful" msgstr "Password Change Successful" -#: src/protocols/toc/toc.c:891 +#: src/protocols/toc/toc.c:894 msgid "TOC has sent a PAUSE command." msgstr "TOC has sent a PAUSE command." -#: src/protocols/toc/toc.c:892 +#: src/protocols/toc/toc.c:895 msgid "" "When this happens, TOC ignores any messages sent to it, and may kick you off " "if you send a message. Gaim will prevent anything from going through. This " @@ -9336,44 +9700,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:1402 +#: src/protocols/toc/toc.c:1409 msgid "Get Dir Info" msgstr "Get Dir Info" -#: src/protocols/toc/toc.c:1538 +#: src/protocols/toc/toc.c:1545 msgid "Set Dir Info" msgstr "Set Dir Info" -#: src/protocols/toc/toc.c:1660 +#: src/protocols/toc/toc.c:1667 #, c-format msgid "Could not open %s for writing!" msgstr "Could not open %s for writing!" -#: src/protocols/toc/toc.c:1696 +#: src/protocols/toc/toc.c:1703 msgid "File transfer failed; other side probably canceled." msgstr "File transfer failed; other side probably canceled." -#: src/protocols/toc/toc.c:1741 src/protocols/toc/toc.c:1781 -#: src/protocols/toc/toc.c:1905 src/protocols/toc/toc.c:1993 +#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788 +#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000 msgid "Could not connect for transfer." msgstr "Could not connect for transfer." -#: src/protocols/toc/toc.c:1938 +#: src/protocols/toc/toc.c:1945 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:2038 +#: src/protocols/toc/toc.c:2045 msgid "Gaim - Save As..." msgstr "Gaim - Save As..." -#: src/protocols/toc/toc.c:2072 +#: src/protocols/toc/toc.c:2079 #, 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:2079 +#: src/protocols/toc/toc.c:2086 #, c-format msgid "%s requests you to send them a file" msgstr "%s requests you to send them a file" @@ -9389,15 +9753,15 @@ #. *< version #. * summary #. * description -#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161 +#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169 msgid "TOC Protocol Plugin" msgstr "TOC Protocol Plugin" -#: src/protocols/toc/toc.c:2180 +#: src/protocols/toc/toc.c:2188 msgid "TOC host" msgstr "TOC host" -#: src/protocols/toc/toc.c:2184 +#: src/protocols/toc/toc.c:2192 msgid "TOC port" msgstr "TOC port" @@ -9481,11 +9845,11 @@ #. *< version #. * summary #. * description -#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280 +#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271 msgid "Trepia Protocol Plugin" msgstr "Trepia Protocol Plugin" -#: src/protocols/yahoo/yahoo.c:307 +#: src/protocols/yahoo/yahoo.c:337 msgid "" "You have been logged off as you have logged in on a different machine or " "device." @@ -9493,25 +9857,25 @@ "You have been logged off as you have logged in on a different machine or " "device." -#: src/protocols/yahoo/yahoo.c:749 +#: src/protocols/yahoo/yahoo.c:807 msgid "Your Yahoo! message did not get sent." msgstr "Your Yahoo! message did not get sent." -#: src/protocols/yahoo/yahoo.c:767 +#: src/protocols/yahoo/yahoo.c:826 msgid "Buzz!!" msgstr "Buzz!!" -#: src/protocols/yahoo/yahoo.c:802 +#: src/protocols/yahoo/yahoo.c:869 #, c-format msgid "Yahoo! system message for %s:" msgstr "Yahoo! system message for %s:" -#: src/protocols/yahoo/yahoo.c:868 +#: src/protocols/yahoo/yahoo.c:935 #, 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:871 +#: src/protocols/yahoo/yahoo.c:938 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -9520,11 +9884,11 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." -#: src/protocols/yahoo/yahoo.c:874 +#: src/protocols/yahoo/yahoo.c:941 msgid "Add buddy rejected" msgstr "Add buddy rejected" -#: src/protocols/yahoo/yahoo.c:1620 +#: src/protocols/yahoo/yahoo.c:1701 #, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -9535,11 +9899,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:1623 +#: src/protocols/yahoo/yahoo.c:1704 msgid "Failed Yahoo! Authentication" msgstr "Failed Yahoo! Authentication" -#: src/protocols/yahoo/yahoo.c:1696 +#: src/protocols/yahoo/yahoo.c:1776 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -9548,76 +9912,76 @@ "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:1699 +#: src/protocols/yahoo/yahoo.c:1779 msgid "Ignore buddy?" msgstr "Ignore buddy?" -#: src/protocols/yahoo/yahoo.c:1732 +#: src/protocols/yahoo/yahoo.c:1812 msgid "Invalid username." msgstr "Invalid username." -#: src/protocols/yahoo/yahoo.c:1735 +#: src/protocols/yahoo/yahoo.c:1815 msgid "Incorrect password." msgstr "Incorrect password." -#: src/protocols/yahoo/yahoo.c:1738 -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:1741 -#, c-format -msgid "Unknown error number %d." -msgstr "Unknown error number %d." - -#: src/protocols/yahoo/yahoo.c:1798 +#: src/protocols/yahoo/yahoo.c:1818 +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:1821 +#, 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:1875 #, 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:1800 +#: src/protocols/yahoo/yahoo.c:1877 msgid "Could not add buddy to server list" msgstr "Could not add buddy to server list" -#: src/protocols/yahoo/yahoo.c:1965 src/protocols/yahoo/yahoo.c:2096 +#: src/protocols/yahoo/yahoo.c:2068 src/protocols/yahoo/yahoo.c:2196 msgid "Unable to read" msgstr "Unable to read" -#: src/protocols/yahoo/yahoo.c:2118 src/protocols/yahoo/yahoo.c:2228 -#: src/protocols/yahoo/yahoo.c:2271 src/protocols/yahoo/yahoochat.c:1360 -#: src/protocols/yahoo/yahoochat.c:1421 +#: src/protocols/yahoo/yahoo.c:2218 src/protocols/yahoo/yahoo.c:2328 +#: src/protocols/yahoo/yahoo.c:2378 src/protocols/yahoo/yahoo.c:2389 +#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458 msgid "Connection problem" msgstr "Connection problem" -#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2740 -#: src/protocols/yahoo/yahoo.c:2852 +#: src/protocols/yahoo/yahoo.c:2481 src/protocols/yahoo/yahoo.c:2862 +#: src/protocols/yahoo/yahoo.c:2976 msgid "Not At Home" msgstr "Not At Home" -#: src/protocols/yahoo/yahoo.c:2357 src/protocols/yahoo/yahoo.c:2742 -#: src/protocols/yahoo/yahoo.c:2853 +#: src/protocols/yahoo/yahoo.c:2483 src/protocols/yahoo/yahoo.c:2864 +#: src/protocols/yahoo/yahoo.c:2977 msgid "Not At Desk" msgstr "Not At Desk" -#: src/protocols/yahoo/yahoo.c:2359 src/protocols/yahoo/yahoo.c:2744 -#: src/protocols/yahoo/yahoo.c:2854 +#: src/protocols/yahoo/yahoo.c:2485 src/protocols/yahoo/yahoo.c:2866 +#: src/protocols/yahoo/yahoo.c:2978 msgid "Not In Office" msgstr "Not In Office" -#: src/protocols/yahoo/yahoo.c:2363 src/protocols/yahoo/yahoo.c:2748 -#: src/protocols/yahoo/yahoo.c:2856 +#: src/protocols/yahoo/yahoo.c:2489 src/protocols/yahoo/yahoo.c:2870 +#: src/protocols/yahoo/yahoo.c:2980 msgid "On Vacation" msgstr "On Vacation" -#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2752 -#: src/protocols/yahoo/yahoo.c:2858 +#: src/protocols/yahoo/yahoo.c:2493 src/protocols/yahoo/yahoo.c:2874 +#: src/protocols/yahoo/yahoo.c:2982 msgid "Stepped Out" msgstr "Stepped Out" -#: src/protocols/yahoo/yahoo.c:2448 src/protocols/yahoo/yahoo.c:2480 +#: src/protocols/yahoo/yahoo.c:2574 src/protocols/yahoo/yahoo.c:2600 msgid "Not on server list" msgstr "Not on server list" -#: src/protocols/yahoo/yahoo.c:2500 +#: src/protocols/yahoo/yahoo.c:2620 #, c-format msgid "" "\n" @@ -9626,81 +9990,30 @@ "\n" "<b>%s:</b> %s" -#: src/protocols/yahoo/yahoo.c:2572 +#: src/protocols/yahoo/yahoo.c:2693 msgid "Join in Chat" msgstr "Join in Chat" -#: src/protocols/yahoo/yahoo.c:2576 +#: src/protocols/yahoo/yahoo.c:2698 msgid "Initiate Conference" msgstr "Initiate Conference" -#: src/protocols/yahoo/yahoo.c:2636 +#: src/protocols/yahoo/yahoo.c:2755 msgid "Active which ID?" msgstr "Active which ID?" -#: src/protocols/yahoo/yahoo.c:2645 +#: src/protocols/yahoo/yahoo.c:2764 msgid "Join who in chat?" msgstr "Join who in chat?" -#: src/protocols/yahoo/yahoo.c:2655 +#: src/protocols/yahoo/yahoo.c:2774 msgid "Activate ID..." msgstr "Activate ID..." -#: src/protocols/yahoo/yahoo.c:2659 +#: src/protocols/yahoo/yahoo.c:2778 msgid "Join user in chat..." msgstr "Join user in chat..." -#: src/protocols/yahoo/yahoo.c:3051 -msgid "" -"<b>Sorry, profiles marked as containing adult content are not supported at " -"this time.</b><br><br>\n" -msgstr "" -"<b>Sorry, profiles marked as containing adult content are not supported at " -"this time.</b><br><br>\n" - -#: src/protocols/yahoo/yahoo.c:3052 src/protocols/yahoo/yahoo.c:3075 -msgid "" -"If you wish to view this profile, you will need to visit this link in your " -"web browser<br>" -msgstr "" -"If you wish to view this profile, you will need to visit this link in your " -"web browser<br>" - -#: src/protocols/yahoo/yahoo.c:3074 -msgid "" -"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n" -msgstr "" -"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n" - -#: src/protocols/yahoo/yahoo.c:3122 src/protocols/yahoo/yahoo.c:3123 -msgid "Yahoo! ID" -msgstr "Yahoo! ID" - -#: src/protocols/yahoo/yahoo.c:3167 src/protocols/yahoo/yahoo.c:3170 -#: src/protocols/yahoo/yahoo.c:3173 -msgid "Hobbies" -msgstr "Hobbies" - -#: src/protocols/yahoo/yahoo.c:3182 src/protocols/yahoo/yahoo.c:3185 -msgid "Latest News" -msgstr "Latest News" - -#: src/protocols/yahoo/yahoo.c:3199 -msgid "Home Page" -msgstr "Home Page" - -#: src/protocols/yahoo/yahoo.c:3211 -msgid "Cool Link 1" -msgstr "Cool Link 1" - -#: src/protocols/yahoo/yahoo.c:3215 -msgid "Cool Link 2" -msgstr "Cool Link 2" - -#: src/protocols/yahoo/yahoo.c:3217 -msgid "Cool Link 3" -msgstr "Cool Link 3" - #. *< api_version #. *< type #. *< ui_requirement @@ -9712,31 +10025,51 @@ #. *< version #. * summary #. * description -#: src/protocols/yahoo/yahoo.c:3425 src/protocols/yahoo/yahoo.c:3427 +#: src/protocols/yahoo/yahoo.c:3307 src/protocols/yahoo/yahoo.c:3309 msgid "Yahoo Protocol Plugin" msgstr "Yahoo Protocol Plugin" -#: src/protocols/yahoo/yahoo.c:3446 +#: src/protocols/yahoo/yahoo.c:3328 +msgid "Yahoo Japan" +msgstr "Yahoo Japan" + +#: src/protocols/yahoo/yahoo.c:3331 msgid "Pager host" msgstr "Pager host" -#: src/protocols/yahoo/yahoo.c:3449 +#: src/protocols/yahoo/yahoo.c:3334 +msgid "Japan Pager host" +msgstr "Japan Pager host" + +#: src/protocols/yahoo/yahoo.c:3337 msgid "Pager port" msgstr "Pager port" -#: src/protocols/yahoo/yahoo.c:3452 +#: src/protocols/yahoo/yahoo.c:3340 msgid "File transfer host" msgstr "File transfer host" -#: src/protocols/yahoo/yahoo.c:3455 +#: src/protocols/yahoo/yahoo.c:3343 +msgid "Japan File transfer host" +msgstr "Japan File transfer host" + +#: src/protocols/yahoo/yahoo.c:3346 msgid "File transfer port" msgstr "File transfer port" -#: src/protocols/yahoo/yahoo.c:3458 +#: src/protocols/yahoo/yahoo.c:3349 msgid "Chat Room List Url" msgstr "Chat Room List Url" -#: src/protocols/yahoo/yahoo_filexfer.c:200 +#: src/protocols/yahoo/yahoo.c:3352 +msgid "YCHT Host" +msgstr "YCHT Host" + +#: src/protocols/yahoo/yahoo.c:3355 +msgid "YCHT Port" +msgstr "YCHT Port" + +#: src/protocols/yahoo/yahoo_filexfer.c:170 msgid "" "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " "(1,048,576 bytes)." @@ -9744,88 +10077,155 @@ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " "(1,048,576 bytes)." -#: src/protocols/yahoo/yahoochat.c:198 +#: src/protocols/yahoo/yahoo_profile.c:640 +#: src/protocols/yahoo/yahoo_profile.c:961 +msgid "Yahoo! ID" +msgstr "Yahoo! ID" + +#: src/protocols/yahoo/yahoo_profile.c:664 +#, c-format +msgid "<b>IP Address:</b> %s<br>" +msgstr "<b>IP Address:</b> %s<br>" + +#: src/protocols/yahoo/yahoo_profile.c:779 +msgid "" +"Sorry, profiles marked as containing adult content are not supported at this " +"time." +msgstr "" +"Sorry, profiles marked as containing adult content are not supported at this " +"time." + +#: src/protocols/yahoo/yahoo_profile.c:781 +#: src/protocols/yahoo/yahoo_profile.c:829 +msgid "" +"If you wish to view this profile, you will need to visit this link in your " +"web browser" +msgstr "" +"If you wish to view this profile, you will need to visit this link in your " +"web browser" + +#: src/protocols/yahoo/yahoo_profile.c:827 +msgid "" +"Sorry, this profile seems to be in a language that is not supported at this " +"time." +msgstr "" +"Sorry, this profile seems to be in a language that is not supported at this " +"time." + +#: src/protocols/yahoo/yahoo_profile.c:1038 +#: src/protocols/yahoo/yahoo_profile.c:1042 +#: src/protocols/yahoo/yahoo_profile.c:1046 +msgid "Hobbies" +msgstr "Hobbies" + +#: src/protocols/yahoo/yahoo_profile.c:1056 +#: src/protocols/yahoo/yahoo_profile.c:1060 +msgid "Latest News" +msgstr "Latest News" + +#: src/protocols/yahoo/yahoo_profile.c:1081 +msgid "Home Page" +msgstr "Home Page" + +#: src/protocols/yahoo/yahoo_profile.c:1096 +msgid "Cool Link 1" +msgstr "Cool Link 1" + +#: src/protocols/yahoo/yahoo_profile.c:1101 +msgid "Cool Link 2" +msgstr "Cool Link 2" + +#: src/protocols/yahoo/yahoo_profile.c:1105 +msgid "Cool Link 3" +msgstr "Cool Link 3" + +#: src/protocols/yahoo/yahoo_profile.c:1138 +#, c-format +msgid "User information for %s unavailable" +msgstr "User information for %s unavailable" + +#: src/protocols/yahoo/yahoochat.c:203 #, 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:200 +#: src/protocols/yahoo/yahoochat.c:205 msgid "Invitation Rejected" msgstr "Invitation Rejected" -#: src/protocols/yahoo/yahoochat.c:350 +#: src/protocols/yahoo/yahoochat.c:355 msgid "Failed to join chat" msgstr "Failed to join chat" -#: src/protocols/yahoo/yahoochat.c:350 +#: src/protocols/yahoo/yahoochat.c:355 msgid "Maybe the room is full?" msgstr "Maybe the room is full?" -#: src/protocols/yahoo/yahoochat.c:426 +#: src/protocols/yahoo/yahoochat.c:429 #, c-format msgid "You are now chatting in %s." msgstr "You are now chatting in %s." -#: src/protocols/yahoo/yahoochat.c:580 +#: src/protocols/yahoo/yahoochat.c:583 msgid "Failed to join buddy in chat" msgstr "Failed to join buddy in chat" -#: src/protocols/yahoo/yahoochat.c:581 +#: src/protocols/yahoo/yahoochat.c:584 msgid "Maybe they're not in a chat?" msgstr "Maybe they're not in a chat?" -#: src/protocols/yahoo/yahoochat.c:1301 +#: src/protocols/yahoo/yahoochat.c:1338 msgid "Unable to connect" msgstr "Unable to connect" -#: src/protocols/yahoo/yahoochat.c:1301 +#: src/protocols/yahoo/yahoochat.c:1338 msgid "Fetching the room list failed." msgstr "Fetching the room list failed." -#: src/protocols/yahoo/yahoochat.c:1346 +#: src/protocols/yahoo/yahoochat.c:1383 msgid "Voices" msgstr "Voices" -#: src/protocols/yahoo/yahoochat.c:1349 +#: src/protocols/yahoo/yahoochat.c:1386 msgid "Webcams" msgstr "Webcams" -#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421 +#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458 msgid "Unable to fetch room list." msgstr "Unable to fetch room list." -#: src/protocols/yahoo/yahoochat.c:1414 +#: src/protocols/yahoo/yahoochat.c:1451 msgid "User Rooms" msgstr "User Rooms" -#: src/protocols/zephyr/zephyr.c:558 +#: src/protocols/zephyr/zephyr.c:566 +#, c-format +msgid "Unable send to chat %s,%s,%s" +msgstr "Unable send to chat %s,%s,%s" + +#: src/protocols/zephyr/zephyr.c:600 #, c-format msgid "<b>User:</b> %s<br>" msgstr "<b>User:</b> %s<br>" -#: src/protocols/zephyr/zephyr.c:560 -#, c-format -msgid "<b>Alias:</b> %s<br>" -msgstr "<b>Alias:</b> %s<br>" - -#: src/protocols/zephyr/zephyr.c:562 +#: src/protocols/zephyr/zephyr.c:604 msgid "<br>Hidden or not logged-in" msgstr "<br>Hidden or not logged-in" -#: src/protocols/zephyr/zephyr.c:566 +#: src/protocols/zephyr/zephyr.c:608 #, c-format msgid "<br>At %s since %s" msgstr "<br>At %s since %s" -#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833 +#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874 msgid "Anyone" msgstr "Anyone" -#: src/protocols/zephyr/zephyr.c:859 +#: src/protocols/zephyr/zephyr.c:900 msgid "Already logged in with Zephyr" msgstr "Already logged in with Zephyr" -#: src/protocols/zephyr/zephyr.c:859 +#: src/protocols/zephyr/zephyr.c:900 msgid "" "Because Zephyr uses your system username, you are unable to have multiple " "accounts on it when logged in as the same user." @@ -9833,15 +10233,15 @@ "Because Zephyr uses your system username, you are unable to have multiple " "accounts on it when logged in as the same user." -#: src/protocols/zephyr/zephyr.c:1191 +#: src/protocols/zephyr/zephyr.c:1232 msgid "_Class:" msgstr "_Class:" -#: src/protocols/zephyr/zephyr.c:1197 +#: src/protocols/zephyr/zephyr.c:1238 msgid "_Instance:" msgstr "_Instance:" -#: src/protocols/zephyr/zephyr.c:1203 +#: src/protocols/zephyr/zephyr.c:1244 msgid "_Recipient:" msgstr "_Recipient:" @@ -9856,19 +10256,19 @@ #. *< version #. * summary #. * description -#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355 +#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414 msgid "Zephyr Protocol Plugin" msgstr "Zephyr Protocol Plugin" -#: src/protocols/zephyr/zephyr.c:1374 +#: src/protocols/zephyr/zephyr.c:1433 msgid "Export to .anyone" msgstr "Export to .anyone" -#: src/protocols/zephyr/zephyr.c:1377 +#: src/protocols/zephyr/zephyr.c:1436 msgid "Export to .zephyr.subs" msgstr "Export to .zephyr.subs" -#: src/protocols/zephyr/zephyr.c:1380 +#: src/protocols/zephyr/zephyr.c:1439 msgid "Exposure" msgstr "Exposure" @@ -9884,11 +10284,11 @@ msgid "Proxy connection error %d" msgstr "Proxy connection error %d" -#: src/proxy.c:1486 +#: src/proxy.c:1495 msgid "Invalid proxy settings" msgstr "Invalid proxy settings" -#: src/proxy.c:1486 +#: src/proxy.c:1495 msgid "" "Either the host name or port number specified for your given proxy type is " "invalid." @@ -9897,7 +10297,7 @@ "invalid." #. * Custom away message. -#: src/prpl.h:177 +#: src/prpl.h:205 msgid "Custom" msgstr "Custom" @@ -9908,67 +10308,67 @@ msgid "Accept" msgstr "Accept" -#: src/server.c:60 +#: src/server.c:63 msgid "Please enter your password" msgstr "Please enter your password" -#: src/server.c:502 +#: src/server.c:528 #, c-format msgid "%s is now known as %s.\n" msgstr "%s is now known as %s.\n" -#: src/server.c:927 +#: src/server.c:938 #, c-format msgid "(%d message)" msgid_plural "(%d messages)" msgstr[0] "(%d message)" msgstr[1] "(%d messages)" -#: src/server.c:941 +#: src/server.c:952 msgid "(1 message)" msgstr "(1 message)" -#: src/server.c:1107 src/server.c:1117 +#: src/server.c:1176 src/server.c:1186 #, c-format msgid "%s logged in." msgstr "%s logged in." -#: src/server.c:1130 +#: src/server.c:1199 #, c-format msgid "%s signed on" msgstr "%s signed on" -#: src/server.c:1146 +#: src/server.c:1215 #, c-format msgid "%s came back" msgstr "%s came back" -#: src/server.c:1148 +#: src/server.c:1217 #, c-format msgid "%s went away" msgstr "%s went away" -#: src/server.c:1162 +#: src/server.c:1231 #, c-format msgid "%s became idle" msgstr "%s became idle" -#: src/server.c:1174 +#: src/server.c:1243 #, c-format msgid "%s became unidle" msgstr "%s became unidle" -#: src/server.c:1185 src/server.c:1193 +#: src/server.c:1254 src/server.c:1262 #, c-format msgid "%s logged out." msgstr "%s logged out." -#: src/server.c:1207 +#: src/server.c:1276 #, c-format msgid "%s signed off" msgstr "%s signed off" -#: src/server.c:1269 +#: src/server.c:1338 #, c-format msgid "" "%s has just been warned by %s.\n" @@ -9977,11 +10377,11 @@ "%s has just been warned by %s.\n" "Your new warning level is %d%%" -#: src/server.c:1272 +#: src/server.c:1341 msgid "an anonymous person" msgstr "an anonymous person" -#: src/server.c:1382 +#: src/server.c:1451 #, c-format msgid "" "User '%s' invites %s to buddy chat room: '%s'\n" @@ -9990,12 +10390,12 @@ "User '%s' invites %s to buddy chat room: '%s'\n" "%s" -#: src/server.c:1386 +#: src/server.c:1455 #, c-format msgid "User '%s' invites %s to buddy chat room: '%s'\n" msgstr "User '%s' invites %s to buddy chat room: '%s'\n" -#: src/server.c:1392 +#: src/server.c:1461 msgid "Accept chat invitation?" msgstr "Accept chat invitation?" @@ -10022,33 +10422,33 @@ msgid "_Warn" msgstr "_Warn" -#: src/util.c:2134 +#: src/util.c:2363 msgid "Calculating..." msgstr "Calculating..." -#: src/util.c:2137 +#: src/util.c:2366 msgid "Unknown." msgstr "Unknown." -#: src/util.c:2168 src/util.c:2173 src/util.c:2178 src/util.c:2181 +#: src/util.c:2399 msgid "day" msgid_plural "days" msgstr[0] "day" msgstr[1] "days" -#: src/util.c:2169 src/util.c:2173 src/util.c:2187 src/util.c:2189 +#: src/util.c:2407 msgid "hour" msgid_plural "hours" msgstr[0] "hour" msgstr[1] "hours" -#: src/util.c:2169 src/util.c:2178 src/util.c:2187 src/util.c:2192 +#: src/util.c:2415 msgid "minute" msgid_plural "minutes" msgstr[0] "minute" msgstr[1] "minutes" -#: src/util.c:2529 +#: src/util.c:2825 msgid "g003: Error opening connection.\n" msgstr "g003: Error opening connection.\n"