Revision 70b5368d76eb82b8742d65844de6fd27330f5a52

nosnilmot at pidgin.im nosnilmot at pidgin.im
Wed Apr 11 01:24:14 EDT 2007


o   -----------------------------------------------------------------
|   Revision: 70b5368d76eb82b8742d65844de6fd27330f5a52
|   Ancestor: 04d700840af211af98a4158ffc126a708d13402b
|   Author: nosnilmot
|   Date: 2005-01-20T01:26:19
|   Branch: im.pidgin.gaim.oldstatus
|   
|   Modified files:
|           po/ChangeLog po/en_GB.po
|   
|   ChangeLog: 
|   
|   [gaim-migrate @ 11854]
|   Update this, if only because I'm a _GB'er and I can. It makes the i18n
|   stats look better too.
|   ============================================================
|   --- po/ChangeLog	bc81ca2640f3b4d730d7b7a794b664990505eefb
|   +++ po/ChangeLog	ffe434018d675abce7eb6d6b0f00ac3594598fa5
|   @@ -9,6 +9,7 @@ version 1.1.2:
|    	* Dutch translation for gaim.desktop file (Vincent van Adrighem)
|    	* Dutch translation updated (Vincent van Adrighem)
|    	* English (Australian) transation updated (Peter (Bleeter) Lawler)
|   +	* English (British) translation updated
|    	* English (Canadian) translation updated (Adam Weinberger)
|    	* Finnish translation updated (Arto Alakulju)
|    	* French translation updated (Eric Boumaour)
|   ============================================================
|   --- po/en_GB.po	f4b6c3bf87f3c34018fd21c2a2c922343f9a78b3
|   +++ po/en_GB.po	ff1592cac2f771a232008223b0dfe3686832bf13
|   @@ -5,15 +5,15 @@ msgstr ""
|    #
|    msgid ""
|    msgstr ""
|   -"Project-Id-Version: Gaim 0.73\n"
|   -"Report-Msgid-Bugs-To: \n"
|   -"POT-Creation-Date: 2004-11-30 17:30+0000\n"
|   +"Project-Id-Version: Gaim 1.1.2\n"
|   +"POT-Creation-Date: 2005-01-19 20:25-0500\n"
|    "PO-Revision-Date: 2004-01-14 12:26+0000\n"
|    "Last-Translator: Luke Ross <lukeross at sys3175.co.uk>\n"
|    "Language-Team:  <en_GB at li.org>\n"
|    "MIME-Version: 1.0\n"
|    "Content-Type: text/plain; charset=iso-8859-1\n"
|    "Content-Transfer-Encoding: 8bit\n"
|   +"Report-Msgid-Bugs-To: \n"
|    "Plural-Forms: nplurals=2; plural=n>1;\n"
|    
|    #: plugins/autorecon.c:234
|   @@ -45,7 +45,6 @@ msgstr "Auto-Reconnect"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/autorecon.c:273 plugins/autorecon.c:275
|    msgid "When you are kicked offline, this reconnects you."
|    msgstr "When you are kicked offline, this reconnects you."
|   @@ -149,7 +148,7 @@ msgstr "Gaim - Away"
|    msgid "Gaim - Away"
|    msgstr "Gaim - Away"
|    
|   -#: plugins/docklet/docklet.c:136 src/gtkaccount.c:738 src/gtkaccount.c:2160
|   +#: plugins/docklet/docklet.c:136 src/gtkaccount.c:751 src/gtkaccount.c:2176
|    msgid "Auto-login"
|    msgstr "Auto-login"
|    
|   @@ -166,20 +165,20 @@ msgstr "New..."
|    msgstr "New..."
|    
|    #: plugins/docklet/docklet.c:184 src/gtkprefs.c:1812 src/protocols/gg/gg.c:52
|   -#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:961
|   +#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:973
|    #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
|   -#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
|   +#: src/protocols/jabber/presence.c:133 src/protocols/novell/novell.c:2800
|    #: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
|   -#: src/protocols/oscar/oscar.c:670 src/protocols/oscar/oscar.c:5617
|   -#: src/protocols/oscar/oscar.c:6609 src/protocols/oscar/oscar.c:6809
|   -#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:47
|   +#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:5670
|   +#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6862
|   +#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
|    #: src/protocols/silc/silc.c:81
|    msgid "Away"
|    msgstr "Away"
|    
|    #. else...
|    #: plugins/docklet/docklet.c:190 src/away.c:584
|   -#: src/protocols/oscar/oscar.c:5535 src/protocols/oscar/oscar.c:6817
|   +#: src/protocols/oscar/oscar.c:5588 src/protocols/oscar/oscar.c:6870
|    msgid "Back"
|    msgstr "Back"
|    
|   @@ -191,7 +190,7 @@ msgstr "File Transfers"
|    msgid "File Transfers"
|    msgstr "File Transfers"
|    
|   -#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2341
|   +#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2357
|    msgid "Accounts"
|    msgstr "Accounts"
|    
|   @@ -300,7 +299,6 @@ msgstr "Gaim File Control"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/filectl.c:227 plugins/filectl.c:229
|    msgid "Allows you to control Gaim by entering commands in a file."
|    msgstr "Allows you to control Gaim by entering commands in a file."
|   @@ -321,7 +319,7 @@ msgstr "Invalid AIM URI"
|    msgid "Invalid AIM URI"
|    msgstr "Invalid AIM URI"
|    
|   -#: plugins/gaim-remote/remote.c:669
|   +#: plugins/gaim-remote/remote.c:670
|    #, c-format
|    msgid ""
|    "Failed to assign %s to a socket:\n"
|   @@ -330,7 +328,7 @@ msgstr ""
|    "Failed to assign %s to a socket:\n"
|    "%s"
|    
|   -#: plugins/gaim-remote/remote.c:692
|   +#: plugins/gaim-remote/remote.c:694
|    msgid "Unable to open socket"
|    msgstr "Unable to open socket"
|    
|   @@ -340,19 +338,19 @@ msgstr "Unable to open socket"
|    #. *< dependencies
|    #. *< priority
|    #. *< id
|   -#: plugins/gaim-remote/remote.c:742
|   +#: plugins/gaim-remote/remote.c:744
|    msgid "Remote Control"
|    msgstr "Remote Control"
|    
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#: plugins/gaim-remote/remote.c:745
|   +#: plugins/gaim-remote/remote.c:747
|    msgid "Provides remote control for gaim applications."
|    msgstr "Provides remote control for gaim applications."
|    
|    #. *  description
|   -#: plugins/gaim-remote/remote.c:747
|   +#: plugins/gaim-remote/remote.c:749
|    msgid ""
|    "Gives Gaim the ability to be remote-controlled through third-party "
|    "applications or through the gaim-remote tool."
|   @@ -444,8 +442,8 @@ msgstr ""
|    
|    #: plugins/gevolution/add_buddy_dialog.c:132
|    #: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2167
|   -#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:599
|   -#: src/protocols/msn/msn.c:1479 src/protocols/trepia/trepia.c:399
|   +#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
|   +#: src/protocols/msn/msn.c:1433 src/protocols/trepia/trepia.c:399
|    msgid "Name"
|    msgstr "Name"
|    
|   @@ -460,13 +458,13 @@ msgstr "Select a person from your addres
|    
|    #. "Search"
|    #: plugins/gevolution/add_buddy_dialog.c:468
|   -#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7093
|   +#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7146
|    msgid "Search"
|    msgstr "Search"
|    
|    #: plugins/gevolution/add_buddy_dialog.c:549
|   -#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4124
|   -#: src/gtkblist.c:4471
|   +#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4144
|   +#: src/gtkblist.c:4492
|    msgid "Group:"
|    msgstr "Group:"
|    
|   @@ -505,13 +503,13 @@ msgstr "_Associate Buddy"
|    msgstr "_Associate Buddy"
|    
|    #: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
|   -#: src/gtkblist.c:3082 src/gtkprefs.c:962 src/gtkprefs.c:1014
|   -#: src/gtkprefs.c:1826 src/protocols/jabber/jabber.c:925
|   +#: src/gtkblist.c:3084 src/gtkprefs.c:962 src/gtkprefs.c:1014
|   +#: src/gtkprefs.c:1826 src/protocols/jabber/jabber.c:937
|    msgid "None"
|    msgstr "None"
|    
|    #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
|   -#: src/blist.c:774 src/blist.c:981 src/blist.c:1924 src/gtkblist.c:3943
|   +#: src/blist.c:774 src/blist.c:981 src/blist.c:1928 src/gtkblist.c:3963
|    #: src/protocols/jabber/roster.c:66
|    msgid "Buddies"
|    msgstr "Buddies"
|   @@ -530,7 +528,7 @@ msgstr "Select all accounts that buddies
|    msgid "Select all accounts that buddies should be auto-added to."
|    msgstr "Select all accounts that buddies should be auto-added to."
|    
|   -#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:620
|   +#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:621
|    msgid "Account"
|    msgstr "Account"
|    
|   @@ -547,7 +545,6 @@ msgstr "Evolution Integration"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
|    msgid "Provides integration with Ximian Evolution."
|    msgstr "Provides integration with Ximian Evolution."
|   @@ -574,8 +571,8 @@ msgstr "Optional information"
|    msgstr "Optional information"
|    
|    #. Label
|   -#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
|   -#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:576
|   +#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
|   +#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:575
|    msgid "Buddy Icon"
|    msgstr "Buddy Icon"
|    
|   @@ -604,7 +601,6 @@ msgstr "GTK Signals Test"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
|    msgid "Test to see that all ui signals are working properly."
|    msgstr "Test to see that all UI signals are working properly."
|   @@ -638,7 +634,6 @@ msgstr "Iconify on Away"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/iconaway.c:107 plugins/iconaway.c:109
|    msgid "Iconifies the buddy list and your conversations when you go away."
|    msgstr "Iconifies the buddy list and your conversations when you go away."
|   @@ -728,68 +723,68 @@ msgstr "Adds a small box to the buddy li
|    msgstr "Adds a small box to the buddy list that shows if you have new mail."
|    
|    #. ---------- "Notify For" ----------
|   -#: plugins/notify.c:601
|   +#: plugins/notify.c:604
|    msgid "Notify For"
|    msgstr "Notify For"
|    
|   -#: plugins/notify.c:605
|   +#: plugins/notify.c:608
|    msgid "_IM windows"
|    msgstr "_IM windows"
|    
|   -#: plugins/notify.c:612
|   +#: plugins/notify.c:615
|    msgid "C_hat windows"
|    msgstr "C_hat windows"
|    
|   -#: plugins/notify.c:619
|   +#: plugins/notify.c:622
|    msgid "_Focused windows"
|    msgstr "_Focused windows"
|    
|    #. ---------- "Notification Methods" ----------
|   -#: plugins/notify.c:627
|   +#: plugins/notify.c:630
|    msgid "Notification Methods"
|    msgstr "Notification Methods"
|    
|   -#: plugins/notify.c:634
|   +#: plugins/notify.c:637
|    msgid "Prepend _string into window title:"
|    msgstr "Prepend _string into window title:"
|    
|    #. Count method button
|   -#: plugins/notify.c:653
|   +#: plugins/notify.c:656
|    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:661
|   +#: plugins/notify.c:664
|    msgid "Set window manager \"_URGENT\" hint"
|    msgstr "Set window manager \"_URGENT\" hint"
|    
|    #. ---------- "Notification Removals" ----------
|   -#: plugins/notify.c:669
|   +#: plugins/notify.c:672
|    msgid "Notification Removal"
|    msgstr "Notification Removal"
|    
|    #. Remove on focus button
|   -#: plugins/notify.c:674
|   +#: plugins/notify.c:677
|    msgid "Remove when conversation window _gains focus"
|    msgstr "Remove when conversation window _gains focus"
|    
|    #. Remove on click button
|   -#: plugins/notify.c:681
|   +#: plugins/notify.c:684
|    msgid "Remove when conversation window _receives click"
|    msgstr "Remove when conversation window _receives click"
|    
|    #. Remove on type button
|   -#: plugins/notify.c:689
|   +#: plugins/notify.c:692
|    msgid "Remove when _typing in conversation window"
|    msgstr "Remove when _typing in conversation window"
|    
|    #. Remove on message send button
|   -#: plugins/notify.c:697
|   +#: plugins/notify.c:700
|    msgid "Remove when a _message gets sent"
|    msgstr "Remove when a _message gets sent"
|    
|    #. Remove on conversation switch button
|   -#: plugins/notify.c:706
|   +#: plugins/notify.c:709
|    msgid "Remove on switch to conversation ta_b"
|    msgstr "Remove on switch to conversation ta_b"
|    
|   @@ -799,15 +794,14 @@ msgstr "Remove on switch to conversation
|    #. *< dependencies
|    #. *< priority
|    #. *< id
|   -#: plugins/notify.c:796
|   +#: plugins/notify.c:799
|    msgid "Message Notification"
|    msgstr "Message Notification"
|    
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: plugins/notify.c:799 plugins/notify.c:801
|   +#: plugins/notify.c:802 plugins/notify.c:804
|    msgid "Provides a variety of ways of notifying you of unread messages."
|    msgstr "Provides a variety of ways of notifying you of unread messages."
|    
|   @@ -823,7 +817,6 @@ msgstr "Perl Plugin Loader"
|    
|    #. *< name
|    #. *< version
|   -#. *< summary
|    #: plugins/perl/perl.c:537 plugins/perl/perl.c:538
|    msgid "Provides support for loading perl plugins."
|    msgstr "Provides support for loading perl plugins."
|   @@ -910,7 +903,6 @@ msgstr "Signals Test"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/signals-test.c:588 plugins/signals-test.c:590
|    msgid "Test to see that all signals are working properly."
|    msgstr "Test to see that all signals are working properly."
|   @@ -928,7 +920,6 @@ msgstr "Simple Plugin"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/simple.c:37 plugins/simple.c:39
|    msgid "Tests to see that most things are working."
|    msgstr "Tests to see that most things are working."
|   @@ -978,7 +969,6 @@ msgstr "GNUTLS"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
|    msgid "Provides SSL support through GNUTLS."
|    msgstr "Provides SSL support through GNUTLS."
|   @@ -989,15 +979,14 @@ msgstr "Provides SSL support through GNU
|    #. *< dependencies
|    #. *< priority
|    #. *< id
|   -#: plugins/ssl/ssl-nss.c:318
|   +#: plugins/ssl/ssl-nss.c:327
|    msgid "NSS"
|    msgstr "NSS"
|    
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
|   +#: plugins/ssl/ssl-nss.c:330 plugins/ssl/ssl-nss.c:332
|    msgid "Provides SSL support through Mozilla NSS."
|    msgstr "Provides SSL support through Mozilla NSS."
|    
|   @@ -1014,7 +1003,6 @@ msgstr "SSL"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
|    msgid "Provides a wrapper around SSL support libraries."
|    msgstr "Provides a wrapper around SSL support libraries."
|   @@ -1064,7 +1052,6 @@ msgstr "Buddy State Notification"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/statenotify.c:122 plugins/statenotify.c:125
|    msgid ""
|    "Notifies in a conversation window when a buddy goes or returns from away or "
|   @@ -1073,11 +1060,11 @@ msgstr ""
|    "Notifies in a conversation window when a buddy goes or returns from away or "
|    "idle."
|    
|   -#: plugins/tcl/tcl.c:363
|   +#: plugins/tcl/tcl.c:364
|    msgid "Tcl Plugin Loader"
|    msgstr "Tcl Plugin Loader"
|    
|   -#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
|   +#: plugins/tcl/tcl.c:366 plugins/tcl/tcl.c:367
|    msgid "Provides support for loading Tcl plugins"
|    msgstr "Provides support for loading Tcl plugins"
|    
|   @@ -1094,7 +1081,6 @@ msgstr "Buddy Ticker"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
|    msgid "A horizontal scrolling version of the buddy list."
|    msgstr "A horizontal scrolling version of the buddy list."
|   @@ -1128,7 +1114,6 @@ msgstr "Timestamp"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: plugins/timestamp.c:274 plugins/timestamp.c:276
|    msgid "Adds iChat-style timestamps to conversations every N minutes."
|    msgstr "Adds iChat-style timestamps to conversations every N minutes."
|   @@ -1205,7 +1190,7 @@ msgstr "_Start Gaim on Windows startup"
|    msgstr "_Start Gaim on Windows startup"
|    
|    #. Buddy List
|   -#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3127
|   +#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3129
|    #: src/gtkprefs.c:2419
|    msgid "Buddy List"
|    msgstr "Buddy List"
|   @@ -1226,7 +1211,7 @@ msgstr "_Keep Buddy List window on top"
|    
|    #. Conversations
|    #: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
|   -#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1816
|   +#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1770
|    msgid "Conversations"
|    msgstr "Conversations"
|    
|   @@ -1242,7 +1227,7 @@ msgstr "Options specific to Windows Gaim
|    msgid "Options specific to Windows Gaim."
|    msgstr "Options specific to Windows Gaim."
|    
|   -#: src/account.c:277 src/protocols/jabber/jabber.c:1002
|   +#: src/account.c:277 src/protocols/jabber/jabber.c:1014
|    msgid "New passwords do not match."
|    msgstr "New passwords do not match."
|    
|   @@ -1274,47 +1259,49 @@ msgstr "Please enter your current passwo
|    #. *
|    #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
|    #.
|   -#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2454
|   -#: src/gtkdialogs.c:392 src/gtkdialogs.c:534 src/gtkdialogs.c:588
|   -#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1049
|   -#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
|   -#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
|   -#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3512
|   -#: src/protocols/oscar/oscar.c:3606 src/protocols/oscar/oscar.c:6880
|   -#: src/protocols/oscar/oscar.c:6972 src/protocols/oscar/oscar.c:7024
|   -#: src/protocols/oscar/oscar.c:7110 src/protocols/silc/buddy.c:460
|   -#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:421
|   -#: src/protocols/silc/chat.c:459 src/protocols/silc/chat.c:722
|   -#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1691
|   -#: src/protocols/silc/silc.c:703 src/protocols/yahoo/yahoo.c:2821
|   -#: src/protocols/yahoo/yahoo.c:2830 src/request.h:1245
|   +#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2456
|   +#: src/gtkdialogs.c:485 src/gtkdialogs.c:627 src/gtkdialogs.c:681
|   +#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1061
|   +#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
|   +#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
|   +#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2323
|   +#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3659
|   +#: src/protocols/oscar/oscar.c:6933 src/protocols/oscar/oscar.c:7025
|   +#: src/protocols/oscar/oscar.c:7077 src/protocols/oscar/oscar.c:7163
|   +#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
|   +#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
|   +#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
|   +#: src/protocols/silc/ops.c:1691 src/protocols/silc/silc.c:703
|   +#: src/protocols/yahoo/yahoo.c:2821 src/protocols/yahoo/yahoo.c:2830
|   +#: src/request.h:1245
|    msgid "OK"
|    msgstr "OK"
|    
|    #: src/account.c:343 src/account.c:381 src/away.c:367 src/connection.c:199
|   -#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2455
|   -#: src/gtkblist.c:4509 src/gtkconn.c:169 src/gtkdialogs.c:393
|   -#: src/gtkdialogs.c:535 src/gtkdialogs.c:589 src/gtkdialogs.c:687
|   -#: src/gtkdialogs.c:709 src/gtkdialogs.c:729 src/gtkdialogs.c:766
|   -#: src/gtkdialogs.c:826 src/gtkdialogs.c:869 src/gtkdialogs.c:907
|   -#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599
|   +#: src/gtkaccount.c:2026 src/gtkaccount.c:2522 src/gtkblist.c:2457
|   +#: src/gtkblist.c:4530 src/gtkconn.c:169 src/gtkdialogs.c:486
|   +#: src/gtkdialogs.c:628 src/gtkdialogs.c:682 src/gtkdialogs.c:780
|   +#: src/gtkdialogs.c:802 src/gtkdialogs.c:822 src/gtkdialogs.c:859
|   +#: src/gtkdialogs.c:919 src/gtkdialogs.c:962 src/gtkdialogs.c:1000
|   +#: src/gtkimhtmltoolbar.c:423 src/gtkprivacy.c:586 src/gtkprivacy.c:599
|    #: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
|    #: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
|   -#: src/protocols/jabber/chat.c:752 src/protocols/jabber/jabber.c:668
|   -#: src/protocols/jabber/jabber.c:1050 src/protocols/jabber/xdata.c:338
|   -#: src/protocols/msn/msn.c:229 src/protocols/msn/msn.c:244
|   -#: src/protocols/msn/msn.c:259 src/protocols/msn/msn.c:274
|   -#: src/protocols/msn/msn.c:291 src/protocols/oscar/oscar.c:1517
|   -#: src/protocols/oscar/oscar.c:3470 src/protocols/oscar/oscar.c:3513
|   -#: src/protocols/oscar/oscar.c:3550 src/protocols/oscar/oscar.c:3607
|   -#: src/protocols/oscar/oscar.c:6881 src/protocols/oscar/oscar.c:6973
|   -#: src/protocols/oscar/oscar.c:7025 src/protocols/oscar/oscar.c:7094
|   -#: src/protocols/oscar/oscar.c:7111 src/protocols/silc/buddy.c:461
|   -#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
|   -#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
|   -#: src/protocols/silc/ops.c:1692 src/protocols/silc/silc.c:704
|   -#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2822
|   -#: src/protocols/yahoo/yahoo.c:2831 src/request.h:1245 src/request.h:1255
|   +#: src/protocols/jabber/chat.c:754 src/protocols/jabber/jabber.c:676
|   +#: src/protocols/jabber/jabber.c:1062 src/protocols/jabber/xdata.c:338
|   +#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
|   +#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
|   +#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1519
|   +#: src/protocols/oscar/oscar.c:2324 src/protocols/oscar/oscar.c:3523
|   +#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3603
|   +#: src/protocols/oscar/oscar.c:3660 src/protocols/oscar/oscar.c:6934
|   +#: src/protocols/oscar/oscar.c:7026 src/protocols/oscar/oscar.c:7078
|   +#: src/protocols/oscar/oscar.c:7147 src/protocols/oscar/oscar.c:7164
|   +#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
|   +#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
|   +#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1692
|   +#: src/protocols/silc/silc.c:704 src/protocols/trepia/trepia.c:348
|   +#: src/protocols/yahoo/yahoo.c:2822 src/protocols/yahoo/yahoo.c:2831
|   +#: src/request.h:1245 src/request.h:1255
|    msgid "Cancel"
|    msgstr "Cancel"
|    
|   @@ -1355,7 +1342,7 @@ msgstr "Remove Away Message"
|    msgstr "Remove Away Message"
|    
|    #. Remove button
|   -#: src/away.c:366 src/gtkconv.c:1500 src/gtkconv.c:3863 src/gtkconv.c:3934
|   +#: src/away.c:366 src/gtkconv.c:1501 src/gtkconv.c:3869 src/gtkconv.c:3940
|    #: src/gtkrequest.c:248
|    msgid "Remove"
|    msgstr "Remove"
|   @@ -1406,7 +1393,7 @@ msgstr "Chats"
|    msgid "Chats"
|    msgstr "Chats"
|    
|   -#: src/blist.c:1349
|   +#: src/blist.c:1352
|    #, c-format
|    msgid ""
|    "%d buddy from group %s was not removed because its account was not logged "
|   @@ -1421,11 +1408,11 @@ 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:1358
|   +#: src/blist.c:1361
|    msgid "Group not removed"
|    msgstr "Group not removed"
|    
|   -#: src/blist.c:2055
|   +#: src/blist.c:2059
|    msgid ""
|    "An error was encountered parsing your buddy list.  It has not been loaded, "
|    "and the old file has moved to blist.xml~."
|   @@ -1433,7 +1420,7 @@ msgstr ""
|    "An error was encountered parsing your buddy list.  It has not been loaded, "
|    "and the old file has been moved to blist.xml~."
|    
|   -#: src/blist.c:2058
|   +#: src/blist.c:2062
|    msgid "Buddy List Error"
|    msgstr "Buddy List Error"
|    
|   @@ -1460,7 +1447,7 @@ msgstr "Unable to send message. The mess
|    msgstr "Unable to send message. The message is too large."
|    
|    #: src/conversation.c:237 src/conversation.c:251
|   -#: src/protocols/oscar/oscar.c:4073
|   +#: src/protocols/oscar/oscar.c:4126
|    #, c-format
|    msgid "Unable to send message to %s:"
|    msgstr "Unable to send message to %s:"
|   @@ -1473,67 +1460,67 @@ msgstr "Unable to send message."
|    msgid "Unable to send message."
|    msgstr "Unable to send message."
|    
|   -#: src/conversation.c:1989
|   +#: src/conversation.c:1992
|    #, c-format
|    msgid "%s entered the room."
|    msgstr "%s entered the room."
|    
|   -#: src/conversation.c:1992
|   +#: src/conversation.c:1995
|    #, c-format
|    msgid "%s [<I>%s</I>] entered the room."
|    msgstr "%s [<I>%s</I>] entered the room."
|    
|   -#: src/conversation.c:2088
|   +#: src/conversation.c:2091
|    #, c-format
|    msgid "You are now known as %s"
|    msgstr "You are now known as %s"
|    
|   -#: src/conversation.c:2091
|   +#: src/conversation.c:2094
|    #, c-format
|    msgid "%s is now known as %s"
|    msgstr "%s is now known as %s"
|    
|   -#: src/conversation.c:2132
|   +#: src/conversation.c:2135
|    #, c-format
|    msgid "%s left the room (%s)."
|    msgstr "%s left the room (%s)."
|    
|   -#: src/conversation.c:2134
|   +#: src/conversation.c:2137
|    #, c-format
|    msgid "%s left the room."
|    msgstr "%s left the room."
|    
|   -#: src/conversation.c:2203
|   +#: src/conversation.c:2206
|    #, c-format
|    msgid "(+%d more)"
|    msgstr "(+%d more)"
|    
|   -#: src/conversation.c:2205
|   +#: src/conversation.c:2208
|    #, c-format
|    msgid " left the room (%s)."
|    msgstr " left the room (%s)."
|    
|   -#: src/conversation.c:2610
|   +#: src/conversation.c:2613
|    msgid "Last created window"
|    msgstr "Last created window"
|    
|   -#: src/conversation.c:2612
|   +#: src/conversation.c:2615
|    msgid "Separate IM and Chat windows"
|    msgstr "Separate IM and Chat windows"
|    
|   -#: src/conversation.c:2614 src/gtkprefs.c:1387
|   +#: src/conversation.c:2617 src/gtkprefs.c:1387
|    msgid "New window"
|    msgstr "New window"
|    
|   -#: src/conversation.c:2616
|   +#: src/conversation.c:2619
|    msgid "By group"
|    msgstr "By group"
|    
|   -#: src/conversation.c:2618
|   +#: src/conversation.c:2621
|    msgid "By account"
|    msgstr "By account"
|    
|   -#: src/ft.c:147 src/protocols/msn/msn.c:370
|   +#: src/ft.c:147 src/protocols/msn/msn.c:368
|    #, c-format
|    msgid ""
|    "Error reading %s: \n"
|   @@ -1573,17 +1560,22 @@ msgstr "%s is not a regular file. Coward
|    msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
|    msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
|    
|   -#: src/ft.c:259
|   +#: src/ft.c:260
|    #, c-format
|    msgid "%s wants to send you %s (%s)"
|    msgstr "%s wants to send you %s (%s)"
|    
|   -#: src/ft.c:300
|   +#: src/ft.c:268
|    #, c-format
|   +msgid "%s wants to send you a file"
|   +msgstr "%s wants to send you a file"
|   +
|   +#: src/ft.c:306
|   +#, c-format
|    msgid "Accept file transfer request from %s?"
|    msgstr "Accept file transfer request from %s?"
|    
|   -#: src/ft.c:304
|   +#: src/ft.c:310
|    #, c-format
|    msgid ""
|    "A file is available for download from:\n"
|   @@ -1594,37 +1586,50 @@ msgstr ""
|    "Remote host: %s\n"
|    "Remote port: %d"
|    
|   -#: src/ft.c:356
|   +#: src/ft.c:362
|    #, c-format
|    msgid "%s is not a valid filename.\n"
|    msgstr "%s is not a valid filename.\n"
|    
|   -#: src/ft.c:374
|   +#: src/ft.c:380
|    #, c-format
|    msgid "Offering to send %s to %s"
|    msgstr "Offering to send %s to %s"
|    
|   -#: src/ft.c:867
|   +#: src/ft.c:874
|    #, c-format
|   -msgid "Transfer of %s complete"
|   -msgstr "Transfer of %s complete"
|   +msgid "Transfer of file %s complete"
|   +msgstr "Transfer of file %s complete"
|    
|   -#: src/ft.c:915
|   +#: src/ft.c:877
|   +msgid "File transfer complete"
|   +msgstr "File transfer complete"
|   +
|   +#: src/ft.c:926
|    #, c-format
|    msgid "You canceled the transfer of %s"
|    msgstr "You cancelled the transfer of %s"
|    
|   -#: src/ft.c:967
|   +#: src/ft.c:932
|   +msgid "File transfer cancelled"
|   +msgstr "File transfer cancelled"
|   +
|   +#: src/ft.c:985
|    #, c-format
|    msgid "%s canceled the transfer of %s"
|    msgstr "%s cancelled the transfer of %s"
|    
|   -#: src/ft.c:1017
|   +#: src/ft.c:991
|    #, c-format
|   +msgid "%s canceled the file transfer"
|   +msgstr "%s cancelled the transfer of"
|   +
|   +#: src/ft.c:1040
|   +#, c-format
|    msgid "File transfer to %s aborted.\n"
|    msgstr "File transfer to %s aborted.\n"
|    
|   -#: src/ft.c:1019
|   +#: src/ft.c:1042
|    #, c-format
|    msgid "File transfer from %s aborted.\n"
|    msgstr "File transfer from %s aborted.\n"
|   @@ -1738,7 +1743,7 @@ msgstr ""
|    "\n"
|    "Set all accounts as not away.\n"
|    
|   -#: src/gtkaccount.c:325
|   +#: src/gtkaccount.c:331
|    #, c-format
|    msgid ""
|    "<b>File:</b> %s\n"
|   @@ -1750,164 +1755,164 @@ msgstr ""
|    "<b>Image size:</b> %dx%d"
|    
|    #. Build the login options frame.
|   -#: src/gtkaccount.c:625
|   +#: src/gtkaccount.c:638
|    msgid "Login Options"
|    msgstr "Login Options"
|    
|   -#: src/gtkaccount.c:642 src/gtkft.c:555
|   +#: src/gtkaccount.c:655 src/gtkft.c:555
|    msgid "Protocol:"
|    msgstr "Protocol:"
|    
|   -#: src/gtkaccount.c:647 src/gtkblist.c:4096
|   +#: src/gtkaccount.c:660 src/gtkblist.c:4116
|    msgid "Screen Name:"
|    msgstr "Screen Name:"
|    
|   -#: src/gtkaccount.c:720
|   +#: src/gtkaccount.c:733
|    msgid "Password:"
|    msgstr "Password:"
|    
|   -#: src/gtkaccount.c:725 src/gtkblist.c:4110 src/gtkblist.c:4457
|   +#: src/gtkaccount.c:738 src/gtkblist.c:4130 src/gtkblist.c:4477
|    msgid "Alias:"
|    msgstr "Alias:"
|    
|   -#: src/gtkaccount.c:729
|   +#: src/gtkaccount.c:742
|    msgid "Remember password"
|    msgstr "Remember password"
|    
|    #. Build the user options frame.
|   -#: src/gtkaccount.c:785
|   +#: src/gtkaccount.c:798
|    msgid "User Options"
|    msgstr "User Options"
|    
|   -#: src/gtkaccount.c:798
|   +#: src/gtkaccount.c:811
|    msgid "New mail notifications"
|    msgstr "New mail notifications"
|    
|   -#: src/gtkaccount.c:807
|   +#: src/gtkaccount.c:820
|    msgid "Buddy icon:"
|    msgstr "Buddy icon:"
|    
|    #. Build the protocol options frame.
|   -#: src/gtkaccount.c:896
|   +#: src/gtkaccount.c:909
|    #, c-format
|    msgid "%s Options"
|    msgstr "%s Options"
|    
|    #. Use Global Proxy Settings
|   -#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
|   +#: src/gtkaccount.c:1045 src/gtkaccount.c:1092
|    msgid "Use Global Proxy Settings"
|    msgstr "Use Global Proxy Settings"
|    
|    #. No Proxy
|   -#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
|   +#: src/gtkaccount.c:1051 src/gtkaccount.c:1099
|    msgid "No Proxy"
|    msgstr "No Proxy"
|    
|    #. HTTP
|   -#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
|   +#: src/gtkaccount.c:1057 src/gtkaccount.c:1106
|    msgid "HTTP"
|    msgstr "HTTP"
|    
|    #. SOCKS 4
|   -#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
|   +#: src/gtkaccount.c:1063 src/gtkaccount.c:1113
|    msgid "SOCKS 4"
|    msgstr "SOCKS 4"
|    
|    #. SOCKS 5
|   -#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
|   +#: src/gtkaccount.c:1069 src/gtkaccount.c:1120
|    msgid "SOCKS 5"
|    msgstr "SOCKS 5"
|    
|    #. Use Environmental Settings
|   -#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1190
|   +#: src/gtkaccount.c:1075 src/gtkaccount.c:1127 src/gtkprefs.c:1190
|    msgid "Use Environmental Settings"
|    msgstr "Use Environmental Settings"
|    
|   -#: src/gtkaccount.c:1153
|   +#: src/gtkaccount.c:1166
|    msgid "you can see the butterflies mating"
|    msgstr "you can see the butterflies mating"
|    
|   -#: src/gtkaccount.c:1157
|   +#: src/gtkaccount.c:1170
|    msgid "If you look real closely"
|    msgstr "If you look real closely"
|    
|   -#: src/gtkaccount.c:1173
|   +#: src/gtkaccount.c:1186
|    msgid "Proxy Options"
|    msgstr "Proxy Options"
|    
|   -#: src/gtkaccount.c:1191 src/gtkprefs.c:1184
|   +#: src/gtkaccount.c:1204 src/gtkprefs.c:1184
|    msgid "Proxy _type:"
|    msgstr "Proxy _type:"
|    
|   -#: src/gtkaccount.c:1200 src/gtkprefs.c:1211
|   +#: src/gtkaccount.c:1213 src/gtkprefs.c:1211
|    msgid "_Host:"
|    msgstr "_Host:"
|    
|   -#: src/gtkaccount.c:1204 src/gtkprefs.c:1229
|   +#: src/gtkaccount.c:1217 src/gtkprefs.c:1229
|    msgid "_Port:"
|    msgstr "_Port:"
|    
|   -#: src/gtkaccount.c:1212
|   +#: src/gtkaccount.c:1225
|    msgid "_Username:"
|    msgstr "_Username:"
|    
|   -#: src/gtkaccount.c:1217 src/gtkprefs.c:1266
|   +#: src/gtkaccount.c:1230 src/gtkprefs.c:1266
|    msgid "Pa_ssword:"
|    msgstr "Pa_ssword:"
|    
|   -#: src/gtkaccount.c:1585
|   +#: src/gtkaccount.c:1601
|    msgid "Add Account"
|    msgstr "Add Account"
|    
|   -#: src/gtkaccount.c:1587
|   +#: src/gtkaccount.c:1603
|    msgid "Modify Account"
|    msgstr "Modify Account"
|    
|    #. Add the disclosure
|   -#: src/gtkaccount.c:1611
|   +#: src/gtkaccount.c:1627
|    msgid "Show more options"
|    msgstr "Show more options"
|    
|   -#: src/gtkaccount.c:1612
|   +#: src/gtkaccount.c:1628
|    msgid "Show fewer options"
|    msgstr "Show fewer options"
|    
|    #. Register button
|   -#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:667
|   +#: src/gtkaccount.c:1655 src/protocols/jabber/jabber.c:675
|    msgid "Register"
|    msgstr "Register"
|    
|   -#: src/gtkaccount.c:2004
|   +#: src/gtkaccount.c:2020
|    #, c-format
|    msgid "Are you sure you want to delete %s?"
|    msgstr "Are you sure you want to delete %s?"
|    
|   -#: src/gtkaccount.c:2009 src/gtkrequest.c:246
|   +#: src/gtkaccount.c:2025 src/gtkrequest.c:246
|    msgid "Delete"
|    msgstr "Delete"
|    
|   -#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4157
|   +#: src/gtkaccount.c:2139 src/protocols/oscar/oscar.c:4210
|    msgid "Screen Name"
|    msgstr "Screen Name"
|    
|   -#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:959
|   -#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:5615
|   -#: src/protocols/oscar/oscar.c:6808 src/protocols/silc/silc.c:45
|   -#: src/protocols/yahoo/yahoo.c:2584 src/protocols/zephyr/zephyr.c:2123
|   -#: src/protocols/zephyr/zephyr.c:2142
|   +#: src/gtkaccount.c:2163 src/protocols/jabber/jabber.c:971
|   +#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:5668
|   +#: src/protocols/oscar/oscar.c:6861 src/protocols/silc/silc.c:45
|   +#: src/protocols/yahoo/yahoo.c:2584 src/protocols/zephyr/zephyr.c:2122
|   +#: src/protocols/zephyr/zephyr.c:2141
|    msgid "Online"
|    msgstr "Online"
|    
|   -#: src/gtkaccount.c:2168
|   +#: src/gtkaccount.c:2184
|    msgid "Protocol"
|    msgstr "Protocol"
|    
|   -#: src/gtkaccount.c:2481
|   +#: src/gtkaccount.c:2497
|    #, 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:2495
|   +#: src/gtkaccount.c:2511
|    msgid ""
|    "\n"
|    "\n"
|   @@ -1917,18 +1922,18 @@ msgstr ""
|    "\n"
|    "Do you wish to add him or her to your buddy list?"
|    
|   -#: src/gtkaccount.c:2499
|   +#: src/gtkaccount.c:2515
|    msgid "Information"
|    msgstr "Information"
|    
|   -#: src/gtkaccount.c:2503
|   +#: src/gtkaccount.c:2519
|    msgid "Add buddy to your list?"
|    msgstr "Add buddy to your list?"
|    
|    #. Add button
|   -#: src/gtkaccount.c:2505 src/gtkblist.c:4508 src/gtkconv.c:1502
|   -#: src/gtkconv.c:3856 src/gtkconv.c:3927 src/gtkrequest.c:247
|   -#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3784
|   +#: src/gtkaccount.c:2521 src/gtkblist.c:4529 src/gtkconv.c:1503
|   +#: src/gtkconv.c:3862 src/gtkconv.c:3933 src/gtkrequest.c:247
|   +#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3837
|    #: src/protocols/silc/chat.c:593
|    msgid "Add"
|    msgstr "Add"
|   @@ -1949,11 +1954,11 @@ msgstr "_Account:"
|    msgid "_Account:"
|    msgstr "_Account:"
|    
|   -#: src/gtkblist.c:1166 src/gtkblist.c:3280
|   +#: src/gtkblist.c:1166 src/gtkblist.c:3282
|    msgid "Get _Info"
|    msgstr "Get _Info"
|    
|   -#: src/gtkblist.c:1169 src/gtkblist.c:3270
|   +#: src/gtkblist.c:1169 src/gtkblist.c:3272
|    msgid "I_M"
|    msgstr "I_M"
|    
|   @@ -1981,7 +1986,7 @@ msgstr "Alias Contact..."
|    msgid "Alias Contact..."
|    msgstr "Alias Contact..."
|    
|   -#: src/gtkblist.c:1200 src/gtkdialogs.c:763 src/gtkdialogs.c:765
|   +#: src/gtkblist.c:1200 src/gtkdialogs.c:856 src/gtkdialogs.c:858
|    msgid "Remove Contact"
|    msgstr "Remove Contact"
|    
|   @@ -2028,136 +2033,136 @@ msgstr "_Expand"
|    msgid "_Expand"
|    msgstr "_Expand"
|    
|   -#: src/gtkblist.c:1981 src/gtkconv.c:4499 src/gtkpounce.c:316
|   +#: src/gtkblist.c:1981 src/gtkconv.c:4505 src/gtkpounce.c:316
|    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:2399
|   +#: src/gtkblist.c:2401
|    msgid "/_Buddies"
|    msgstr "/_Buddies"
|    
|   -#: src/gtkblist.c:2400
|   +#: src/gtkblist.c:2402
|    msgid "/Buddies/New Instant _Message..."
|    msgstr "/Buddies/New Instant _Message..."
|    
|   -#: src/gtkblist.c:2401
|   +#: src/gtkblist.c:2403
|    msgid "/Buddies/Join a _Chat..."
|    msgstr "/Buddies/Join a _Chat..."
|    
|   -#: src/gtkblist.c:2402
|   +#: src/gtkblist.c:2404
|    msgid "/Buddies/Get User _Info..."
|    msgstr "/Buddies/Get User _Info..."
|    
|   -#: src/gtkblist.c:2403
|   +#: src/gtkblist.c:2405
|    msgid "/Buddies/View User _Log..."
|    msgstr "/Buddies/View User _Log..."
|    
|   -#: src/gtkblist.c:2405
|   +#: src/gtkblist.c:2407
|    msgid "/Buddies/Show _Offline Buddies"
|    msgstr "/Buddies/Show _Offline Buddies"
|    
|   -#: src/gtkblist.c:2406
|   +#: src/gtkblist.c:2408
|    msgid "/Buddies/Show _Empty Groups"
|    msgstr "/Buddies/Show _Empty Groups"
|    
|   -#: src/gtkblist.c:2407
|   +#: src/gtkblist.c:2409
|    msgid "/Buddies/_Add Buddy..."
|    msgstr "/Buddies/_Add Buddy..."
|    
|   -#: src/gtkblist.c:2408
|   +#: src/gtkblist.c:2410
|    msgid "/Buddies/Add C_hat..."
|    msgstr "/Buddies/Add C_hat..."
|    
|   -#: src/gtkblist.c:2409
|   +#: src/gtkblist.c:2411
|    msgid "/Buddies/Add _Group..."
|    msgstr "/Buddies/Add _Group..."
|    
|   -#: src/gtkblist.c:2411
|   +#: src/gtkblist.c:2413
|    msgid "/Buddies/_Signoff"
|    msgstr "/Buddies/_Signoff"
|    
|   -#: src/gtkblist.c:2412
|   +#: src/gtkblist.c:2414
|    msgid "/Buddies/_Quit"
|    msgstr "/Buddies/_Quit"
|    
|    #. Tools
|   -#: src/gtkblist.c:2415
|   +#: src/gtkblist.c:2417
|    msgid "/_Tools"
|    msgstr "/_Tools"
|    
|   -#: src/gtkblist.c:2416
|   +#: src/gtkblist.c:2418
|    msgid "/Tools/_Away"
|    msgstr "/Tools/_Away"
|    
|   -#: src/gtkblist.c:2417
|   +#: src/gtkblist.c:2419
|    msgid "/Tools/Buddy _Pounce"
|    msgstr "/Tools/Buddy _Pounce"
|    
|   -#: src/gtkblist.c:2418
|   +#: src/gtkblist.c:2420
|    msgid "/Tools/Account Ac_tions"
|    msgstr "/Tools/Account Ac_tions"
|    
|   -#: src/gtkblist.c:2419
|   +#: src/gtkblist.c:2421
|    msgid "/Tools/Pl_ugin Actions"
|    msgstr "/Tools/Pl_ugin Actions"
|    
|   -#: src/gtkblist.c:2421
|   +#: src/gtkblist.c:2423
|    msgid "/Tools/A_ccounts"
|    msgstr "/Tools/A_ccounts"
|    
|   -#: src/gtkblist.c:2422
|   +#: src/gtkblist.c:2424
|    msgid "/Tools/_File Transfers"
|    msgstr "/Tools/_File Transfers"
|    
|   -#: src/gtkblist.c:2423
|   +#: src/gtkblist.c:2425
|    msgid "/Tools/R_oom List"
|    msgstr "/Tools/R_oom List"
|    
|   -#: src/gtkblist.c:2424
|   +#: src/gtkblist.c:2426
|    msgid "/Tools/Pr_eferences"
|    msgstr "/Tools/Pr_eferences"
|    
|   -#: src/gtkblist.c:2425
|   +#: src/gtkblist.c:2427
|    msgid "/Tools/Pr_ivacy"
|    msgstr "/Tools/Pr_ivacy"
|    
|   -#: src/gtkblist.c:2427
|   +#: src/gtkblist.c:2429
|    msgid "/Tools/View System _Log"
|    msgstr "/Tools/View System _Log"
|    
|    #. Help
|   -#: src/gtkblist.c:2430
|   +#: src/gtkblist.c:2432
|    msgid "/_Help"
|    msgstr "/_Help"
|    
|   -#: src/gtkblist.c:2431
|   +#: src/gtkblist.c:2433
|    msgid "/Help/Online _Help"
|    msgstr "/Help/Online _Help"
|    
|   -#: src/gtkblist.c:2432
|   +#: src/gtkblist.c:2434
|    msgid "/Help/_Debug Window"
|    msgstr "/Help/_Debug Window"
|    
|   -#: src/gtkblist.c:2433
|   +#: src/gtkblist.c:2435
|    msgid "/Help/_About"
|    msgstr "/Help/_About"
|    
|   -#: src/gtkblist.c:2451
|   +#: src/gtkblist.c:2453
|    msgid "Rename Group"
|    msgstr "Rename Group"
|    
|   -#: src/gtkblist.c:2451
|   +#: src/gtkblist.c:2453
|    msgid "New group name"
|    msgstr "New group name"
|    
|   -#: src/gtkblist.c:2452
|   +#: src/gtkblist.c:2454
|    msgid "Please enter a new name for the selected group."
|    msgstr "Please enter a new name for the selected group."
|    
|   -#: src/gtkblist.c:2481
|   +#: src/gtkblist.c:2483
|    #, c-format
|    msgid ""
|    "\n"
|   @@ -2166,7 +2171,7 @@ msgstr ""
|    "\n"
|    "<b>Account:</b> %s"
|    
|   -#: src/gtkblist.c:2545
|   +#: src/gtkblist.c:2547
|    msgid ""
|    "\n"
|    "<b>Status:</b> Offline"
|   @@ -2174,12 +2179,12 @@ msgstr ""
|    "\n"
|    "<b>Status:</b> Offline"
|    
|   -#: src/gtkblist.c:2560
|   +#: src/gtkblist.c:2562
|    #, c-format
|    msgid "%d%%"
|    msgstr "%d%%"
|    
|   -#: src/gtkblist.c:2576
|   +#: src/gtkblist.c:2578
|    msgid ""
|    "\n"
|    "<b>Account:</b>"
|   @@ -2187,7 +2192,7 @@ msgstr ""
|    "\n"
|    "<b>Account:</b>"
|    
|   -#: src/gtkblist.c:2577
|   +#: src/gtkblist.c:2579
|    msgid ""
|    "\n"
|    "<b>Contact Alias:</b>"
|   @@ -2195,7 +2200,7 @@ msgstr ""
|    "\n"
|    "<b>Contact Alias:</b>"
|    
|   -#: src/gtkblist.c:2578
|   +#: src/gtkblist.c:2580
|    msgid ""
|    "\n"
|    "<b>Alias:</b>"
|   @@ -2203,7 +2208,7 @@ msgstr ""
|    "\n"
|    "<b>Alias:</b>"
|    
|   -#: src/gtkblist.c:2579
|   +#: src/gtkblist.c:2581
|    msgid ""
|    "\n"
|    "<b>Nickname:</b>"
|   @@ -2211,7 +2216,7 @@ msgstr ""
|    "\n"
|    "<b>Nickname:</b>"
|    
|   -#: src/gtkblist.c:2580
|   +#: src/gtkblist.c:2582
|    msgid ""
|    "\n"
|    "<b>Logged In:</b>"
|   @@ -2219,7 +2224,7 @@ msgstr ""
|    "\n"
|    "<b>Logged In:</b>"
|    
|   -#: src/gtkblist.c:2581
|   +#: src/gtkblist.c:2583
|    msgid ""
|    "\n"
|    "<b>Idle:</b>"
|   @@ -2227,7 +2232,7 @@ msgstr ""
|    "\n"
|    "<b>Idle:</b>"
|    
|   -#: src/gtkblist.c:2582
|   +#: src/gtkblist.c:2584
|    msgid ""
|    "\n"
|    "<b>Warned:</b>"
|   @@ -2235,7 +2240,7 @@ msgstr ""
|    "\n"
|    "<b>Warned:</b>"
|    
|   -#: src/gtkblist.c:2584
|   +#: src/gtkblist.c:2586
|    msgid ""
|    "\n"
|    "<b>Description:</b> Spooky"
|   @@ -2243,7 +2248,7 @@ msgstr ""
|    "\n"
|    "<b>Description:</b> Spooky"
|    
|   -#: src/gtkblist.c:2585
|   +#: src/gtkblist.c:2587
|    msgid ""
|    "\n"
|    "<b>Status</b>: Awesome"
|   @@ -2251,7 +2256,7 @@ msgstr ""
|    "\n"
|    "<b>Status</b>: Awesome"
|    
|   -#: src/gtkblist.c:2586
|   +#: src/gtkblist.c:2588
|    msgid ""
|    "\n"
|    "<b>Status</b>: Rockin'"
|   @@ -2259,108 +2264,108 @@ msgstr ""
|    "\n"
|    "<b>Status</b>: Rockin'"
|    
|   -#: src/gtkblist.c:2868
|   +#: src/gtkblist.c:2870
|    #, c-format
|    msgid "Idle (%dh%02dm) "
|    msgstr "Idle (%dh%02dm) "
|    
|   -#: src/gtkblist.c:2870
|   +#: src/gtkblist.c:2872
|    #, c-format
|    msgid "Idle (%dm) "
|    msgstr "Idle (%dm) "
|    
|   -#: src/gtkblist.c:2875
|   +#: src/gtkblist.c:2877
|    #, c-format
|    msgid "Warned (%d%%) "
|    msgstr "Warned (%d%%) "
|    
|   -#: src/gtkblist.c:2878
|   +#: src/gtkblist.c:2880
|    msgid "Offline "
|    msgstr "Offline "
|    
|    #. Make menu items sensitive/insensitive where appropriate
|   -#: src/gtkblist.c:2996
|   +#: src/gtkblist.c:2998
|    msgid "/Buddies/Join a Chat..."
|    msgstr "/Buddies/Join a Chat..."
|    
|   -#: src/gtkblist.c:2999
|   +#: src/gtkblist.c:3001
|    msgid "/Tools/Room List"
|    msgstr "/Tools/Room List"
|    
|   -#: src/gtkblist.c:3002
|   +#: src/gtkblist.c:3004
|    msgid "/Tools/Privacy"
|    msgstr "/Tools/Privacy"
|    
|   -#: src/gtkblist.c:3084
|   +#: src/gtkblist.c:3086
|    msgid "Alphabetical"
|    msgstr "Alphabetical"
|    
|   -#: src/gtkblist.c:3085
|   +#: src/gtkblist.c:3087
|    msgid "By status"
|    msgstr "By status"
|    
|   -#: src/gtkblist.c:3086
|   +#: src/gtkblist.c:3088
|    msgid "By log size"
|    msgstr "By log size"
|    
|   -#: src/gtkblist.c:3152
|   +#: src/gtkblist.c:3154
|    msgid "/Tools/Away"
|    msgstr "/Tools/Away"
|    
|   -#: src/gtkblist.c:3155
|   +#: src/gtkblist.c:3157
|    msgid "/Tools/Buddy Pounce"
|    msgstr "/Tools/Buddy Pounce"
|    
|   -#: src/gtkblist.c:3158
|   +#: src/gtkblist.c:3160
|    msgid "/Tools/Account Actions"
|    msgstr "/Tools/Account Actions"
|    
|   -#: src/gtkblist.c:3161
|   +#: src/gtkblist.c:3163
|    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:3249
|   +#: src/gtkblist.c:3251
|    msgid "/Buddies/Show Offline Buddies"
|    msgstr "/Buddies/Show Offline Buddies"
|    
|   -#: src/gtkblist.c:3251
|   +#: src/gtkblist.c:3253
|    msgid "/Buddies/Show Empty Groups"
|    msgstr "/Buddies/Show Empty Groups"
|    
|   -#: src/gtkblist.c:3276
|   +#: src/gtkblist.c:3278
|    msgid "Send a message to the selected buddy"
|    msgstr "Send a message to the selected buddy"
|    
|   -#: src/gtkblist.c:3286
|   +#: src/gtkblist.c:3288
|    msgid "Get information on the selected buddy"
|    msgstr "Get information on the selected buddy"
|    
|   -#: src/gtkblist.c:3290
|   +#: src/gtkblist.c:3292
|    msgid "_Chat"
|    msgstr "_Chat"
|    
|   -#: src/gtkblist.c:3295
|   +#: src/gtkblist.c:3297
|    msgid "Join a chat room"
|    msgstr "Join a chat room"
|    
|   -#: src/gtkblist.c:3300
|   +#: src/gtkblist.c:3302
|    msgid "_Away"
|    msgstr "_Away"
|    
|   -#: src/gtkblist.c:3305
|   +#: src/gtkblist.c:3307
|    msgid "Set an away message"
|    msgstr "Set an away message"
|    
|   -#: src/gtkblist.c:4050 src/protocols/silc/buddy.c:731
|   +#: src/gtkblist.c:4070 src/protocols/silc/buddy.c:731
|    #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
|    #: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2751
|    msgid "Add Buddy"
|    msgstr "Add Buddy"
|    
|   -#: src/gtkblist.c:4074
|   +#: src/gtkblist.c:4094
|    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. "
|   @@ -2371,15 +2376,15 @@ msgstr ""
|    "The alias will be displayed in place of the screen name whenever possible.\n"
|    
|    #. Set up stuff for the account box
|   -#: src/gtkblist.c:4134 src/gtkblist.c:4437
|   +#: src/gtkblist.c:4154 src/gtkblist.c:4457
|    msgid "Account:"
|    msgstr "Account:"
|    
|   -#: src/gtkblist.c:4370
|   +#: src/gtkblist.c:4390
|    msgid "This protocol does not support chat rooms."
|    msgstr "This protocol does not support chat rooms."
|    
|   -#: src/gtkblist.c:4386
|   +#: src/gtkblist.c:4406
|    msgid ""
|    "You are not currently signed on with any protocols that have the ability to "
|    "chat."
|   @@ -2387,11 +2392,11 @@ msgstr ""
|    "You are not currently signed on with any protocols that have the ability to "
|    "chat."
|    
|   -#: src/gtkblist.c:4403
|   +#: src/gtkblist.c:4423
|    msgid "Add Chat"
|    msgstr "Add Chat"
|    
|   -#: src/gtkblist.c:4427
|   +#: src/gtkblist.c:4447
|    msgid ""
|    "Please enter an alias, and the appropriate information about the chat you "
|    "would like to add to your buddy list.\n"
|   @@ -2399,15 +2404,15 @@ msgstr ""
|    "Please enter an alias, and the appropriate information about the chat you "
|    "would like to add to your buddy list.\n"
|    
|   -#: src/gtkblist.c:4505
|   +#: src/gtkblist.c:4526
|    msgid "Add Group"
|    msgstr "Add Group"
|    
|   -#: src/gtkblist.c:4506
|   +#: src/gtkblist.c:4527
|    msgid "Please enter the name of the group to be added."
|    msgstr "Please enter the name of the group to be added."
|    
|   -#: src/gtkblist.c:5075 src/gtkblist.c:5172
|   +#: src/gtkblist.c:5096 src/gtkblist.c:5193
|    msgid "No actions available"
|    msgstr "No actions available"
|    
|   @@ -2427,11 +2432,11 @@ msgstr "Cancel All"
|    msgid "Cancel All"
|    msgstr "Cancel All"
|    
|   -#: src/gtkconn.c:361 src/gtkconn.c:593
|   +#: src/gtkconn.c:361 src/gtkconn.c:594
|    msgid "_Reconnect"
|    msgstr "_Reconnect"
|    
|   -#: src/gtkconn.c:557
|   +#: src/gtkconn.c:558
|    #, c-format
|    msgid ""
|    "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
|   @@ -2444,15 +2449,15 @@ msgstr ""
|    "%s\n"
|    "%s"
|    
|   -#: src/gtkconn.c:559
|   +#: src/gtkconn.c:560
|    msgid "Reason Unknown."
|    msgstr "Reason Unknown."
|    
|   -#: src/gtkconn.c:598
|   +#: src/gtkconn.c:599
|    msgid "Reconnect _All"
|    msgstr "Reconnect _All"
|    
|   -#: src/gtkconn.c:628
|   +#: src/gtkconn.c:629
|    msgid "Time"
|    msgstr "Time"
|    
|   @@ -2533,7 +2538,7 @@ msgstr "_Message:"
|    msgid "_Message:"
|    msgstr "_Message:"
|    
|   -#: src/gtkconv.c:905 src/gtkconv.c:2615 src/gtkdebug.c:182
|   +#: src/gtkconv.c:905 src/gtkconv.c:2620 src/gtkdebug.c:182
|    msgid "Unable to open file."
|    msgstr "Unable to read file."
|    
|   @@ -2554,318 +2559,318 @@ msgstr "_Search for:"
|    msgid "_Search for:"
|    msgstr "_Search for:"
|    
|   -#: src/gtkconv.c:1450
|   +#: src/gtkconv.c:1451
|    msgid "IM"
|    msgstr "IM"
|    
|    #. Send File button
|   -#: src/gtkconv.c:1459 src/gtkconv.c:3849 src/protocols/oscar/oscar.c:591
|   +#: src/gtkconv.c:1460 src/gtkconv.c:3855 src/protocols/oscar/oscar.c:590
|    msgid "Send File"
|    msgstr "Send File"
|    
|   -#: src/gtkconv.c:1468
|   +#: src/gtkconv.c:1469
|    msgid "Un-Ignore"
|    msgstr "Un-Ignore"
|    
|   -#: src/gtkconv.c:1470 src/gtkprefs.c:831
|   +#: src/gtkconv.c:1471 src/gtkprefs.c:831
|    msgid "Ignore"
|    msgstr "Ignore"
|    
|    #. Info button
|   -#: src/gtkconv.c:1479 src/gtkconv.c:3870
|   +#: src/gtkconv.c:1480 src/gtkconv.c:3876
|    msgid "Info"
|    msgstr "Info"
|    
|   -#: src/gtkconv.c:1488
|   +#: src/gtkconv.c:1489
|    msgid "Get Away Msg"
|    msgstr "Get Away Msg"
|    
|   -#: src/gtkconv.c:2623
|   +#: src/gtkconv.c:2628
|    msgid "Unable to save icon file to disk."
|    msgstr "Unable to save icon file to disk."
|    
|   -#: src/gtkconv.c:2644
|   +#: src/gtkconv.c:2649
|    msgid "Save Icon"
|    msgstr "Save Icon"
|    
|   -#: src/gtkconv.c:2674
|   +#: src/gtkconv.c:2679
|    msgid "Animate"
|    msgstr "Animate"
|    
|   -#: src/gtkconv.c:2679
|   +#: src/gtkconv.c:2684
|    msgid "Hide Icon"
|    msgstr "Hide Icon"
|    
|   -#: src/gtkconv.c:2685
|   +#: src/gtkconv.c:2690
|    msgid "Save Icon As..."
|    msgstr "Save Icon As..."
|    
|   -#: src/gtkconv.c:3055
|   +#: src/gtkconv.c:3061
|    msgid "User is typing..."
|    msgstr "User is typing..."
|    
|   -#: src/gtkconv.c:3063
|   +#: src/gtkconv.c:3069
|    msgid "User has typed something and paused"
|    msgstr "User has typed something and paused"
|    
|    #. Build the Send As menu
|   -#: src/gtkconv.c:3166
|   +#: src/gtkconv.c:3172
|    msgid "_Send As"
|    msgstr "_Send As"
|    
|    #. Conversation menu
|   -#: src/gtkconv.c:3619
|   +#: src/gtkconv.c:3625
|    msgid "/_Conversation"
|    msgstr "/_Conversation"
|    
|   -#: src/gtkconv.c:3621
|   +#: src/gtkconv.c:3627
|    msgid "/Conversation/New Instant _Message..."
|    msgstr "/Conversation/New Instant _Message..."
|    
|   -#: src/gtkconv.c:3626
|   +#: src/gtkconv.c:3632
|    msgid "/Conversation/_Find..."
|    msgstr "/Conversation/_Find..."
|    
|   -#: src/gtkconv.c:3628
|   +#: src/gtkconv.c:3634
|    msgid "/Conversation/View _Log"
|    msgstr "/Conversation/View _Log"
|    
|   -#: src/gtkconv.c:3629
|   +#: src/gtkconv.c:3635
|    msgid "/Conversation/_Save As..."
|    msgstr "/Conversation/_Save As..."
|    
|   -#: src/gtkconv.c:3631
|   +#: src/gtkconv.c:3637
|    msgid "/Conversation/Clear"
|    msgstr "/Conversation/Clear"
|    
|   -#: src/gtkconv.c:3635
|   +#: src/gtkconv.c:3641
|    msgid "/Conversation/Se_nd File..."
|    msgstr "/Conversation/Se_nd File..."
|    
|   -#: src/gtkconv.c:3636
|   +#: src/gtkconv.c:3642
|    msgid "/Conversation/Add Buddy _Pounce..."
|    msgstr "/Conversation/Add Buddy _Pounce..."
|    
|   -#: src/gtkconv.c:3638
|   +#: src/gtkconv.c:3644
|    msgid "/Conversation/_Get Info"
|    msgstr "/Conversation/_Get Info"
|    
|   -#: src/gtkconv.c:3640
|   +#: src/gtkconv.c:3646
|    msgid "/Conversation/_Warn..."
|    msgstr "/Conversation/_Warn..."
|    
|   -#: src/gtkconv.c:3642
|   +#: src/gtkconv.c:3648
|    msgid "/Conversation/In_vite..."
|    msgstr "/Conversation/In_vite..."
|    
|   -#: src/gtkconv.c:3647
|   +#: src/gtkconv.c:3653
|    msgid "/Conversation/A_lias..."
|    msgstr "/Conversation/A_lias..."
|    
|   -#: src/gtkconv.c:3649
|   +#: src/gtkconv.c:3655
|    msgid "/Conversation/_Block..."
|    msgstr "/Conversation/_Block..."
|    
|   -#: src/gtkconv.c:3651
|   +#: src/gtkconv.c:3657
|    msgid "/Conversation/_Add..."
|    msgstr "/Conversation/_Add..."
|    
|   -#: src/gtkconv.c:3653
|   +#: src/gtkconv.c:3659
|    msgid "/Conversation/_Remove..."
|    msgstr "/Conversation/_Remove..."
|    
|   -#: src/gtkconv.c:3658
|   +#: src/gtkconv.c:3664
|    msgid "/Conversation/Insert Lin_k..."
|    msgstr "/Conversation/Insert Lin_k..."
|    
|   -#: src/gtkconv.c:3660
|   +#: src/gtkconv.c:3666
|    msgid "/Conversation/Insert Imag_e..."
|    msgstr "/Conversation/Insert Imag_e..."
|    
|   -#: src/gtkconv.c:3665
|   +#: src/gtkconv.c:3671
|    msgid "/Conversation/_Close"
|    msgstr "/Conversation/_Close"
|    
|    #. Options
|   -#: src/gtkconv.c:3669
|   +#: src/gtkconv.c:3675
|    msgid "/_Options"
|    msgstr "/_Options"
|    
|   -#: src/gtkconv.c:3670
|   +#: src/gtkconv.c:3676
|    msgid "/Options/Enable _Logging"
|    msgstr "/Options/Enable _Logging"
|    
|   -#: src/gtkconv.c:3671
|   +#: src/gtkconv.c:3677
|    msgid "/Options/Enable _Sounds"
|    msgstr "/Options/Enable _Sounds"
|    
|   -#: src/gtkconv.c:3672
|   +#: src/gtkconv.c:3678
|    msgid "/Options/Show Formatting _Toolbar"
|    msgstr "/Options/Show Formatting _Toolbar"
|    
|   -#: src/gtkconv.c:3673
|   +#: src/gtkconv.c:3679
|    msgid "/Options/Show T_imestamps"
|    msgstr "/Options/Show T_imestamps"
|    
|   -#: src/gtkconv.c:3715
|   +#: src/gtkconv.c:3721
|    msgid "/Conversation/View Log"
|    msgstr "/Conversation/View Log"
|    
|   -#: src/gtkconv.c:3720
|   +#: src/gtkconv.c:3726
|    msgid "/Conversation/Send File..."
|    msgstr "/Conversation/Send File..."
|    
|   -#: src/gtkconv.c:3724
|   +#: src/gtkconv.c:3730
|    msgid "/Conversation/Add Buddy Pounce..."
|    msgstr "/Conversation/Add Buddy Pounce..."
|    
|   -#: src/gtkconv.c:3730
|   +#: src/gtkconv.c:3736
|    msgid "/Conversation/Get Info"
|    msgstr "/Conversation/Get Info"
|    
|   -#: src/gtkconv.c:3734
|   +#: src/gtkconv.c:3740
|    msgid "/Conversation/Warn..."
|    msgstr "/Conversation/Warn..."
|    
|   -#: src/gtkconv.c:3738
|   +#: src/gtkconv.c:3744
|    msgid "/Conversation/Invite..."
|    msgstr "/Conversation/Invite..."
|    
|   -#: src/gtkconv.c:3744
|   +#: src/gtkconv.c:3750
|    msgid "/Conversation/Alias..."
|    msgstr "/Conversation/Alias..."
|    
|   -#: src/gtkconv.c:3748
|   +#: src/gtkconv.c:3754
|    msgid "/Conversation/Block..."
|    msgstr "/Conversation/Block..."
|    
|   -#: src/gtkconv.c:3752
|   +#: src/gtkconv.c:3758
|    msgid "/Conversation/Add..."
|    msgstr "/Conversation/Add..."
|    
|   -#: src/gtkconv.c:3756
|   +#: src/gtkconv.c:3762
|    msgid "/Conversation/Remove..."
|    msgstr "/Conversation/Remove..."
|    
|   -#: src/gtkconv.c:3762
|   +#: src/gtkconv.c:3768
|    msgid "/Conversation/Insert Link..."
|    msgstr "/Conversation/Insert Link..."
|    
|   -#: src/gtkconv.c:3766
|   +#: src/gtkconv.c:3772
|    msgid "/Conversation/Insert Image..."
|    msgstr "/Conversation/Insert Image..."
|    
|   -#: src/gtkconv.c:3772
|   +#: src/gtkconv.c:3778
|    msgid "/Options/Enable Logging"
|    msgstr "/Options/Enable Logging"
|    
|   -#: src/gtkconv.c:3775
|   +#: src/gtkconv.c:3781
|    msgid "/Options/Enable Sounds"
|    msgstr "/Options/Enable Sounds"
|    
|   -#: src/gtkconv.c:3778
|   +#: src/gtkconv.c:3784
|    msgid "/Options/Show Formatting Toolbar"
|    msgstr "/Options/Show Formatting Toolbar"
|    
|   -#: src/gtkconv.c:3781
|   +#: src/gtkconv.c:3787
|    msgid "/Options/Show Timestamps"
|    msgstr "/Options/Show Timestamps"
|    
|    #. The buttons, from left to right
|    #. Warn button
|   -#: src/gtkconv.c:3835
|   +#: src/gtkconv.c:3841
|    msgid "Warn"
|    msgstr "Warn"
|    
|   -#: src/gtkconv.c:3836
|   +#: src/gtkconv.c:3842
|    msgid "Warn the user"
|    msgstr "Warn the user"
|    
|    #. Block button
|   -#: src/gtkconv.c:3842 src/gtkprivacy.c:623 src/gtkprivacy.c:634
|   +#: src/gtkconv.c:3848 src/gtkprivacy.c:623 src/gtkprivacy.c:634
|    msgid "Block"
|    msgstr "Block"
|    
|   -#: src/gtkconv.c:3843
|   +#: src/gtkconv.c:3849
|    msgid "Block the user"
|    msgstr "Block the user"
|    
|   -#: src/gtkconv.c:3850
|   +#: src/gtkconv.c:3856
|    msgid "Send a file to the user"
|    msgstr "Send a file to the user"
|    
|   -#: src/gtkconv.c:3857
|   +#: src/gtkconv.c:3863
|    msgid "Add the user to your buddy list"
|    msgstr "Add the user to your buddy list"
|    
|   -#: src/gtkconv.c:3864
|   +#: src/gtkconv.c:3870
|    msgid "Remove the user from your buddy list"
|    msgstr "Remove the user from your buddy list"
|    
|   -#: src/gtkconv.c:3871 src/gtkconv.c:4206
|   +#: src/gtkconv.c:3877 src/gtkconv.c:4212
|    msgid "Get the user's information"
|    msgstr "Get the user's information"
|    
|    #. Send button
|   -#: src/gtkconv.c:3877 src/gtkconv.c:3941
|   +#: src/gtkconv.c:3883 src/gtkconv.c:3947
|    msgid "Send"
|    msgstr "Send"
|    
|   -#: src/gtkconv.c:3878 src/gtkconv.c:3942
|   +#: src/gtkconv.c:3884 src/gtkconv.c:3948
|    msgid "Send message"
|    msgstr "Send message"
|    
|    #. The buttons, from left to right
|    #. Invite
|   -#: src/gtkconv.c:3920
|   +#: src/gtkconv.c:3926
|    msgid "Invite"
|    msgstr "Invite"
|    
|   -#: src/gtkconv.c:3921
|   +#: src/gtkconv.c:3927
|    msgid "Invite a user"
|    msgstr "Invite a user"
|    
|   -#: src/gtkconv.c:3928
|   +#: src/gtkconv.c:3934
|    msgid "Add the chat to your buddy list"
|    msgstr "Add the chat to your buddy list"
|    
|   -#: src/gtkconv.c:3935
|   +#: src/gtkconv.c:3941
|    msgid "Remove the chat from your buddy list"
|    msgstr "Remove the chat from your buddy list"
|    
|   -#: src/gtkconv.c:4059
|   +#: src/gtkconv.c:4065
|    msgid "Topic:"
|    msgstr "Topic:"
|    
|    #. Setup the label telling how many people are in the room.
|   -#: src/gtkconv.c:4122
|   +#: src/gtkconv.c:4128
|    msgid "0 people in room"
|    msgstr "0 people in room"
|    
|   -#: src/gtkconv.c:4183
|   +#: src/gtkconv.c:4189
|    msgid "IM the user"
|    msgstr "IM the user"
|    
|   -#: src/gtkconv.c:4195
|   +#: src/gtkconv.c:4201
|    msgid "Ignore the user"
|    msgstr "Ignore the user"
|    
|   -#: src/gtkconv.c:4790
|   +#: src/gtkconv.c:4796
|    msgid "Close conversation"
|    msgstr "Close conversation"
|    
|   -#: src/gtkconv.c:5323 src/gtkconv.c:5352 src/gtkconv.c:5448 src/gtkconv.c:5506
|   +#: src/gtkconv.c:5329 src/gtkconv.c:5358 src/gtkconv.c:5454 src/gtkconv.c:5512
|    #, 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:6079 src/gtkconv.c:6082
|   +#: src/gtkconv.c:6085 src/gtkconv.c:6088
|    msgid "<main>/Conversation/Close"
|    msgstr "<main>/Conversation/Close"
|    
|   -#: src/gtkconv.c:6454
|   +#: src/gtkconv.c:6460
|    msgid ""
|    "say &lt;message&gt;:  Send a message normally as if you weren't using a "
|    "command."
|   @@ -2873,11 +2878,11 @@ msgstr ""
|    "say &lt;message&gt;:  Send a message normally as if you weren't using a "
|    "command."
|    
|   -#: src/gtkconv.c:6457
|   +#: src/gtkconv.c:6463
|    msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
|    msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
|    
|   -#: src/gtkconv.c:6460
|   +#: src/gtkconv.c:6466
|    msgid ""
|    "debug &lt;option&gt;:  Send various debug information to the current "
|    "conversation."
|   @@ -2885,7 +2890,7 @@ msgstr ""
|    "debug &lt;option&gt;:  Send various debug information to the current "
|    "conversation."
|    
|   -#: src/gtkconv.c:6464
|   +#: src/gtkconv.c:6470
|    msgid "help &lt;command&gt;:  Help on a specific command."
|    msgstr "help &lt;command&gt;:  Help on a specific command."
|    
|   @@ -2913,205 +2918,218 @@ msgstr "lead developer"
|    msgid "lead developer"
|    msgstr "lead developer"
|    
|   -#: src/gtkdialogs.c:65
|   -msgid "developer & webmaster"
|   -msgstr "developer & webmaster"
|   +#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:68
|   +#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:73
|   +#: src/gtkdialogs.c:74
|   +msgid "developer"
|   +msgstr "developer"
|    
|   -#: src/gtkdialogs.c:66
|   +#: src/gtkdialogs.c:67
|    msgid "win32 port"
|    msgstr "win32 port"
|    
|   -#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
|   -#: src/gtkdialogs.c:70 src/gtkdialogs.c:72
|   -msgid "developer"
|   -msgstr "developer"
|   +#: src/gtkdialogs.c:69
|   +msgid "developer & webmaster"
|   +msgstr "developer & webmaster"
|    
|   -#: src/gtkdialogs.c:71
|   +#: src/gtkdialogs.c:72
|    msgid "support"
|    msgstr "support"
|    
|   -#: src/gtkdialogs.c:77
|   +#: src/gtkdialogs.c:90
|    msgid "former libfaim maintainer"
|    msgstr "former libfaim maintainer"
|    
|   -#: src/gtkdialogs.c:78
|   +#: src/gtkdialogs.c:91
|    msgid "former lead developer"
|    msgstr "former lead developer"
|    
|   -#: src/gtkdialogs.c:79
|   +#: src/gtkdialogs.c:92
|    msgid "former maintainer"
|    msgstr "former maintainer"
|    
|   -#: src/gtkdialogs.c:80
|   +#: src/gtkdialogs.c:93
|    msgid "former Jabber developer"
|    msgstr "former Jabber developer"
|    
|   -#: src/gtkdialogs.c:81
|   +#: src/gtkdialogs.c:94
|    msgid "original author"
|    msgstr "original author"
|    
|   -#: src/gtkdialogs.c:82
|   +#: src/gtkdialogs.c:95
|    msgid "hacker and designated driver [lazy bum]"
|    msgstr "hacker and designated driver [lazy bum]"
|    
|   -#: src/gtkdialogs.c:87 src/gtkdialogs.c:126
|   +#: src/gtkdialogs.c:100
|   +msgid "Albanian"
|   +msgstr "Albanian"
|   +
|   +#: src/gtkdialogs.c:101 src/gtkdialogs.c:142
|    msgid "Bulgarian"
|    msgstr "Bulgarian"
|    
|   -#: src/gtkdialogs.c:88 src/gtkdialogs.c:127 src/gtkdialogs.c:128
|   +#: src/gtkdialogs.c:102 src/gtkdialogs.c:143 src/gtkdialogs.c:144
|    msgid "Catalan"
|    msgstr "Catalan"
|    
|   -#: src/gtkdialogs.c:89 src/gtkdialogs.c:129
|   +#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
|    msgid "Czech"
|    msgstr "Czech"
|    
|   -#: src/gtkdialogs.c:90
|   +#: src/gtkdialogs.c:104
|    msgid "Danish"
|    msgstr "Danish"
|    
|   -#: src/gtkdialogs.c:91
|   +#: src/gtkdialogs.c:105
|    msgid "Australian English"
|    msgstr "Australian English"
|    
|   -#: src/gtkdialogs.c:92
|   +#: src/gtkdialogs.c:106
|    msgid "British English"
|    msgstr "Proper English"
|    
|   -#: src/gtkdialogs.c:93
|   +#: src/gtkdialogs.c:107
|    msgid "Canadian English"
|    msgstr "Canadian English"
|    
|   -#: src/gtkdialogs.c:94 src/gtkdialogs.c:130
|   +#: src/gtkdialogs.c:108 src/gtkdialogs.c:146
|    msgid "German"
|    msgstr "German"
|    
|   -#: src/gtkdialogs.c:95 src/gtkdialogs.c:131
|   +#: src/gtkdialogs.c:109 src/gtkdialogs.c:147
|    msgid "Spanish"
|    msgstr "Spanish"
|    
|   -#: src/gtkdialogs.c:96 src/gtkdialogs.c:132
|   +#: src/gtkdialogs.c:110 src/gtkdialogs.c:148
|    msgid "Finnish"
|    msgstr "Finnish"
|    
|   -#: src/gtkdialogs.c:97 src/gtkdialogs.c:133
|   +#: src/gtkdialogs.c:111 src/gtkdialogs.c:149
|    msgid "French"
|    msgstr "French"
|    
|   -#: src/gtkdialogs.c:98
|   +#: src/gtkdialogs.c:112
|    msgid "Hebrew"
|    msgstr "Hebrew"
|    
|   -#: src/gtkdialogs.c:99
|   +#: src/gtkdialogs.c:113
|    msgid "Hindi"
|    msgstr "Hindi"
|    
|   -#: src/gtkdialogs.c:100
|   +#: src/gtkdialogs.c:114
|    msgid "Hungarian"
|    msgstr "Hungarian"
|    
|   -#: src/gtkdialogs.c:101 src/gtkdialogs.c:134
|   +#: src/gtkdialogs.c:115 src/gtkdialogs.c:150
|    msgid "Italian"
|    msgstr "Italian"
|    
|   -#: src/gtkdialogs.c:102 src/gtkdialogs.c:135
|   +#: src/gtkdialogs.c:116 src/gtkdialogs.c:151
|    msgid "Japanese"
|    msgstr "Japanese"
|    
|   -#: src/gtkdialogs.c:103
|   +#: src/gtkdialogs.c:117
|    msgid "Lithuanian"
|    msgstr "Lithuanian"
|    
|   -#: src/gtkdialogs.c:104 src/gtkdialogs.c:136
|   +#: src/gtkdialogs.c:118 src/gtkdialogs.c:152
|    msgid "Korean"
|    msgstr "Korean"
|    
|   -#: src/gtkdialogs.c:105
|   +#: src/gtkdialogs.c:119
|    msgid "Dutch; Flemish"
|    msgstr "Dutch; Flemish"
|    
|   -#: src/gtkdialogs.c:106
|   +#: src/gtkdialogs.c:120
|    msgid "Macedonian"
|    msgstr "Macedonian"
|    
|   -#: src/gtkdialogs.c:107
|   +#: src/gtkdialogs.c:121
|   +msgid "Burmese"
|   +msgstr "Burmese"
|   +
|   +#: src/gtkdialogs.c:122
|    msgid "Norwegian"
|    msgstr "Norwegian"
|    
|   -#: src/gtkdialogs.c:108 src/gtkdialogs.c:137
|   +#: src/gtkdialogs.c:123 src/gtkdialogs.c:153
|    msgid "Polish"
|    msgstr "Polish"
|    
|   -#: src/gtkdialogs.c:109
|   +#: src/gtkdialogs.c:124
|    msgid "Portuguese"
|    msgstr "Portuguese"
|    
|   -#: src/gtkdialogs.c:110
|   +#: src/gtkdialogs.c:125
|    msgid "Portuguese-Brazil"
|    msgstr "Portuguese-Brazil"
|    
|   -#: src/gtkdialogs.c:111
|   +#: src/gtkdialogs.c:126
|    msgid "Romanian"
|    msgstr "Romanian"
|    
|   -#: src/gtkdialogs.c:112 src/gtkdialogs.c:138 src/gtkdialogs.c:139
|   +#: src/gtkdialogs.c:127 src/gtkdialogs.c:154 src/gtkdialogs.c:155
|    msgid "Russian"
|    msgstr "Russian"
|    
|   -#: src/gtkdialogs.c:113
|   +#: src/gtkdialogs.c:128
|    msgid "Serbian"
|    msgstr "Serbian"
|    
|   -#: src/gtkdialogs.c:114
|   +#: src/gtkdialogs.c:129
|    msgid "Slovenian"
|    msgstr "Slovenian"
|    
|   -#: src/gtkdialogs.c:115 src/gtkdialogs.c:141
|   +#: src/gtkdialogs.c:130 src/gtkdialogs.c:157 src/gtkdialogs.c:158
|    msgid "Swedish"
|    msgstr "Swedish"
|    
|   -#: src/gtkdialogs.c:116
|   +#: src/gtkdialogs.c:131
|    msgid "Turkish"
|    msgstr "Turkish"
|    
|   -#: src/gtkdialogs.c:117
|   +#: src/gtkdialogs.c:132
|   +msgid "Ukrainian"
|   +msgstr "Ukrainian"
|   +
|   +#: src/gtkdialogs.c:133
|    msgid "Vietnamese"
|    msgstr "Vietnamese"
|    
|   -#: src/gtkdialogs.c:117
|   +#: src/gtkdialogs.c:133
|    msgid "T.M.Thanh and the Gnome-Vi Team"
|    msgstr "T.M.Thanh and the Gnome-Vi Team"
|    
|   -#: src/gtkdialogs.c:118
|   +#: src/gtkdialogs.c:134
|    msgid "Simplified Chinese"
|    msgstr "Simplified Chinese"
|    
|   -#: src/gtkdialogs.c:119
|   +#: src/gtkdialogs.c:135
|    msgid "Traditional Chinese"
|    msgstr "Traditional Chinese"
|    
|   -#: src/gtkdialogs.c:125
|   +#: src/gtkdialogs.c:141
|    msgid "Amharic"
|    msgstr "Amharic"
|    
|   -#: src/gtkdialogs.c:140
|   +#: src/gtkdialogs.c:156
|    msgid "Slovak"
|    msgstr "Slovak"
|    
|   -#: src/gtkdialogs.c:142
|   +#: src/gtkdialogs.c:159
|    msgid "Chinese"
|    msgstr "Chinese"
|    
|   -#: src/gtkdialogs.c:184
|   +#: src/gtkdialogs.c:201
|    msgid "About Gaim"
|    msgstr "About Gaim"
|    
|   -#: src/gtkdialogs.c:199
|   +#: src/gtkdialogs.c:216
|    #, c-format
|    msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
|    msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
|    
|   -#: src/gtkdialogs.c:220
|   +#: src/gtkdialogs.c:238
|    msgid ""
|    "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
|    "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
|   @@ -3121,71 +3139,71 @@ msgstr ""
|    "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>"
|    
|   -#: src/gtkdialogs.c:229
|   +#: src/gtkdialogs.c:247
|    msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
|    msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
|    
|   -#: src/gtkdialogs.c:238
|   +#: src/gtkdialogs.c:252
|    msgid "Active Developers"
|    msgstr "Active Developers"
|    
|   -#: src/gtkdialogs.c:253
|   +#: src/gtkdialogs.c:267
|    msgid "Crazy Patch Writers"
|    msgstr "Crazy Patch Writers"
|    
|   -#: src/gtkdialogs.c:268
|   +#: src/gtkdialogs.c:282
|    msgid "Retired Developers"
|    msgstr "Retired Developers"
|    
|   -#: src/gtkdialogs.c:283
|   +#: src/gtkdialogs.c:297
|    msgid "Current Translators"
|    msgstr "Current Translators"
|    
|   -#: src/gtkdialogs.c:303
|   +#: src/gtkdialogs.c:317
|    msgid "Past Translators"
|    msgstr "Past Translators"
|    
|   -#: src/gtkdialogs.c:374 src/gtkdialogs.c:516 src/gtkdialogs.c:569
|   +#: src/gtkdialogs.c:467 src/gtkdialogs.c:609 src/gtkdialogs.c:662
|    msgid "_Screen name"
|    msgstr "_Screen name"
|    
|   -#: src/gtkdialogs.c:380 src/gtkdialogs.c:522 src/gtkdialogs.c:575
|   +#: src/gtkdialogs.c:473 src/gtkdialogs.c:615 src/gtkdialogs.c:668
|    msgid "_Account"
|    msgstr "_Account"
|    
|   -#: src/gtkdialogs.c:387
|   +#: src/gtkdialogs.c:480
|    msgid "New Instant Message"
|    msgstr "New Instant Message"
|    
|   -#: src/gtkdialogs.c:389
|   +#: src/gtkdialogs.c:482
|    msgid "Please enter the screen name of the person you would like to IM."
|    msgstr "Please enter the screen name of the person you would like to IM."
|    
|   -#: src/gtkdialogs.c:529
|   +#: src/gtkdialogs.c:622
|    msgid "Get User Info"
|    msgstr "Get User Info"
|    
|   -#: src/gtkdialogs.c:531
|   +#: src/gtkdialogs.c:624
|    msgid ""
|    "Please enter the screen name of the person whose info you would like to view."
|    msgstr ""
|    "Please enter the screen name of the person whose info you would like to view."
|    
|   -#: src/gtkdialogs.c:583
|   +#: src/gtkdialogs.c:676
|    msgid "Get User Log"
|    msgstr "Get User Log"
|    
|   -#: src/gtkdialogs.c:585
|   +#: src/gtkdialogs.c:678
|    msgid ""
|    "Please enter the screen name of the person whose log you would like to view."
|    msgstr ""
|    "Please enter the screen name of the person whose log you would like to view."
|    
|   -#: src/gtkdialogs.c:625
|   +#: src/gtkdialogs.c:718
|    msgid "Warn User"
|    msgstr "Warn User"
|    
|   -#: src/gtkdialogs.c:646
|   +#: src/gtkdialogs.c:739
|    #, c-format
|    msgid ""
|    "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
|   @@ -3198,45 +3216,45 @@ msgstr ""
|    "This will increase %s's warning level and he or she will be subject to "
|    "harsher rate limiting.\n"
|    
|   -#: src/gtkdialogs.c:655
|   +#: src/gtkdialogs.c:748
|    msgid "Warn _anonymously?"
|    msgstr "Warn _anonymously?"
|    
|   -#: src/gtkdialogs.c:662
|   +#: src/gtkdialogs.c:755
|    msgid "<b>Anonymous warnings are less severe.</b>"
|    msgstr "<b>Anonymous warnings are less severe.</b>"
|    
|   -#: src/gtkdialogs.c:683
|   +#: src/gtkdialogs.c:776
|    msgid "Alias Contact"
|    msgstr "Alias Contact"
|    
|   -#: src/gtkdialogs.c:684
|   +#: src/gtkdialogs.c:777
|    msgid "Enter an alias for this contact."
|    msgstr "Enter an alias for this contact."
|    
|   -#: src/gtkdialogs.c:686 src/gtkdialogs.c:708 src/gtkdialogs.c:728
|   +#: src/gtkdialogs.c:779 src/gtkdialogs.c:801 src/gtkdialogs.c:821
|    #: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
|    msgid "Alias"
|    msgstr "Alias"
|    
|   -#: src/gtkdialogs.c:704
|   +#: src/gtkdialogs.c:797
|    #, c-format
|    msgid "Enter an alias for %s."
|    msgstr "Enter an alias for %s."
|    
|   -#: src/gtkdialogs.c:706
|   +#: src/gtkdialogs.c:799
|    msgid "Alias Buddy"
|    msgstr "Alias Buddy"
|    
|   -#: src/gtkdialogs.c:725
|   +#: src/gtkdialogs.c:818
|    msgid "Alias Chat"
|    msgstr "Alias Chat"
|    
|   -#: src/gtkdialogs.c:726
|   +#: src/gtkdialogs.c:819
|    msgid "Enter an alias for this chat."
|    msgstr "Enter an alias for this chat."
|    
|   -#: src/gtkdialogs.c:760
|   +#: src/gtkdialogs.c:853
|    #, c-format
|    msgid ""
|    "You are about to remove the contact containing %s and %d other buddies from "
|   @@ -3245,7 +3263,7 @@ msgstr ""
|    "You are about to remove the contact containing %s and %d other buddies from "
|    "your buddy list.  Do you want to continue?"
|    
|   -#: src/gtkdialogs.c:821
|   +#: src/gtkdialogs.c:914
|    #, c-format
|    msgid ""
|    "You are about to remove the group %s and all its members from your buddy "
|   @@ -3254,22 +3272,22 @@ msgstr ""
|    "You are about to remove the group %s and all its members from your buddy "
|    "list.  Do you want to continue?"
|    
|   -#: src/gtkdialogs.c:824 src/gtkdialogs.c:825
|   +#: src/gtkdialogs.c:917 src/gtkdialogs.c:918
|    msgid "Remove Group"
|    msgstr "Remove Group"
|    
|   -#: src/gtkdialogs.c:863
|   +#: src/gtkdialogs.c:956
|    #, c-format
|    msgid ""
|    "You are about to remove %s from your buddy list.  Do you want to continue?"
|    msgstr ""
|    "You are about to remove %s from your buddy list.  Do you want to continue?"
|    
|   -#: src/gtkdialogs.c:866 src/gtkdialogs.c:868
|   +#: src/gtkdialogs.c:959 src/gtkdialogs.c:961
|    msgid "Remove Buddy"
|    msgstr "Remove Buddy"
|    
|   -#: src/gtkdialogs.c:901
|   +#: src/gtkdialogs.c:994
|    #, c-format
|    msgid ""
|    "You are about to remove the chat %s from your buddy list.  Do you want to "
|   @@ -3278,7 +3296,7 @@ msgstr ""
|    "You are about to remove the chat %s from your buddy list.  Do you want to "
|    "continue?"
|    
|   -#: src/gtkdialogs.c:905 src/gtkdialogs.c:906
|   +#: src/gtkdialogs.c:998 src/gtkdialogs.c:999
|    msgid "Remove Chat"
|    msgstr "Remove Chat"
|    
|   @@ -3414,7 +3432,7 @@ msgstr "_Open Link in Browser"
|    msgid "_Open Link in Browser"
|    msgstr "_Open Link in Browser"
|    
|   -#: src/gtkimhtml.c:2846
|   +#: src/gtkimhtml.c:2852
|    msgid ""
|    "Unable to guess the image type based on the file extension supplied.  "
|    "Defaulting to PNG."
|   @@ -3422,16 +3440,16 @@ msgstr ""
|    "Unable to guess the image type based on the file extension supplied.  "
|    "Defaulting to PNG."
|    
|   -#: src/gtkimhtml.c:2854
|   +#: src/gtkimhtml.c:2860
|    #, c-format
|    msgid "Error saving image: %s"
|    msgstr "Error saving image: %s"
|    
|   -#: src/gtkimhtml.c:2931 src/gtkimhtml.c:2943
|   +#: src/gtkimhtml.c:2937 src/gtkimhtml.c:2949
|    msgid "Save Image"
|    msgstr "Save Image"
|    
|   -#: src/gtkimhtml.c:2971
|   +#: src/gtkimhtml.c:2977
|    msgid "_Save Image..."
|    msgstr "_Save Image..."
|    
|   @@ -3439,23 +3457,23 @@ msgstr "Select Font"
|    msgid "Select Font"
|    msgstr "Select Font"
|    
|   -#: src/gtkimhtmltoolbar.c:239
|   +#: src/gtkimhtmltoolbar.c:240
|    msgid "Select Text Color"
|    msgstr "Select Text Colour"
|    
|   -#: src/gtkimhtmltoolbar.c:312
|   +#: src/gtkimhtmltoolbar.c:314
|    msgid "Select Background Color"
|    msgstr "Select Background Colour"
|    
|   -#: src/gtkimhtmltoolbar.c:395
|   +#: src/gtkimhtmltoolbar.c:398
|    msgid "_URL"
|    msgstr "_URL"
|    
|   -#: src/gtkimhtmltoolbar.c:403
|   +#: src/gtkimhtmltoolbar.c:406
|    msgid "_Description"
|    msgstr "_Description"
|    
|   -#: src/gtkimhtmltoolbar.c:406
|   +#: src/gtkimhtmltoolbar.c:409
|    msgid ""
|    "Please enter the URL and description of the link that you want to insert. "
|    "The description is optional."
|   @@ -3463,77 +3481,77 @@ msgstr ""
|    "Please enter the URL and description of the link that you want to insert. "
|    "The description is optional."
|    
|   -#: src/gtkimhtmltoolbar.c:410
|   +#: src/gtkimhtmltoolbar.c:413
|    msgid "Please enter the URL of the link that you want to insert."
|    msgstr "Please enter the URL of the link that you want to insert."
|    
|   -#: src/gtkimhtmltoolbar.c:415
|   +#: src/gtkimhtmltoolbar.c:418
|    msgid "Insert Link"
|    msgstr "Insert Link"
|    
|   -#: src/gtkimhtmltoolbar.c:419
|   +#: src/gtkimhtmltoolbar.c:422
|    msgid "_Insert"
|    msgstr "_Insert"
|    
|   -#: src/gtkimhtmltoolbar.c:488
|   +#: src/gtkimhtmltoolbar.c:491
|    #, c-format
|    msgid "Failed to store image: %s\n"
|    msgstr "Failed to store image: %s\n"
|    
|   -#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
|   +#: src/gtkimhtmltoolbar.c:517 src/gtkimhtmltoolbar.c:527
|    msgid "Insert Image"
|    msgstr "Insert Image"
|    
|   -#: src/gtkimhtmltoolbar.c:662
|   +#: src/gtkimhtmltoolbar.c:665
|    msgid "This theme has no available smileys."
|    msgstr "This theme has no available smileys."
|    
|    #. show everything
|   -#: src/gtkimhtmltoolbar.c:677
|   +#: src/gtkimhtmltoolbar.c:680
|    msgid "Smile!"
|    msgstr "Smile!"
|    
|   -#: src/gtkimhtmltoolbar.c:895
|   +#: src/gtkimhtmltoolbar.c:898
|    msgid "Bold"
|    msgstr "Bold"
|    
|   -#: src/gtkimhtmltoolbar.c:906
|   +#: src/gtkimhtmltoolbar.c:909
|    msgid "Italic"
|    msgstr "Italic"
|    
|   -#: src/gtkimhtmltoolbar.c:917
|   +#: src/gtkimhtmltoolbar.c:920
|    msgid "Underline"
|    msgstr "Underline"
|    
|   -#: src/gtkimhtmltoolbar.c:933
|   +#: src/gtkimhtmltoolbar.c:936
|    msgid "Larger font size"
|    msgstr "Larger font size"
|    
|   -#: src/gtkimhtmltoolbar.c:945
|   +#: src/gtkimhtmltoolbar.c:948
|    msgid "Smaller font size"
|    msgstr "Smaller font size"
|    
|   -#: src/gtkimhtmltoolbar.c:962
|   +#: src/gtkimhtmltoolbar.c:965
|    msgid "Font Face"
|    msgstr "Font Face"
|    
|   -#: src/gtkimhtmltoolbar.c:974
|   +#: src/gtkimhtmltoolbar.c:977
|    msgid "Foreground font color"
|    msgstr "Foreground font colour"
|    
|   -#: src/gtkimhtmltoolbar.c:986
|   +#: src/gtkimhtmltoolbar.c:989
|    msgid "Background color"
|    msgstr "Background colour"
|    
|   -#: src/gtkimhtmltoolbar.c:1001
|   +#: src/gtkimhtmltoolbar.c:1004
|    msgid "Insert link"
|    msgstr "Insert link"
|    
|   -#: src/gtkimhtmltoolbar.c:1011
|   +#: src/gtkimhtmltoolbar.c:1014
|    msgid "Insert image"
|    msgstr "Insert image"
|    
|   -#: src/gtkimhtmltoolbar.c:1022
|   +#: src/gtkimhtmltoolbar.c:1025
|    msgid "Insert smiley"
|    msgstr "Insert smiley"
|    
|   @@ -3617,7 +3635,7 @@ msgstr "Please enter a buddy to pounce."
|    msgstr "Please enter a buddy to pounce."
|    
|    #. "New Buddy Pounce"
|   -#: src/gtkpounce.c:391 src/gtkpounce.c:893
|   +#: src/gtkpounce.c:391 src/gtkpounce.c:895
|    msgid "New Buddy Pounce"
|    msgstr "New Buddy Pounce"
|    
|   @@ -3713,51 +3731,51 @@ msgstr "Sav_e this pounce after activati
|    msgstr "Sav_e this pounce after activation"
|    
|    #. "Remove Buddy Pounce"
|   -#: src/gtkpounce.c:900
|   +#: src/gtkpounce.c:902
|    msgid "Remove Buddy Pounce"
|    msgstr "Remove Buddy Pounce"
|    
|   -#: src/gtkpounce.c:961
|   +#: src/gtkpounce.c:963
|    #, c-format
|    msgid "%s has started typing to you (%s)"
|    msgstr "%s has started typing to you (%s)"
|    
|   -#: src/gtkpounce.c:963
|   +#: src/gtkpounce.c:965
|    #, c-format
|    msgid "%s has signed on (%s)"
|    msgstr "%s has signed on (%s)"
|    
|   -#: src/gtkpounce.c:965
|   +#: src/gtkpounce.c:967
|    #, c-format
|    msgid "%s has returned from being idle (%s)"
|    msgstr "%s has returned from being idle (%s)"
|    
|   -#: src/gtkpounce.c:967
|   +#: src/gtkpounce.c:969
|    #, c-format
|    msgid "%s has returned from being away (%s)"
|    msgstr "%s has returned from being away (%s)"
|    
|   -#: src/gtkpounce.c:969
|   +#: src/gtkpounce.c:971
|    #, c-format
|    msgid "%s has stopped typing to you (%s)"
|    msgstr "%s has stopped typing to you (%s)"
|    
|   -#: src/gtkpounce.c:971
|   +#: src/gtkpounce.c:973
|    #, c-format
|    msgid "%s has signed off (%s)"
|    msgstr "%s has signed off (%s)"
|    
|   -#: src/gtkpounce.c:973
|   +#: src/gtkpounce.c:975
|    #, c-format
|    msgid "%s has become idle (%s)"
|    msgstr "%s has become idle (%s)"
|    
|   -#: src/gtkpounce.c:975
|   +#: src/gtkpounce.c:977
|    #, c-format
|    msgid "%s has gone away. (%s)"
|    msgstr "%s has gone away. (%s)"
|    
|   -#: src/gtkpounce.c:976
|   +#: src/gtkpounce.c:978
|    msgid "Unknown pounce event. Please report this!"
|    msgstr "Unknown pounce event. Please report this!"
|    
|   @@ -3782,7 +3800,7 @@ msgstr "Icon"
|    msgstr "Icon"
|    
|    #: src/gtkprefs.c:728 src/gtkprefs.c:2204 src/protocols/jabber/buddy.c:264
|   -#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:741
|   +#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:743
|    msgid "Description"
|    msgstr "Description"
|    
|   @@ -3987,8 +4005,8 @@ msgstr "New conversation _placement:"
|    msgid "New conversation _placement:"
|    msgstr "New conversation _placement:"
|    
|   -#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:734
|   -#: src/protocols/oscar/oscar.c:5019
|   +#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:733
|   +#: src/protocols/oscar/oscar.c:5072
|    msgid "IP Address"
|    msgstr "IP Address"
|    
|   @@ -4230,9 +4248,9 @@ msgstr "When away and idle"
|    msgid "When away and idle"
|    msgstr "When away and idle"
|    
|   -#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1332
|   +#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1286
|    #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
|   -#: src/protocols/oscar/oscar.c:4172 src/protocols/yahoo/yahoo.c:2580
|   +#: src/protocols/oscar/oscar.c:4225 src/protocols/yahoo/yahoo.c:2580
|    #: src/protocols/yahoo/yahoo_profile.c:664
|    msgid "Idle"
|    msgstr "Idle"
|   @@ -4379,7 +4397,7 @@ msgstr "Block only the users below"
|    msgid "Block only the users below"
|    msgstr "Block only the users below"
|    
|   -#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1467
|   +#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1479
|    msgid "Privacy"
|    msgstr "Privacy"
|    
|   @@ -4444,16 +4462,16 @@ msgstr "Are you sure you want to block %
|    #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
|    #.
|    #: src/gtkrequest.c:240 src/protocols/gg/gg.c:950
|   -#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:500
|   -#: src/protocols/msn/msn.c:503 src/protocols/novell/novell.c:1892
|   +#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:498
|   +#: src/protocols/msn/msn.c:501 src/protocols/novell/novell.c:1892
|    #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
|    #: src/request.h:1236
|    msgid "Yes"
|    msgstr "Yes"
|    
|    #: src/gtkrequest.c:241 src/protocols/gg/gg.c:950
|   -#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:500
|   -#: src/protocols/msn/msn.c:503 src/protocols/novell/novell.c:1893
|   +#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:498
|   +#: src/protocols/msn/msn.c:501 src/protocols/novell/novell.c:1893
|    #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
|    #: src/request.h:1236
|    msgid "No"
|   @@ -4463,24 +4481,24 @@ msgstr "Apply"
|    msgid "Apply"
|    msgstr "Apply"
|    
|   -#: src/gtkrequest.c:245 src/protocols/msn/msn.c:316
|   +#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
|    #: src/protocols/silc/util.c:332
|    msgid "Close"
|    msgstr "Close"
|    
|   -#: src/gtkrequest.c:1398
|   +#: src/gtkrequest.c:1402
|    msgid "That file already exists"
|    msgstr "That file already exists"
|    
|   -#: src/gtkrequest.c:1399
|   +#: src/gtkrequest.c:1403
|    msgid "Would you like to overwrite it?"
|    msgstr "Would you like to overwrite it?"
|    
|   -#: src/gtkrequest.c:1437 src/gtkrequest.c:1458
|   +#: src/gtkrequest.c:1441 src/gtkrequest.c:1462
|    msgid "Save File..."
|    msgstr "Save File..."
|    
|   -#: src/gtkrequest.c:1438 src/gtkrequest.c:1459
|   +#: src/gtkrequest.c:1442 src/gtkrequest.c:1463
|    msgid "Open File..."
|    msgstr "Open File..."
|    
|   @@ -4633,7 +4651,7 @@ msgstr "_Sign on"
|    msgstr "_Sign on"
|    
|    #. full help text
|   -#: src/main.c:517
|   +#: src/main.c:513
|    #, c-format
|    msgid ""
|    "Gaim %s\n"
|   @@ -4667,16 +4685,16 @@ msgstr ""
|    "  -h, --help          display this help and exit\n"
|    
|    #. short message
|   -#: src/main.c:532
|   +#: src/main.c:528
|    #, c-format
|    msgid "Gaim %s. Try `%s -h' for more information.\n"
|    msgstr "Gaim %s. Try `%s -h' for more information.\n"
|    
|   -#: src/main.c:899
|   +#: src/main.c:895
|    msgid "Unable to load preferences"
|    msgstr "Unable to load preferences"
|    
|   -#: src/main.c:899
|   +#: src/main.c:895
|    msgid ""
|    "Gaim was not able to load your preferences because they are stored in an old "
|    "format that is no longer used.  Please reconfigure your settings using the "
|   @@ -4709,12 +4727,12 @@ msgstr "Slightly less boring default"
|    msgstr "Slightly less boring default"
|    
|    #: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
|   -#: src/protocols/msn/msn.c:514 src/protocols/msn/state.c:29
|   +#: src/protocols/msn/msn.c:512 src/protocols/msn/state.c:29
|    #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
|    #: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2797
|    #: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
|   -#: src/protocols/oscar/oscar.c:756 src/protocols/yahoo/yahoo.c:2925
|   -#: src/protocols/yahoo/yahoo.c:3041
|   +#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2923
|   +#: src/protocols/yahoo/yahoo.c:3039
|    msgid "Available"
|    msgstr "Available"
|    
|   @@ -4726,12 +4744,12 @@ msgstr "Away for friends only"
|    msgid "Away for friends only"
|    msgstr "Away for friends only"
|    
|   -#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:965
|   -#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:674
|   -#: src/protocols/oscar/oscar.c:5530 src/protocols/oscar/oscar.c:5608
|   -#: src/protocols/oscar/oscar.c:5632 src/protocols/oscar/oscar.c:6814
|   -#: src/protocols/oscar/oscar.c:6819 src/protocols/yahoo/yahoo.c:2578
|   -#: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:3053
|   +#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977
|   +#: src/protocols/jabber/presence.c:140 src/protocols/oscar/oscar.c:673
|   +#: src/protocols/oscar/oscar.c:5583 src/protocols/oscar/oscar.c:5661
|   +#: src/protocols/oscar/oscar.c:5685 src/protocols/oscar/oscar.c:6867
|   +#: src/protocols/oscar/oscar.c:6872 src/protocols/yahoo/yahoo.c:2578
|   +#: src/protocols/yahoo/yahoo.c:2943 src/protocols/yahoo/yahoo.c:3051
|    msgid "Invisible"
|    msgstr "Invisible"
|    
|   @@ -4751,10 +4769,10 @@ msgstr "Unable to connect to server."
|    msgid "Unable to connect to server."
|    msgstr "Unable to connect to server."
|    
|   -#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
|   -#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
|   -#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
|   -#: src/protocols/jabber/jabber.c:107
|   +#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
|   +#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
|   +#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
|   +#: src/protocols/jabber/jabber.c:108
|    msgid "Invalid response from server."
|    msgstr "Invalid response from server."
|    
|   @@ -4774,18 +4792,17 @@ msgstr "Unknown Error Code."
|    msgid "Unknown Error Code."
|    msgstr "Unknown Error Code."
|    
|   -#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:3973
|   +#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4026
|    #, c-format
|    msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
|    msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
|    
|    #. res[0] == username
|   -#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
|    #: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1012
|   -#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3977
|   -#: src/protocols/oscar/oscar.c:4201 src/protocols/silc/ops.c:1086
|   +#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4030
|   +#: src/protocols/oscar/oscar.c:4254 src/protocols/silc/ops.c:1086
|    #: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
|   -#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1131
|   +#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
|    msgid "Buddy Information"
|    msgstr "Buddy Information"
|    
|   @@ -4870,25 +4887,25 @@ msgstr "Active"
|    msgid "Active"
|    msgstr "Active"
|    
|   -#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5011
|   +#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5064
|    msgid "UIN"
|    msgstr "UIN"
|    
|    #. First Name
|   -#: src/protocols/gg/gg.c:958 src/protocols/jabber/jabber.c:614
|   -#: src/protocols/oscar/oscar.c:5022 src/protocols/silc/ops.c:808
|   +#: src/protocols/gg/gg.c:958 src/protocols/jabber/jabber.c:622
|   +#: src/protocols/oscar/oscar.c:5075 src/protocols/silc/ops.c:808
|    #: src/protocols/trepia/trepia.c:268
|    msgid "First Name"
|    msgstr "Forename"
|    
|    #. Last Name
|   -#: src/protocols/gg/gg.c:963 src/protocols/jabber/jabber.c:619
|   -#: src/protocols/oscar/oscar.c:5023 src/protocols/trepia/trepia.c:275
|   +#: src/protocols/gg/gg.c:963 src/protocols/jabber/jabber.c:627
|   +#: src/protocols/oscar/oscar.c:5076 src/protocols/trepia/trepia.c:275
|    msgid "Last Name"
|    msgstr "Surname"
|    
|    #: src/protocols/gg/gg.c:967 src/protocols/gg/gg.c:1711
|   -#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5012
|   +#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5065
|    #: src/protocols/silc/ops.c:1204
|    msgid "Nick"
|    msgstr "Nick"
|   @@ -4903,8 +4920,8 @@ msgstr "Sex"
|    msgstr "Sex"
|    
|    #. City
|   -#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:629
|   -#: src/protocols/oscar/oscar.c:5066 src/protocols/oscar/oscar.c:5074
|   +#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:637
|   +#: src/protocols/oscar/oscar.c:5119 src/protocols/oscar/oscar.c:5127
|    #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
|    msgid "City"
|    msgstr "City"
|   @@ -5008,7 +5025,7 @@ msgstr "Directory Search"
|    msgstr "Directory Search"
|    
|    #. if (js->protocol_options & CHANGE_PASSWORD) {
|   -#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1063
|   +#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1075
|    #: src/protocols/toc/toc.c:1564
|    msgid "Change Password"
|    msgstr "Change Password"
|   @@ -5046,7 +5063,6 @@ msgstr ""
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: src/protocols/gg/gg.c:1690 src/protocols/gg/gg.c:1692
|    msgid "Gadu-Gadu Protocol Plugin"
|    msgstr "Gadu-Gadu Protocol Plugin"
|   @@ -5060,15 +5076,15 @@ msgstr "The user %s (%s%s%s%s%s) wants y
|    msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
|    msgstr "The user %s (%s%s%s%s%s) wants you to authorise them."
|    
|   -#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:248
|   -#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3712
|   -#: src/protocols/oscar/oscar.c:6262
|   +#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249
|   +#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3765
|   +#: src/protocols/oscar/oscar.c:6315
|    msgid "Authorize"
|    msgstr "Authorise"
|    
|   -#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249
|   -#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3714
|   -#: src/protocols/oscar/oscar.c:6263
|   +#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:250
|   +#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3767
|   +#: src/protocols/oscar/oscar.c:6316
|    msgid "Deny"
|    msgstr "Deny"
|    
|   @@ -5093,21 +5109,20 @@ msgstr "Unknown command: %s"
|    msgid "Unknown command: %s"
|    msgstr "Unknown command: %s"
|    
|   -#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:574
|   +#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:576
|    #: src/protocols/silc/silc.c:1007
|    #, c-format
|    msgid "current topic is: %s"
|    msgstr "current topic is: %s"
|    
|   -#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:578
|   +#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:580
|    #: src/protocols/silc/silc.c:1011
|    msgid "No topic is set"
|    msgstr "No topic is set"
|    
|   -#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:171
|   -#: src/protocols/yahoo/yahoo_filexfer.c:180
|   -#: src/protocols/yahoo/yahoo_filexfer.c:189
|   -#: src/protocols/yahoo/yahoo_filexfer.c:199
|   +#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
|   +#: src/protocols/yahoo/yahoo_filexfer.c:182
|   +#: src/protocols/yahoo/yahoo_filexfer.c:191
|    msgid "File Transfer Aborted"
|    msgstr "File Transfer Aborted"
|    
|   @@ -5132,7 +5147,7 @@ msgstr "MOTD for %s"
|    msgid "MOTD for %s"
|    msgstr "MOTD for %s"
|    
|   -#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:401
|   +#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:400
|    msgid "Server has disconnected"
|    msgstr "Server has disconnected"
|    
|   @@ -5152,31 +5167,35 @@ msgstr "IRC nicks may not contain whites
|    msgid "IRC nicks may not contain whitespace"
|    msgstr "IRC nicks may not contain whitespace"
|    
|   -#: src/protocols/irc/irc.c:236 src/protocols/toc/toc.c:198
|   -#, c-format
|   -msgid "Signon: %s"
|   -msgstr "Signon: %s"
|   +#. connect to the server
|   +#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:796
|   +#: src/protocols/msn/session.c:334 src/protocols/napster/napster.c:510
|   +#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1744
|   +#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2439
|   +#: src/protocols/zephyr/zephyr.c:1452
|   +msgid "Connecting"
|   +msgstr "Connecting"
|    
|   -#: src/protocols/irc/irc.c:245
|   +#: src/protocols/irc/irc.c:243
|    msgid "Couldn't create socket"
|    msgstr "Couldn't create socket"
|    
|   -#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:298
|   -#: src/protocols/oscar/oscar.c:1673 src/protocols/oscar/oscar.c:1737
|   +#: src/protocols/irc/irc.c:258 src/protocols/jabber/jabber.c:302
|   +#: src/protocols/oscar/oscar.c:1675 src/protocols/oscar/oscar.c:1740
|    msgid "Couldn't connect to host"
|    msgstr "Couldn't connect to host"
|    
|   -#: src/protocols/irc/irc.c:398 src/protocols/trepia/trepia.c:927
|   +#: src/protocols/irc/irc.c:397 src/protocols/trepia/trepia.c:927
|    msgid "Read error"
|    msgstr "Read error"
|    
|   -#: src/protocols/irc/irc.c:553 src/protocols/silc/chat.c:1373
|   -#: src/protocols/yahoo/yahoochat.c:1398
|   +#: src/protocols/irc/irc.c:552 src/protocols/silc/chat.c:1373
|   +#: src/protocols/yahoo/yahoochat.c:1399
|    msgid "Users"
|    msgstr "Users"
|    
|   -#: src/protocols/irc/irc.c:556 src/protocols/silc/chat.c:1376
|   -#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1407
|   +#: src/protocols/irc/irc.c:555 src/protocols/silc/chat.c:1376
|   +#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1408
|    msgid "Topic"
|    msgstr "Topic"
|    
|   @@ -5188,39 +5207,39 @@ msgstr "Topic"
|    #. *< id
|    #. *< name
|    #. *< version
|   -#: src/protocols/irc/irc.c:663
|   +#: src/protocols/irc/irc.c:662
|    msgid "IRC Protocol Plugin"
|    msgstr "IRC Protocol Plugin"
|    
|    #. *  summary
|   -#: src/protocols/irc/irc.c:664
|   +#: src/protocols/irc/irc.c:663
|    msgid "The IRC Protocol Plugin that Sucks Less"
|    msgstr "The IRC Protocol Plugin that Sucks Less"
|    
|   -#: src/protocols/irc/irc.c:683 src/protocols/irc/msgs.c:201
|   -#: src/protocols/jabber/jabber.c:1580 src/protocols/napster/napster.c:670
|   +#: src/protocols/irc/irc.c:682 src/protocols/irc/msgs.c:201
|   +#: src/protocols/jabber/jabber.c:1592 src/protocols/napster/napster.c:670
|    #: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
|    msgid "Server"
|    msgstr "Server"
|    
|   -#: src/protocols/irc/irc.c:686 src/protocols/jabber/jabber.c:1601
|   -#: src/protocols/msn/msn.c:1939 src/protocols/napster/napster.c:675
|   +#: src/protocols/irc/irc.c:685 src/protocols/jabber/jabber.c:1613
|   +#: src/protocols/msn/msn.c:1893 src/protocols/napster/napster.c:675
|    #: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1301
|    msgid "Port"
|    msgstr "Port"
|    
|   -#: src/protocols/irc/irc.c:689
|   +#: src/protocols/irc/irc.c:688
|    msgid "Encodings"
|    msgstr "Encodings"
|    
|   -#: src/protocols/irc/irc.c:692 src/protocols/irc/msgs.c:195
|   -#: src/protocols/jabber/jabber.c:589 src/protocols/silc/buddy.c:1445
|   +#: src/protocols/irc/irc.c:691 src/protocols/irc/msgs.c:195
|   +#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1454
|    #: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
|    #: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
|    msgid "Username"
|    msgstr "Username"
|    
|   -#: src/protocols/irc/irc.c:695
|   +#: src/protocols/irc/irc.c:694
|    msgid "Real name"
|    msgstr "Real name"
|    
|   @@ -5253,7 +5272,7 @@ msgstr " <i>(identified)</i>"
|    
|    #: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
|    #: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
|   -#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo_profile.c:664
|   +#: src/protocols/msn/msn.c:1286 src/protocols/yahoo/yahoo_profile.c:664
|    #, c-format
|    msgid "<b>%s:</b> %s<br>"
|    msgstr "<b>%s:</b> %s<br>"
|   @@ -5285,111 +5304,111 @@ msgstr "Buddy Information for %s"
|    msgid "Buddy Information for %s"
|    msgstr "Buddy Information for %s"
|    
|   -#: src/protocols/irc/msgs.c:286
|   +#: src/protocols/irc/msgs.c:287
|    #, c-format
|    msgid "%s has changed the topic to: %s"
|    msgstr "%s has changed the topic to: %s"
|    
|   -#: src/protocols/irc/msgs.c:291
|   +#: src/protocols/irc/msgs.c:292
|    #, c-format
|    msgid "The topic for %s is: %s"
|    msgstr "The topic for %s is: %s"
|    
|   -#: src/protocols/irc/msgs.c:308
|   +#: src/protocols/irc/msgs.c:309
|    #, c-format
|    msgid "Unknown message '%s'"
|    msgstr "Unknown message '%s'"
|    
|   -#: src/protocols/irc/msgs.c:309
|   +#: src/protocols/irc/msgs.c:310
|    msgid "Unknown message"
|    msgstr "Unknown message"
|    
|   -#: src/protocols/irc/msgs.c:309
|   +#: src/protocols/irc/msgs.c:310
|    msgid "Gaim has sent a message the IRC server did not understand."
|    msgstr "Gaim has sent a message the IRC server did not understand."
|    
|   -#: src/protocols/irc/msgs.c:332
|   +#: src/protocols/irc/msgs.c:333
|    #, c-format
|    msgid "Users on %s: %s"
|    msgstr "Users on %s: %s"
|    
|   -#: src/protocols/irc/msgs.c:426
|   +#: src/protocols/irc/msgs.c:427
|    msgid "No such channel"
|    msgstr "No such channel"
|    
|    #. does this happen?
|   -#: src/protocols/irc/msgs.c:437
|   +#: src/protocols/irc/msgs.c:438
|    msgid "no such channel"
|    msgstr "no such channel"
|    
|   -#: src/protocols/irc/msgs.c:440
|   +#: src/protocols/irc/msgs.c:441
|    msgid "User is not logged in"
|    msgstr "User is not logged in"
|    
|   -#: src/protocols/irc/msgs.c:445
|   +#: src/protocols/irc/msgs.c:446
|    msgid "No such nick or channel"
|    msgstr "No such nick or channel"
|    
|   -#: src/protocols/irc/msgs.c:465
|   +#: src/protocols/irc/msgs.c:466
|    msgid "Could not send"
|    msgstr "Could not send"
|    
|   -#: src/protocols/irc/msgs.c:521
|   +#: src/protocols/irc/msgs.c:522
|    #, c-format
|    msgid "Joining %s requires an invitation."
|    msgstr "Joining %s requires an invitation."
|    
|   -#: src/protocols/irc/msgs.c:522
|   +#: src/protocols/irc/msgs.c:523
|    msgid "Invitation only"
|    msgstr "Invitation only"
|    
|   -#: src/protocols/irc/msgs.c:625
|   +#: src/protocols/irc/msgs.c:626
|    #, c-format
|    msgid "You have been kicked by %s: (%s)"
|    msgstr "You have been kicked by %s: (%s)"
|    
|   -#: src/protocols/irc/msgs.c:630
|   +#: src/protocols/irc/msgs.c:631
|    #, c-format
|    msgid "Kicked by %s (%s)"
|    msgstr "Kicked by %s (%s)"
|    
|   -#: src/protocols/irc/msgs.c:651
|   +#: src/protocols/irc/msgs.c:652
|    #, c-format
|    msgid "mode (%s %s) by %s"
|    msgstr "mode (%s %s) by %s"
|    
|   -#: src/protocols/irc/msgs.c:760
|   +#: src/protocols/irc/msgs.c:762
|    msgid "Could not change nick"
|    msgstr "Could not change nick"
|    
|   -#: src/protocols/irc/msgs.c:761
|   +#: src/protocols/irc/msgs.c:763
|    msgid "Cannot change nick"
|    msgstr "Cannot change nick"
|    
|   -#: src/protocols/irc/msgs.c:782
|   +#: src/protocols/irc/msgs.c:784
|    #, c-format
|    msgid "You have parted the channel%s%s"
|    msgstr "You have parted the channel%s%s"
|    
|   -#: src/protocols/irc/msgs.c:822
|   +#: src/protocols/irc/msgs.c:824
|    msgid "Error: invalid PONG from server"
|    msgstr "Error: invalid PONG from server"
|    
|   -#: src/protocols/irc/msgs.c:824
|   +#: src/protocols/irc/msgs.c:826
|    #, c-format
|    msgid "PING reply -- Lag: %lu seconds"
|    msgstr "PING reply -- Lag: %lu seconds"
|    
|   -#: src/protocols/irc/msgs.c:899
|   +#: src/protocols/irc/msgs.c:901
|    #, c-format
|    msgid "Cannot join %s:"
|    msgstr "Cannot join %s:"
|    
|   -#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912
|   +#: src/protocols/irc/msgs.c:902 src/protocols/silc/ops.c:912
|    msgid "Cannot join channel"
|    msgstr "Cannot join channel"
|    
|   -#: src/protocols/irc/msgs.c:936
|   +#: src/protocols/irc/msgs.c:938
|    #, c-format
|    msgid "Wallops from %s"
|    msgstr "Wallops from %s"
|   @@ -5488,7 +5507,7 @@ msgstr "names [channel]:  List the users
|    msgid "names [channel]:  List the users currently in a channel."
|    msgstr "names [channel]:  List the users currently in a channel."
|    
|   -#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1411
|   +#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1423
|    msgid "nick &lt;new nickname&gt;:  Change your nickname."
|    msgstr "nick &lt;new nickname&gt;:  Change your nickname."
|    
|   @@ -5576,40 +5595,48 @@ msgstr "whois &lt;nick&gt;:  Get informa
|    msgid "whois &lt;nick&gt;:  Get information on a user."
|    msgstr "whois &lt;nick&gt;:  Get information on a user."
|    
|   -#: src/protocols/irc/parse.c:414
|   +#: src/protocols/irc/parse.c:417
|    #, c-format
|    msgid "Reply time from %s: %lu seconds"
|    msgstr "Reply time from %s: %lu seconds"
|    
|   -#: src/protocols/irc/parse.c:415
|   +#: src/protocols/irc/parse.c:418
|    msgid "PONG"
|    msgstr "PONG"
|    
|   -#: src/protocols/irc/parse.c:415
|   +#: src/protocols/irc/parse.c:418
|    msgid "CTCP PING reply"
|    msgstr "CTCP PING reply"
|    
|   -#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
|   -#: src/protocols/oscar/oscar.c:1570 src/protocols/toc/toc.c:188
|   +#: src/protocols/irc/parse.c:521 src/protocols/irc/parse.c:525
|   +#: src/protocols/oscar/oscar.c:1572 src/protocols/toc/toc.c:188
|    #: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
|    #: src/protocols/toc/toc.c:689
|    msgid "Disconnected."
|    msgstr "Disconnected."
|    
|   -#: src/protocols/jabber/auth.c:51
|   -msgid "Server requires SSL for login"
|   -msgstr "Server requires SSL for login"
|   +#: src/protocols/jabber/auth.c:52
|   +msgid ""
|   +"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
|   +"account properties"
|   +msgstr ""
|   +"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
|   +"account properties"
|    
|   -#: src/protocols/jabber/auth.c:111
|   +#: src/protocols/jabber/auth.c:54
|   +msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
|   +msgstr "Server requires TLS/SSL for login. No TLS/SSL support found."
|   +
|   +#: src/protocols/jabber/auth.c:115
|    msgid "Server requires plaintext authentication over an unencrypted stream"
|    msgstr "Server requires plaintext authentication over an unencrypted stream"
|    
|   -#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
|   -#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
|   +#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
|   +#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
|    msgid "Plaintext Authentication"
|    msgstr "Plaintext Authentication"
|    
|   -#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
|   +#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
|    msgid ""
|    "This server requires plaintext authentication over an unencrypted "
|    "connection.  Allow this and continue authentication?"
|   @@ -5617,11 +5644,11 @@ msgstr ""
|    "This server requires plaintext authentication over an unencrypted "
|    "connection.  Allow this and continue authentication?"
|    
|   -#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
|   +#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
|    msgid "Server does not use any supported authentication method"
|    msgstr "Server does not use any supported authentication method"
|    
|   -#: src/protocols/jabber/auth.c:386
|   +#: src/protocols/jabber/auth.c:390
|    msgid "Invalid challenge from server"
|    msgstr "Invalid challenge from server"
|    
|   @@ -5640,14 +5667,14 @@ msgstr "Given Name"
|    msgstr "Given Name"
|    
|    #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
|   -#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1322
|   -#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:820
|   +#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1276
|   +#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
|    #: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
|    #: src/protocols/yahoo/yahoo_profile.c:1000
|    msgid "Nickname"
|    msgstr "Nickname"
|    
|   -#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:649
|   +#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:657
|    msgid "URL"
|    msgstr "URL"
|    
|   @@ -5668,7 +5695,7 @@ msgstr "Region"
|    msgstr "Region"
|    
|    #: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
|   -#: src/protocols/jabber/jabber.c:639
|   +#: src/protocols/jabber/jabber.c:647
|    msgid "Postal Code"
|    msgstr "Postal Code"
|    
|   @@ -5707,7 +5734,7 @@ msgstr "Role"
|    msgstr "Role"
|    
|    #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
|   -#: src/protocols/oscar/oscar.c:5047
|   +#: src/protocols/oscar/oscar.c:5100
|    msgid "Birthday"
|    msgstr "Birthday"
|    
|   @@ -5728,15 +5755,15 @@ msgstr "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:939
|   -#: src/protocols/msn/msn.c:490 src/protocols/novell/novell.c:2819
|   -#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:716
|   -#: src/protocols/oscar/oscar.c:722 src/protocols/oscar/oscar.c:724
|   +#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:951
|   +#: src/protocols/msn/msn.c:488 src/protocols/novell/novell.c:2819
|   +#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:715
|   +#: src/protocols/oscar/oscar.c:721 src/protocols/oscar/oscar.c:723
|    #: src/protocols/yahoo/yahoo.c:2703
|    msgid "Status"
|    msgstr "Status"
|    
|   -#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1583
|   +#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1595
|    msgid "Resource"
|    msgstr "Resource"
|    
|   @@ -5744,8 +5771,8 @@ msgstr "Middle Name"
|    msgid "Middle Name"
|    msgstr "Middle Name"
|    
|   -#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:624
|   -#: src/protocols/oscar/oscar.c:5065 src/protocols/oscar/oscar.c:5073
|   +#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:632
|   +#: src/protocols/oscar/oscar.c:5118 src/protocols/oscar/oscar.c:5126
|    #: src/protocols/silc/ops.c:848
|    msgid "Address"
|    msgstr "Address"
|   @@ -5790,7 +5817,7 @@ msgstr "Unsubscribe"
|    msgid "Unsubscribe"
|    msgstr "Unsubscribe"
|    
|   -#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6333
|   +#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6386
|    #: src/protocols/yahoo/yahoochat.c:1003
|    msgid "_Room:"
|    msgstr "_Room:"
|   @@ -5830,51 +5857,51 @@ msgstr "Invalid Room Handle"
|    msgid "Invalid Room Handle"
|    msgstr "Invalid Room Handle"
|    
|   -#: src/protocols/jabber/chat.c:377
|   +#: src/protocols/jabber/chat.c:379
|    msgid "Configuration error"
|    msgstr "Configuration error"
|    
|   -#: src/protocols/jabber/chat.c:386 src/protocols/jabber/chat.c:531
|   +#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
|    msgid "Unable to configure"
|    msgstr "Unable to configure"
|    
|   -#: src/protocols/jabber/chat.c:402
|   +#: src/protocols/jabber/chat.c:404
|    msgid "Room Configuration Error"
|    msgstr "Room Configuration Error"
|    
|   -#: src/protocols/jabber/chat.c:403
|   +#: src/protocols/jabber/chat.c:405
|    msgid "This room is not capable of being configured"
|    msgstr "This room is not capable of being configured"
|    
|   -#: src/protocols/jabber/chat.c:453 src/protocols/jabber/chat.c:522
|   +#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
|    msgid "Registration error"
|    msgstr "Registration error"
|    
|   -#: src/protocols/jabber/chat.c:605
|   +#: src/protocols/jabber/chat.c:607
|    msgid "Nick changing not supported in non-MUC chatrooms"
|    msgstr "Nick changing not supported in non-MUC chatrooms"
|    
|   -#: src/protocols/jabber/chat.c:649 src/protocols/jabber/chat.c:660
|   +#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
|    msgid "Roomlist Error"
|    msgstr "Roomlist Error"
|    
|   -#: src/protocols/jabber/chat.c:650 src/protocols/jabber/chat.c:661
|   +#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
|    msgid "Error retreiving roomlist"
|    msgstr "Error retreiving roomlist"
|    
|   -#: src/protocols/jabber/chat.c:709
|   +#: src/protocols/jabber/chat.c:711
|    msgid "Invalid Server"
|    msgstr "Invalid Server"
|    
|   -#: src/protocols/jabber/chat.c:747
|   +#: src/protocols/jabber/chat.c:749
|    msgid "Enter a Conference Server"
|    msgstr "Enter a Conference Server"
|    
|   -#: src/protocols/jabber/chat.c:748
|   +#: src/protocols/jabber/chat.c:750
|    msgid "Select a conference server to query"
|    msgstr "Select a conference server to query"
|    
|   -#: src/protocols/jabber/chat.c:751
|   +#: src/protocols/jabber/chat.c:753
|    msgid "Find Rooms"
|    msgstr "Find Rooms"
|    
|   @@ -5882,443 +5909,435 @@ msgstr "Error initializing session"
|    msgid "Error initializing session"
|    msgstr "Error initializing session"
|    
|   -#: src/protocols/jabber/jabber.c:207 src/protocols/msn/httpmethod.c:266
|   -#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
|   -#: src/protocols/trepia/trepia.c:988 src/protocols/trepia/trepia.c:1032
|   -#: src/protocols/trepia/trepia.c:1131 src/protocols/trepia/trepia.c:1177
|   +#: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248
|   +#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
|   +#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
|   +#: src/protocols/trepia/trepia.c:1177
|    msgid "Write error"
|    msgstr "Write error"
|    
|   -#: src/protocols/jabber/jabber.c:245 src/protocols/jabber/jabber.c:265
|   +#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269
|    msgid "Read Error"
|    msgstr "Read Error"
|    
|   -#: src/protocols/jabber/jabber.c:325
|   +#: src/protocols/jabber/jabber.c:329
|    msgid "Connection Failed"
|    msgstr "Connection Failed"
|    
|   -#: src/protocols/jabber/jabber.c:328
|   +#: src/protocols/jabber/jabber.c:332
|    msgid "SSL Handshake Failed"
|    msgstr "SSL Handshake Failed"
|    
|   -#: src/protocols/jabber/jabber.c:371 src/protocols/jabber/jabber.c:700
|   +#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709
|    msgid "Invalid Jabber ID"
|    msgstr "Invalid Jabber ID"
|    
|   -#: src/protocols/jabber/jabber.c:399 src/protocols/jabber/jabber.c:727
|   +#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:739
|    msgid "SSL support unavailable"
|    msgstr "SSL support unavailable"
|    
|   -#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:737
|   +#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
|    #: src/protocols/trepia/trepia.c:1071
|    msgid "Unable to create socket"
|    msgstr "Unable to create socket"
|    
|   -#: src/protocols/jabber/jabber.c:434
|   +#: src/protocols/jabber/jabber.c:442
|    #, c-format
|    msgid "Registration of %s@%s successful"
|    msgstr "Registration of %s@%s successful"
|    
|   -#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
|   +#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
|    msgid "Registration Successful"
|    msgstr "Registration Successful"
|    
|   -#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:1182
|   +#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1194
|    msgid "Unknown Error"
|    msgstr "Unknown Error"
|    
|   -#: src/protocols/jabber/jabber.c:445 src/protocols/jabber/jabber.c:446
|   +#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
|    msgid "Registration Failed"
|    msgstr "Registration Failed"
|    
|   -#: src/protocols/jabber/jabber.c:557 src/protocols/jabber/jabber.c:558
|   +#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566
|    msgid "Already Registered"
|    msgstr "Already Registered"
|    
|   -#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:1037
|   +#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1049
|    msgid "Password"
|    msgstr "Password"
|    
|   -#: src/protocols/jabber/jabber.c:604
|   +#: src/protocols/jabber/jabber.c:612
|    msgid "E-Mail"
|    msgstr "E-Mail"
|    
|    #. State
|   -#: src/protocols/jabber/jabber.c:634 src/protocols/oscar/oscar.c:5067
|   -#: src/protocols/oscar/oscar.c:5075 src/protocols/trepia/trepia.c:336
|   +#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5120
|   +#: src/protocols/oscar/oscar.c:5128 src/protocols/trepia/trepia.c:336
|    #: src/protocols/trepia/trepia.c:414
|    msgid "State"
|    msgstr "County/State"
|    
|   -#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:853
|   +#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:853
|    #: src/protocols/silc/silc.c:650 src/protocols/silc/util.c:510
|    msgid "Phone"
|    msgstr "Telephone"
|    
|   -#: src/protocols/jabber/jabber.c:654
|   +#: src/protocols/jabber/jabber.c:662
|    msgid "Date"
|    msgstr "Date"
|    
|   -#: src/protocols/jabber/jabber.c:662
|   +#: src/protocols/jabber/jabber.c:670
|    msgid "Please fill out the information below to register your new account."
|    msgstr "Please fill out the information below to register your new account."
|    
|   -#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:666
|   +#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674
|    msgid "Register New Jabber Account"
|    msgstr "Register New Jabber Account"
|    
|   -#: src/protocols/jabber/jabber.c:745
|   +#: src/protocols/jabber/jabber.c:757
|    msgid "Logged out"
|    msgstr "Logged out"
|    
|   -#. connect to the server
|   -#: src/protocols/jabber/jabber.c:784 src/protocols/msn/msn.c:654
|   -#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2152
|   -#: src/protocols/oscar/oscar.c:1741 src/protocols/trepia/trepia.c:1065
|   -#: src/protocols/yahoo/yahoo.c:2439 src/protocols/zephyr/zephyr.c:1453
|   -msgid "Connecting"
|   -msgstr "Connecting"
|   -
|   -#: src/protocols/jabber/jabber.c:788
|   +#: src/protocols/jabber/jabber.c:800
|    msgid "Initializing Stream"
|    msgstr "Initialising Stream"
|    
|   -#: src/protocols/jabber/jabber.c:794
|   +#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:340
|    msgid "Authenticating"
|    msgstr "Authenticating"
|    
|   -#: src/protocols/jabber/jabber.c:803
|   +#: src/protocols/jabber/jabber.c:815
|    msgid "Re-initializing Stream"
|    msgstr "Re-initialising Stream"
|    
|   -#: src/protocols/jabber/jabber.c:883 src/protocols/jabber/jabber.c:1160
|   -#: src/protocols/jabber/jabber.c:1201 src/protocols/jabber/jabber.c:1234
|   -#: src/protocols/oscar/oscar.c:722 src/protocols/oscar/oscar.c:6617
|   +#: src/protocols/jabber/jabber.c:895 src/protocols/jabber/jabber.c:1172
|   +#: src/protocols/jabber/jabber.c:1213 src/protocols/jabber/jabber.c:1246
|   +#: src/protocols/oscar/oscar.c:721 src/protocols/oscar/oscar.c:6670
|    msgid "Not Authorized"
|    msgstr "Not Authorised"
|    
|   -#: src/protocols/jabber/jabber.c:914
|   +#: src/protocols/jabber/jabber.c:926
|    msgid "Both"
|    msgstr "Both"
|    
|   -#: src/protocols/jabber/jabber.c:916
|   +#: src/protocols/jabber/jabber.c:928
|    msgid "From (To pending)"
|    msgstr "From (To pending)"
|    
|   -#: src/protocols/jabber/jabber.c:918
|   +#: src/protocols/jabber/jabber.c:930
|    msgid "From"
|    msgstr "From"
|    
|   -#: src/protocols/jabber/jabber.c:921
|   +#: src/protocols/jabber/jabber.c:933
|    msgid "To"
|    msgstr "To"
|    
|   -#: src/protocols/jabber/jabber.c:923
|   +#: src/protocols/jabber/jabber.c:935
|    msgid "None (To pending)"
|    msgstr "None (To pending)"
|    
|   -#: src/protocols/jabber/jabber.c:927
|   +#: src/protocols/jabber/jabber.c:939
|    msgid "Subscription"
|    msgstr "Subscription"
|    
|   -#: src/protocols/jabber/jabber.c:947
|   +#: src/protocols/jabber/jabber.c:959
|    msgid "Error"
|    msgstr "Error"
|    
|   -#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:35
|   -#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
|   +#: src/protocols/jabber/jabber.c:972 src/protocols/jabber/jutil.c:35
|   +#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:131
|    msgid "Chatty"
|    msgstr "Chatty"
|    
|   -#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:38
|   -#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
|   +#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jutil.c:38
|   +#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:136
|    msgid "Extended Away"
|    msgstr "Extended Away"
|    
|   -#: src/protocols/jabber/jabber.c:963 src/protocols/jabber/jutil.c:41
|   -#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
|   -#: src/protocols/oscar/oscar.c:664 src/protocols/oscar/oscar.c:5620
|   -#: src/protocols/oscar/oscar.c:6810
|   +#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41
|   +#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:138
|   +#: src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:5673
|   +#: src/protocols/oscar/oscar.c:6863
|    msgid "Do Not Disturb"
|    msgstr "Do Not Disturb"
|    
|   -#: src/protocols/jabber/jabber.c:980
|   +#: src/protocols/jabber/jabber.c:992
|    msgid "Password Changed"
|    msgstr "Password Changed"
|    
|   -#: src/protocols/jabber/jabber.c:981
|   +#: src/protocols/jabber/jabber.c:993
|    msgid "Your password has been changed."
|    msgstr "Your password has been changed."
|    
|   -#: src/protocols/jabber/jabber.c:985 src/protocols/jabber/jabber.c:986
|   +#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jabber.c:998
|    msgid "Error changing password"
|    msgstr "Error changing password"
|    
|   -#: src/protocols/jabber/jabber.c:1042
|   +#: src/protocols/jabber/jabber.c:1054
|    msgid "Password (again)"
|    msgstr "Password (again)"
|    
|   -#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/jabber.c:1048
|   +#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/jabber.c:1060
|    msgid "Change Jabber Password"
|    msgstr "Change Jabber Password"
|    
|   -#: src/protocols/jabber/jabber.c:1048
|   +#: src/protocols/jabber/jabber.c:1060
|    msgid "Please enter your new password"
|    msgstr "Please enter your new password"
|    
|   -#: src/protocols/jabber/jabber.c:1058 src/protocols/toc/toc.c:1554
|   +#: src/protocols/jabber/jabber.c:1070 src/protocols/toc/toc.c:1554
|    msgid "Set User Info"
|    msgstr "Set User Info"
|    
|   -#: src/protocols/jabber/jabber.c:1140
|   +#: src/protocols/jabber/jabber.c:1152
|    msgid "Bad Request"
|    msgstr "Bad Request"
|    
|   -#: src/protocols/jabber/jabber.c:1142
|   +#: src/protocols/jabber/jabber.c:1154
|    msgid "Conflict"
|    msgstr "Conflict"
|    
|   -#: src/protocols/jabber/jabber.c:1144
|   +#: src/protocols/jabber/jabber.c:1156
|    msgid "Feature Not Implemented"
|    msgstr "Feature Not Implemented"
|    
|   -#: src/protocols/jabber/jabber.c:1146
|   +#: src/protocols/jabber/jabber.c:1158
|    msgid "Forbidden"
|    msgstr "Forbidden"
|    
|   -#: src/protocols/jabber/jabber.c:1148
|   +#: src/protocols/jabber/jabber.c:1160
|    msgid "Gone"
|    msgstr "Gone"
|    
|   -#: src/protocols/jabber/jabber.c:1150 src/protocols/jabber/jabber.c:1224
|   +#: src/protocols/jabber/jabber.c:1162 src/protocols/jabber/jabber.c:1236
|    msgid "Internal Server Error"
|    msgstr "Internal Server Error"
|    
|   -#: src/protocols/jabber/jabber.c:1152
|   +#: src/protocols/jabber/jabber.c:1164
|    msgid "Item Not Found"
|    msgstr "Item Not Found"
|    
|   -#: src/protocols/jabber/jabber.c:1154
|   +#: src/protocols/jabber/jabber.c:1166
|    msgid "Malformed Jabber ID"
|    msgstr "Malformed Jabber ID"
|    
|   -#: src/protocols/jabber/jabber.c:1156
|   +#: src/protocols/jabber/jabber.c:1168
|    msgid "Not Acceptable"
|    msgstr "Not Acceptable"
|    
|   -#: src/protocols/jabber/jabber.c:1158
|   +#: src/protocols/jabber/jabber.c:1170
|    msgid "Not Allowed"
|    msgstr "Not Allowed"
|    
|   -#: src/protocols/jabber/jabber.c:1162
|   +#: src/protocols/jabber/jabber.c:1174
|    msgid "Payment Required"
|    msgstr "Payment Required"
|    
|   -#: src/protocols/jabber/jabber.c:1164
|   +#: src/protocols/jabber/jabber.c:1176
|    msgid "Recipient Unavailable"
|    msgstr "Recipient unavailable"
|    
|   -#: src/protocols/jabber/jabber.c:1168
|   +#: src/protocols/jabber/jabber.c:1180
|    msgid "Registration Required"
|    msgstr "Registration Required"
|    
|   -#: src/protocols/jabber/jabber.c:1170
|   +#: src/protocols/jabber/jabber.c:1182
|    msgid "Remote Server Not Found"
|    msgstr "Remote Server Not Found"
|    
|   -#: src/protocols/jabber/jabber.c:1172
|   +#: src/protocols/jabber/jabber.c:1184
|    msgid "Remote Server Timeout"
|    msgstr "Remote Server Timeout"
|    
|   -#: src/protocols/jabber/jabber.c:1174
|   +#: src/protocols/jabber/jabber.c:1186
|    msgid "Server Overloaded"
|    msgstr "Server Overloaded"
|    
|   -#: src/protocols/jabber/jabber.c:1176
|   +#: src/protocols/jabber/jabber.c:1188
|    msgid "Service Unavailable"
|    msgstr "Service Unavailable"
|    
|   -#: src/protocols/jabber/jabber.c:1178
|   +#: src/protocols/jabber/jabber.c:1190
|    msgid "Subscription Required"
|    msgstr "Subscription Required"
|    
|   -#: src/protocols/jabber/jabber.c:1180
|   +#: src/protocols/jabber/jabber.c:1192
|    msgid "Unexpected Request"
|    msgstr "Unexpected Request"
|    
|   -#: src/protocols/jabber/jabber.c:1187
|   +#: src/protocols/jabber/jabber.c:1199
|    msgid "Authorization Aborted"
|    msgstr "Authorisation Aborted"
|    
|   -#: src/protocols/jabber/jabber.c:1189
|   +#: src/protocols/jabber/jabber.c:1201
|    msgid "Incorrect encoding in authorization"
|    msgstr "Incorrect encoding in authorisation"
|    
|   -#: src/protocols/jabber/jabber.c:1192
|   +#: src/protocols/jabber/jabber.c:1204
|    msgid "Invalid authzid"
|    msgstr "Invalid authzid"
|    
|   -#: src/protocols/jabber/jabber.c:1195
|   +#: src/protocols/jabber/jabber.c:1207
|    msgid "Invalid Authorization Mechanism"
|    msgstr "Invalid Authorisation Mechanism"
|    
|   -#: src/protocols/jabber/jabber.c:1198
|   +#: src/protocols/jabber/jabber.c:1210
|    msgid "Authorization mechanism too weak"
|    msgstr "Authorisation mechanism too weak"
|    
|   -#: src/protocols/jabber/jabber.c:1203
|   +#: src/protocols/jabber/jabber.c:1215
|    msgid "Temporary Authentication Failure"
|    msgstr "Temporary Authentication Failure"
|    
|   -#: src/protocols/jabber/jabber.c:1205
|   +#: src/protocols/jabber/jabber.c:1217
|    msgid "Authentication Failure"
|    msgstr "Authentication Failure"
|    
|   -#: src/protocols/jabber/jabber.c:1209
|   +#: src/protocols/jabber/jabber.c:1221
|    msgid "Bad Format"
|    msgstr "Bad Format"
|    
|   -#: src/protocols/jabber/jabber.c:1211
|   +#: src/protocols/jabber/jabber.c:1223
|    msgid "Bad Namespace Prefix"
|    msgstr "Bad Namespace Prefix"
|    
|   -#: src/protocols/jabber/jabber.c:1214
|   +#: src/protocols/jabber/jabber.c:1226
|    msgid "Resource Conflict"
|    msgstr "Resource Conflict"
|    
|   -#: src/protocols/jabber/jabber.c:1216 src/protocols/silc/ops.c:1511
|   +#: src/protocols/jabber/jabber.c:1228 src/protocols/silc/ops.c:1511
|    msgid "Connection Timeout"
|    msgstr "Connection Timeout"
|    
|   -#: src/protocols/jabber/jabber.c:1218
|   +#: src/protocols/jabber/jabber.c:1230
|    msgid "Host Gone"
|    msgstr "Host Gone"
|    
|   -#: src/protocols/jabber/jabber.c:1220
|   +#: src/protocols/jabber/jabber.c:1232
|    msgid "Host Unknown"
|    msgstr "Host Unknown"
|    
|   -#: src/protocols/jabber/jabber.c:1222
|   +#: src/protocols/jabber/jabber.c:1234
|    msgid "Improper Addressing"
|    msgstr "Improper Addressing"
|    
|   -#: src/protocols/jabber/jabber.c:1226
|   +#: src/protocols/jabber/jabber.c:1238
|    msgid "Invalid ID"
|    msgstr "Invalid ID"
|    
|   -#: src/protocols/jabber/jabber.c:1228
|   +#: src/protocols/jabber/jabber.c:1240
|    msgid "Invalid Namespace"
|    msgstr "Invalid Namespace"
|    
|   -#: src/protocols/jabber/jabber.c:1230
|   +#: src/protocols/jabber/jabber.c:1242
|    msgid "Invalid XML"
|    msgstr "Invalid XML"
|    
|   -#: src/protocols/jabber/jabber.c:1232
|   +#: src/protocols/jabber/jabber.c:1244
|    msgid "Non-matching Hosts"
|    msgstr "Non-matching Hosts"
|    
|   -#: src/protocols/jabber/jabber.c:1236
|   +#: src/protocols/jabber/jabber.c:1248
|    msgid "Policy Violation"
|    msgstr "Policy Violation"
|    
|   -#: src/protocols/jabber/jabber.c:1238
|   +#: src/protocols/jabber/jabber.c:1250
|    msgid "Remote Connection Failed"
|    msgstr "Remote Connection Failed"
|    
|   -#: src/protocols/jabber/jabber.c:1240
|   +#: src/protocols/jabber/jabber.c:1252
|    msgid "Resource Constraint"
|    msgstr "Resource Constraint"
|    
|   -#: src/protocols/jabber/jabber.c:1242
|   +#: src/protocols/jabber/jabber.c:1254
|    msgid "Restricted XML"
|    msgstr "Restricted XML"
|    
|   -#: src/protocols/jabber/jabber.c:1244
|   +#: src/protocols/jabber/jabber.c:1256
|    msgid "See Other Host"
|    msgstr "See Other Host"
|    
|   -#: src/protocols/jabber/jabber.c:1246
|   +#: src/protocols/jabber/jabber.c:1258
|    msgid "System Shutdown"
|    msgstr "System Shutdown"
|    
|   -#: src/protocols/jabber/jabber.c:1248
|   +#: src/protocols/jabber/jabber.c:1260
|    msgid "Undefined Condition"
|    msgstr "Undefined Condition"
|    
|   -#: src/protocols/jabber/jabber.c:1250
|   +#: src/protocols/jabber/jabber.c:1262
|    msgid "Unsupported Encoding"
|    msgstr "Unsupported Encoding"
|    
|   -#: src/protocols/jabber/jabber.c:1252
|   +#: src/protocols/jabber/jabber.c:1264
|    msgid "Unsupported Stanza Type"
|    msgstr "Unsupported Stanza Type"
|    
|   -#: src/protocols/jabber/jabber.c:1254
|   +#: src/protocols/jabber/jabber.c:1266
|    msgid "Unsupported Version"
|    msgstr "Unsupported Version"
|    
|   -#: src/protocols/jabber/jabber.c:1256
|   +#: src/protocols/jabber/jabber.c:1268
|    msgid "XML Not Well Formed"
|    msgstr "XML Not Well Formed"
|    
|   -#: src/protocols/jabber/jabber.c:1258
|   +#: src/protocols/jabber/jabber.c:1270
|    msgid "Stream Error"
|    msgstr "Stream Error"
|    
|   -#: src/protocols/jabber/jabber.c:1325
|   +#: src/protocols/jabber/jabber.c:1337
|    #, c-format
|    msgid "Unable to ban user %s"
|    msgstr "Unable to ban user %s"
|    
|   -#: src/protocols/jabber/jabber.c:1377
|   +#: src/protocols/jabber/jabber.c:1389
|    #, c-format
|    msgid "Unable to kick user %s"
|    msgstr "Unable to kick user %s"
|    
|   -#: src/protocols/jabber/jabber.c:1403
|   +#: src/protocols/jabber/jabber.c:1415
|    msgid "config:  Configure a chat room."
|    msgstr "config:  Configure a chat room."
|    
|   -#: src/protocols/jabber/jabber.c:1407
|   +#: src/protocols/jabber/jabber.c:1419
|    msgid "configure:  Configure a chat room."
|    msgstr "configure:  Configure a chat room."
|    
|   -#: src/protocols/jabber/jabber.c:1416
|   +#: src/protocols/jabber/jabber.c:1428
|    msgid "part [room]:  Leave the room."
|    msgstr "part [room]:  Leave the room."
|    
|   -#: src/protocols/jabber/jabber.c:1421
|   +#: src/protocols/jabber/jabber.c:1433
|    msgid "register:  Register with a chat room."
|    msgstr "register:  Register with a chat room."
|    
|   -#: src/protocols/jabber/jabber.c:1427
|   +#: src/protocols/jabber/jabber.c:1439
|    msgid "topic [new topic]:  View or change the topic."
|    msgstr "topic [new topic]:  View or change the topic."
|    
|   -#: src/protocols/jabber/jabber.c:1433
|   +#: src/protocols/jabber/jabber.c:1445
|    msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
|    msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
|    
|   -#: src/protocols/jabber/jabber.c:1439
|   +#: src/protocols/jabber/jabber.c:1451
|    msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
|    msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
|    
|   -#: src/protocols/jabber/jabber.c:1445
|   +#: src/protocols/jabber/jabber.c:1457
|    msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
|    msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
|    
|   -#: src/protocols/jabber/jabber.c:1451
|   +#: src/protocols/jabber/jabber.c:1463
|    msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
|    msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
|    
|   -#: src/protocols/jabber/jabber.c:1456
|   +#: src/protocols/jabber/jabber.c:1468
|    msgid ""
|    "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
|    msgstr ""
|    "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
|    
|   -#: src/protocols/jabber/jabber.c:1471
|   +#: src/protocols/jabber/jabber.c:1483
|    msgid "Hide Operating System"
|    msgstr "Hide Operating System"
|    
|   @@ -6331,25 +6350,24 @@ msgstr "Hide Operating System"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: src/protocols/jabber/jabber.c:1558 src/protocols/jabber/jabber.c:1560
|   +#: src/protocols/jabber/jabber.c:1570 src/protocols/jabber/jabber.c:1572
|    msgid "Jabber Protocol Plugin"
|    msgstr "Jabber Protocol Plugin"
|    
|   -#: src/protocols/jabber/jabber.c:1586
|   +#: src/protocols/jabber/jabber.c:1598
|    msgid "Use TLS if available"
|    msgstr "Use TLS if available"
|    
|   -#: src/protocols/jabber/jabber.c:1591
|   +#: src/protocols/jabber/jabber.c:1603
|    msgid "Force old SSL"
|    msgstr "Force old SSL"
|    
|   -#: src/protocols/jabber/jabber.c:1596
|   +#: src/protocols/jabber/jabber.c:1608
|    msgid "Allow plaintext auth over unencrypted streams"
|    msgstr "Allow plaintext auth over unencrypted streams"
|    
|    #. Account options
|   -#: src/protocols/jabber/jabber.c:1605 src/protocols/silc/silc.c:1589
|   +#: src/protocols/jabber/jabber.c:1617 src/protocols/silc/silc.c:1589
|    msgid "Connect server"
|    msgstr "Connect server"
|    
|   @@ -6386,20 +6404,20 @@ msgstr "XML Parse error"
|    msgid "XML Parse error"
|    msgstr "XML Parse error"
|    
|   -#: src/protocols/jabber/presence.c:239
|   +#: src/protocols/jabber/presence.c:240
|    msgid "Unknown Error in presence"
|    msgstr "Unknown Error in presence"
|    
|   -#: src/protocols/jabber/presence.c:242
|   +#: src/protocols/jabber/presence.c:243
|    #, 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:296 src/protocols/jabber/presence.c:297
|   +#: src/protocols/jabber/presence.c:297 src/protocols/jabber/presence.c:298
|    msgid "Create New Room"
|    msgstr "Create New Room"
|    
|   -#: src/protocols/jabber/presence.c:298
|   +#: src/protocols/jabber/presence.c:299
|    msgid ""
|    "You are creating a new room.  Would you like to configure it, or accept the "
|    "default settings?"
|   @@ -6407,20 +6425,20 @@ msgstr ""
|    "You are creating a new room.  Would you like to configure it, or accept the "
|    "default settings?"
|    
|   -#: src/protocols/jabber/presence.c:300
|   +#: src/protocols/jabber/presence.c:301
|    msgid "Configure Room"
|    msgstr "Configure Room"
|    
|   -#: src/protocols/jabber/presence.c:302
|   +#: src/protocols/jabber/presence.c:303
|    msgid "Accept Defaults"
|    msgstr "Accept Defaults"
|    
|   -#: src/protocols/jabber/presence.c:332
|   +#: src/protocols/jabber/presence.c:333
|    #, c-format
|    msgid "Error in chat %s"
|    msgstr "Error in chat %s"
|    
|   -#: src/protocols/jabber/presence.c:335
|   +#: src/protocols/jabber/presence.c:336
|    #, c-format
|    msgid "Error joining chat %s"
|    msgstr "Error joining chat %s"
|   @@ -6434,18 +6452,6 @@ msgstr "File Send Failed"
|    msgid "File Send Failed"
|    msgstr "File Send Failed"
|    
|   -#: src/protocols/msn/cmdproc.c:355
|   -msgid "Miscellaneous error"
|   -msgstr "Miscellaneous error"
|   -
|   -#: src/protocols/msn/cmdproc.c:358
|   -msgid "You have signed on from another location."
|   -msgstr "You have signed on from another location."
|   -
|   -#: src/protocols/msn/cmdproc.c:360
|   -msgid "The MSN servers are going down temporarily."
|   -msgstr "The MSN servers are going down temporarily."
|   -
|    #: src/protocols/msn/dialog.c:91
|    #, c-format
|    msgid "Buddy list synchronization issue in %s (%s)"
|   @@ -6658,7 +6664,7 @@ msgstr "Server too busy"
|    msgid "Server too busy"
|    msgstr "Server too busy"
|    
|   -#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2172
|   +#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2182
|    #: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:630
|    msgid "Authentication failed"
|    msgstr "Authentication failed"
|   @@ -6693,35 +6699,35 @@ msgstr "MSN Error: %s\n"
|    msgid "MSN Error: %s\n"
|    msgstr "MSN Error: %s\n"
|    
|   -#: src/protocols/msn/msn.c:116
|   +#: src/protocols/msn/msn.c:114
|    msgid "Your new MSN friendly name is too long."
|    msgstr "Your new MSN friendly name is too long."
|    
|   -#: src/protocols/msn/msn.c:224
|   +#: src/protocols/msn/msn.c:222
|    msgid "Set your friendly name."
|    msgstr "Set your friendly name."
|    
|   -#: src/protocols/msn/msn.c:225
|   +#: src/protocols/msn/msn.c:223
|    msgid "This is the name that other MSN buddies will see you as."
|    msgstr "This is the name that other MSN buddies will see you as."
|    
|   -#: src/protocols/msn/msn.c:241
|   +#: src/protocols/msn/msn.c:239
|    msgid "Set your home phone number."
|    msgstr "Set your home phone number."
|    
|   -#: src/protocols/msn/msn.c:256
|   +#: src/protocols/msn/msn.c:254
|    msgid "Set your work phone number."
|    msgstr "Set your work phone number."
|    
|   -#: src/protocols/msn/msn.c:271
|   +#: src/protocols/msn/msn.c:269
|    msgid "Set your mobile phone number."
|    msgstr "Set your mobile phone number."
|    
|   -#: src/protocols/msn/msn.c:284
|   +#: src/protocols/msn/msn.c:282
|    msgid "Allow MSN Mobile pages?"
|    msgstr "Allow MSN Mobile pages?"
|    
|   -#: src/protocols/msn/msn.c:285
|   +#: src/protocols/msn/msn.c:283
|    msgid ""
|    "Do you want to allow or disallow people on your buddy list to send you MSN "
|    "Mobile pages to your cell phone or other mobile device?"
|   @@ -6729,24 +6735,24 @@ msgstr ""
|    "Do you want to allow or disallow people on your buddy list to send you MSN "
|    "Mobile pages to your mobile phone or other mobile device?"
|    
|   -#: src/protocols/msn/msn.c:289
|   +#: src/protocols/msn/msn.c:287
|    msgid "Allow"
|    msgstr "Allow"
|    
|   -#: src/protocols/msn/msn.c:290
|   +#: src/protocols/msn/msn.c:288
|    msgid "Disallow"
|    msgstr "Disallow"
|    
|   -#: src/protocols/msn/msn.c:313
|   +#: src/protocols/msn/msn.c:311
|    msgid "Send a mobile message."
|    msgstr "Send a mobile message."
|    
|   -#: src/protocols/msn/msn.c:315
|   +#: src/protocols/msn/msn.c:313
|    msgid "Page"
|    msgstr "Page"
|    
|   -#: src/protocols/msn/msn.c:490 src/protocols/msn/msn.c:498
|   -#: src/protocols/msn/msn.c:501 src/protocols/yahoo/yahoo.c:2703
|   +#: src/protocols/msn/msn.c:488 src/protocols/msn/msn.c:496
|   +#: src/protocols/msn/msn.c:499 src/protocols/yahoo/yahoo.c:2703
|    #, c-format
|    msgid ""
|    "\n"
|   @@ -6755,84 +6761,84 @@ msgstr ""
|    "\n"
|    "<b>%s:</b> %s"
|    
|   -#: src/protocols/msn/msn.c:498
|   +#: src/protocols/msn/msn.c:496
|    msgid "Has you"
|    msgstr "Has you"
|    
|   -#: src/protocols/msn/msn.c:501
|   +#: src/protocols/msn/msn.c:499
|    msgid "Blocked"
|    msgstr "Blocked"
|    
|   -#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:824
|   +#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:795
|    #: src/protocols/msn/state.c:34
|    msgid "Away From Computer"
|    msgstr "Away From Computer"
|    
|   -#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:826
|   +#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:797
|    #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2560
|   -#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3043
|   +#: src/protocols/yahoo/yahoo.c:2925 src/protocols/yahoo/yahoo.c:3041
|    msgid "Be Right Back"
|    msgstr "Be Right Back"
|    
|   -#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:828
|   +#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:799
|    #: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
|    #: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
|   -#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:48
|   +#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
|    #: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2562
|   -#: src/protocols/yahoo/yahoo.c:2929 src/protocols/yahoo/yahoo.c:3044
|   +#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3042
|    msgid "Busy"
|    msgstr "Busy"
|    
|   -#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:830
|   +#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:801
|    #: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2570
|   -#: src/protocols/yahoo/yahoo.c:2937 src/protocols/yahoo/yahoo.c:3048
|   +#: src/protocols/yahoo/yahoo.c:2935 src/protocols/yahoo/yahoo.c:3046
|    msgid "On The Phone"
|    msgstr "On The Phone"
|    
|   -#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:832
|   +#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:803
|    #: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2574
|   -#: src/protocols/yahoo/yahoo.c:2941 src/protocols/yahoo/yahoo.c:3050
|   +#: src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:3048
|    msgid "Out To Lunch"
|    msgstr "Out To Lunch"
|    
|   -#: src/protocols/msn/msn.c:520 src/protocols/msn/msn.c:834
|   -#: src/protocols/zephyr/zephyr.c:2112 src/protocols/zephyr/zephyr.c:2144
|   +#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:805
|   +#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
|    msgid "Hidden"
|    msgstr "Hidden"
|    
|   -#: src/protocols/msn/msn.c:531
|   +#: src/protocols/msn/msn.c:529
|    msgid "Set Friendly Name"
|    msgstr "Set Friendly Name"
|    
|   -#: src/protocols/msn/msn.c:536
|   +#: src/protocols/msn/msn.c:534
|    msgid "Set Home Phone Number"
|    msgstr "Set Home Phone Number"
|    
|   -#: src/protocols/msn/msn.c:540
|   +#: src/protocols/msn/msn.c:538
|    msgid "Set Work Phone Number"
|    msgstr "Set Work Phone Number"
|    
|   -#: src/protocols/msn/msn.c:544
|   +#: src/protocols/msn/msn.c:542
|    msgid "Set Mobile Phone Number"
|    msgstr "Set Mobile Phone Number"
|    
|   -#: src/protocols/msn/msn.c:550
|   +#: src/protocols/msn/msn.c:548
|    msgid "Enable/Disable Mobile Devices"
|    msgstr "Enable/Disable Mobile Devices"
|    
|   -#: src/protocols/msn/msn.c:555
|   +#: src/protocols/msn/msn.c:553
|    msgid "Allow/Disallow Mobile Pages"
|    msgstr "Allow/Disallow Mobile Pages"
|    
|   -#: src/protocols/msn/msn.c:578
|   +#: src/protocols/msn/msn.c:576
|    msgid "Send to Mobile"
|    msgstr "Send to Mobile"
|    
|   -#: src/protocols/msn/msn.c:588
|   -msgid "Initiate Chat"
|   -msgstr "Initiate Chat"
|   +#: src/protocols/msn/msn.c:585 src/protocols/novell/novell.c:3369
|   +msgid "Initiate _Chat"
|   +msgstr "Initiate _Chat"
|    
|   -#: src/protocols/msn/msn.c:624
|   +#: src/protocols/msn/msn.c:621
|    msgid ""
|    "SSL support is needed for MSN. Please install a supported SSL library. See "
|    "http://gaim.sf.net/faq-ssl.php for more information."
|   @@ -6840,91 +6846,91 @@ msgstr ""
|    "SSL support is needed for MSN. Please install a supported SSL library. See "
|    "http://gaim.sf.net/faq-ssl.php for more information."
|    
|   -#: src/protocols/msn/msn.c:1314 src/protocols/yahoo/yahoo_profile.c:659
|   -#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1121
|   +#: src/protocols/msn/msn.c:1268 src/protocols/yahoo/yahoo_profile.c:659
|   +#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
|    #, c-format
|    msgid "<b>Alias:</b> %s<br>"
|    msgstr "<b>Alias:</b> %s<br>"
|    
|    #. put a link to the actual profile URL
|   -#: src/protocols/msn/msn.c:1322 src/protocols/msn/msn.c:1680
|   +#: src/protocols/msn/msn.c:1276 src/protocols/msn/msn.c:1634
|    #: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
|    #, c-format
|    msgid "<b>%s:</b> "
|    msgstr "<b>%s:</b> "
|    
|   -#: src/protocols/msn/msn.c:1410
|   +#: src/protocols/msn/msn.c:1364
|    msgid "MSN Profile"
|    msgstr "MSN Profile"
|    
|   -#: src/protocols/msn/msn.c:1415 src/protocols/msn/msn.c:1667
|   +#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1621
|    #: src/protocols/yahoo/yahoo_profile.c:761
|    msgid "Error retrieving profile"
|    msgstr "Error retreiving profile"
|    
|    #. Age
|   -#: src/protocols/msn/msn.c:1486 src/protocols/oscar/oscar.c:5052
|   +#: src/protocols/msn/msn.c:1440 src/protocols/oscar/oscar.c:5105
|    #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
|    #: src/protocols/yahoo/yahoo_profile.c:1015
|    msgid "Age"
|    msgstr "Age"
|    
|    #. Gender
|   -#: src/protocols/msn/msn.c:1493 src/protocols/oscar/oscar.c:5038
|   +#: src/protocols/msn/msn.c:1447 src/protocols/oscar/oscar.c:5091
|    #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
|    #: src/protocols/yahoo/yahoo_profile.c:1025
|    msgid "Gender"
|    msgstr "Gender"
|    
|   -#: src/protocols/msn/msn.c:1502 src/protocols/yahoo/yahoo_profile.c:1020
|   +#: src/protocols/msn/msn.c:1456 src/protocols/yahoo/yahoo_profile.c:1020
|    msgid "Marital Status"
|    msgstr "Marital Status"
|    
|   -#: src/protocols/msn/msn.c:1509 src/protocols/novell/novell.c:1445
|   +#: src/protocols/msn/msn.c:1463 src/protocols/novell/novell.c:1445
|    #: src/protocols/yahoo/yahoo_profile.c:1010
|    msgid "Location"
|    msgstr "Location"
|    
|   -#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1030
|   +#: src/protocols/msn/msn.c:1471 src/protocols/yahoo/yahoo_profile.c:1030
|    msgid "Occupation"
|    msgstr "Occupation"
|    
|   -#: src/protocols/msn/msn.c:1534 src/protocols/msn/msn.c:1540
|   -#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1555
|   -#: src/protocols/msn/msn.c:1562
|   +#: src/protocols/msn/msn.c:1488 src/protocols/msn/msn.c:1494
|   +#: src/protocols/msn/msn.c:1501 src/protocols/msn/msn.c:1509
|   +#: src/protocols/msn/msn.c:1516
|    msgid "A Little About Me"
|    msgstr "A Little About Me"
|    
|   -#: src/protocols/msn/msn.c:1571 src/protocols/msn/msn.c:1577
|   -#: src/protocols/msn/msn.c:1584 src/protocols/msn/msn.c:1591
|   +#: src/protocols/msn/msn.c:1525 src/protocols/msn/msn.c:1531
|   +#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1545
|    msgid "Favorite Things"
|    msgstr "Favourite Things"
|    
|   -#: src/protocols/msn/msn.c:1600 src/protocols/msn/msn.c:1606
|   -#: src/protocols/msn/msn.c:1613
|   +#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1560
|   +#: src/protocols/msn/msn.c:1567
|    msgid "Hobbies and Interests"
|    msgstr "Hobbies and Interests"
|    
|   -#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628
|   +#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582
|    #: src/protocols/yahoo/yahoo_profile.c:1072
|    msgid "Favorite Quote"
|    msgstr "Favourite Quote"
|    
|   -#: src/protocols/msn/msn.c:1636 src/protocols/yahoo/yahoo_profile.c:1123
|   +#: src/protocols/msn/msn.c:1590 src/protocols/yahoo/yahoo_profile.c:1123
|    msgid "Last Updated"
|    msgstr "Last Updated"
|    
|    #. Homepage
|   -#: src/protocols/msn/msn.c:1647 src/protocols/silc/ops.c:844
|   +#: src/protocols/msn/msn.c:1601 src/protocols/silc/ops.c:844
|    #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
|    msgid "Homepage"
|    msgstr "Homepage"
|    
|   -#: src/protocols/msn/msn.c:1669
|   +#: src/protocols/msn/msn.c:1623
|    msgid "The user has not created a public profile."
|    msgstr "The user has not created a public profile."
|    
|   -#: src/protocols/msn/msn.c:1670
|   +#: src/protocols/msn/msn.c:1624
|    msgid ""
|    "MSN reported not being able to find the user's profile. This either means "
|    "that the user does not exist, or that the user exists but has not created a "
|   @@ -6934,7 +6940,8 @@ msgstr ""
|    "that the user does not exist, or that the user exists but has not created a "
|    "public profile."
|    
|   -#: src/protocols/msn/msn.c:1674
|   +#. This should never happen
|   +#: src/protocols/msn/msn.c:1628
|    msgid ""
|    "Gaim could not find any information in the user's profile. The user most "
|    "likely does not exist."
|   @@ -6942,15 +6949,15 @@ msgstr ""
|    "Gaim could not find any information in the user's profile. The user most "
|    "likely does not exist."
|    
|   -#: src/protocols/msn/msn.c:1680 src/protocols/yahoo/yahoo_profile.c:1168
|   +#: src/protocols/msn/msn.c:1634 src/protocols/yahoo/yahoo_profile.c:1168
|    msgid "Profile URL"
|    msgstr "Profile URL"
|    
|   -#: src/protocols/msn/msn.c:1821
|   +#: src/protocols/msn/msn.c:1775
|    msgid "Display conversation closed notices"
|    msgstr "Display conversation closed notices"
|    
|   -#: src/protocols/msn/msn.c:1826
|   +#: src/protocols/msn/msn.c:1780
|    msgid "Display timeout notices"
|    msgstr "Display timeout notices"
|    
|   @@ -6963,51 +6970,73 @@ msgstr "Display timeout notices"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: src/protocols/msn/msn.c:1913 src/protocols/msn/msn.c:1915
|   +#: src/protocols/msn/msn.c:1867 src/protocols/msn/msn.c:1869
|    msgid "MSN Protocol Plugin"
|    msgstr "MSN Protocol Plugin"
|    
|   -#: src/protocols/msn/msn.c:1934 src/protocols/trepia/trepia.c:1296
|   +#: src/protocols/msn/msn.c:1888 src/protocols/trepia/trepia.c:1296
|    msgid "Login server"
|    msgstr "Login server"
|    
|   -#: src/protocols/msn/msn.c:1943
|   +#: src/protocols/msn/msn.c:1897
|    msgid "Use HTTP Method"
|    msgstr "Use HTTP Method"
|    
|   -#: src/protocols/msn/nexus.c:79
|   -msgid "Unable to connect to server"
|   -msgstr "Unable to connect to server"
|   +#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
|   +#: src/protocols/yahoo/yahoochat.c:1357
|   +msgid "Unable to connect"
|   +msgstr "Unable to connect"
|    
|   -#: src/protocols/msn/nexus.c:218
|   -msgid "Unknown error when attempting to authorize with MSN login server."
|   -msgstr "Unknown error when attempting to authorise with MSN login server."
|   +#: src/protocols/msn/notification.c:178
|   +#, c-format
|   +msgid "%s is not a valid group."
|   +msgstr "%s is not a valid group."
|    
|   -#: src/protocols/msn/notification.c:84
|   -msgid "Requesting to send password"
|   -msgstr "Requesting to send password"
|   +#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:495
|   +#: src/protocols/msn/session.c:320
|   +msgid "Unknown error."
|   +msgstr "Unknown error."
|    
|   -#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:636
|   -msgid "Retrieving buddy list"
|   -msgstr "Retrieving buddy list"
|   +#: src/protocols/msn/notification.c:187
|   +#, c-format
|   +msgid "%s on %s (%s)"
|   +msgstr "%s on %s (%s)"
|    
|   -#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
|   -#: src/protocols/oscar/oscar.c:2462
|   -msgid "Password sent"
|   -msgstr "Password sent"
|   +#: src/protocols/msn/notification.c:465
|   +#, c-format
|   +msgid "Unable to add user on %s (%s)"
|   +msgstr "Unable to add user on %s (%s)"
|    
|   -#: src/protocols/msn/notification.c:714
|   +#: src/protocols/msn/notification.c:469
|    #, 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."
|   +msgid "Unable to block user on %s (%s)"
|   +msgstr "Unable to block user on %s (%s)"
|    
|   -#: src/protocols/msn/notification.c:1090
|   +#: src/protocols/msn/notification.c:473
|    #, c-format
|   +msgid "Unable to permit user on %s (%s)"
|   +msgstr "Unable to permit user on %s (%s)"
|   +
|   +#: src/protocols/msn/notification.c:481
|   +#, c-format
|   +msgid "%s could not be added because your buddy list is full."
|   +msgstr "%s could not be added because your buddy list is full."
|   +
|   +#: src/protocols/msn/notification.c:490
|   +#, c-format
|   +msgid "%s is not a valid passport account."
|   +msgstr "%s is not a valid passport account."
|   +
|   +#: src/protocols/msn/notification.c:746
|   +msgid "Unable to rename group"
|   +msgstr "Unable to rename group"
|   +
|   +#: src/protocols/msn/notification.c:801
|   +msgid "Unable to delete group"
|   +msgstr "Unable to delete group"
|   +
|   +#: src/protocols/msn/notification.c:1203
|   +#, c-format
|    msgid ""
|    "The MSN server will shut down for maintenance in %d minute. You will "
|    "automatically be signed out at that time.  Please finish any conversations "
|   @@ -7037,68 +7066,114 @@ msgstr[1] ""
|    "After the maintenance has been completed, you will be able to successfully "
|    "sign in."
|    
|   -#: src/protocols/msn/notification.c:1155
|   -msgid "Syncing with server"
|   -msgstr "Syncing with server"
|   +#: src/protocols/msn/servconn.c:129
|   +msgid "Writing error"
|   +msgstr "Write error"
|    
|   -#: 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:131
|   +msgid "Reading error"
|   +msgstr "Read error"
|    
|   -#: src/protocols/msn/servconn.c:50
|   +#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:312
|   +#: src/protocols/oscar/oscar.c:4088
|   +msgid "Unknown error"
|   +msgstr "Unknown error"
|   +
|   +#: src/protocols/msn/servconn.c:136
|    #, c-format
|   -msgid "Error writing to %s server"
|   -msgstr "Error writing to %s server"
|   +msgid ""
|   +"Connection error from %s server (%s):\n"
|   +"%s"
|   +msgstr ""
|   +"Connection error from %s server (%s):\n"
|   +"%s"
|    
|   -#: src/protocols/msn/servconn.c:54
|   -#, c-format
|   -msgid "Error reading from %s server"
|   -msgstr "Error reading from %s server"
|   +#: src/protocols/msn/session.c:295
|   +msgid "Our protocol is not supported by the server."
|   +msgstr "Our protocol is not supported by the server."
|    
|   -#: src/protocols/msn/servconn.c:58
|   +#: src/protocols/msn/session.c:299
|   +msgid "Error parsing HTTP."
|   +msgstr "Error parsing HTTP."
|   +
|   +#: src/protocols/msn/session.c:303
|   +msgid "You have signed on from another location."
|   +msgstr "You have signed on from another location."
|   +
|   +#: src/protocols/msn/session.c:306
|   +msgid "The MSN servers are going down temporarily."
|   +msgstr "The MSN servers are going down temporarily."
|   +
|   +#: src/protocols/msn/session.c:310
|    #, c-format
|   -msgid "Unknown error from %s server"
|   -msgstr "Unknown error from %s server"
|   +msgid "Unable to authenticate: %s"
|   +msgstr "Unable to authenticate: %s"
|    
|   -#: src/protocols/msn/servconn.c:351
|   -msgid "Received HTTP error. Please report this."
|   -msgstr "Received HTTP error. Please report this."
|   +#: src/protocols/msn/session.c:315
|   +msgid ""
|   +"Your MSN buddy list is temporarily unavailable. Please wait and try again."
|   +msgstr ""
|   +"Your MSN buddy list is temporarily unavailable. Please wait and try again."
|    
|   -#: src/protocols/msn/switchboard.c:193
|   -msgid "The conversation has become inactive and timed out."
|   -msgstr "The conversation has become inactive and timed out."
|   +#: src/protocols/msn/session.c:335 src/protocols/msn/session.c:337
|   +msgid "Handshaking"
|   +msgstr "Handshaking"
|    
|   -#: src/protocols/msn/switchboard.c:212
|   -#, c-format
|   -msgid "%s has closed the conversation window."
|   -msgstr "%s has closed the conversation window."
|   +#: src/protocols/msn/session.c:336
|   +msgid "Transferring"
|   +msgstr "Transferring"
|    
|   -#: src/protocols/msn/switchboard.c:478
|   -msgid "Message could not be sent, not allowed while invisible"
|   -msgstr "Message could not be sent; not allowed while invisible"
|   +#: src/protocols/msn/session.c:338
|   +msgid "Starting authentication"
|   +msgstr "Starting authentication"
|    
|   -#: src/protocols/msn/switchboard.c:481
|   -msgid "Message could not be sent because the user is offline"
|   -msgstr "Message could not be sent because the user is offline"
|   +#: src/protocols/msn/session.c:339
|   +msgid "Getting cookie"
|   +msgstr "Getting cookie"
|    
|   -#: src/protocols/msn/switchboard.c:484
|   -msgid "Message could not be sent because a connection error occured"
|   -msgstr "Message could not be sent because a connection error occured"
|   +#: src/protocols/msn/session.c:341
|   +msgid "Sending cookie"
|   +msgstr "Sending cookie"
|    
|   -#: src/protocols/msn/switchboard.c:487
|   -msgid "Message could not be sent for an unknown reason"
|   -msgstr "Message could not be sent for an unknown reason"
|   +#: src/protocols/msn/session.c:342 src/protocols/trepia/trepia.c:636
|   +msgid "Retrieving buddy list"
|   +msgstr "Retrieving buddy list"
|    
|   -#: src/protocols/msn/switchboard.c:492
|   -#, c-format
|   +#: src/protocols/msn/switchboard.c:368
|   +msgid "Message may have not been sent because a timeout occurred:"
|   +msgstr "Message may not have been sent because a timeout occurred:"
|   +
|   +#: src/protocols/msn/switchboard.c:376
|   +msgid "Message could not be sent, not allowed while invisible:"
|   +msgstr "Message could not be sent, not allowed while invisible:"
|   +
|   +#: src/protocols/msn/switchboard.c:380
|   +msgid "Message could not be sent because the user is offline:"
|   +msgstr "Message could not be sent because the user is offline:"
|   +
|   +#: src/protocols/msn/switchboard.c:384
|   +msgid "Message could not be sent because a connection error occurred:"
|   +msgstr "Message could not be sent because a connection error occurred:"
|   +
|   +#: src/protocols/msn/switchboard.c:388
|    msgid ""
|   -"%s:\n"
|   -"%s"
|   +"Message could not be sent because an error with the switchboard occurred:"
|    msgstr ""
|   -"%s:\n"
|   -"%s"
|   +"Message could not be sent because an error with the switchboard occurred:"
|    
|   +#: src/protocols/msn/switchboard.c:396
|   +msgid "Message may have not been sent because an unknown error occurred:"
|   +msgstr "Message may not have been sent because an unknown error occurred:"
|   +
|   +#: src/protocols/msn/switchboard.c:626
|   +msgid "The conversation has become inactive and timed out."
|   +msgstr "The conversation has become inactive and timed out."
|   +
|   +#: src/protocols/msn/switchboard.c:645
|   +#, c-format
|   +msgid "%s has closed the conversation window."
|   +msgstr "%s has closed the conversation window."
|   +
|    #: src/protocols/msn/userlist.c:87
|    #, c-format
|    msgid "The user %s (%s) wants to add %s to his or her buddy list."
|   @@ -7167,7 +7242,6 @@ msgstr "_Group:"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: src/protocols/napster/napster.c:650 src/protocols/napster/napster.c:652
|    msgid "NAPSTER Protocol Plugin"
|    msgstr "NAPSTER Protocol Plugin"
|   @@ -7410,8 +7484,8 @@ msgstr "Mailstop"
|    msgid "Mailstop"
|    msgstr "Mailstop"
|    
|   -#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5025
|   -#: src/protocols/oscar/oscar.c:5032
|   +#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5078
|   +#: src/protocols/oscar/oscar.c:5085
|    msgid "Email Address"
|    msgstr "Email Address"
|    
|   @@ -7512,8 +7586,8 @@ msgstr "This conference has been closed.
|    msgid "This conference has been closed. No more messages can be sent."
|    msgstr "This conference has been closed. No more messages can be sent."
|    
|   -#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:724
|   -#: src/protocols/oscar/oscar.c:6619 src/protocols/yahoo/yahoo.c:2582
|   +#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:723
|   +#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2582
|    msgid "Offline"
|    msgstr "Offline"
|    
|   @@ -7525,10 +7599,6 @@ msgstr "Appear Offline"
|    msgid "Appear Offline"
|    msgstr "Appear Offline"
|    
|   -#: src/protocols/novell/novell.c:3369
|   -msgid "Initiate _Chat"
|   -msgstr "Initiate _Chat"
|   -
|    #. *< type
|    #. *< ui_requirement
|    #. *< flags
|   @@ -7538,7 +7608,6 @@ msgstr "Initiate _Chat"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
|    msgid "Novell GroupWise Messenger Protocol Plugin"
|    msgstr "Novell GroupWise Messenger Protocol Plugin"
|   @@ -7647,7 +7716,7 @@ msgstr "Not while on AOL"
|    msgid "Not while on AOL"
|    msgstr "Not while on AOL"
|    
|   -#: src/protocols/oscar/oscar.c:403 src/protocols/oscar/oscar.c:486
|   +#: src/protocols/oscar/oscar.c:402 src/protocols/oscar/oscar.c:485
|    msgid ""
|    "(There was an error receiving this message.  The buddy you are speaking to "
|    "most likely has a buggy client.)"
|   @@ -7655,157 +7724,157 @@ msgstr ""
|    "(There was an error receiving this message.  The buddy you are speaking to "
|    "most likely has a buggy client.)"
|    
|   -#: src/protocols/oscar/oscar.c:579
|   +#: src/protocols/oscar/oscar.c:578
|    msgid "Voice"
|    msgstr "Voice"
|    
|   -#: src/protocols/oscar/oscar.c:582
|   +#: src/protocols/oscar/oscar.c:581
|    msgid "AIM Direct IM"
|    msgstr "AIM Direct IM"
|    
|   -#: src/protocols/oscar/oscar.c:585 src/protocols/silc/silc.c:646
|   +#: src/protocols/oscar/oscar.c:584 src/protocols/silc/silc.c:646
|    #: src/protocols/silc/util.c:506
|    msgid "Chat"
|    msgstr "Chat"
|    
|   -#: src/protocols/oscar/oscar.c:588 src/protocols/oscar/oscar.c:6921
|   +#: src/protocols/oscar/oscar.c:587 src/protocols/oscar/oscar.c:6974
|    msgid "Get File"
|    msgstr "Get File"
|    
|   -#: src/protocols/oscar/oscar.c:595
|   +#: src/protocols/oscar/oscar.c:594
|    msgid "Games"
|    msgstr "Games"
|    
|   -#: src/protocols/oscar/oscar.c:598
|   +#: src/protocols/oscar/oscar.c:597
|    msgid "Add-Ins"
|    msgstr "Add-Ins"
|    
|   -#: src/protocols/oscar/oscar.c:601
|   +#: src/protocols/oscar/oscar.c:600
|    msgid "Send Buddy List"
|    msgstr "Send Buddy List"
|    
|   -#: src/protocols/oscar/oscar.c:604
|   +#: src/protocols/oscar/oscar.c:603
|    msgid "ICQ Direct Connect"
|    msgstr "ICQ Direct Connect"
|    
|   -#: src/protocols/oscar/oscar.c:607
|   +#: src/protocols/oscar/oscar.c:606
|    msgid "AP User"
|    msgstr "AP User"
|    
|   -#: src/protocols/oscar/oscar.c:610
|   +#: src/protocols/oscar/oscar.c:609
|    msgid "ICQ RTF"
|    msgstr "ICQ RTF"
|    
|   -#: src/protocols/oscar/oscar.c:613
|   +#: src/protocols/oscar/oscar.c:612
|    msgid "Nihilist"
|    msgstr "Nihilist"
|    
|   -#: src/protocols/oscar/oscar.c:616
|   +#: src/protocols/oscar/oscar.c:615
|    msgid "ICQ Server Relay"
|    msgstr "ICQ Server Relay"
|    
|   -#: src/protocols/oscar/oscar.c:619
|   +#: src/protocols/oscar/oscar.c:618
|    msgid "Old ICQ UTF8"
|    msgstr "Old ICQ UTF8"
|    
|   -#: src/protocols/oscar/oscar.c:622
|   +#: src/protocols/oscar/oscar.c:621
|    msgid "Trillian Encryption"
|    msgstr "Trillian Encryption"
|    
|   -#: src/protocols/oscar/oscar.c:625
|   +#: src/protocols/oscar/oscar.c:624
|    msgid "ICQ UTF8"
|    msgstr "ICQ UTF8"
|    
|   -#: src/protocols/oscar/oscar.c:628
|   +#: src/protocols/oscar/oscar.c:627
|    msgid "Hiptop"
|    msgstr "Hiptop"
|    
|   -#: src/protocols/oscar/oscar.c:631
|   +#: src/protocols/oscar/oscar.c:630
|    msgid "Security Enabled"
|    msgstr "Security Enabled"
|    
|   -#: src/protocols/oscar/oscar.c:634
|   +#: src/protocols/oscar/oscar.c:633
|    msgid "Video Chat"
|    msgstr "Video Chat"
|    
|   -#: src/protocols/oscar/oscar.c:638
|   +#: src/protocols/oscar/oscar.c:637
|    msgid "iChat AV"
|    msgstr "iChat AV"
|    
|   -#: src/protocols/oscar/oscar.c:641
|   +#: src/protocols/oscar/oscar.c:640
|    msgid "Live Video"
|    msgstr "Live Video"
|    
|   -#: src/protocols/oscar/oscar.c:644
|   +#: src/protocols/oscar/oscar.c:643
|    msgid "Camera"
|    msgstr "Camera"
|    
|   -#: src/protocols/oscar/oscar.c:662 src/protocols/oscar/oscar.c:5629
|   -#: src/protocols/oscar/oscar.c:6813
|   +#: src/protocols/oscar/oscar.c:661 src/protocols/oscar/oscar.c:5682
|   +#: src/protocols/oscar/oscar.c:6866
|    msgid "Free For Chat"
|    msgstr "Free For Chat"
|    
|   -#: src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:5623
|   -#: src/protocols/oscar/oscar.c:6811
|   +#: src/protocols/oscar/oscar.c:665 src/protocols/oscar/oscar.c:5676
|   +#: src/protocols/oscar/oscar.c:6864
|    msgid "Not Available"
|    msgstr "Not Available"
|    
|   -#: src/protocols/oscar/oscar.c:668 src/protocols/oscar/oscar.c:5626
|   -#: src/protocols/oscar/oscar.c:6812
|   +#: src/protocols/oscar/oscar.c:667 src/protocols/oscar/oscar.c:5679
|   +#: src/protocols/oscar/oscar.c:6865
|    msgid "Occupied"
|    msgstr "Occupied"
|    
|   -#: src/protocols/oscar/oscar.c:672
|   +#: src/protocols/oscar/oscar.c:671
|    msgid "Web Aware"
|    msgstr "Web Aware"
|    
|   -#: src/protocols/oscar/oscar.c:740
|   +#: src/protocols/oscar/oscar.c:739
|    msgid "Capabilities"
|    msgstr "Capabilities"
|    
|   -#: src/protocols/oscar/oscar.c:749
|   +#: src/protocols/oscar/oscar.c:748
|    msgid "Buddy Comment"
|    msgstr "Buddy Comment"
|    
|   -#: src/protocols/oscar/oscar.c:884
|   +#: src/protocols/oscar/oscar.c:883
|    #, c-format
|    msgid "Direct IM with %s closed"
|    msgstr "Direct IM with %s closed"
|    
|   -#: src/protocols/oscar/oscar.c:886
|   +#: src/protocols/oscar/oscar.c:885
|    #, c-format
|    msgid "Direct IM with %s failed"
|    msgstr "Direct IM with %s failed"
|    
|   -#: src/protocols/oscar/oscar.c:893
|   +#: src/protocols/oscar/oscar.c:892
|    msgid "Direct Connect failed"
|    msgstr "Direct Connect failed"
|    
|   -#: src/protocols/oscar/oscar.c:970 src/protocols/oscar/oscar.c:1101
|   +#: src/protocols/oscar/oscar.c:969 src/protocols/oscar/oscar.c:1100
|    #, c-format
|    msgid "Direct IM with %s established"
|    msgstr "Direct IM with %s established"
|    
|   -#: src/protocols/oscar/oscar.c:1051
|   +#: src/protocols/oscar/oscar.c:1050
|    #, c-format
|    msgid "Attempting to connect to %s at %s:%hu for Direct IM."
|    msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
|    
|   -#: src/protocols/oscar/oscar.c:1468
|   +#: src/protocols/oscar/oscar.c:1470
|    #, c-format
|    msgid "Asking %s to connect to us at %s:%hu for Direct IM."
|    msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
|    
|   -#: src/protocols/oscar/oscar.c:1473
|   +#: src/protocols/oscar/oscar.c:1475
|    msgid "Unable to open Direct IM"
|    msgstr "Unable to open Direct IM"
|    
|   -#: src/protocols/oscar/oscar.c:1508
|   +#: src/protocols/oscar/oscar.c:1510
|    #, c-format
|    msgid "You have selected to open a Direct IM connection with %s."
|    msgstr "You have selected to open a Direct IM connection with %s."
|    
|   -#: src/protocols/oscar/oscar.c:1512
|   +#: src/protocols/oscar/oscar.c:1514
|    msgid ""
|    "Because this reveals your IP address, it may be considered a privacy risk.  "
|    "Do you wish to continue?"
|   @@ -7813,24 +7882,24 @@ msgstr ""
|    "Because this reveals your IP address, it may be considered a privacy risk.  "
|    "Do you wish to continue?"
|    
|   -#: src/protocols/oscar/oscar.c:1516 src/protocols/oscar/oscar.c:3469
|   +#: src/protocols/oscar/oscar.c:1518 src/protocols/oscar/oscar.c:3522
|    msgid "Connect"
|    msgstr "Connect"
|    
|   -#: src/protocols/oscar/oscar.c:1583 src/protocols/toc/toc.c:874
|   +#: src/protocols/oscar/oscar.c:1585 src/protocols/toc/toc.c:874
|    #, c-format
|    msgid "You have been disconnected from chat room %s."
|    msgstr "You have been disconnected from chat room %s."
|    
|   -#: src/protocols/oscar/oscar.c:1602
|   +#: src/protocols/oscar/oscar.c:1604
|    msgid "Chat is currently unavailable"
|    msgstr "Chat is currently unavailable"
|    
|   -#: src/protocols/oscar/oscar.c:1683
|   +#: src/protocols/oscar/oscar.c:1685
|    msgid "Screen name sent"
|    msgstr "Screen name sent"
|    
|   -#: src/protocols/oscar/oscar.c:1697
|   +#: src/protocols/oscar/oscar.c:1699
|    #, c-format
|    msgid ""
|    "Unable to login: Could not sign on as %s because the screen name is "
|   @@ -7841,46 +7910,46 @@ msgstr ""
|    "invalid.  Screen names must either start with a letter and contain only "
|    "letters, numbers and spaces, or contain only numbers."
|    
|   -#: src/protocols/oscar/oscar.c:1725
|   +#: src/protocols/oscar/oscar.c:1727
|    msgid "Unable to login to AIM"
|    msgstr "Unable to login to AIM"
|    
|   -#: src/protocols/oscar/oscar.c:1826 src/protocols/oscar/oscar.c:2265
|   +#: src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:2275
|    msgid "Could Not Connect"
|    msgstr "Could Not Connect"
|    
|   -#: src/protocols/oscar/oscar.c:1834
|   +#: src/protocols/oscar/oscar.c:1837
|    msgid "Connection established, cookie sent"
|    msgstr "Connection established, cookie sent"
|    
|   -#: src/protocols/oscar/oscar.c:1947 src/protocols/yahoo/yahoo_filexfer.c:181
|   -#: src/protocols/yahoo/yahoo_filexfer.c:190
|   -#: src/protocols/yahoo/yahoo_filexfer.c:200
|   +#: src/protocols/oscar/oscar.c:1957 src/protocols/yahoo/yahoo_filexfer.c:174
|   +#: src/protocols/yahoo/yahoo_filexfer.c:183
|   +#: src/protocols/yahoo/yahoo_filexfer.c:192
|    msgid "Unable to establish file descriptor."
|    msgstr "Unable to establish file descriptor."
|    
|   -#: src/protocols/oscar/oscar.c:1952
|   +#: src/protocols/oscar/oscar.c:1962
|    msgid "Unable to create new connection."
|    msgstr "Unable to create new connection."
|    
|   -#: src/protocols/oscar/oscar.c:2024
|   +#: src/protocols/oscar/oscar.c:2034
|    msgid "Unable to establish listener socket."
|    msgstr "Unable to establish listener socket."
|    
|   -#: src/protocols/oscar/oscar.c:2149 src/protocols/toc/toc.c:541
|   +#: src/protocols/oscar/oscar.c:2159 src/protocols/toc/toc.c:541
|    msgid "Incorrect nickname or password."
|    msgstr "Incorrect nickname or password."
|    
|   -#: src/protocols/oscar/oscar.c:2154
|   +#: src/protocols/oscar/oscar.c:2164
|    msgid "Your account is currently suspended."
|    msgstr "Your account is currently suspended."
|    
|    #. service temporarily unavailable
|   -#: src/protocols/oscar/oscar.c:2158
|   +#: src/protocols/oscar/oscar.c:2168
|    msgid "The AOL Instant Messenger service is temporarily unavailable."
|    msgstr "The AOL Instant Messenger service is temporarily unavailable."
|    
|   -#: src/protocols/oscar/oscar.c:2163
|   +#: src/protocols/oscar/oscar.c:2173
|    msgid ""
|    "You have been connecting and disconnecting too frequently. Wait ten minutes "
|    "and try again. If you continue to try, you will need to wait even longer."
|   @@ -7888,21 +7957,33 @@ msgstr ""
|    "You have been connecting and disconnecting too frequently. Wait ten minutes "
|    "and try again. If you continue to try, you will need to wait even longer."
|    
|   -#: src/protocols/oscar/oscar.c:2168
|   +#: src/protocols/oscar/oscar.c:2178
|    #, c-format
|    msgid "The client version you are using is too old. Please upgrade at %s"
|    msgstr "The client version you are using is too old. Please upgrade at %s"
|    
|   -#: src/protocols/oscar/oscar.c:2200
|   +#: src/protocols/oscar/oscar.c:2210
|    msgid "Internal Error"
|    msgstr "Internal Error"
|    
|   -#: src/protocols/oscar/oscar.c:2272
|   +#: src/protocols/oscar/oscar.c:2282
|    msgid "Received authorization"
|    msgstr "Received authorisation"
|    
|   -#: src/protocols/oscar/oscar.c:2308 src/protocols/oscar/oscar.c:2338
|   -#: src/protocols/oscar/oscar.c:2427
|   +#: src/protocols/oscar/oscar.c:2306
|   +msgid "The SecurID key entered is invalid."
|   +msgstr "The SecurID key entered is invalid."
|   +
|   +#: src/protocols/oscar/oscar.c:2320
|   +msgid "Enter SecurID"
|   +msgstr "Enter SecurID"
|   +
|   +#: src/protocols/oscar/oscar.c:2321
|   +msgid "Enter the 6 digit number from the digital display."
|   +msgstr "Enter the 6 digit number from the digital display."
|   +
|   +#: src/protocols/oscar/oscar.c:2361 src/protocols/oscar/oscar.c:2391
|   +#: src/protocols/oscar/oscar.c:2480
|    #, c-format
|    msgid ""
|    "You may be disconnected shortly.  You may want to use TOC until this is "
|   @@ -7911,20 +7992,24 @@ msgstr ""
|    "You may be disconnected shortly.  You may want to use TOC until this is "
|    "fixed.  Check %s for updates."
|    
|   -#: src/protocols/oscar/oscar.c:2311 src/protocols/oscar/oscar.c:2341
|   +#: src/protocols/oscar/oscar.c:2364 src/protocols/oscar/oscar.c:2394
|    msgid "Gaim was unable to get a valid AIM login hash."
|    msgstr "Gaim was unable to get a valid AIM login hash."
|    
|   -#: src/protocols/oscar/oscar.c:2430
|   +#: src/protocols/oscar/oscar.c:2483
|    msgid "Gaim was unable to get a valid login hash."
|    msgstr "Gaim was unable to get a valid login hash."
|    
|   -#: src/protocols/oscar/oscar.c:3461
|   +#: src/protocols/oscar/oscar.c:2515
|   +msgid "Password sent"
|   +msgstr "Password sent"
|   +
|   +#: src/protocols/oscar/oscar.c:3514
|    #, 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:3464
|   +#: src/protocols/oscar/oscar.c:3517
|    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 "
|   @@ -7934,19 +8019,19 @@ msgstr ""
|    "for IM Images.  Because your IP address will be revealed, this may be "
|    "considered a privacy risk."
|    
|   -#: src/protocols/oscar/oscar.c:3502
|   +#: src/protocols/oscar/oscar.c:3555
|    msgid "Please authorize me so I can add you to my buddy list."
|    msgstr "Please authorise me so I can add you to my buddy list."
|    
|   -#: src/protocols/oscar/oscar.c:3510
|   +#: src/protocols/oscar/oscar.c:3563
|    msgid "Authorization Request Message:"
|    msgstr "Authorisation Request Message:"
|    
|   -#: src/protocols/oscar/oscar.c:3511
|   +#: src/protocols/oscar/oscar.c:3564
|    msgid "Please authorize me!"
|    msgstr "Please authorise me!"
|    
|   -#: src/protocols/oscar/oscar.c:3541
|   +#: src/protocols/oscar/oscar.c:3594
|    #, c-format
|    msgid ""
|    "The user %s requires authorization before being added to a buddy list.  Do "
|   @@ -7955,22 +8040,22 @@ msgstr ""
|    "The user %s requires authorisation before being added to a buddy list.  Do "
|    "you want to send an authorisation request?"
|    
|   -#: src/protocols/oscar/oscar.c:3546 src/protocols/oscar/oscar.c:3548
|   +#: src/protocols/oscar/oscar.c:3599 src/protocols/oscar/oscar.c:3601
|    msgid "Request Authorization"
|    msgstr "Request Authorisation"
|    
|   -#: src/protocols/oscar/oscar.c:3596 src/protocols/oscar/oscar.c:3598
|   -#: src/protocols/oscar/oscar.c:3605 src/protocols/oscar/oscar.c:3702
|   -#: src/protocols/oscar/oscar.c:3722 src/protocols/oscar/oscar.c:6254
|   -#: src/protocols/oscar/oscar.c:6300
|   +#: src/protocols/oscar/oscar.c:3649 src/protocols/oscar/oscar.c:3651
|   +#: src/protocols/oscar/oscar.c:3658 src/protocols/oscar/oscar.c:3755
|   +#: src/protocols/oscar/oscar.c:3775 src/protocols/oscar/oscar.c:6307
|   +#: src/protocols/oscar/oscar.c:6353
|    msgid "No reason given."
|    msgstr "No reason given."
|    
|   -#: src/protocols/oscar/oscar.c:3604
|   +#: src/protocols/oscar/oscar.c:3657
|    msgid "Authorization Denied Message:"
|    msgstr "Authorisation Denied Message:"
|    
|   -#: src/protocols/oscar/oscar.c:3702
|   +#: src/protocols/oscar/oscar.c:3755
|    #, c-format
|    msgid ""
|    "The user %u wants to add you to their buddy list for the following reason:\n"
|   @@ -7979,11 +8064,11 @@ msgstr ""
|    "The user %u wants to add you to their buddy list for the following reason:\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:3710 src/protocols/oscar/oscar.c:6260
|   +#: src/protocols/oscar/oscar.c:3763 src/protocols/oscar/oscar.c:6313
|    msgid "Authorization Request"
|    msgstr "Authorisation Request"
|    
|   -#: src/protocols/oscar/oscar.c:3722
|   +#: src/protocols/oscar/oscar.c:3775
|    #, c-format
|    msgid ""
|    "The user %u has denied your request to add them to your buddy list for the "
|   @@ -7994,17 +8079,17 @@ msgstr ""
|    "following reason:\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:3723
|   +#: src/protocols/oscar/oscar.c:3776
|    msgid "ICQ authorization denied."
|    msgstr "ICQ authorisation denied."
|    
|    #. Someone has granted you authorization
|   -#: src/protocols/oscar/oscar.c:3730
|   +#: src/protocols/oscar/oscar.c:3783
|    #, 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:3738
|   +#: src/protocols/oscar/oscar.c:3791
|    #, c-format
|    msgid ""
|    "You have received a special message\n"
|   @@ -8017,7 +8102,7 @@ msgstr ""
|    "From: %s [%s]\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:3746
|   +#: src/protocols/oscar/oscar.c:3799
|    #, c-format
|    msgid ""
|    "You have received an ICQ page\n"
|   @@ -8030,7 +8115,7 @@ msgstr ""
|    "From: %s [%s]\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:3754
|   +#: src/protocols/oscar/oscar.c:3807
|    #, c-format
|    msgid ""
|    "You have received an ICQ email from %s [%s]\n"
|   @@ -8043,34 +8128,34 @@ msgstr ""
|    "Message is:\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:3775
|   +#: src/protocols/oscar/oscar.c:3828
|    #, 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:3781
|   +#: src/protocols/oscar/oscar.c:3834
|    msgid "Do you want to add this buddy to your buddy list?"
|    msgstr "Do you want to add this buddy to your buddy list?"
|    
|   -#: src/protocols/oscar/oscar.c:3785
|   +#: src/protocols/oscar/oscar.c:3838
|    msgid "Decline"
|    msgstr "Decline"
|    
|   -#: src/protocols/oscar/oscar.c:3869
|   +#: src/protocols/oscar/oscar.c:3922
|    #, 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:3878
|   +#: src/protocols/oscar/oscar.c:3931
|    #, 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:3887
|   +#: src/protocols/oscar/oscar.c:3940
|    #, c-format
|    msgid ""
|    "You missed %hu message from %s because the rate limit has been exceeded."
|   @@ -8081,80 +8166,76 @@ msgstr[1] ""
|    msgstr[1] ""
|    "You missed %hu messages from %s because the rate limit has been exceeded."
|    
|   -#: src/protocols/oscar/oscar.c:3896
|   +#: src/protocols/oscar/oscar.c:3949
|    #, 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:3905
|   +#: src/protocols/oscar/oscar.c:3958
|    #, 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:3914
|   +#: src/protocols/oscar/oscar.c:3967
|    #, 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:3968 src/protocols/oscar/oscar.c:4200
|   +#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4253
|    #, c-format
|    msgid "Info for %s"
|    msgstr "Info for %s"
|    
|   -#: src/protocols/oscar/oscar.c:4034
|   +#: src/protocols/oscar/oscar.c:4087
|    #, c-format
|    msgid "SNAC threw error: %s\n"
|    msgstr "SNAC threw error: %s\n"
|    
|   -#: src/protocols/oscar/oscar.c:4035
|   -msgid "Unknown error"
|   -msgstr "Unknown error"
|   -
|    #. Data is assumed to be the destination sn
|   -#: src/protocols/oscar/oscar.c:4070
|   +#: src/protocols/oscar/oscar.c:4123
|    #, c-format
|    msgid "Unable to send message: %s"
|    msgstr "Unable to send message: %s"
|    
|   -#: src/protocols/oscar/oscar.c:4070 src/protocols/oscar/oscar.c:4075
|   -#: src/protocols/oscar/oscar.c:4133 src/protocols/oscar/oscar.c:4137
|   +#: src/protocols/oscar/oscar.c:4123 src/protocols/oscar/oscar.c:4128
|   +#: src/protocols/oscar/oscar.c:4186 src/protocols/oscar/oscar.c:4190
|    msgid "Unknown reason."
|    msgstr "Unknown reason."
|    
|   -#: src/protocols/oscar/oscar.c:4133
|   +#: src/protocols/oscar/oscar.c:4186
|    #, c-format
|    msgid "User information not available: %s"
|    msgstr "User information not available: %s"
|    
|   -#: src/protocols/oscar/oscar.c:4136
|   +#: src/protocols/oscar/oscar.c:4189
|    #, c-format
|    msgid "User information for %s unavailable:"
|    msgstr "User information for %s unavailable:"
|    
|   -#: src/protocols/oscar/oscar.c:4158
|   +#: src/protocols/oscar/oscar.c:4211
|    msgid "Warning Level"
|    msgstr "Warning Level"
|    
|   -#: src/protocols/oscar/oscar.c:4162
|   +#: src/protocols/oscar/oscar.c:4215
|    msgid "Online Since"
|    msgstr "Online Since"
|    
|   -#: src/protocols/oscar/oscar.c:4167 src/protocols/yahoo/yahoo_profile.c:1118
|   +#: src/protocols/oscar/oscar.c:4220 src/protocols/yahoo/yahoo_profile.c:1118
|    msgid "Member Since"
|    msgstr "Member Since"
|    
|   -#: src/protocols/oscar/oscar.c:4251
|   +#: src/protocols/oscar/oscar.c:4304
|    msgid "Your AIM connection may be lost."
|    msgstr "Your AIM connection may be lost."
|    
|    #. The conversion failed!
|   -#: src/protocols/oscar/oscar.c:4437
|   +#: src/protocols/oscar/oscar.c:4490
|    msgid ""
|    "[Unable to display a message from this user because it contained invalid "
|    "characters.]"
|   @@ -8162,11 +8243,11 @@ msgstr ""
|    "[Unable to display a message from this user because it contained invalid "
|    "characters.]"
|    
|   -#: src/protocols/oscar/oscar.c:4657
|   +#: src/protocols/oscar/oscar.c:4710
|    msgid "Rate limiting error."
|    msgstr "Rate limiting error."
|    
|   -#: src/protocols/oscar/oscar.c:4658
|   +#: src/protocols/oscar/oscar.c:4711
|    msgid ""
|    "The last action you attempted could not be performed because you are over "
|    "the rate limit. Please wait 10 seconds and try again."
|   @@ -8174,7 +8255,7 @@ msgstr ""
|    "The last action you attempted could not be performed because you are over "
|    "the rate limit. Please wait 10 seconds and try again."
|    
|   -#: src/protocols/oscar/oscar.c:4721
|   +#: src/protocols/oscar/oscar.c:4774
|    msgid ""
|    "You have been disconnected because you have signed on with this screen name "
|    "at another location."
|   @@ -8182,109 +8263,109 @@ msgstr ""
|    "You have been disconnected because you have signed on with this screen name "
|    "at another location."
|    
|   -#: src/protocols/oscar/oscar.c:4723
|   +#: src/protocols/oscar/oscar.c:4776
|    msgid "You have been signed off for an unknown reason."
|    msgstr "You have been signed off for an unknown reason."
|    
|   -#: src/protocols/oscar/oscar.c:4754
|   +#: src/protocols/oscar/oscar.c:4807
|    msgid "Finalizing connection"
|    msgstr "Finalizing connection"
|    
|   -#: src/protocols/oscar/oscar.c:5037 src/protocols/silc/util.c:538
|   +#: src/protocols/oscar/oscar.c:5090 src/protocols/silc/util.c:538
|    msgid "Mobile Phone"
|    msgstr "Mobile Phone"
|    
|   -#: src/protocols/oscar/oscar.c:5038
|   +#: src/protocols/oscar/oscar.c:5091
|    msgid "Not specified"
|    msgstr "Not specified"
|    
|   -#: src/protocols/oscar/oscar.c:5039 src/protocols/trepia/trepia.c:282
|   +#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:282
|    #: src/protocols/trepia/trepia.c:408
|    msgid "Female"
|    msgstr "Female"
|    
|   -#: src/protocols/oscar/oscar.c:5039 src/protocols/trepia/trepia.c:281
|   +#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:281
|    #: src/protocols/trepia/trepia.c:408
|    msgid "Male"
|    msgstr "Male"
|    
|   -#: src/protocols/oscar/oscar.c:5055
|   +#: src/protocols/oscar/oscar.c:5108
|    msgid "Personal Web Page"
|    msgstr "Personal Web Page"
|    
|   -#: src/protocols/oscar/oscar.c:5059
|   +#: src/protocols/oscar/oscar.c:5112
|    msgid "Additional Information"
|    msgstr "Additional Information"
|    
|   -#: src/protocols/oscar/oscar.c:5064
|   +#: src/protocols/oscar/oscar.c:5117
|    msgid "Home Address"
|    msgstr "Home Address"
|    
|   -#: src/protocols/oscar/oscar.c:5068 src/protocols/oscar/oscar.c:5076
|   +#: src/protocols/oscar/oscar.c:5121 src/protocols/oscar/oscar.c:5129
|    msgid "Zip Code"
|    msgstr "Postcode"
|    
|   -#: src/protocols/oscar/oscar.c:5072
|   +#: src/protocols/oscar/oscar.c:5125
|    msgid "Work Address"
|    msgstr "Work Address"
|    
|   -#: src/protocols/oscar/oscar.c:5080
|   +#: src/protocols/oscar/oscar.c:5133
|    msgid "Work Information"
|    msgstr "Work Information"
|    
|   -#: src/protocols/oscar/oscar.c:5081
|   +#: src/protocols/oscar/oscar.c:5134
|    msgid "Company"
|    msgstr "Company"
|    
|   -#: src/protocols/oscar/oscar.c:5082
|   +#: src/protocols/oscar/oscar.c:5135
|    msgid "Division"
|    msgstr "Division"
|    
|   -#: src/protocols/oscar/oscar.c:5083
|   +#: src/protocols/oscar/oscar.c:5136
|    msgid "Position"
|    msgstr "Position"
|    
|   -#: src/protocols/oscar/oscar.c:5085
|   +#: src/protocols/oscar/oscar.c:5138
|    msgid "Web Page"
|    msgstr "Web Page"
|    
|   -#: src/protocols/oscar/oscar.c:5095
|   +#: src/protocols/oscar/oscar.c:5148
|    #, c-format
|    msgid "ICQ Info for %s"
|    msgstr "ICQ Info for %s"
|    
|   -#: src/protocols/oscar/oscar.c:5144
|   +#: src/protocols/oscar/oscar.c:5197
|    msgid "Pop-Up Message"
|    msgstr "Pop-Up Message"
|    
|   -#: src/protocols/oscar/oscar.c:5165
|   +#: src/protocols/oscar/oscar.c:5218
|    #, 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:5169
|   +#: src/protocols/oscar/oscar.c:5222
|    msgid "Search Results"
|    msgstr "Search Results"
|    
|   -#: src/protocols/oscar/oscar.c:5186
|   +#: src/protocols/oscar/oscar.c:5239
|    #, c-format
|    msgid "No results found for email address %s"
|    msgstr "No results found for email address %s"
|    
|   -#: src/protocols/oscar/oscar.c:5207
|   +#: src/protocols/oscar/oscar.c:5260
|    #, 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:5209
|   +#: src/protocols/oscar/oscar.c:5262
|    msgid "Account Confirmation Requested"
|    msgstr "Account Confirmation Requested"
|    
|   -#: src/protocols/oscar/oscar.c:5240
|   +#: src/protocols/oscar/oscar.c:5293
|    msgid "Error Changing Account Info"
|    msgstr "Error Changing Account Info"
|    
|   -#: src/protocols/oscar/oscar.c:5243
|   +#: src/protocols/oscar/oscar.c:5296
|    #, c-format
|    msgid ""
|    "Error 0x%04x: Unable to format screen name because the requested screen name "
|   @@ -8293,7 +8374,7 @@ msgstr ""
|    "Error 0x%04x: Unable to format screen name because the requested screen name "
|    "differs from the original."
|    
|   -#: src/protocols/oscar/oscar.c:5246
|   +#: src/protocols/oscar/oscar.c:5299
|    #, c-format
|    msgid ""
|    "Error 0x%04x: Unable to format screen name because the requested screen name "
|   @@ -8302,7 +8383,7 @@ msgstr ""
|    "Error 0x%04x: Unable to format screen name because the requested screen name "
|    "ends in a space."
|    
|   -#: src/protocols/oscar/oscar.c:5249
|   +#: src/protocols/oscar/oscar.c:5302
|    #, c-format
|    msgid ""
|    "Error 0x%04x: Unable to format screen name because the requested screen name "
|   @@ -8311,7 +8392,7 @@ msgstr ""
|    "Error 0x%04x: Unable to format screen name because the requested screen name "
|    "is too long."
|    
|   -#: src/protocols/oscar/oscar.c:5252
|   +#: src/protocols/oscar/oscar.c:5305
|    #, c-format
|    msgid ""
|    "Error 0x%04x: Unable to change email address because there is already a "
|   @@ -8320,7 +8401,7 @@ msgstr ""
|    "Error 0x%04x: Unable to change email address because there is already a "
|    "request pending for this screen name."
|    
|   -#: src/protocols/oscar/oscar.c:5255
|   +#: src/protocols/oscar/oscar.c:5308
|    #, c-format
|    msgid ""
|    "Error 0x%04x: Unable to change email address because the given address has "
|   @@ -8329,7 +8410,7 @@ msgstr ""
|    "Error 0x%04x: Unable to change email address because the given address has "
|    "too many screen names associated with it."
|    
|   -#: src/protocols/oscar/oscar.c:5258
|   +#: src/protocols/oscar/oscar.c:5311
|    #, c-format
|    msgid ""
|    "Error 0x%04x: Unable to change email address because the given address is "
|   @@ -8338,12 +8419,12 @@ msgstr ""
|    "Error 0x%04x: Unable to change email address because the given address is "
|    "invalid."
|    
|   -#: src/protocols/oscar/oscar.c:5261
|   +#: src/protocols/oscar/oscar.c:5314
|    #, c-format
|    msgid "Error 0x%04x: Unknown error."
|    msgstr "Error 0x%04x: Unknown error."
|    
|   -#: src/protocols/oscar/oscar.c:5271
|   +#: src/protocols/oscar/oscar.c:5324
|    #, c-format
|    msgid ""
|    "Your screen name is currently formatted as follows:\n"
|   @@ -8352,26 +8433,26 @@ msgstr ""
|    "Your screen name is currently formatted as follows:\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:5272 src/protocols/oscar/oscar.c:5279
|   +#: src/protocols/oscar/oscar.c:5325 src/protocols/oscar/oscar.c:5332
|    msgid "Account Info"
|    msgstr "Account Info"
|    
|   -#: src/protocols/oscar/oscar.c:5277
|   +#: src/protocols/oscar/oscar.c:5330
|    #, c-format
|    msgid "The email address for %s is %s"
|    msgstr "The email address for %s is %s"
|    
|   -#: src/protocols/oscar/oscar.c:5342
|   +#: src/protocols/oscar/oscar.c:5395
|    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:5478
|   +#: src/protocols/oscar/oscar.c:5531
|    msgid "Unable to set AIM profile."
|    msgstr "Unable to set AIM profile."
|    
|   -#: src/protocols/oscar/oscar.c:5479
|   +#: src/protocols/oscar/oscar.c:5532
|    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 "
|   @@ -8381,7 +8462,7 @@ msgstr ""
|    "completed.  Your profile remains unset; try setting it again when you are "
|    "fully connected."
|    
|   -#: src/protocols/oscar/oscar.c:5506
|   +#: src/protocols/oscar/oscar.c:5559
|    #, c-format
|    msgid ""
|    "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
|   @@ -8396,19 +8477,19 @@ msgstr[1] ""
|    "The maximum profile length of %d bytes has been exceeded.  Gaim has "
|    "truncated it for you."
|    
|   -#: src/protocols/oscar/oscar.c:5511
|   +#: src/protocols/oscar/oscar.c:5564
|    msgid "Profile too long."
|    msgstr "Profile too long."
|    
|   -#: src/protocols/oscar/oscar.c:5527 src/protocols/oscar/oscar.c:6818
|   +#: src/protocols/oscar/oscar.c:5580 src/protocols/oscar/oscar.c:6871
|    msgid "Visible"
|    msgstr "Visible"
|    
|   -#: src/protocols/oscar/oscar.c:5545
|   +#: src/protocols/oscar/oscar.c:5598
|    msgid "Unable to set AIM away message."
|    msgstr "Unable to set AIM away message."
|    
|   -#: src/protocols/oscar/oscar.c:5546
|   +#: src/protocols/oscar/oscar.c:5599
|    msgid ""
|    "You have probably requested to set your away message before the login "
|    "procedure completed.  You remain in a \"present\" state; try setting it "
|   @@ -8418,7 +8499,7 @@ msgstr ""
|    "procedure completed.  You remain in a \"present\" state; try setting it "
|    "again when you are fully connected."
|    
|   -#: src/protocols/oscar/oscar.c:5586
|   +#: src/protocols/oscar/oscar.c:5639
|    #, c-format
|    msgid ""
|    "The maximum away message length of %d byte has been exceeded.  Gaim has "
|   @@ -8433,11 +8514,11 @@ msgstr[1] ""
|    "The maximum away message length of %d bytes has been exceeded.  Gaim has "
|    "truncated it for you."
|    
|   -#: src/protocols/oscar/oscar.c:5591
|   +#: src/protocols/oscar/oscar.c:5644
|    msgid "Away message too long."
|    msgstr "Away message too long."
|    
|   -#: src/protocols/oscar/oscar.c:5669
|   +#: src/protocols/oscar/oscar.c:5722
|    #, c-format
|    msgid ""
|    "Could not add the buddy %s because the screen name is invalid.  Screen names "
|   @@ -8448,16 +8529,16 @@ msgstr ""
|    "must either start with a letter and contain only letters, numbers and "
|    "spaces, or contain only numbers."
|    
|   -#: src/protocols/oscar/oscar.c:5671 src/protocols/oscar/oscar.c:6120
|   -#: src/protocols/oscar/oscar.c:6134
|   +#: src/protocols/oscar/oscar.c:5724 src/protocols/oscar/oscar.c:6173
|   +#: src/protocols/oscar/oscar.c:6187
|    msgid "Unable To Add"
|    msgstr "Unable To Add"
|    
|   -#: src/protocols/oscar/oscar.c:5832
|   +#: src/protocols/oscar/oscar.c:5885
|    msgid "Unable To Retrieve Buddy List"
|    msgstr "Unable To Retrieve Buddy List"
|    
|   -#: src/protocols/oscar/oscar.c:5833
|   +#: src/protocols/oscar/oscar.c:5886
|    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 "
|   @@ -8467,13 +8548,13 @@ msgstr ""
|    "servers.  Your buddy list is not lost, and will probably become available in "
|    "a few hours."
|    
|   -#: src/protocols/oscar/oscar.c:6015 src/protocols/oscar/oscar.c:6016
|   -#: src/protocols/oscar/oscar.c:6021 src/protocols/oscar/oscar.c:6178
|   -#: src/protocols/oscar/oscar.c:6179 src/protocols/oscar/oscar.c:6184
|   +#: src/protocols/oscar/oscar.c:6068 src/protocols/oscar/oscar.c:6069
|   +#: src/protocols/oscar/oscar.c:6074 src/protocols/oscar/oscar.c:6231
|   +#: src/protocols/oscar/oscar.c:6232 src/protocols/oscar/oscar.c:6237
|    msgid "Orphans"
|    msgstr "Orphans"
|    
|   -#: src/protocols/oscar/oscar.c:6118
|   +#: src/protocols/oscar/oscar.c:6171
|    #, c-format
|    msgid ""
|    "Could not add the buddy %s because you have too many buddies in your buddy "
|   @@ -8482,11 +8563,11 @@ msgstr ""
|    "Could not add the buddy %s because you have too many buddies in your buddy "
|    "list.  Please remove one and try again."
|    
|   -#: src/protocols/oscar/oscar.c:6118 src/protocols/oscar/oscar.c:6132
|   +#: src/protocols/oscar/oscar.c:6171 src/protocols/oscar/oscar.c:6185
|    msgid "(no name)"
|    msgstr "(no name)"
|    
|   -#: src/protocols/oscar/oscar.c:6132
|   +#: src/protocols/oscar/oscar.c:6185
|    #, c-format
|    msgid ""
|    "Could not add the buddy %s for an unknown reason.  The most common reason "
|   @@ -8497,7 +8578,7 @@ msgstr ""
|    "for this is that you have the maximum number of allowed buddies in your "
|    "buddy list."
|    
|   -#: src/protocols/oscar/oscar.c:6215
|   +#: src/protocols/oscar/oscar.c:6268
|    #, c-format
|    msgid ""
|    "The user %s has given you permission to add you to their buddy list.  Do you "
|   @@ -8506,11 +8587,11 @@ msgstr ""
|    "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:6221
|   +#: src/protocols/oscar/oscar.c:6274
|    msgid "Authorization Given"
|    msgstr "Authorisation Given"
|    
|   -#: src/protocols/oscar/oscar.c:6254
|   +#: src/protocols/oscar/oscar.c:6307
|    #, c-format
|    msgid ""
|    "The user %s wants to add you to their buddy list for the following reason:\n"
|   @@ -8520,17 +8601,17 @@ msgstr ""
|    "%s"
|    
|    #. Granted
|   -#: src/protocols/oscar/oscar.c:6296
|   +#: src/protocols/oscar/oscar.c:6349
|    #, 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:6297
|   +#: src/protocols/oscar/oscar.c:6350
|    msgid "Authorization Granted"
|    msgstr "Authorisation Granted"
|    
|    #. Denied
|   -#: src/protocols/oscar/oscar.c:6300
|   +#: src/protocols/oscar/oscar.c:6353
|    #, c-format
|    msgid ""
|    "The user %s has denied your request to add them to your buddy list for the "
|   @@ -8541,76 +8622,76 @@ msgstr ""
|    "following reason:\n"
|    "%s"
|    
|   -#: src/protocols/oscar/oscar.c:6301
|   +#: src/protocols/oscar/oscar.c:6354
|    msgid "Authorization Denied"
|    msgstr "Authorisation Denied"
|    
|   -#: src/protocols/oscar/oscar.c:6338 src/protocols/toc/toc.c:1273
|   +#: src/protocols/oscar/oscar.c:6391 src/protocols/toc/toc.c:1273
|    msgid "_Exchange:"
|    msgstr "_Exchange:"
|    
|   -#: src/protocols/oscar/oscar.c:6376
|   +#: src/protocols/oscar/oscar.c:6429
|    msgid "Invalid chat name specified."
|    msgstr "Invalid chat name specified."
|    
|   -#: src/protocols/oscar/oscar.c:6465
|   +#: src/protocols/oscar/oscar.c:6518
|    msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
|    msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
|    
|   -#: src/protocols/oscar/oscar.c:6591
|   +#: src/protocols/oscar/oscar.c:6644
|    msgid "Away Message"
|    msgstr "Away Message"
|    
|   -#: src/protocols/oscar/oscar.c:6877
|   +#: src/protocols/oscar/oscar.c:6930
|    #, c-format
|    msgid "Buddy Comment for %s"
|    msgstr "Buddy Comment for %s"
|    
|   -#: src/protocols/oscar/oscar.c:6878
|   +#: src/protocols/oscar/oscar.c:6931
|    msgid "Buddy Comment:"
|    msgstr "Buddy Comment:"
|    
|   -#: src/protocols/oscar/oscar.c:6897
|   +#: src/protocols/oscar/oscar.c:6950
|    msgid "Edit Buddy Comment"
|    msgstr "Edit Buddy Comment"
|    
|   -#: src/protocols/oscar/oscar.c:6903
|   +#: src/protocols/oscar/oscar.c:6956
|    msgid "Get Status Msg"
|    msgstr "Get Status Msg"
|    
|   -#: src/protocols/oscar/oscar.c:6915
|   +#: src/protocols/oscar/oscar.c:6968
|    msgid "Direct IM"
|    msgstr "Direct IM"
|    
|   -#: src/protocols/oscar/oscar.c:6932
|   +#: src/protocols/oscar/oscar.c:6985
|    msgid "Re-request Authorization"
|    msgstr "Re-request Authorisation"
|    
|   -#: src/protocols/oscar/oscar.c:6962
|   +#: src/protocols/oscar/oscar.c:7015
|    msgid "The new formatting is invalid."
|    msgstr "The new formatting is invalid."
|    
|   -#: src/protocols/oscar/oscar.c:6963
|   +#: src/protocols/oscar/oscar.c:7016
|    msgid "Screen name formatting can change only capitalization and whitespace."
|    msgstr "Screen name formatting can change only capitalisation and whitespace."
|    
|   -#: src/protocols/oscar/oscar.c:6970
|   +#: src/protocols/oscar/oscar.c:7023
|    msgid "New screen name formatting:"
|    msgstr "New screen name formatting:"
|    
|   -#: src/protocols/oscar/oscar.c:7022
|   +#: src/protocols/oscar/oscar.c:7075
|    msgid "Change Address To:"
|    msgstr "Change Address To:"
|    
|   -#: src/protocols/oscar/oscar.c:7067
|   +#: src/protocols/oscar/oscar.c:7120
|    msgid "<i>you are not waiting for authorization</i>"
|    msgstr "<i>you are not waiting for authorisation</i>"
|    
|   -#: src/protocols/oscar/oscar.c:7070
|   +#: src/protocols/oscar/oscar.c:7123
|    msgid "You are awaiting authorization from the following buddies"
|    msgstr "You are awaiting authorisation from the following buddies"
|    
|   -#: src/protocols/oscar/oscar.c:7071
|   +#: src/protocols/oscar/oscar.c:7124
|    msgid ""
|    "You can re-request authorization from these buddies by right-clicking on "
|    "them and selecting \"Re-request Authorization.\""
|   @@ -8618,75 +8699,75 @@ msgstr ""
|    "You can re-request authorisation from these buddies by right-clicking on "
|    "them and selecting \"Re-request Authorisation.\""
|    
|   -#: src/protocols/oscar/oscar.c:7088
|   +#: src/protocols/oscar/oscar.c:7141
|    msgid "Find Buddy by E-mail"
|    msgstr "Find Buddy by E-mail"
|    
|   -#: src/protocols/oscar/oscar.c:7089
|   +#: src/protocols/oscar/oscar.c:7142
|    msgid "Search for a buddy by e-mail address"
|    msgstr "Search for a buddy by e-mail address"
|    
|   -#: src/protocols/oscar/oscar.c:7090
|   +#: src/protocols/oscar/oscar.c:7143
|    msgid "Type the e-mail address of the buddy you are searching for."
|    msgstr "Type the e-mail address of the buddy you are searching for."
|    
|   -#: src/protocols/oscar/oscar.c:7107
|   +#: src/protocols/oscar/oscar.c:7160
|    msgid "Available Message:"
|    msgstr "Available Message:"
|    
|   -#: src/protocols/oscar/oscar.c:7108
|   +#: src/protocols/oscar/oscar.c:7161
|    msgid "I'm doing work and hoping for a distraction--IM me!"
|    msgstr "I'm doing work and hoping for a distraction--IM me!"
|    
|   -#: src/protocols/oscar/oscar.c:7189 src/protocols/silc/silc.c:800
|   +#: src/protocols/oscar/oscar.c:7242 src/protocols/silc/silc.c:800
|    msgid "Set User Info..."
|    msgstr "Set User Info..."
|    
|   -#: src/protocols/oscar/oscar.c:7194
|   +#: src/protocols/oscar/oscar.c:7247
|    msgid "Set User Info (URL)..."
|    msgstr "Set User Info (URL)..."
|    
|   -#: src/protocols/oscar/oscar.c:7200
|   +#: src/protocols/oscar/oscar.c:7253
|    msgid "Set Available Message..."
|    msgstr "Set Available Message..."
|    
|   -#: src/protocols/oscar/oscar.c:7205 src/protocols/silc/silc.c:796
|   +#: src/protocols/oscar/oscar.c:7258 src/protocols/silc/silc.c:796
|    msgid "Change Password..."
|    msgstr "Change Password..."
|    
|   -#: src/protocols/oscar/oscar.c:7210
|   +#: src/protocols/oscar/oscar.c:7263
|    msgid "Change Password (URL)"
|    msgstr "Change Password (URL)"
|    
|   -#: src/protocols/oscar/oscar.c:7214
|   +#: src/protocols/oscar/oscar.c:7267
|    msgid "Configure IM Forwarding (URL)"
|    msgstr "Configure IM Forwarding (URL)"
|    
|   -#: src/protocols/oscar/oscar.c:7223
|   +#: src/protocols/oscar/oscar.c:7276
|    msgid "Format Screen Name..."
|    msgstr "Format Screen Name..."
|    
|   -#: src/protocols/oscar/oscar.c:7227
|   +#: src/protocols/oscar/oscar.c:7280
|    msgid "Confirm Account"
|    msgstr "Confirm Account"
|    
|   -#: src/protocols/oscar/oscar.c:7231
|   +#: src/protocols/oscar/oscar.c:7284
|    msgid "Display Currently Registered Address"
|    msgstr "Display Currently Registered Address"
|    
|   -#: src/protocols/oscar/oscar.c:7235
|   +#: src/protocols/oscar/oscar.c:7288
|    msgid "Change Currently Registered Address..."
|    msgstr "Change Currently Registered Address"
|    
|   -#: src/protocols/oscar/oscar.c:7242
|   +#: src/protocols/oscar/oscar.c:7295
|    msgid "Show Buddies Awaiting Authorization"
|    msgstr "Show Buddies Awaiting Authorisation"
|    
|   -#: src/protocols/oscar/oscar.c:7248
|   +#: src/protocols/oscar/oscar.c:7301
|    msgid "Search for Buddy by Email..."
|    msgstr "Search for Buddy by Email..."
|    
|   -#: src/protocols/oscar/oscar.c:7253
|   +#: src/protocols/oscar/oscar.c:7306
|    msgid "Search for Buddy by Information"
|    msgstr "Search for Buddy by Information"
|    
|   @@ -8699,20 +8780,19 @@ msgstr "Search for Buddy by Information"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: src/protocols/oscar/oscar.c:7374 src/protocols/oscar/oscar.c:7376
|   +#: src/protocols/oscar/oscar.c:7427 src/protocols/oscar/oscar.c:7429
|    msgid "AIM/ICQ Protocol Plugin"
|    msgstr "AIM/ICQ Protocol Plugin"
|    
|   -#: src/protocols/oscar/oscar.c:7395
|   +#: src/protocols/oscar/oscar.c:7448
|    msgid "Auth host"
|    msgstr "Auth host"
|    
|   -#: src/protocols/oscar/oscar.c:7398
|   +#: src/protocols/oscar/oscar.c:7451
|    msgid "Auth port"
|    msgstr "Auth port"
|    
|   -#: src/protocols/oscar/oscar.c:7401 src/protocols/zephyr/zephyr.c:2761
|   +#: src/protocols/oscar/oscar.c:7454 src/protocols/zephyr/zephyr.c:2760
|    msgid "Encoding"
|    msgstr "Encoding"
|    
|   @@ -8810,7 +8890,7 @@ msgstr "Cannot fetch the public key"
|    msgid "Cannot fetch the public key"
|    msgstr "Cannot fetch the public key"
|    
|   -#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
|   +#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
|    msgid "Show Public Key"
|    msgstr "Show Public Key"
|    
|   @@ -8885,134 +8965,134 @@ msgstr ""
|    "More than one user was found with the same name. Select the correct user "
|    "from the list to add to the buddy list."
|    
|   -#: src/protocols/silc/buddy.c:1377
|   +#: src/protocols/silc/buddy.c:1386
|    msgid "Detached"
|    msgstr "Detached"
|    
|   -#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:49
|   +#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
|    #: src/protocols/silc/silc.c:85
|    msgid "Indisposed"
|    msgstr "Indisposed"
|    
|   -#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:50
|   +#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
|    #: src/protocols/silc/silc.c:87
|    msgid "Wake Me Up"
|    msgstr "Wake Me Up"
|    
|   -#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:46
|   +#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
|    #: src/protocols/silc/silc.c:79
|    msgid "Hyper Active"
|    msgstr "Hyper Active"
|    
|   -#: src/protocols/silc/buddy.c:1389
|   +#: src/protocols/silc/buddy.c:1398
|    msgid "Robot"
|    msgstr "Robot"
|    
|   -#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:621
|   +#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:621
|    #: src/protocols/silc/util.c:469
|    msgid "Happy"
|    msgstr "Happy"
|    
|   -#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:623
|   +#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:623
|    #: src/protocols/silc/util.c:471
|    msgid "Sad"
|    msgstr "Sad"
|    
|   -#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:625
|   +#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:625
|    #: src/protocols/silc/util.c:473
|    msgid "Angry"
|    msgstr "Angry"
|    
|   -#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:627
|   +#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:627
|    #: src/protocols/silc/util.c:475
|    msgid "Jealous"
|    msgstr "Jealous"
|    
|   -#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:629
|   +#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:629
|    #: src/protocols/silc/util.c:477
|    msgid "Ashamed"
|    msgstr "Ashamed"
|    
|   -#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:631
|   +#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:631
|    #: src/protocols/silc/util.c:479
|    msgid "Invincible"
|    msgstr "Invincible"
|    
|   -#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:633
|   +#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:633
|    #: src/protocols/silc/util.c:481
|    msgid "In Love"
|    msgstr "In Love"
|    
|   -#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:635
|   +#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:635
|    #: src/protocols/silc/util.c:483
|    msgid "Sleepy"
|    msgstr "Sleepy"
|    
|   -#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:637
|   +#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:637
|    #: src/protocols/silc/util.c:485
|    msgid "Bored"
|    msgstr "Bored"
|    
|   -#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:639
|   +#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:639
|    #: src/protocols/silc/util.c:487
|    msgid "Excited"
|    msgstr "Excited"
|    
|   -#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:641
|   +#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:641
|    #: src/protocols/silc/util.c:489
|    msgid "Anxious"
|    msgstr "Anxious"
|    
|   -#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980
|   +#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
|    msgid "User Modes"
|    msgstr "User Modes"
|    
|   -#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989
|   +#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
|    msgid "Mood"
|    msgstr "Mood"
|    
|   -#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995
|   +#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
|    msgid "Status Text"
|    msgstr "Status Text"
|    
|   -#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001
|   +#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
|    msgid "Preferred Contact"
|    msgstr "Preferred Contact"
|    
|   -#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006
|   +#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
|    msgid "Preferred Language"
|    msgstr "Preferred Language"
|    
|   -#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011
|   +#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
|    msgid "Device"
|    msgstr "Device"
|    
|   -#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016
|   +#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
|    #: src/protocols/silc/silc.c:689 src/protocols/silc/silc.c:691
|    msgid "Timezone"
|    msgstr "Timezone"
|    
|   -#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021
|   +#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
|    msgid "Geolocation"
|    msgstr "Geolocation"
|    
|   -#: src/protocols/silc/buddy.c:1529
|   +#: src/protocols/silc/buddy.c:1538
|    msgid "Reset IM Key"
|    msgstr "Reset IM Key"
|    
|   -#: src/protocols/silc/buddy.c:1534
|   +#: src/protocols/silc/buddy.c:1543
|    msgid "IM with Key Exchange"
|    msgstr "IM with Key Exchange"
|    
|   -#: src/protocols/silc/buddy.c:1538
|   +#: src/protocols/silc/buddy.c:1547
|    msgid "IM with Password"
|    msgstr "IM with Password"
|    
|   -#: src/protocols/silc/buddy.c:1549
|   +#: src/protocols/silc/buddy.c:1558
|    msgid "Get Public Key..."
|    msgstr "Get Public Key..."
|    
|   -#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409
|   +#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1409
|    msgid "Kill User"
|    msgstr "Kill User"
|    
|   @@ -9756,7 +9836,7 @@ msgstr "whois &lt;nick&gt;:  View nick's
|    msgid "whois &lt;nick&gt;:  View nick's information"
|    msgstr "whois &lt;nick&gt;:  View nick's information"
|    
|   -#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2479
|   +#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2478
|    msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
|    msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
|    
|   @@ -10035,6 +10115,11 @@ msgstr "Looking up %s"
|    msgid "Looking up %s"
|    msgstr "Looking up %s"
|    
|   +#: src/protocols/toc/toc.c:198
|   +#, c-format
|   +msgid "Signon: %s"
|   +msgstr "Signon: %s"
|   +
|    #: src/protocols/toc/toc.c:480
|    #, c-format
|    msgid "Unable to write file %s."
|   @@ -10232,7 +10317,6 @@ msgstr "%s requests you to send them a f
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
|    msgid "TOC Protocol Plugin"
|    msgstr "TOC Protocol Plugin"
|   @@ -10323,7 +10407,6 @@ msgstr "Logging in"
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|    #: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
|    msgid "Trepia Protocol Plugin"
|    msgstr "Trepia Protocol Plugin"
|   @@ -10444,33 +10527,33 @@ msgstr "Unable to read"
|    
|    #: src/protocols/yahoo/yahoo.c:2298 src/protocols/yahoo/yahoo.c:2408
|    #: src/protocols/yahoo/yahoo.c:2458 src/protocols/yahoo/yahoo.c:2468
|   -#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
|   +#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477
|    #: src/protocols/yahoo/ycht.c:518
|    msgid "Connection problem"
|    msgstr "Connection problem"
|    
|   -#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2931
|   -#: src/protocols/yahoo/yahoo.c:3045
|   +#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2929
|   +#: src/protocols/yahoo/yahoo.c:3043
|    msgid "Not At Home"
|    msgstr "Not At Home"
|    
|   -#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2933
|   -#: src/protocols/yahoo/yahoo.c:3046
|   +#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2931
|   +#: src/protocols/yahoo/yahoo.c:3044
|    msgid "Not At Desk"
|    msgstr "Not At Desk"
|    
|   -#: src/protocols/yahoo/yahoo.c:2568 src/protocols/yahoo/yahoo.c:2935
|   -#: src/protocols/yahoo/yahoo.c:3047
|   +#: src/protocols/yahoo/yahoo.c:2568 src/protocols/yahoo/yahoo.c:2933
|   +#: src/protocols/yahoo/yahoo.c:3045
|    msgid "Not In Office"
|    msgstr "Not In Office"
|    
|   -#: src/protocols/yahoo/yahoo.c:2572 src/protocols/yahoo/yahoo.c:2939
|   -#: src/protocols/yahoo/yahoo.c:3049
|   +#: src/protocols/yahoo/yahoo.c:2572 src/protocols/yahoo/yahoo.c:2937
|   +#: src/protocols/yahoo/yahoo.c:3047
|    msgid "On Vacation"
|    msgstr "On Vacation"
|    
|   -#: src/protocols/yahoo/yahoo.c:2576 src/protocols/yahoo/yahoo.c:2943
|   -#: src/protocols/yahoo/yahoo.c:3051
|   +#: src/protocols/yahoo/yahoo.c:2576 src/protocols/yahoo/yahoo.c:2941
|   +#: src/protocols/yahoo/yahoo.c:3049
|    msgid "Stepped Out"
|    msgstr "Stepped Out"
|    
|   @@ -10511,60 +10594,50 @@ msgstr "Join user in chat..."
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: src/protocols/yahoo/yahoo.c:3377 src/protocols/yahoo/yahoo.c:3379
|   +#: src/protocols/yahoo/yahoo.c:3375 src/protocols/yahoo/yahoo.c:3377
|    msgid "Yahoo Protocol Plugin"
|    msgstr "Yahoo Protocol Plugin"
|    
|   -#: src/protocols/yahoo/yahoo.c:3398
|   +#: src/protocols/yahoo/yahoo.c:3396
|    msgid "Yahoo Japan"
|    msgstr "Yahoo Japan"
|    
|   -#: src/protocols/yahoo/yahoo.c:3401
|   +#: src/protocols/yahoo/yahoo.c:3399
|    msgid "Pager host"
|    msgstr "Pager host"
|    
|   -#: src/protocols/yahoo/yahoo.c:3404
|   +#: src/protocols/yahoo/yahoo.c:3402
|    msgid "Japan Pager host"
|    msgstr "Japan Pager host"
|    
|   -#: src/protocols/yahoo/yahoo.c:3407
|   +#: src/protocols/yahoo/yahoo.c:3405
|    msgid "Pager port"
|    msgstr "Pager port"
|    
|   -#: src/protocols/yahoo/yahoo.c:3410
|   +#: src/protocols/yahoo/yahoo.c:3408
|    msgid "File transfer host"
|    msgstr "File transfer host"
|    
|   -#: src/protocols/yahoo/yahoo.c:3413
|   +#: src/protocols/yahoo/yahoo.c:3411
|    msgid "Japan File transfer host"
|    msgstr "Japan File transfer host"
|    
|   -#: src/protocols/yahoo/yahoo.c:3416
|   +#: src/protocols/yahoo/yahoo.c:3414
|    msgid "File transfer port"
|    msgstr "File transfer port"
|    
|   -#: src/protocols/yahoo/yahoo.c:3419
|   +#: src/protocols/yahoo/yahoo.c:3417
|    msgid "Chat Room List Url"
|    msgstr "Chat Room List Url"
|    
|   -#: src/protocols/yahoo/yahoo.c:3422
|   +#: src/protocols/yahoo/yahoo.c:3420
|    msgid "YCHT Host"
|    msgstr "YCHT Host"
|    
|   -#: src/protocols/yahoo/yahoo.c:3425
|   +#: src/protocols/yahoo/yahoo.c:3423
|    msgid "YCHT Port"
|    msgstr "YCHT Port"
|    
|   -#: src/protocols/yahoo/yahoo_filexfer.c:169
|   -#, c-format
|   -msgid ""
|   -"Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
|   -"bytes)."
|   -msgstr ""
|   -"Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
|   -"bytes)."
|   -
|    #: src/protocols/yahoo/yahoo_profile.c:675
|    #, c-format
|    msgid "<b>IP Address:</b> %s<br>"
|   @@ -10690,27 +10763,23 @@ msgstr "Perhaps they're not in a chat?"
|    msgid "Maybe they're not in a chat?"
|    msgstr "Perhaps they're not in a chat?"
|    
|   -#: src/protocols/yahoo/yahoochat.c:1356
|   -msgid "Unable to connect"
|   -msgstr "Unable to connect"
|   -
|   -#: src/protocols/yahoo/yahoochat.c:1356
|   +#: src/protocols/yahoo/yahoochat.c:1357
|    msgid "Fetching the room list failed."
|    msgstr "Fetching the room list failed."
|    
|   -#: src/protocols/yahoo/yahoochat.c:1401
|   +#: src/protocols/yahoo/yahoochat.c:1402
|    msgid "Voices"
|    msgstr "Voices"
|    
|   -#: src/protocols/yahoo/yahoochat.c:1404
|   +#: src/protocols/yahoo/yahoochat.c:1405
|    msgid "Webcams"
|    msgstr "Webcams"
|    
|   -#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
|   +#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477
|    msgid "Unable to fetch room list."
|    msgstr "Unable to fetch room list."
|    
|   -#: src/protocols/yahoo/yahoochat.c:1469
|   +#: src/protocols/yahoo/yahoochat.c:1470
|    msgid "User Rooms"
|    msgstr "User Rooms"
|    
|   @@ -10731,68 +10800,68 @@ msgstr "Unable send to chat %s,%s,%s"
|    msgid "Unable send to chat %s,%s,%s"
|    msgstr "Unable send to chat %s,%s,%s"
|    
|   -#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1119
|   +#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118
|    #, c-format
|    msgid "<b>User:</b> %s<br>"
|    msgstr "<b>User:</b> %s<br>"
|    
|   -#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1124
|   +#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123
|    msgid "<br>Hidden or not logged-in"
|    msgstr "<br>Hidden or not logged-in"
|    
|   -#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1126
|   +#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125
|    #, c-format
|    msgid "<br>At %s since %s"
|    msgstr "<br>At %s since %s"
|    
|   -#: src/protocols/zephyr/zephyr.c:1409 src/protocols/zephyr/zephyr.c:1410
|   +#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409
|    msgid "Anyone"
|    msgstr "Anyone"
|    
|   -#: src/protocols/zephyr/zephyr.c:2156
|   +#: src/protocols/zephyr/zephyr.c:2155
|    msgid "_Class:"
|    msgstr "_Class:"
|    
|   -#: src/protocols/zephyr/zephyr.c:2162
|   +#: src/protocols/zephyr/zephyr.c:2161
|    msgid "_Instance:"
|    msgstr "_Instance:"
|    
|   -#: src/protocols/zephyr/zephyr.c:2168
|   +#: src/protocols/zephyr/zephyr.c:2167
|    msgid "_Recipient:"
|    msgstr "_Recipient:"
|    
|   -#: src/protocols/zephyr/zephyr.c:2179
|   +#: src/protocols/zephyr/zephyr.c:2178
|    #, c-format
|    msgid "Attempt to subscribe to %s,%s,%s failed"
|    msgstr "Attempt to subscribe to %s,%s,%s failed"
|    
|   -#: src/protocols/zephyr/zephyr.c:2484
|   +#: src/protocols/zephyr/zephyr.c:2483
|    msgid "zlocate &lt;nick&gt;: Locate user"
|    msgstr "zlocate &lt;nick&gt;: Locate user"
|    
|   -#: src/protocols/zephyr/zephyr.c:2489
|   +#: src/protocols/zephyr/zephyr.c:2488
|    msgid "zl &lt;nick&gt;: Locate user"
|    msgstr "zl &lt;nick&gt;: Locate user"
|    
|   -#: src/protocols/zephyr/zephyr.c:2494
|   +#: src/protocols/zephyr/zephyr.c:2493
|    msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
|    msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
|    
|   -#: src/protocols/zephyr/zephyr.c:2499
|   +#: src/protocols/zephyr/zephyr.c:2498
|    msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
|    msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
|    
|   -#: src/protocols/zephyr/zephyr.c:2505
|   +#: src/protocols/zephyr/zephyr.c:2504
|    msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
|    msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
|    
|   -#: src/protocols/zephyr/zephyr.c:2510
|   +#: src/protocols/zephyr/zephyr.c:2509
|    msgid ""
|    "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
|    msgstr ""
|    "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
|    
|   -#: src/protocols/zephyr/zephyr.c:2516
|   +#: src/protocols/zephyr/zephyr.c:2515
|    msgid ""
|    "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
|    "<i>instance</i>,*&gt;"
|   @@ -10800,7 +10869,7 @@ msgstr ""
|    "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
|    "<i>instance</i>,*&gt;"
|    
|   -#: src/protocols/zephyr/zephyr.c:2522
|   +#: src/protocols/zephyr/zephyr.c:2521
|    msgid ""
|    "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
|    "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
|   @@ -10808,7 +10877,7 @@ msgstr ""
|    "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
|    "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
|    
|   -#: src/protocols/zephyr/zephyr.c:2528
|   +#: src/protocols/zephyr/zephyr.c:2527
|    msgid ""
|    "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
|    "<i>instance</i>,<i>recipient</i>&gt;"
|   @@ -10816,15 +10885,15 @@ msgstr ""
|    "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
|    "<i>instance</i>,<i>recipient</i>&gt;"
|    
|   -#: src/protocols/zephyr/zephyr.c:2533
|   +#: src/protocols/zephyr/zephyr.c:2532
|    msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
|    msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
|    
|   -#: src/protocols/zephyr/zephyr.c:2639
|   +#: src/protocols/zephyr/zephyr.c:2638
|    msgid "Resubscribe"
|    msgstr "Resubscribe"
|    
|   -#: src/protocols/zephyr/zephyr.c:2642
|   +#: src/protocols/zephyr/zephyr.c:2641
|    msgid "Retrieve subscriptions from server"
|    msgstr "Retrieve subscriptions from server"
|    
|   @@ -10837,20 +10906,19 @@ msgstr "Retrieve subscriptions from serv
|    #. *< name
|    #. *< version
|    #. *  summary
|   -#. *  description
|   -#: src/protocols/zephyr/zephyr.c:2725 src/protocols/zephyr/zephyr.c:2727
|   +#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726
|    msgid "Zephyr Protocol Plugin"
|    msgstr "Zephyr Protocol Plugin"
|    
|   -#: src/protocols/zephyr/zephyr.c:2752
|   +#: src/protocols/zephyr/zephyr.c:2751
|    msgid "Export to .anyone"
|    msgstr "Export to .anyone"
|    
|   -#: src/protocols/zephyr/zephyr.c:2755
|   +#: src/protocols/zephyr/zephyr.c:2754
|    msgid "Export to .zephyr.subs"
|    msgstr "Export to .zephyr.subs"
|    
|   -#: src/protocols/zephyr/zephyr.c:2758
|   +#: src/protocols/zephyr/zephyr.c:2757
|    msgid "Exposure"
|    msgstr "Exposure"
|    
|   @@ -10899,58 +10967,58 @@ msgstr "%s is now known as %s.\n"
|    msgid "%s is now known as %s.\n"
|    msgstr "%s is now known as %s.\n"
|    
|   -#: src/server.c:944
|   +#: src/server.c:966
|    #, c-format
|    msgid "(%d message)"
|    msgid_plural "(%d messages)"
|    msgstr[0] "(%d message)"
|    msgstr[1] "(%d messages)"
|    
|   -#: src/server.c:958
|   +#: src/server.c:980
|    msgid "(1 message)"
|    msgstr "(1 message)"
|    
|   -#: src/server.c:1187 src/server.c:1196
|   +#: src/server.c:1203 src/server.c:1212
|    #, c-format
|    msgid "%s logged in."
|    msgstr "%s logged in."
|    
|   -#: src/server.c:1208
|   +#: src/server.c:1224
|    #, c-format
|    msgid "%s signed on"
|    msgstr "%s signed on"
|    
|   -#: src/server.c:1223
|   +#: src/server.c:1239
|    #, c-format
|    msgid "%s came back"
|    msgstr "%s came back"
|    
|   -#: src/server.c:1225
|   +#: src/server.c:1241
|    #, c-format
|    msgid "%s went away"
|    msgstr "%s went away."
|    
|   -#: src/server.c:1239
|   +#: src/server.c:1255
|    #, c-format
|    msgid "%s became idle"
|    msgstr "%s became idle"
|    
|   -#: src/server.c:1250
|   +#: src/server.c:1266
|    #, c-format
|    msgid "%s became unidle"
|    msgstr "%s is no longer idle"
|    
|   -#: src/server.c:1260 src/server.c:1267
|   +#: src/server.c:1276 src/server.c:1283
|    #, c-format
|    msgid "%s logged out."
|    msgstr "%s logged out."
|    
|   -#: src/server.c:1280
|   +#: src/server.c:1296
|    #, c-format
|    msgid "%s signed off"
|    msgstr "%s signed off"
|    
|   -#: src/server.c:1342
|   +#: src/server.c:1358
|    #, c-format
|    msgid ""
|    "%s has just been warned by %s.\n"
|   @@ -10959,11 +11027,11 @@ msgstr ""
|    "%s has just been warned by %s.\n"
|    "Your new warning level is %d%%"
|    
|   -#: src/server.c:1345
|   +#: src/server.c:1361
|    msgid "an anonymous person"
|    msgstr "an anonymous person"
|    
|   -#: src/server.c:1455
|   +#: src/server.c:1473
|    #, c-format
|    msgid ""
|    "%s has invited %s to the chat room %s:\n"
|   @@ -10972,12 +11040,12 @@ msgstr ""
|    "%s has invited %s to the chat room %s:\n"
|    "<b>%s</b>"
|    
|   -#: src/server.c:1459
|   +#: src/server.c:1479
|    #, c-format
|    msgid "%s has invited %s to the chat room %s\n"
|    msgstr "%s has invited %s to the chat room %s\n"
|    
|   -#: src/server.c:1465
|   +#: src/server.c:1485
|    msgid "Accept chat invitation?"
|    msgstr "Accept chat invitation?"
|    
|   @@ -11008,38 +11076,85 @@ msgstr "_Warn"
|    msgid "_Warn"
|    msgstr "_Warn"
|    
|   -#: src/util.c:2354
|   +#: src/util.c:2365
|    msgid "Calculating..."
|    msgstr "Calculating..."
|    
|   -#: src/util.c:2357
|   +#: src/util.c:2368
|    msgid "Unknown."
|    msgstr "Unknown."
|    
|   -#: src/util.c:2387
|   +#: src/util.c:2398
|    msgid "second"
|    msgid_plural "seconds"
|    msgstr[0] "second"
|    msgstr[1] "seconds"
|    
|   -#: src/util.c:2401
|   +#: src/util.c:2412
|    msgid "day"
|    msgid_plural "days"
|    msgstr[0] "day"
|    msgstr[1] "days"
|    
|   -#: src/util.c:2409
|   +#: src/util.c:2420
|    msgid "hour"
|    msgid_plural "hours"
|    msgstr[0] "hour"
|    msgstr[1] "hours"
|    
|   -#: src/util.c:2417
|   +#: src/util.c:2428
|    msgid "minute"
|    msgid_plural "minutes"
|    msgstr[0] "minute"
|    msgstr[1] "minutes"
|    
|   -#: src/util.c:2834
|   +#: src/util.c:2845
|    msgid "g003: Error opening connection.\n"
|    msgstr "g003: Error opening connection.\n"
|   +
|   +#~ msgid "Miscellaneous error"
|   +#~ msgstr "Miscellaneous error"
|   +
|   +#~ msgid "Initiate Chat"
|   +#~ msgstr "Initiate Chat"
|   +
|   +#~ msgid "Unable to connect to server"
|   +#~ msgstr "Unable to connect to server"
|   +
|   +#~ msgid "Unknown error when attempting to authorize with MSN login server."
|   +#~ msgstr "Unknown error when attempting to authorise with MSN login server."
|   +
|   +#~ msgid "Requesting to send password"
|   +#~ msgstr "Requesting to send password"
|   +
|   +#~ msgid "Syncing with server"
|   +#~ msgstr "Syncing with server"
|   +
|   +#~ msgid "Unable to connect to %s server"
|   +#~ msgstr "Unable to connect to %s server"
|   +
|   +#~ msgid "Error writing to %s server"
|   +#~ msgstr "Error writing to %s server"
|   +
|   +#~ msgid "Error reading from %s server"
|   +#~ msgstr "Error reading from %s server"
|   +
|   +#~ msgid "Received HTTP error. Please report this."
|   +#~ msgstr "Received HTTP error. Please report this."
|   +
|   +#~ msgid "Message could not be sent for an unknown reason"
|   +#~ msgstr "Message could not be sent for an unknown reason"
|   +
|   +#~ msgid ""
|   +#~ "%s:\n"
|   +#~ "%s"
|   +#~ msgstr ""
|   +#~ "%s:\n"
|   +#~ "%s"
|   +
|   +#~ msgid ""
|   +#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
|   +#~ "bytes)."
|   +#~ msgstr ""
|   +#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
|   +#~ "bytes)."

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 70b5368d76eb82b8742d65844de6fd27330f5a52


More information about the Commits mailing list