summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorLuke Schierer <lschiere@pidgin.im>2006-02-08 02:19:54 +0000
committerLuke Schierer <lschiere@pidgin.im>2006-02-08 02:19:54 +0000
commit7011e14584fab83c7a75ac6d0c61a16dfd285d1f (patch)
treefe40b2c11aea9a7e0a8b6be8002af3c1baab5a68 /po/en_GB.po
parentb0ea0910f594a7f400ffe8d45003908b53852a6c (diff)
downloadpidgin-7011e14584fab83c7a75ac6d0c61a16dfd285d1f.tar.gz
[gaim-migrate @ 15532]
a gaggle of translation updates. Datallah, can you take care of that kurdish.nsh? thanks
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po8331
1 files changed, 4357 insertions, 3974 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 678a500667..dcc169fada 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Gaim 1.1.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-29 09:11-0400\n"
-"PO-Revision-Date: 2005-02-14 13:35+0000\n"
+"POT-Creation-Date: 2006-02-07 15:14+0000\n"
+"PO-Revision-Date: 2006-02-07 13:57+0000\n"
"Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
"Language-Team: <en_GB@li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,76 +16,62 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Error Message Suppression"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Hide Disconnect Errors"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Hide Login Errors"
-
-#: plugins/autorecon.c:313
-msgid "Hide Reconnecting Dialog"
-msgstr "Hide Reconnecting Dialog"
-
#. *< type
#. *< ui_requirement
#. *< flags
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Auto-Reconnect"
+#: plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Cipher Test"
#. *< name
#. *< version
#. * summary
#. * description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "When you are kicked offline, this reconnects you."
+#: plugins/ciphertest.c:267 plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Tests the ciphers that ship with gaim."
-#: plugins/contact_priority.c:84
-msgid "Point values to use when..."
-msgstr "Point values to use when..."
+#: plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Buddy is idle"
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "Buddy is offline:"
+#: plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Buddy is away"
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "Buddy is away:"
+#: plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Buddy is away for an extended period"
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "Buddy is idle:"
+#. Not used yet.
+#: plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Buddy is mobile"
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "Use last matching buddy"
+#: plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Buddy is offline"
-#. Explanation
-#: plugins/contact_priority.c:141
+#: plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Point values to use when..."
+
+#: plugins/contact_priority.c:118
msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
msgstr ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The buddy with the <i>highest score</i> is the buddy who will have priority "
+"in the contact.\n"
-#: plugins/contact_priority.c:144
+#: plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Use last buddy when scores are equal"
+
+#: plugins/contact_priority.c:130
msgid "Point values to use for account..."
msgstr "Point values to use for account..."
@@ -95,21 +81,21 @@ msgstr "Point values to use for account..."
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/contact_priority.c:195
+#: plugins/contact_priority.c:182
msgid "Contact Priority"
msgstr "Contact Priority"
#. *< name
#. *< version
#. *< summary
-#: plugins/contact_priority.c:198
+#: plugins/contact_priority.c:185
msgid ""
"Allows for controlling the values associated with different buddy states."
msgstr ""
"Allows for controlling the values associated with different buddy states."
#. *< description
-#: plugins/contact_priority.c:200
+#: plugins/contact_priority.c:187
msgid ""
"Allows for changing the point values of idle/away/offline states for buddies "
"in contact priority computations."
@@ -117,100 +103,247 @@ msgstr ""
"Allows for changing the point values of idle/away/offline states for buddies "
"in contact priority computations."
-#: plugins/docklet/docklet.c:383
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Plug-in to establish a Crazychat session."
+
+#. * description
+#: plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr "Uses Gaim to obtain buddy IPs to connect for a Crazychat session"
+
+#. make the network configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "TCP port"
+
+#: plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "UDP port"
+
+#. make the feature configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Feature Calibration"
+
+#. add enabled / disabled
+#: plugins/crazychat/cc_gaim_plugin.c:345 src/gtkaccount.c:2234
+#: src/gtkplugin.c:577
+msgid "Enabled"
+msgstr "Enabled"
+
+#: plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Disabled"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: plugins/dbus-example.c:138 plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "DBus Plug-in Example"
+
+#: plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "Right-click for more unread messages...\n"
+
+#: plugins/docklet/docklet.c:157 src/gtkblist.c:3277
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d unread message from %s\n"
+msgstr[1] "%d unread messages from %s\n"
+
+#: plugins/docklet/docklet.c:426
+msgid "Change Status"
+msgstr "Change Status"
+
+#: plugins/docklet/docklet.c:429 src/gtkstatusbox.c:660
+#: src/protocols/jabber/buddy.c:1101 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:2845
+#: src/protocols/yahoo/yahoo.c:2682 src/status.c:155
+msgid "Available"
+msgstr "Available"
+
+#. Away stuff
+#: plugins/docklet/docklet.c:433 src/gtkprefs.c:1752 src/gtkstatusbox.c:661
+#: src/protocols/irc/irc.c:456 src/protocols/irc/msgs.c:219
+#: src/protocols/jabber/buddy.c:1105 src/protocols/novell/novell.c:2848
+#: src/protocols/oscar/oscar.c:727 src/protocols/oscar/oscar.c:6742
+#: src/protocols/oscar/oscar.c:7786 src/protocols/silc/buddy.c:1469
+#: src/protocols/yahoo/yahoo.c:3136 src/status.c:158
+msgid "Away"
+msgstr "Away"
+
+#: plugins/docklet/docklet.c:437 src/gtkstatusbox.c:662
+#: src/protocols/oscar/oscar.c:731 src/protocols/yahoo/yahoo.c:2676
+#: src/status.c:157
+msgid "Invisible"
+msgstr "Invisible"
+
+#: plugins/docklet/docklet.c:441 src/gtkblist.c:3015 src/gtkstatusbox.c:663
+#: src/protocols/jabber/buddy.c:1099 src/protocols/novell/novell.c:2857
+#: src/protocols/oscar/oscar.c:793 src/protocols/oscar/oscar.c:7758
+#: src/protocols/yahoo/yahoo.c:2680 src/status.c:154
+msgid "Offline"
+msgstr "Offline"
+
+#: plugins/docklet/docklet.c:461
+msgid "New Status..."
+msgstr "New Status..."
+
+#: plugins/docklet/docklet.c:462
+msgid "Saved Status..."
+msgstr "Saved Status..."
+
+#: plugins/docklet/docklet.c:478
msgid "Show Buddy List"
msgstr "Show Buddy List"
-#: plugins/docklet/docklet.c:390
+#: plugins/docklet/docklet.c:483
+msgid "Unread Messages"
+msgstr "Unread Messages"
+
+#: plugins/docklet/docklet.c:504
msgid "New Message..."
msgstr "New Message..."
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Join A Chat..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Mute Sounds"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "File Transfers"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
+#: plugins/docklet/docklet.c:513 src/gtkaccount.c:2450
msgid "Accounts"
msgstr "Accounts"
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1765
+#: plugins/docklet/docklet.c:514 src/gtkplugin.c:541
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#: plugins/docklet/docklet.c:515 src/gtkprefs.c:1893
msgid "Preferences"
msgstr "Preferences"
+#: plugins/docklet/docklet.c:519
+msgid "Mute Sounds"
+msgstr "Mute Sounds"
+
#. TODO: need a submenu to change status, this needs to "link"
#. * to the status in the buddy list gtkstatusbox
#.
-#: plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:532
msgid "Quit"
msgstr "Quit"
+#: plugins/docklet/docklet.c:673
+msgid "Blink tray icon for unread..."
+msgstr "Blink tray icon for unread..."
+
+#: plugins/docklet/docklet.c:676
+msgid "_Instant Messages:"
+msgstr "_Instant Messages:"
+
+#: plugins/docklet/docklet.c:678 plugins/docklet/docklet.c:686
+#: plugins/win32/winprefs/winprefs.c:411 src/gtkprefs.c:816
+#: src/gtkprefs.c:1742 src/gtkprefs.c:1756
+msgid "Never"
+msgstr "Never"
+
+#: plugins/docklet/docklet.c:679
+msgid "In hidden conversations"
+msgstr "In hidden conversations"
+
+#: plugins/docklet/docklet.c:680 plugins/docklet/docklet.c:688
+#: plugins/timestamp_format.c:39 plugins/timestamp_format.c:48
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:818
+msgid "Always"
+msgstr "Always"
+
+#: plugins/docklet/docklet.c:684
+msgid "C_hat Messages:"
+msgstr "C_hat Messages:"
+
+#: plugins/docklet/docklet.c:687
+msgid "When my nick is said"
+msgstr "When my nick is mentioned"
+
#. *< type
#. *< ui_requirement
#. *< flags
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/docklet/docklet.c:556
+#: plugins/docklet/docklet.c:714
msgid "System Tray Icon"
msgstr "System Tray Icon"
#. *< name
#. *< version
#. * summary
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:717
msgid "Displays an icon for Gaim in the system tray."
msgstr "Displays an icon for Gaim in the system tray."
#. * description
-#: plugins/docklet/docklet.c:561
+#: plugins/docklet/docklet.c:719
msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
msgstr ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-
-#.
-#. * DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Signed off"
+#: plugins/docklet/eggtrayicon.c:123
+msgid "Orientation"
+msgstr "Orientation"
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Away"
+#: plugins/docklet/eggtrayicon.c:124
+msgid "The orientation of the tray."
+msgstr "The orientation of the tray."
-#: plugins/extplacement.c:79
+#: plugins/extplacement.c:80
msgid "By conversation count"
msgstr "By conversation count"
-#: plugins/extplacement.c:100
+#: plugins/extplacement.c:101
msgid "Conversation Placement"
msgstr "Conversation Placement"
-#: plugins/extplacement.c:105
+#: plugins/extplacement.c:106
msgid "Number of conversations per window"
msgstr "Number of conversations per window"
-#: plugins/extplacement.c:111
+#: plugins/extplacement.c:112
msgid "Separate IM and Chat windows when placing by number"
msgstr "Separate IM and Chat windows when placing by number"
@@ -220,19 +353,19 @@ msgstr "Separate IM and Chat windows when placing by number"
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:135
msgid "ExtPlacement"
msgstr "ExtPlacement"
#. *< name
#. *< version
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:137
msgid "Extra conversation placement options."
msgstr "Extra conversation placement options."
#. *< summary
#. * description
-#: plugins/extplacement.c:136
+#: plugins/extplacement.c:139
msgid ""
"Restrict the number of conversations per windows, optionally separating IMs "
"and Chats"
@@ -266,14 +399,14 @@ msgstr "Allows you to control Gaim by entering commands in a file."
#. *< id
#: plugins/gaiminc.c:91
msgid "Gaim Demonstration Plugin"
-msgstr "Gaim Demonstration Plugin"
+msgstr "Gaim Demonstration Plug-in"
#. *< name
#. *< version
#. * summary
#: plugins/gaiminc.c:94
msgid "An example plugin that does stuff - see the description."
-msgstr "An example plugin that does stuff - see the description."
+msgstr "An example plug-in that does stuff - see the description."
#. * description
#: plugins/gaiminc.c:96
@@ -283,96 +416,133 @@ msgid ""
"- It reverses all incoming text\n"
"- It sends a message to people on your list immediately when they sign on"
msgstr ""
-"This is a really cool plugin that does a lot of stuff:\n"
+"This is a really cool plug-in that does a lot of stuff:\n"
"- It tells you who wrote the program when you log in\n"
"- It reverses all incoming text\n"
"- It sends a message to people on your list immediately when they sign on"
-#: plugins/gaimrc.c:40
+#: plugins/gaimrc.c:41
msgid "Cursor Color"
msgstr "Cursor Colour"
-#: plugins/gaimrc.c:41
+#: plugins/gaimrc.c:42
msgid "Secondary Cursor Color"
msgstr "Secondary Cursor Colour"
-#: plugins/gaimrc.c:42
+#: plugins/gaimrc.c:43
msgid "Hyperlink Color"
msgstr "Hyperlink Colour"
-#: plugins/gaimrc.c:53
+#: plugins/gaimrc.c:56
msgid "GtkTreeView Expander Size"
msgstr "GtkTreeView Expander Size"
-#: plugins/gaimrc.c:72
+#: plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView Horizontal Separation"
+
+#: plugins/gaimrc.c:76
msgid "Conversation Entry"
msgstr "Conversation Entry"
-#: plugins/gaimrc.c:73
+#: plugins/gaimrc.c:77
msgid "Conversation History"
msgstr "Conversation History"
-#: plugins/gaimrc.c:74
+#: plugins/gaimrc.c:78
msgid "Log Viewer"
msgstr "Log Viewer"
-#: plugins/gaimrc.c:75
+#: plugins/gaimrc.c:79
msgid "Request Dialog"
msgstr "Request Dialog"
-#: plugins/gaimrc.c:76
+#: plugins/gaimrc.c:80
msgid "Notify Dialog"
msgstr "Notify Dialog"
-#: plugins/gaimrc.c:210
+#: plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView Indent Expanders"
+
+#: plugins/gaimrc.c:287
#, c-format
msgid "Select Color for %s"
msgstr "Select Colour for %s"
-#: plugins/gaimrc.c:212
+#: plugins/gaimrc.c:289
msgid "Select Color"
msgstr "Select Colour"
-#: plugins/gaimrc.c:247
+#: plugins/gaimrc.c:324
#, c-format
msgid "Select Font for %s"
msgstr "Select Font for %s"
-#: plugins/gaimrc.c:285
+#: plugins/gaimrc.c:362
msgid "Select Interface Font"
msgstr "Select Interface Font"
-#: plugins/gaimrc.c:344
+#: plugins/gaimrc.c:415
+msgid "General"
+msgstr "General"
+
+#: plugins/gaimrc.c:420
msgid "GTK+ Interface Font"
msgstr "GTK+ Interface Font"
-#: plugins/gaimrc.c:363
+#: plugins/gaimrc.c:440
msgid "GTK+ Text Shortcut Theme"
msgstr "GTK+ Text Shortcut Theme"
-#: plugins/gaimrc.c:461
+#: plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "Interface colours"
+
+#: plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "Widget Sizes"
+
+#: plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "Fonts"
+
+#: plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "Tools"
+
+#: plugins/gaimrc.c:548
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Write settings to %s%sgtkrc-2.0"
+
+#: plugins/gaimrc.c:556
+msgid "Re-read gtkrc files"
+msgstr "Re-read gtkrc files"
+
+#: plugins/gaimrc.c:583
msgid "Gaim GTK+ Theme Control"
msgstr "Gaim GTK+ Theme Control"
-#: plugins/gaimrc.c:463 plugins/gaimrc.c:464
+#: plugins/gaimrc.c:585 plugins/gaimrc.c:586
msgid "Provides access to commonly used gtkrc settings."
msgstr "Provides access to commonly used gtkrc settings."
#. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: plugins/gestures/gestures.c:235
msgid "Mouse Gestures Configuration"
msgstr "Mouse Gestures Configuration"
-#: plugins/gestures/gestures.c:250
+#: plugins/gestures/gestures.c:242
msgid "Middle mouse button"
msgstr "Middle mouse button"
-#: plugins/gestures/gestures.c:255
+#: plugins/gestures/gestures.c:247
msgid "Right mouse button"
msgstr "Right mouse button"
#. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: plugins/gestures/gestures.c:259
msgid "_Visual gesture display"
msgstr "_Visual gesture display"
@@ -382,19 +552,19 @@ msgstr "_Visual gesture display"
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/gestures/gestures.c:296
+#: plugins/gestures/gestures.c:289
msgid "Mouse Gestures"
msgstr "Mouse Gestures"
#. *< name
#. *< version
#. * summary
-#: plugins/gestures/gestures.c:299
+#: plugins/gestures/gestures.c:292
msgid "Provides support for mouse gestures"
msgstr "Provides support for mouse gestures"
#. * description
-#: plugins/gestures/gestures.c:301
+#: plugins/gestures/gestures.c:294
msgid ""
"Allows support for mouse gestures in conversation windows.\n"
"Drag the middle mouse button to perform certain actions:\n"
@@ -411,9 +581,9 @@ msgstr ""
"Drag up and then to the right to switch to the next conversation."
#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkplugin.c:388
-#: src/gtkroomlist.c:572 src/protocols/jabber/jabber.c:638
-#: src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:119 src/gtkplugin.c:590
+#: src/gtkroomlist.c:604 src/protocols/jabber/jabber.c:686
+#: src/protocols/msn/msn.c:1524
msgid "Name"
msgstr "Name"
@@ -422,31 +592,31 @@ msgid "Instant Messaging"
msgstr "Instant Messaging"
#. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: plugins/gevolution/add_buddy_dialog.c:454
msgid "Select a person from your address book below, or add a new person."
msgstr "Select a person from your address book below, or add a new person."
#. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: plugins/gevolution/add_buddy_dialog.c:467
+#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1411
+#: src/protocols/oscar/oscar.c:8306 src/protocols/sametime/sametime.c:5433
msgid "Search"
msgstr "Search"
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: plugins/gevolution/add_buddy_dialog.c:548
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4540
+#: src/gtkblist.c:4904
msgid "Group:"
msgstr "Group:"
#. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
+#: plugins/gevolution/add_buddy_dialog.c:574
#: plugins/gevolution/assoc-buddy.c:464
msgid "New Person"
msgstr "New Person"
#. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: plugins/gevolution/add_buddy_dialog.c:591
msgid "Select Buddy"
msgstr "Select Buddy"
@@ -470,13 +640,13 @@ msgid "_Associate Buddy"
msgstr "_Associate Buddy"
#: plugins/gevolution/eds-utils.c:73 plugins/gevolution/eds-utils.c:86
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/jabber/jabber.c:1039
msgid "None"
msgstr "None"
-#: plugins/gevolution/gevolution.c:96 plugins/gevolution/gevo-util.c:64
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:516 src/blist.c:1269 src/blist.c:1494 src/gtkblist.c:4349
+#: src/protocols/jabber/roster.c:65
msgid "Buddies"
msgstr "Buddies"
@@ -501,16 +671,17 @@ msgid "Send E-Mail"
msgstr "Send E-Mail"
#. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:417
msgid "Evolution Integration Configuration"
msgstr "Evolution Integration Configuration"
#. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:420
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:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:450 plugins/idle.c:147 plugins/idle.c:183
+#: src/gtknotify.c:371 src/gtkpounce.c:1259
msgid "Account"
msgstr "Account"
@@ -520,7 +691,7 @@ msgstr "Account"
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:527
msgid "Evolution Integration"
msgstr "Evolution Integration"
@@ -528,7 +699,7 @@ msgstr "Evolution Integration"
#. *< version
#. * summary
#. * description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#: plugins/gevolution/gevolution.c:530 plugins/gevolution/gevolution.c:532
msgid "Provides integration with Evolution."
msgstr "Provides integration with Evolution."
@@ -544,28 +715,28 @@ msgstr "Please enter the buddy's screen name and account type below."
msgid "Account type:"
msgstr "Account type:"
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
-msgstr "Screenname:"
+#: plugins/gevolution/new_person_dialog.c:294 src/gtkaccount.c:767
+msgid "Screen name:"
+msgstr "Screen name:"
#. Optional Information section
#: plugins/gevolution/new_person_dialog.c:314
msgid "Optional information:"
-msgstr "Optional information"
+msgstr "Optional information:"
#. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:407
+#: src/gtkaccount.c:429 src/protocols/oscar/oscar.c:633
msgid "Buddy Icon"
msgstr "Buddy Icon"
#: plugins/gevolution/new_person_dialog.c:349
msgid "First name:"
-msgstr "First name:"
+msgstr "Forename"
#: plugins/gevolution/new_person_dialog.c:361
msgid "Last name:"
-msgstr "Last name:"
+msgstr "Surname"
#: plugins/gevolution/new_person_dialog.c:381
msgid "E-mail:"
@@ -577,7 +748,7 @@ msgstr "E-mail:"
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/gtk-signals-test.c:107
+#: plugins/gtk-signals-test.c:158
msgid "GTK Signals Test"
msgstr "GTK Signals Test"
@@ -585,15 +756,15 @@ msgstr "GTK Signals Test"
#. *< version
#. * summary
#. * description
-#: plugins/gtk-signals-test.c:110 plugins/gtk-signals-test.c:112
+#: plugins/gtk-signals-test.c:161 plugins/gtk-signals-test.c:163
msgid "Test to see that all ui signals are working properly."
msgstr "Test to see that all UI signals are working properly."
-#: plugins/history.c:146
+#: plugins/history.c:143
msgid "History Plugin Requires Logging"
-msgstr "History Plugin Requires Logging"
+msgstr "History Plug-in Requires Logging"
-#: plugins/history.c:147
+#: plugins/history.c:144
msgid ""
"Logging can be enabled from Tools -> Preferences -> Logging.\n"
"\n"
@@ -605,29 +776,21 @@ msgstr ""
"Enabling logs for instant messages and/or chats will activate history for "
"the same conversation type(s)."
-#: plugins/history.c:186
+#: plugins/history.c:184
msgid "History"
msgstr "History"
-#: plugins/history.c:188
+#: plugins/history.c:186
msgid "Shows recently logged conversations in new conversations."
msgstr "Shows recently logged conversations in new conversations."
-#: plugins/history.c:189
+#: plugins/history.c:187
msgid ""
"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
+"conversation into the current conversation."
msgstr ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
+"When a new conversation is opened this plug-in will insert the last "
+"conversation into the current conversation."
#. *< type
#. *< ui_requirement
@@ -635,7 +798,7 @@ msgstr ""
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/iconaway.c:101
+#: plugins/iconaway.c:82
msgid "Iconify on Away"
msgstr "Iconify on Away"
@@ -643,45 +806,53 @@ msgstr "Iconify on Away"
#. *< version
#. * summary
#. * description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:85 plugins/iconaway.c:87
msgid "Iconifies the buddy list and your conversations when you go away."
msgstr "Iconifies the buddy list and your conversations when you go away."
-#: plugins/idle.c:115
+#: plugins/idle.c:152 plugins/idle.c:210
msgid "Minutes"
msgstr "Minutes"
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:159 plugins/idle.c:192 plugins/idle.c:217 plugins/idle.c:306
msgid "I'dle Mak'er"
msgstr "I'dle Mak'er"
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:160 plugins/idle.c:249
msgid "Set Account Idle Time"
msgstr "Set Account Idle Time"
-#: plugins/idle.c:126
+#: plugins/idle.c:163 plugins/idle.c:221
msgid "_Set"
msgstr "_Set"
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:164 plugins/idle.c:197 plugins/idle.c:222
msgid "_Cancel"
msgstr "_Cancel"
-#: plugins/idle.c:150 plugins/idle.c:185
+#: plugins/idle.c:177
+msgid "None of your accounts are idle."
+msgstr "None of your accounts are idle."
+
+#: plugins/idle.c:193 plugins/idle.c:253
msgid "Unset Account Idle Time"
msgstr "Unset Account Idle Time"
-#: plugins/idle.c:153
+#: plugins/idle.c:196
msgid "_Unset"
msgstr "_Unset"
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
+#: plugins/idle.c:218 plugins/idle.c:257
+msgid "Set Idle Time for All Accounts"
+msgstr "Set Idle Time for All Accounts"
+
+#: plugins/idle.c:262
+msgid "Unset Idle Time for All Idled Accounts"
msgstr "Unset Idle Time For All Idled Accounts"
-#: plugins/idle.c:217 plugins/idle.c:218
+#: plugins/idle.c:308 plugins/idle.c:309
msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Allows you to hand-configure how long you've been idle"
+msgstr "Allows you to hand-configure how long you've been idle for"
#. *< type
#. *< ui_requirement
@@ -698,7 +869,7 @@ msgstr "IPC Test Client"
#. * summary
#: plugins/ipc-test-client.c:90
msgid "Test plugin IPC support, as a client."
-msgstr "Test plugin IPC support, as a client."
+msgstr "Test plug-in IPC support, as a client."
#. * description
#: plugins/ipc-test-client.c:92
@@ -706,7 +877,7 @@ msgid ""
"Test plugin IPC support, as a client. This locates the server plugin and "
"calls the commands registered."
msgstr ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
+"Test plug-in IPC support, as a client. This locates the server plug-in and "
"calls the commands registered."
#. *< type
@@ -724,12 +895,118 @@ msgstr "IPC Test Server"
#. * summary
#: plugins/ipc-test-server.c:77
msgid "Test plugin IPC support, as a server."
-msgstr "Test plugin IPC support, as a server."
+msgstr "Test plug-in IPC support, as a server."
#. * description
#: plugins/ipc-test-server.c:79
msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Test plug-in IPC support, as a server. This registers the IPC commands."
+
+#: plugins/log_reader.c:1407
+msgid "User is offline."
+msgstr "User is offline."
+
+#: plugins/log_reader.c:1413
+msgid "Auto-response sent:"
+msgstr "Auto-response sent:"
+
+#: plugins/log_reader.c:1423 plugins/log_reader.c:1426
+#, c-format
+msgid "%s logged out."
+msgstr "%s logged out."
+
+#: plugins/log_reader.c:1440
+msgid "One or more messages may have been undeliverable."
+msgstr "One or more messages may not have been delivered."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: plugins/log_reader.c:1450 src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "You were disconnected from the server."
+
+#: plugins/log_reader.c:1458
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+
+#: plugins/log_reader.c:1473
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Message could not be sent because the maximum length was exceeded."
+
+#: plugins/log_reader.c:1478
+msgid "Message could not be sent."
+msgstr "Message could not be sent."
+
+#. Add general preferences.
+#: plugins/log_reader.c:1912
+msgid "General Log Reading Configuration"
+msgstr "General Log Reading Configuration"
+
+#: plugins/log_reader.c:1916
+msgid "Fast size calculations"
+msgstr "Fast size calculations"
+
+#: plugins/log_reader.c:1920
+msgid "Use name heuristics"
+msgstr "Use name heuristics"
+
+#. Add Log Directory preferences.
+#: plugins/log_reader.c:1926
+msgid "Log Directory"
+msgstr "Log Directory"
+
+#: plugins/log_reader.c:1930
+msgid "Adium"
+msgstr "Adium"
+
+#: plugins/log_reader.c:1934
+msgid "Fire"
+msgstr "Fire"
+
+#: plugins/log_reader.c:1938
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: plugins/log_reader.c:1942
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: plugins/log_reader.c:1946
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/log_reader.c:1969
+msgid "Log Reader"
+msgstr "Log Reader"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/log_reader.c:1973
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Includes other IM clients' logs in the log viewer."
+
+#. * description
+#: plugins/log_reader.c:1977
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+"When viewing logs, this plug-in will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
#: plugins/mailchk.c:160
msgid "Mail Checker"
@@ -745,89 +1022,142 @@ msgstr "Adds a small box to the buddy list that shows if you have new mail."
#: plugins/mono/loader/mono.c:213
msgid "Mono Plugin Loader"
-msgstr "Mono Plugin Loader"
+msgstr "Mono Plug-in Loader"
#: plugins/mono/loader/mono.c:215 plugins/mono/loader/mono.c:216
msgid "Loads .NET plugins with Mono."
-msgstr "Loads .NET plugins with Mono."
+msgstr "Loads .NET plug-ins with Mono."
+
+#: plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+
+#: plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Music messaging session confirmed."
+
+#: plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "Music Messaging"
+
+#: plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "There was a conflict in running the command:"
+
+#: plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "Error Running Editor"
+
+#: plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "The following error has occurred:"
#. Configuration frame
-#: plugins/musicmessaging/musicmessaging.c:617
+#: plugins/musicmessaging/musicmessaging.c:623
msgid "Music Messaging Configuration"
msgstr "Music Messaging Configuration"
-#: plugins/musicmessaging/musicmessaging.c:622
+#: plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "Score Editor Path"
+
+#: plugins/musicmessaging/musicmessaging.c:628
msgid "_Apply"
msgstr "_Apply"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Music Messaging Plugin for collaborative composition."
+
+#. * summary
+#: plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+
#. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:632
msgid "Notify For"
msgstr "Notify For"
-#: plugins/notify.c:642
+#: plugins/notify.c:636
msgid "_IM windows"
msgstr "_IM windows"
-#: plugins/notify.c:649
+#: plugins/notify.c:643
msgid "C_hat windows"
msgstr "C_hat windows"
-#: plugins/notify.c:656
+#: plugins/notify.c:650
msgid "_Focused windows"
msgstr "_Focused windows"
#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:658
msgid "Notification Methods"
msgstr "Notification Methods"
-#: plugins/notify.c:671
+#: plugins/notify.c:665
msgid "Prepend _string into window title:"
msgstr "Prepend _string into window title:"
#. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:684
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:698
+#: plugins/notify.c:693
msgid "Set window manager \"_URGENT\" hint"
msgstr "Set window manager \"_URGENT\" hint"
#. Raise window method button
-#: plugins/notify.c:706
+#: plugins/notify.c:702
msgid "R_aise conversation window"
msgstr "R_aise conversation window"
#. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:710
msgid "Notification Removal"
msgstr "Notification Removal"
#. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:715
msgid "Remove when conversation window _gains focus"
msgstr "Remove when conversation window _gains focus"
#. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:722
msgid "Remove when conversation window _receives click"
msgstr "Remove when conversation window _receives click"
#. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:730
msgid "Remove when _typing in conversation window"
msgstr "Remove when _typing in conversation window"
#. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:738
msgid "Remove when a _message gets sent"
msgstr "Remove when a _message gets sent"
#. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:747
msgid "Remove on switch to conversation ta_b"
msgstr "Remove on switch to conversation ta_b"
@@ -837,7 +1167,7 @@ msgstr "Remove on switch to conversation ta_b"
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:836
msgid "Message Notification"
msgstr "Message Notification"
@@ -845,7 +1175,7 @@ msgstr "Message Notification"
#. *< version
#. * summary
#. * description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:839 plugins/notify.c:841
msgid "Provides a variety of ways of notifying you of unread messages."
msgstr "Provides a variety of ways of notifying you of unread messages."
@@ -855,26 +1185,56 @@ msgstr "Provides a variety of ways of notifying you of unread messages."
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/perl/perl.c:587
+#: plugins/perl/perl.c:583
msgid "Perl Plugin Loader"
-msgstr "Perl Plugin Loader"
+msgstr "Perl Plug-in Loader"
#. *< name
#. *< version
#. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: plugins/perl/perl.c:585 plugins/perl/perl.c:586
msgid "Provides support for loading perl plugins."
-msgstr "Provides support for loading perl plugins."
+msgstr "Provides support for loading perl plug-ins."
+
+#: plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "Psychic Mode"
+
+#: plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "Psychic mode for incoming conversation"
+
+#: plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you"
+msgstr ""
+"Causes conversation windows to appear as other users begin to message you"
+
+#: plugins/psychic.c:59
+msgid "You feel a disturbance in the force..."
+msgstr "You have a premonition..."
-#: plugins/raw.c:151
+#: plugins/psychic.c:76
+msgid "Only enable for users on the buddy list"
+msgstr "Only enable for users on the buddy list"
+
+#: plugins/psychic.c:81
+msgid "Disable when away"
+msgstr "Disable when away"
+
+#: plugins/psychic.c:85
+msgid "Display notification message in conversations"
+msgstr "Display notification message in conversations"
+
+#: plugins/raw.c:175
msgid "Raw"
msgstr "Raw"
-#: plugins/raw.c:153
+#: plugins/raw.c:177
msgid "Lets you send raw input to text-based protocols."
msgstr "Lets you send raw input to text-based protocols."
-#: plugins/raw.c:154
+#: plugins/raw.c:178
msgid ""
"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
"'Enter' in the entry box to send. Watch the debug window."
@@ -902,7 +1262,7 @@ msgid ""
"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
"\">http://gaim.sourceforge.net</a>."
msgstr ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"You can get version %s from <br><a href=\"http://gaim.sourceforge.net/"
"\">http://gaim.sourceforge.net</a>."
#: plugins/relnot.c:78 plugins/relnot.c:79
@@ -941,7 +1301,7 @@ msgstr ""
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/signals-test.c:730
+#: plugins/signals-test.c:671
msgid "Signals Test"
msgstr "Signals Test"
@@ -949,7 +1309,7 @@ msgstr "Signals Test"
#. *< version
#. * summary
#. * description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:674 plugins/signals-test.c:676
msgid "Test to see that all signals are working properly."
msgstr "Test to see that all signals are working properly."
@@ -961,7 +1321,7 @@ msgstr "Test to see that all signals are working properly."
#. *< id
#: plugins/simple.c:34
msgid "Simple Plugin"
-msgstr "Simple Plugin"
+msgstr "Simple Plug-in"
#. *< name
#. *< version
@@ -971,51 +1331,68 @@ msgstr "Simple Plugin"
msgid "Tests to see that most things are working."
msgstr "Tests to see that most things are working."
-#: plugins/spellchk.c:1788
+#: plugins/spellchk.c:1902
msgid "Duplicate Correction"
msgstr "Duplicate Correction"
-#: plugins/spellchk.c:1789
+#: plugins/spellchk.c:1903
msgid "The specified word already exists in the correction list."
msgstr "The specified word already exists in the correction list."
-#: plugins/spellchk.c:1948
+#: plugins/spellchk.c:2112
msgid "Text Replacements"
msgstr "Text Replacements"
-#: plugins/spellchk.c:1972
+#: plugins/spellchk.c:2135
msgid "You type"
msgstr "You type"
-#: plugins/spellchk.c:1984
+#: plugins/spellchk.c:2149
msgid "You send"
msgstr "You send"
-#: plugins/spellchk.c:1996
+#: plugins/spellchk.c:2163
msgid "Whole words only"
msgstr "Whole words only"
-#: plugins/spellchk.c:2022
+#: plugins/spellchk.c:2175
+msgid "Case sensitive"
+msgstr "Case sensitive"
+
+#: plugins/spellchk.c:2201
msgid "Add a new text replacement"
msgstr "Add a new text replacement"
-#: plugins/spellchk.c:2032
+#: plugins/spellchk.c:2217
msgid "You _type:"
msgstr "You _type:"
-#: plugins/spellchk.c:2048
+#: plugins/spellchk.c:2234
msgid "You _send:"
msgstr "You _send:"
-#: plugins/spellchk.c:2060
+#. Created here so it can be passed to whole_words_button_toggled.
+#: plugins/spellchk.c:2246
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "_Exact case match (uncheck for automatic case handling)"
+
+#: plugins/spellchk.c:2248
msgid "Only replace _whole words"
msgstr "Only replace _whole words"
-#: plugins/spellchk.c:2097
+#: plugins/spellchk.c:2273
+msgid "General Text Replacement Options"
+msgstr "General Text Replacement Options"
+
+#: plugins/spellchk.c:2274
+msgid "Enable replacement of last word on send"
+msgstr "Enable replacement of last word on send"
+
+#: plugins/spellchk.c:2299
msgid "Text replacement"
msgstr "Text replacement"
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: plugins/spellchk.c:2301 plugins/spellchk.c:2302
msgid "Replaces text in outgoing messages according to user-defined rules."
msgstr "Replaces text in outgoing messages according to user-defined rules."
@@ -1025,24 +1402,6 @@ msgstr "Replaces text in outgoing messages according to user-defined rules."
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/ssl/ssl.c:94
-msgid "SSL"
-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."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
#: plugins/ssl/ssl-gnutls.c:227
msgid "GNUTLS"
msgstr "GNUTLS"
@@ -1073,17 +1432,35 @@ msgstr "NSS"
msgid "Provides SSL support through Mozilla NSS."
msgstr "Provides SSL support through Mozilla NSS."
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s has gone away."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:94
+msgid "SSL"
+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."
#: plugins/statenotify.c:49
#, c-format
msgid "%s is no longer away."
msgstr "%s is no longer away."
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s has gone away."
+
+#: plugins/statenotify.c:61
#, c-format
msgid "%s has become idle."
msgstr "%s has become idle."
@@ -1093,25 +1470,39 @@ msgstr "%s has become idle."
msgid "%s is no longer idle."
msgstr "%s is no longer idle."
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s has signed on."
+
+#: plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s has signed off."
+
+#: plugins/statenotify.c:90
msgid "Notify When"
msgstr "Notify When"
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:93
msgid "Buddy Goes _Away"
msgstr "Buddy Goes _Away"
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:96
msgid "Buddy Goes _Idle"
msgstr "Buddy Becomes _Idle"
+#: plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "Buddy _Signs On/Off"
+
#. *< type
#. *< ui_requirement
#. *< flags
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:141
msgid "Buddy State Notification"
msgstr "Buddy State Notification"
@@ -1119,7 +1510,7 @@ msgstr "Buddy State Notification"
#. *< version
#. * summary
#. * description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:144 plugins/statenotify.c:147
msgid ""
"Notifies in a conversation window when a buddy goes or returns from away or "
"idle."
@@ -1127,13 +1518,13 @@ 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:368
msgid "Tcl Plugin Loader"
-msgstr "Tcl Plugin Loader"
+msgstr "Tcl Plug-in Loader"
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: plugins/tcl/tcl.c:370 plugins/tcl/tcl.c:371
msgid "Provides support for loading Tcl plugins"
-msgstr "Provides support for loading Tcl plugins"
+msgstr "Provides support for loading Tcl plug-ins"
#. *< type
#. *< ui_requirement
@@ -1141,7 +1532,7 @@ msgstr "Provides support for loading Tcl plugins"
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:77 plugins/ticker/ticker.c:355
msgid "Buddy Ticker"
msgstr "Buddy Ticker"
@@ -1149,19 +1540,19 @@ msgstr "Buddy Ticker"
#. *< version
#. * summary
#. * description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:358 plugins/ticker/ticker.c:360
msgid "A horizontal scrolling version of the buddy list."
msgstr "A horizontal scrolling version of the buddy list."
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:188
msgid "iChat Timestamp"
msgstr "iChat Timestamp"
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:195
msgid "Delay"
msgstr "Delay"
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:202
msgid "minutes."
msgstr "minutes."
@@ -1171,7 +1562,7 @@ msgstr "minutes."
#. *< dependencies
#. *< priority
#. *< id
-#: plugins/timestamp.c:279
+#: plugins/timestamp.c:264
msgid "Timestamp"
msgstr "Timestamp"
@@ -1179,10 +1570,64 @@ msgstr "Timestamp"
#. *< version
#. * summary
#. * description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: plugins/timestamp.c:267 plugins/timestamp.c:269
msgid "Adds iChat-style timestamps to conversations every N minutes."
msgstr "Adds iChat-style timestamps to conversations every N minutes."
+#: plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Timestamp Format Options"
+
+#: plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Force (traditional Gaim) 24-hour time format"
+
+#: plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Show dates in..."
+
+#: plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Co_nversations"
+
+#: plugins/timestamp_format.c:37 plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "For delayed messages"
+
+#: plugins/timestamp_format.c:38 plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "For delayed messages and in chats"
+
+#: plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "_Message Logs:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Message Timestamp Formats"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Customises the message timestamp formats."
+
+#. * description
+#: plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+
#: plugins/win32/transparency/win2ktrans.c:183
#: plugins/win32/transparency/win2ktrans.c:569
#: plugins/win32/transparency/win2ktrans.c:616
@@ -1249,70 +1694,62 @@ msgid ""
"\n"
"* Note: This plugin requires Win2000 or greater."
msgstr ""
-"This plugin enables variable alpha transparency on conversation windows and "
+"This plug-in enables variable alpha transparency on conversation windows and "
"the buddy list.\n"
"\n"
-"* Note: This plugin requires Win2000 or greater."
+"* Note: This plug-in requires Win2000 or greater."
-#: plugins/win32/winprefs/winprefs.c:385
+#: plugins/win32/winprefs/winprefs.c:384
msgid "GTK+ Runtime Version"
msgstr "GTK+ Runtime Version"
#. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: plugins/win32/winprefs/winprefs.c:392
msgid "Startup"
msgstr "Startup"
-#: plugins/win32/winprefs/winprefs.c:394
+#: plugins/win32/winprefs/winprefs.c:393
msgid "_Start Gaim on Windows startup"
msgstr "_Start Gaim on Windows startup"
#. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: plugins/win32/winprefs/winprefs.c:404 src/gtkblist.c:3596
msgid "Buddy List"
msgstr "Buddy List"
-#: plugins/win32/winprefs/winprefs.c:406
+#: plugins/win32/winprefs/winprefs.c:405
msgid "_Dockable Buddy List"
msgstr "_Dockable Buddy List"
#. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:409
msgid "_Keep Buddy List window on top:"
msgstr "_Keep Buddy List window on top:"
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1659
-msgid "Never"
-msgstr "Never"
-
-#: plugins/win32/winprefs/winprefs.c:413
-msgid "Always"
-msgstr "Always"
-
#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: plugins/win32/winprefs/winprefs.c:414
msgid "Only when docked"
msgstr "Only when docked"
#. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1729
+#: plugins/win32/winprefs/winprefs.c:418 src/gtkprefs.c:812
+#: src/gtkprefs.c:1857
msgid "Conversations"
msgstr "Conversations"
-#: plugins/win32/winprefs/winprefs.c:420
+#: plugins/win32/winprefs/winprefs.c:419
msgid "_Flash window when messages are received"
msgstr "_Flash window when messages are received"
-#: plugins/win32/winprefs/winprefs.c:443
+#: plugins/win32/winprefs/winprefs.c:442
msgid "WinGaim Options"
msgstr "WinGaim Options"
-#: plugins/win32/winprefs/winprefs.c:445
+#: plugins/win32/winprefs/winprefs.c:444
msgid "Options specific to Windows Gaim."
msgstr "Options specific to Windows Gaim."
-#: plugins/win32/winprefs/winprefs.c:446
+#: plugins/win32/winprefs/winprefs.c:445
msgid ""
"Provides options specific to Windows Gaim, such as buddy list docking and "
"conversation flashing."
@@ -1324,154 +1761,162 @@ msgstr ""
msgid "accounts"
msgstr "accounts"
-#: src/account.c:915
+#: src/account.c:923
msgid "Password is required to sign on."
msgstr "Password is required to sign on."
-#: src/account.c:940
+#: src/account.c:948
#, c-format
msgid "Enter password for %s (%s)"
msgstr "Enter password for %s (%s)"
-#: src/account.c:947
+#: src/account.c:955
msgid "Enter Password"
msgstr "Enter Password"
-#: src/account.c:952
+#: src/account.c:960
msgid "Save password"
msgstr "Save password"
#. *
#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:509
-#: src/gtkdialogs.c:650 src/gtkdialogs.c:706 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
+#: src/account.c:968 src/account.c:1139 src/gtkdialogs.c:570
+#: src/gtkdialogs.c:707 src/gtkdialogs.c:775 src/gtkrequest.c:287
+#: src/protocols/gg/gg.c:454 src/protocols/gg/gg.c:595
+#: src/protocols/gg/gg.c:731 src/protocols/jabber/jabber.c:1236
#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:4519 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:8037 src/protocols/oscar/oscar.c:8160
+#: src/protocols/oscar/oscar.c:8185 src/protocols/oscar/oscar.c:8237
+#: src/protocols/silc/buddy.c:466 src/protocols/silc/buddy.c:1182
+#: src/protocols/silc/chat.c:423 src/protocols/silc/chat.c:461
+#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1910 src/protocols/silc/silc.c:749
+#: src/protocols/yahoo/yahoo.c:3010 src/protocols/yahoo/yahoo.c:3019
+#: src/request.h:1340
msgid "OK"
msgstr "OK"
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:510 src/gtkdialogs.c:651 src/gtkdialogs.c:707
-#: src/gtkdialogs.c:726 src/gtkdialogs.c:748 src/gtkdialogs.c:768
-#: src/gtkdialogs.c:812 src/gtkdialogs.c:874 src/gtkdialogs.c:916
-#: src/gtkdialogs.c:958 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
+#: src/account.c:969 src/account.c:1140 src/account.c:1177
+#: src/gtkaccount.c:2154 src/gtkaccount.c:2621 src/gtkblist.c:4945
+#: src/gtkdialogs.c:571 src/gtkdialogs.c:708 src/gtkdialogs.c:776
+#: src/gtkdialogs.c:795 src/gtkdialogs.c:817 src/gtkdialogs.c:837
+#: src/gtkdialogs.c:881 src/gtkdialogs.c:936 src/gtkdialogs.c:973
+#: src/gtkdialogs.c:998 src/gtkimhtmltoolbar.c:419 src/gtkplugin.c:297
+#: src/gtkpounce.c:1092 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:288
+#: src/gtksavedstatuses.c:307 src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:596 src/protocols/gg/gg.c:732
+#: src/protocols/gg/gg.c:812 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1412 src/protocols/jabber/buddy.c:1446
+#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:755
+#: src/protocols/jabber/jabber.c:1237 src/protocols/jabber/xdata.c:338
#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1641
+#: src/protocols/oscar/oscar.c:2987 src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4520 src/protocols/oscar/oscar.c:4557
+#: src/protocols/oscar/oscar.c:4601 src/protocols/oscar/oscar.c:8038
+#: src/protocols/oscar/oscar.c:8161 src/protocols/oscar/oscar.c:8186
+#: src/protocols/oscar/oscar.c:8238 src/protocols/oscar/oscar.c:8307
+#: src/protocols/sametime/sametime.c:3323
+#: src/protocols/sametime/sametime.c:3408
+#: src/protocols/sametime/sametime.c:3536
+#: src/protocols/sametime/sametime.c:5221
+#: src/protocols/sametime/sametime.c:5310
+#: src/protocols/sametime/sametime.c:5434 src/protocols/silc/buddy.c:467
+#: src/protocols/silc/buddy.c:1078 src/protocols/silc/buddy.c:1183
+#: src/protocols/silc/chat.c:596 src/protocols/silc/chat.c:725
+#: src/protocols/silc/ops.c:1911 src/protocols/silc/silc.c:750
+#: src/protocols/silc/silc.c:955 src/protocols/yahoo/yahoo.c:3011
+#: src/protocols/yahoo/yahoo.c:3020 src/request.h:1340 src/request.h:1350
msgid "Cancel"
msgstr "Cancel"
-#: src/account.c:986 src/connection.c:96
+#: src/account.c:994 src/connection.c:96
#, c-format
msgid "Missing protocol plugin for %s"
-msgstr "Missing protocol plugin for %s"
+msgstr "Missing protocol plug-in for %s"
-#: src/account.c:988 src/connection.c:99
+#: src/account.c:996 src/connection.c:99 src/gtkblist.c:3484
msgid "Connection Error"
msgstr "Connection Error"
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: src/account.c:1076 src/protocols/gg/gg.c:636
+#: src/protocols/jabber/jabber.c:1189
msgid "New passwords do not match."
msgstr "New passwords do not match."
-#: src/account.c:1061
+#: src/account.c:1085
msgid "Fill out all fields completely."
msgstr "Fill out all fields completely."
-#: src/account.c:1085
+#: src/account.c:1108
msgid "Original password"
msgstr "Original password"
-#: src/account.c:1092
+#: src/account.c:1115
msgid "New password"
msgstr "New password"
-#: src/account.c:1099
+#: src/account.c:1122
msgid "New password (again)"
msgstr "New password (again)"
-#: src/account.c:1105
+#: src/account.c:1128
#, c-format
msgid "Change password for %s"
msgstr "Change password for %s"
-#: src/account.c:1113
+#: src/account.c:1136
msgid "Please enter your current password and your new password."
msgstr "Please enter your current password and your new password."
-#: src/account.c:1146
+#: src/account.c:1169
#, c-format
msgid "Change user information for %s"
msgstr "Change user information for %s"
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/account.c:1176 src/gtkdebug.c:684 src/gtkrequest.c:294
#: src/protocols/jabber/buddy.c:572
msgid "Save"
msgstr "Save"
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/account.c:1671 src/gtkft.c:157 src/protocols/jabber/buddy.c:630
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/buddy.c:1112
+#: src/protocols/novell/novell.c:2860
msgid "Unknown"
msgstr "Unknown"
-#: src/blist.c:545
+#: src/blist.c:543
msgid "buddy list"
msgstr "buddy list"
-#: src/blist.c:1162
+#: src/blist.c:1172
msgid "Chats"
msgstr "Chats"
-#: src/blist.c:1863
+#: src/blist.c:1885
#, c-format
msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in. This buddy and the group were not removed.\n"
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline. This buddy and the group were not removed.\n"
msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in. These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline. These buddies and the group were "
+"not removed.\n"
msgstr[0] ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in. This buddy and the group were not removed.\n"
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline. This buddy and the group were not removed.\n"
msgstr[1] ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in. These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline. These buddies and the group were "
+"not removed.\n"
-#: src/blist.c:1872
+#: src/blist.c:1895
msgid "Group not removed"
msgstr "Group not removed"
@@ -1479,68 +1924,68 @@ msgstr "Group not removed"
msgid "Registration Error"
msgstr "Registration Error"
-#: src/conversation.c:205
+#: src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s signed on"
+
+#: src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s signed off"
+
+#: src/conversation.c:182
msgid "Unable to send message: The message is too large."
msgstr "Unable to send message: The message is too large."
-#: src/conversation.c:208 src/conversation.c:221
+#: src/conversation.c:185 src/conversation.c:198
#, c-format
msgid "Unable to send message to %s."
msgstr "Unable to send message to %s."
-#: src/conversation.c:209
+#: src/conversation.c:186
msgid "The message is too large."
msgstr "The message is too large."
-#: src/conversation.c:218
+#: src/conversation.c:195
msgid "Unable to send message."
msgstr "Unable to send message."
-#: src/conversation.c:1498
+#: src/conversation.c:1510
#, c-format
msgid "%s entered the room."
msgstr "%s entered the room."
-#: src/conversation.c:1500
+#: src/conversation.c:1513
#, c-format
msgid "%s [<I>%s</I>] entered the room."
msgstr "%s [<I>%s</I>] entered the room."
-#: src/conversation.c:1603
+#: src/conversation.c:1620
#, c-format
msgid "You are now known as %s"
msgstr "You are now known as %s"
-#: src/conversation.c:1618
+#: src/conversation.c:1640
#, c-format
msgid "%s is now known as %s"
msgstr "%s is now known as %s"
-#: src/conversation.c:1674
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s left the room (%s)."
-
-#: src/conversation.c:1676
+#: src/conversation.c:1713
#, c-format
msgid "%s left the room."
msgstr "%s left the room."
-#: src/conversation.c:1753
+#: src/conversation.c:1716
#, c-format
-msgid "(+%d more)"
-msgstr "(+%d more)"
-
-#: src/conversation.c:1755
-#, c-format
-msgid " left the room (%s)."
-msgstr " left the room (%s)."
+msgid "%s left the room (%s)."
+msgstr "%s left the room (%s)."
#: src/desktopitem.c:286 src/desktopitem.c:875
msgid "No name"
msgstr "No name"
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: src/ft.c:189 src/protocols/msn/msn.c:412
#, c-format
msgid ""
"Error reading %s: \n"
@@ -1549,7 +1994,7 @@ msgstr ""
"Error reading %s: \n"
"%s.\n"
-#: src/ft.c:192
+#: src/ft.c:193
#, c-format
msgid ""
"Error writing %s: \n"
@@ -1558,7 +2003,7 @@ msgstr ""
"Error writing %s: \n"
"%s.\n"
-#: src/ft.c:196
+#: src/ft.c:197
#, c-format
msgid ""
"Error accessing %s: \n"
@@ -1567,35 +2012,35 @@ msgstr ""
"Error accessing %s: \n"
"%s.\n"
-#: src/ft.c:229
+#: src/ft.c:230
msgid "Cannot send a file of 0 bytes."
msgstr "Cannot send a file of 0 bytes."
-#: src/ft.c:239
+#: src/ft.c:240
msgid "Cannot send a directory."
msgstr "Cannot send a directory."
-#: src/ft.c:248
+#: src/ft.c:249
#, c-format
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:306
+#: src/ft.c:307
#, c-format
msgid "%s wants to send you %s (%s)"
msgstr "%s wants to send you %s (%s)"
-#: src/ft.c:313
+#: src/ft.c:314
#, c-format
msgid "%s wants to send you a file"
msgstr "%s wants to send you a file"
-#: src/ft.c:354
+#: src/ft.c:355
#, c-format
msgid "Accept file transfer request from %s?"
msgstr "Accept file transfer request from %s?"
-#: src/ft.c:358
+#: src/ft.c:359
#, c-format
msgid ""
"A file is available for download from:\n"
@@ -1606,65 +2051,65 @@ msgstr ""
"Remote host: %s\n"
"Remote port: %d"
-#: src/ft.c:382
+#: src/ft.c:383
#, c-format
msgid "%s is offering to send file %s"
msgstr "%s is offering to send file %s"
-#: src/ft.c:422
+#: src/ft.c:427
#, c-format
msgid "%s is not a valid filename.\n"
msgstr "%s is not a valid filename.\n"
-#: src/ft.c:443
+#: src/ft.c:448
#, c-format
msgid "Offering to send %s to %s"
msgstr "Offering to send %s to %s"
-#: src/ft.c:454
+#: src/ft.c:459
#, c-format
msgid "Starting transfer of %s from %s"
msgstr "Starting transfer of %s from %s"
-#: src/ft.c:608
+#: src/ft.c:613
#, c-format
msgid "Transfer of file %s complete"
msgstr "Transfer of file %s complete"
-#: src/ft.c:611
+#: src/ft.c:616
msgid "File transfer complete"
msgstr "File transfer complete"
-#: src/ft.c:995
+#: src/ft.c:1007
#, c-format
msgid "You canceled the transfer of %s"
msgstr "You cancelled the transfer of %s"
-#: src/ft.c:1000
+#: src/ft.c:1012
msgid "File transfer cancelled"
msgstr "File transfer cancelled"
-#: src/ft.c:1057
+#: src/ft.c:1069
#, c-format
msgid "%s canceled the transfer of %s"
msgstr "%s cancelled the transfer of %s"
-#: src/ft.c:1062
+#: src/ft.c:1074
#, c-format
msgid "%s canceled the file transfer"
msgstr "%s cancelled the file transfer"
-#: src/ft.c:1119
+#: src/ft.c:1131
#, c-format
msgid "File transfer to %s failed."
msgstr "File transfer to %s failed."
-#: src/ft.c:1121
+#: src/ft.c:1133
#, c-format
msgid "File transfer from %s failed."
msgstr "File transfer from %s failed."
-#: src/gtkaccount.c:362
+#: src/gtkaccount.c:357
#, c-format
msgid ""
"<b>File:</b> %s\n"
@@ -1676,176 +2121,162 @@ msgstr ""
"<b>Image size:</b> %dx%d"
#. Build the login options frame.
-#: src/gtkaccount.c:730
+#: src/gtkaccount.c:745
msgid "Login Options"
msgstr "Login Options"
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: src/gtkaccount.c:762 src/gtkft.c:640
msgid "Protocol:"
msgstr "Protocol:"
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Screen Name:"
-
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:841
msgid "Password:"
msgstr "Password:"
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: src/gtkaccount.c:846 src/gtkblist.c:4523 src/gtkblist.c:4889
msgid "Alias:"
msgstr "Alias:"
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:850
msgid "Remember password"
msgstr "Remember password"
#. Build the user options frame.
-#: src/gtkaccount.c:879
+#: src/gtkaccount.c:902
msgid "User Options"
msgstr "User Options"
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:915
msgid "New mail notifications"
msgstr "New mail notifications"
-#: src/gtkaccount.c:901
+#: src/gtkaccount.c:924
msgid "Buddy icon:"
msgstr "Buddy icon:"
#. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: src/gtkaccount.c:1015
#, c-format
msgid "%s Options"
msgstr "%s Options"
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: src/gtkaccount.c:1216
msgid "Use Global Proxy Settings"
msgstr "Use Global Proxy Settings"
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: src/gtkaccount.c:1222
msgid "No Proxy"
msgstr "No Proxy"
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: src/gtkaccount.c:1228
msgid "HTTP"
msgstr "HTTP"
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: src/gtkaccount.c:1234
msgid "SOCKS 4"
msgstr "SOCKS 4"
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: src/gtkaccount.c:1240
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1008
+#: src/gtkaccount.c:1246 src/gtkprefs.c:1036
msgid "Use Environmental Settings"
msgstr "Use Environmental Settings"
-#: src/gtkaccount.c:1249
+#: src/gtkaccount.c:1280
msgid "you can see the butterflies mating"
msgstr "you can see the butterflies mating"
-#: src/gtkaccount.c:1253
+#: src/gtkaccount.c:1284
msgid "If you look real closely"
msgstr "If you look real closely"
-#: src/gtkaccount.c:1269
+#: src/gtkaccount.c:1300
msgid "Proxy Options"
msgstr "Proxy Options"
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1002
+#: src/gtkaccount.c:1314 src/gtkprefs.c:1030
msgid "Proxy _type:"
msgstr "Proxy _type:"
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1023
+#: src/gtkaccount.c:1323 src/gtkprefs.c:1051
msgid "_Host:"
msgstr "_Host:"
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1041
+#: src/gtkaccount.c:1327 src/gtkprefs.c:1069
msgid "_Port:"
msgstr "_Port:"
-#: src/gtkaccount.c:1308
+#: src/gtkaccount.c:1335
msgid "_Username:"
msgstr "_Username:"
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1078
+#: src/gtkaccount.c:1341 src/gtkprefs.c:1106
msgid "Pa_ssword:"
msgstr "Pa_ssword:"
-#: src/gtkaccount.c:1700
+#: src/gtkaccount.c:1719
msgid "Add Account"
msgstr "Add Account"
-#: src/gtkaccount.c:1702
+#: src/gtkaccount.c:1721
msgid "Modify Account"
msgstr "Modify Account"
+#: src/gtkaccount.c:1743
+msgid "_Basic"
+msgstr "_Basic"
+
+#: src/gtkaccount.c:1754
+msgid "_Advanced"
+msgstr "_Advanced"
+
#. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1769 src/protocols/jabber/jabber.c:754
msgid "Register"
msgstr "Register"
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: src/gtkaccount.c:2148 src/gtksavedstatuses.c:304
#, c-format
msgid "Are you sure you want to delete %s?"
msgstr "Are you sure you want to delete %s?"
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: src/gtkaccount.c:2153 src/gtkpounce.c:1091 src/gtkrequest.c:291
+#: src/gtksavedstatuses.c:306
msgid "Delete"
msgstr "Delete"
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: src/gtkaccount.c:2211 src/gtksavedstatuses.c:887
+#: src/protocols/oscar/oscar.c:5164
msgid "Screen Name"
msgstr "Screen Name"
-#: src/gtkaccount.c:2210 src/gtkplugin.c:378
-msgid "Enabled"
-msgstr "Enabled"
-
-#: src/gtkaccount.c:2218
+#: src/gtkaccount.c:2242
msgid "Protocol"
msgstr "Protocol"
-#: src/gtkaccount.c:2550
+#: src/gtkaccount.c:2569
#, 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:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s has made %s his or her buddy%s%s"
-#: src/gtkaccount.c:2572
+#: src/gtkaccount.c:2618
msgid "Add buddy to your list?"
msgstr "Add buddy to your list?"
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1529
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2620 src/gtkblist.c:4944 src/gtkconv.c:1616
+#: src/gtkrequest.c:292 src/protocols/gg/gg.c:811
+#: src/protocols/oscar/oscar.c:4789 src/protocols/sametime/sametime.c:5309
+#: src/protocols/silc/chat.c:595
msgid "Add"
msgstr "Add"
-#: src/gtkblist.c:595
+#: src/gtkblist.c:678
msgid "Join a Chat"
msgstr "Join a Chat"
-#: src/gtkblist.c:616
+#: src/gtkblist.c:699
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
@@ -1853,216 +2284,217 @@ msgstr ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:710 src/gtkpounce.c:527 src/gtkroomlist.c:377
msgid "_Account:"
msgstr "_Account:"
-#: src/gtkblist.c:935
+#: src/gtkblist.c:954
msgid "Get _Info"
msgstr "Get _Info"
-#: src/gtkblist.c:938
+#: src/gtkblist.c:957 src/gtkstock.c:141
msgid "I_M"
msgstr "I_M"
-#: src/gtkblist.c:944
+#: src/gtkblist.c:963
msgid "_Send File"
msgstr "_Send File"
-#: src/gtkblist.c:950
+#: src/gtkblist.c:971
+msgid "Start _Voice Chat"
+msgstr "Start _Voice Chat"
+
+#: src/gtkblist.c:977
msgid "Add Buddy _Pounce"
msgstr "Add Buddy _Pounce"
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: src/gtkblist.c:981 src/gtkblist.c:985 src/gtkblist.c:1084
+#: src/gtkblist.c:1107
msgid "View _Log"
msgstr "View _Log"
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "_Alias Buddy..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "_Remove Buddy"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "Alias Contact..."
+#: src/gtkblist.c:996
+msgid "Alias..."
+msgstr "Alias..."
-#: src/gtkblist.c:976 src/gtkdialogs.c:810 src/gtkdialogs.c:811
-msgid "Remove Contact"
-msgstr "Remove Contact"
+#: src/gtkblist.c:999 src/gtkconv.c:1613 src/gtkrequest.c:293
+msgid "Remove"
+msgstr "Remove"
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1005 src/gtkblist.c:1092 src/gtkblist.c:1113
msgid "_Alias..."
msgstr "_Alias..."
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:1007 src/gtkblist.c:1094 src/gtkblist.c:1115
msgid "_Remove"
msgstr "_Remove"
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1055
msgid "Add a _Buddy"
msgstr "Add a _Buddy"
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1057
msgid "Add a C_hat"
msgstr "Add a C_hat"
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1060
msgid "_Delete Group"
msgstr "_Delete Group"
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1062
msgid "_Rename"
msgstr "_Rename"
#. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: src/gtkblist.c:1080 src/gtkroomlist.c:285 src/gtkroomlist.c:441
+#: src/gtkstock.c:139
msgid "_Join"
msgstr "_Join"
-#: src/gtkblist.c:1054
+#: src/gtkblist.c:1082
msgid "Auto-Join"
msgstr "Auto-Join"
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1120 src/gtkblist.c:1143
msgid "_Collapse"
msgstr "_Collapse"
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1148
msgid "_Expand"
msgstr "_Expand"
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
+#: src/gtkblist.c:1426 src/gtkblist.c:1438 src/gtkblist.c:3741
+#: src/gtkblist.c:3751
msgid "/Tools/Mute Sounds"
msgstr "/Tools/Mute Sounds"
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+#: src/gtkblist.c:1901 src/gtkconv.c:4203 src/gtkpounce.c:426
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:2329
+#: src/gtkblist.c:2475
msgid "/_Buddies"
msgstr "/_Buddies"
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2476
msgid "/Buddies/New Instant _Message..."
msgstr "/Buddies/New Instant _Message..."
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2477
msgid "/Buddies/Join a _Chat..."
msgstr "/Buddies/Join a _Chat..."
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2478
msgid "/Buddies/Get User _Info..."
msgstr "/Buddies/Get User _Info..."
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2479
msgid "/Buddies/View User _Log..."
msgstr "/Buddies/View User _Log..."
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2481
msgid "/Buddies/Show _Offline Buddies"
msgstr "/Buddies/Show _Offline Buddies"
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2482
msgid "/Buddies/Show _Empty Groups"
msgstr "/Buddies/Show _Empty Groups"
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2483
msgid "/Buddies/Show Buddy _Details"
msgstr "/Buddies/Show Buddy _Details"
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-msgid "/Buddies/Sort Buddies"
-msgstr "/Buddies/Sort Buddies"
+#: src/gtkblist.c:2484
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Buddies/Show Idle _Times"
+
+#: src/gtkblist.c:2485
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Buddies/_Sort Buddies"
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2487
msgid "/Buddies/_Add Buddy..."
msgstr "/Buddies/_Add Buddy..."
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2488
msgid "/Buddies/Add C_hat..."
msgstr "/Buddies/Add C_hat..."
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2489
msgid "/Buddies/Add _Group..."
msgstr "/Buddies/Add _Group..."
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2491
msgid "/Buddies/_Quit"
msgstr "/Buddies/_Quit"
+#. Accounts menu
+#: src/gtkblist.c:2494
+msgid "/_Accounts"
+msgstr "/_Accounts"
+
+#: src/gtkblist.c:2495 src/gtkblist.c:5523
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Accounts/Add\\/Edit"
+
#. Tools
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2498
msgid "/_Tools"
msgstr "/_Tools"
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Tools/Buddy _Pounce"
+#: src/gtkblist.c:2499
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Tools/Buddy _Pounces"
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/Tools/Account Ac_tions"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/Tools/A_ccounts"
+#: src/gtkblist.c:2500
+msgid "/Tools/Plu_gins"
+msgstr "/Tools/Plu_gins"
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2501
msgid "/Tools/Pr_eferences"
msgstr "/Tools/Pr_eferences"
-#: src/gtkblist.c:2353
-msgid "/Tools/Plu_gins"
-msgstr "/Tools/Plu_gins"
-
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2502
msgid "/Tools/Pr_ivacy"
msgstr "/Tools/Pr_ivacy"
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2504
msgid "/Tools/_File Transfers"
msgstr "/Tools/_File Transfers"
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2505
msgid "/Tools/R_oom List"
msgstr "/Tools/R_oom List"
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2506
+msgid "/Tools/System _Log"
+msgstr "/Tools/System _Log"
+
+#: src/gtkblist.c:2508
msgid "/Tools/Mute _Sounds"
msgstr "/Tools/Mute _Sounds"
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/Tools/View System _Log"
-
#. Help
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2511
msgid "/_Help"
msgstr "/_Help"
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2512
msgid "/Help/Online _Help"
msgstr "/Help/Online _Help"
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2513
msgid "/Help/_Debug Window"
msgstr "/Help/_Debug Window"
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2514
msgid "/Help/_About"
msgstr "/Help/_About"
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: src/gtkblist.c:2546 src/gtkblist.c:2615
#, c-format
msgid ""
"\n"
@@ -2071,25 +2503,16 @@ msgstr ""
"\n"
"<b>Account:</b> %s"
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2626
#, c-format
msgid ""
"\n"
-"<b>Contact Alias:</b> %s"
+"<b>Buddy Alias:</b> %s"
msgstr ""
"\n"
-"<b>Contact Alias:</b> %s"
+"<b>Buddy Alias:</b> %s"
-#: src/gtkblist.c:2481
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias:</b> %s"
-
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2638
#, c-format
msgid ""
"\n"
@@ -2098,7 +2521,7 @@ msgstr ""
"\n"
"<b>Nickname:</b> %s"
-#: src/gtkblist.c:2498
+#: src/gtkblist.c:2647
#, c-format
msgid ""
"\n"
@@ -2107,7 +2530,7 @@ msgstr ""
"\n"
"<b>Logged In:</b> %s"
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2658
#, c-format
msgid ""
"\n"
@@ -2116,7 +2539,7 @@ msgstr ""
"\n"
"<b>Idle:</b> %s"
-#: src/gtkblist.c:2546
+#: src/gtkblist.c:2693
#, c-format
msgid ""
"\n"
@@ -2125,7 +2548,7 @@ msgstr ""
"\n"
"<b>Last Seen:</b> %s ago"
-#: src/gtkblist.c:2554
+#: src/gtkblist.c:2702
msgid ""
"\n"
"<b>Status:</b> Offline"
@@ -2133,7 +2556,7 @@ msgstr ""
"\n"
"<b>Status:</b> Offline"
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2713
msgid ""
"\n"
"<b>Description:</b> Spooky"
@@ -2141,7 +2564,7 @@ msgstr ""
"\n"
"<b>Description:</b> Spooky"
-#: src/gtkblist.c:2579
+#: src/gtkblist.c:2715
msgid ""
"\n"
"<b>Status:</b> Awesome"
@@ -2149,7 +2572,7 @@ msgstr ""
"\n"
"<b>Status:</b> Awesome"
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2717
msgid ""
"\n"
"<b>Status:</b> Rockin'"
@@ -2157,102 +2580,116 @@ msgstr ""
"\n"
"<b>Status:</b> Rockin'"
-#: src/gtkblist.c:2843
+#: src/gtkblist.c:3006
#, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Idle (%dh %02dm) "
+msgid "Idle %dh %02dm"
+msgstr "Idle %dh %02dm"
-#: src/gtkblist.c:2845
+#: src/gtkblist.c:3008
#, c-format
-msgid "Idle (%dm) "
-msgstr "Idle (%dm) "
+msgid "Idle %dm"
+msgstr "Idle %dm"
-#: src/gtkblist.c:2848
-msgid "Idle "
+#. Idle stuff
+#: src/gtkblist.c:3011 src/gtkprefs.c:1738 src/protocols/bonjour/bonjour.c:333
+#: src/protocols/msn/msn.c:552 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2854 src/protocols/oscar/oscar.c:5185
+#: src/protocols/yahoo/yahoo.c:2678 src/protocols/yahoo/yahoo_profile.c:691
+msgid "Idle"
msgstr "Idle"
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "Offline "
-
-#: src/gtkblist.c:2968
+#: src/gtkblist.c:3135
msgid "/Buddies/New Instant Message..."
msgstr "/Buddies/New Instant Message..."
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+#: src/gtkblist.c:3136 src/gtkblist.c:3169
msgid "/Buddies/Join a Chat..."
msgstr "/Buddies/Join a Chat..."
-#: src/gtkblist.c:2970
+#: src/gtkblist.c:3137
msgid "/Buddies/Get User Info..."
msgstr "/Buddies/Get User Info..."
-#: src/gtkblist.c:2971
+#: src/gtkblist.c:3138
msgid "/Buddies/Add Buddy..."
msgstr "/Buddies/Add Buddy..."
-#: src/gtkblist.c:2972
+#: src/gtkblist.c:3139 src/gtkblist.c:3172
msgid "/Buddies/Add Chat..."
msgstr "/Buddies/Add Chat..."
-#: src/gtkblist.c:2973
+#: src/gtkblist.c:3140
msgid "/Buddies/Add Group..."
msgstr "/Buddies/Add Group..."
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/Tools/Room List"
+#: src/gtkblist.c:3175
+msgid "/Tools/Buddy Pounces"
+msgstr "/Tools/Buddy Pounces"
-#: src/gtkblist.c:3009
+#: src/gtkblist.c:3178
msgid "/Tools/Privacy"
msgstr "/Tools/Privacy"
-#: src/gtkblist.c:3085
+#: src/gtkblist.c:3181
+msgid "/Tools/Room List"
+msgstr "/Tools/Room List"
+
+#: src/gtkblist.c:3375
msgid "Manually"
msgstr "Manually"
-#: src/gtkblist.c:3087
+#: src/gtkblist.c:3377
msgid "Alphabetically"
msgstr "Alphabetically"
-#: src/gtkblist.c:3088
+#: src/gtkblist.c:3378
msgid "By status"
msgstr "By status"
-#: src/gtkblist.c:3089
+#: src/gtkblist.c:3379
msgid "By log size"
msgstr "By log size"
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Tools/Buddy Pounce"
+#: src/gtkblist.c:3481 src/gtkconn.c:191
+#, c-format
+msgid "%s disconnected"
+msgstr "%s disconnected"
+
+#: src/gtkblist.c:3503
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s disconnected: %s</span>"
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/Tools/Account Actions"
+#: src/gtkblist.c:3630
+msgid "/Accounts"
+msgstr "/Accounts"
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
#.
-#: src/gtkblist.c:3322
+#: src/gtkblist.c:3735
msgid "/Buddies/Show Offline Buddies"
msgstr "/Buddies/Show Offline Buddies"
-#: src/gtkblist.c:3324
+#: src/gtkblist.c:3738
msgid "/Buddies/Show Empty Groups"
msgstr "/Buddies/Show Empty Groups"
-#: src/gtkblist.c:3328
+#: src/gtkblist.c:3744
msgid "/Buddies/Show Buddy Details"
msgstr "/Buddies/Show Buddy Details"
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+#: src/gtkblist.c:3747
+msgid "/Buddies/Show Idle Times"
+msgstr "/Buddies/Show Idle Times"
+
+#: src/gtkblist.c:4456 src/protocols/silc/buddy.c:736
+#: src/protocols/silc/buddy.c:1030 src/protocols/silc/buddy.c:1075
+#: src/protocols/silc/buddy.c:1174 src/protocols/yahoo/yahoo.c:2925
msgid "Add Buddy"
msgstr "Add Buddy"
-#: src/gtkblist.c:4029
+#: src/gtkblist.c:4480
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. "
@@ -2262,16 +2699,20 @@ msgstr ""
"buddy list. You may optionally enter an alias, or nickname, for the buddy. "
"The alias will be displayed in place of the screen name whenever possible.\n"
+#: src/gtkblist.c:4502
+msgid "Screen Name:"
+msgstr "Screen Name:"
+
#. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: src/gtkblist.c:4550 src/gtkblist.c:4869
msgid "Account:"
msgstr "Account:"
-#: src/gtkblist.c:4357
+#: src/gtkblist.c:4802
msgid "This protocol does not support chat rooms."
msgstr "This protocol does not support chat rooms."
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4818
msgid ""
"You are not currently signed on with any protocols that have the ability to "
"chat."
@@ -2279,11 +2720,11 @@ msgstr ""
"You are not currently signed on with any protocols that have the ability to "
"chat."
-#: src/gtkblist.c:4390
+#: src/gtkblist.c:4835
msgid "Add Chat"
msgstr "Add Chat"
-#: src/gtkblist.c:4414
+#: src/gtkblist.c:4859
msgid ""
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
@@ -2291,50 +2732,136 @@ 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:4493
+#: src/gtkblist.c:4941 src/protocols/sametime/sametime.c:5220
+#: src/protocols/sametime/sametime.c:5307
msgid "Add Group"
msgstr "Add Group"
-#: src/gtkblist.c:4494
+#: src/gtkblist.c:4942
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:5025
+#: src/gtkblist.c:5563
+msgid "_Edit Account"
+msgstr "_Edit Account"
+
+#: src/gtkblist.c:5596 src/gtkblist.c:5602
msgid "No actions available"
msgstr "No actions available"
-#: src/gtkblist.c:5094
+#: src/gtkblist.c:5610
+msgid "_Disable"
+msgstr "_Disable"
+
+#: src/gtkblist.c:5622
+msgid "Enable Account"
+msgstr "Enable Account"
+
+#: src/gtkblist.c:5675
msgid "/Tools"
msgstr "/Tools"
-#: src/gtkconn.c:190
-#, c-format
-msgid "%s disconnected"
-msgstr "%s disconnected"
+#: src/gtkblist.c:5770
+msgid "/Buddies/Sort Buddies"
+msgstr "/Buddies/Sort Buddies"
+
+#: src/gtkcellview.c:198
+msgid "Background color name"
+msgstr "Background colour name"
+
+#: src/gtkcellview.c:199
+msgid "Background color as a string"
+msgstr "Background colour as a string"
+
+#: src/gtkcellview.c:205 src/gtkimhtmltoolbar.c:1014
+msgid "Background color"
+msgstr "Background colour"
+
+#: src/gtkcellview.c:206
+msgid "Background color as a GdkColor"
+msgstr "Background colour as a GdkColor"
+
+#: src/gtkcellview.c:213
+msgid "Background set"
+msgstr "Background set"
+
+#: src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr "Whether this tag affects the background colour"
+
+#: src/gtkcombobox.c:490
+msgid "ComboBox model"
+msgstr "ComboBox model"
+
+#: src/gtkcombobox.c:491
+msgid "The model for the combo box"
+msgstr "The model for the combo box"
+
+#: src/gtkcombobox.c:498
+msgid "Wrap width"
+msgstr "Wrap width"
+
+#: src/gtkcombobox.c:499
+msgid "Wrap width for layouting the items in a grid"
+msgstr "Wrap width for layouting the items in a grid"
+
+#: src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr "Row span column"
+
+#: src/gtkcombobox.c:509
+msgid "TreeModel column containing the row span values"
+msgstr "TreeModel column containing the row span values"
+
+#: src/gtkcombobox.c:518
+msgid "Column span column"
+msgstr "Column span column"
+
+#: src/gtkcombobox.c:520
+msgid "TreeModel column containing the column span values"
+msgstr "TreeModel column containing the column span values"
+
+#: src/gtkcombobox.c:529
+msgid "Active item"
+msgstr "Active item"
+
+#: src/gtkcombobox.c:530
+msgid "The item which is currently active"
+msgstr "The item which is currently active"
+
+#: src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr "Appears as list"
-#: src/gtkconn.c:191
+#: src/gtkcombobox.c:539
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr "Whether combobox dropdowns should look like lists rather than menus"
+
+#: src/gtkconn.c:192
#, c-format
msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
msgstr ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"%s was disconnected due to an error. %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
-#: src/gtkconv.c:325
+#: src/gtkconv.c:364
#, c-format
msgid "me is using Gaim v%s."
msgstr "me is using Gaim v%s."
-#: src/gtkconv.c:334
+#: src/gtkconv.c:373
msgid "Supported debug options are: version"
msgstr "Supported debug options are: version"
-#: src/gtkconv.c:371
+#: src/gtkconv.c:409
msgid "No such command (in this context)."
msgstr "No such command (in this context)."
-#: src/gtkconv.c:374
+#: src/gtkconv.c:412
msgid ""
"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
"The following commands are available in this context:\n"
@@ -2342,47 +2869,47 @@ msgstr ""
"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
"The following commands are available in this context:\n"
-#: src/gtkconv.c:446
+#: src/gtkconv.c:484
msgid "No such command."
msgstr "No such command."
-#: src/gtkconv.c:453
+#: src/gtkconv.c:491
msgid "Syntax Error: You typed the wrong number of arguments to that command."
msgstr ""
"Syntax Error: You typed the wrong number of arguments to that command."
-#: src/gtkconv.c:458
+#: src/gtkconv.c:496
msgid "Your command failed for an unknown reason."
msgstr "Your command failed for an unknown reason."
-#: src/gtkconv.c:465
+#: src/gtkconv.c:503
msgid "That command only works in chats, not IMs."
msgstr "That command only works in chats, not IMs."
-#: src/gtkconv.c:468
+#: src/gtkconv.c:506
msgid "That command only works in IMs, not chats."
msgstr "That command only works in IMs, not chats."
-#: src/gtkconv.c:472
+#: src/gtkconv.c:510
msgid "That command doesn't work on this protocol."
msgstr "That command doesn't work on this protocol."
-#: src/gtkconv.c:699 src/gtkconv.c:725
+#: src/gtkconv.c:744 src/gtkconv.c:770
msgid "That buddy is not on the same protocol as this chat."
msgstr "That buddy is not on the same protocol as this chat."
-#: src/gtkconv.c:719
+#: src/gtkconv.c:764
msgid ""
"You are not currently signed on with an account that can invite that buddy."
msgstr ""
"You are not currently signed on with an account that can invite that buddy."
-#: src/gtkconv.c:772
+#: src/gtkconv.c:817
msgid "Invite Buddy Into Chat Room"
msgstr "Invite Buddy Into Chat Room"
#. Put our happy label in it.
-#: src/gtkconv.c:802
+#: src/gtkconv.c:847
msgid ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
@@ -2390,293 +2917,297 @@ msgstr ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
-#: src/gtkconv.c:823
+#: src/gtkconv.c:868
msgid "_Buddy:"
msgstr "_Buddy:"
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: src/gtkconv.c:888 src/gtksavedstatuses.c:1102 src/gtksavedstatuses.c:1465
msgid "_Message:"
msgstr "_Message:"
-#: src/gtkconv.c:900 src/gtkconv.c:2230 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:945 src/gtkconv.c:2399 src/gtkdebug.c:217 src/gtkft.c:488
msgid "Unable to open file."
-msgstr "Unable to read file."
+msgstr "Unable to open file."
-#: src/gtkconv.c:906
+#: src/gtkconv.c:951
#, c-format
msgid "<h1>Conversation with %s</h1>\n"
msgstr "<h1>Conversation with %s</h1>\n"
-#: src/gtkconv.c:930
+#: src/gtkconv.c:975
msgid "Save Conversation"
msgstr "Save Conversation"
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1093 src/gtkdebug.c:165 src/gtkdebug.c:678
msgid "Find"
msgstr "Find"
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1119 src/gtkdebug.c:193
msgid "_Search for:"
msgstr "_Search for:"
-#: src/gtkconv.c:1227
+#: src/gtkconv.c:1290
msgid "Logging started. Future messages in this conversation will be logged."
msgstr "Logging started. Future messages in this conversation will be logged."
-#: src/gtkconv.c:1235
+#: src/gtkconv.c:1298
msgid ""
"Logging stopped. Future messages in this conversation will not be logged."
msgstr ""
"Logging stopped. Future messages in this conversation will not be logged."
-#: src/gtkconv.c:1491
+#: src/gtkconv.c:1578
msgid "IM"
msgstr "IM"
-#: src/gtkconv.c:1497 src/protocols/oscar/oscar.c:628
+#: src/gtkconv.c:1584 src/protocols/oscar/oscar.c:648
msgid "Send File"
msgstr "Send File"
-#: src/gtkconv.c:1504
+#: src/gtkconv.c:1591
msgid "Un-Ignore"
msgstr "Un-Ignore"
-#: src/gtkconv.c:1507
+#: src/gtkconv.c:1594
msgid "Ignore"
msgstr "Ignore"
-#: src/gtkconv.c:1513
+#: src/gtkconv.c:1600
msgid "Info"
msgstr "Info"
-#: src/gtkconv.c:1519
+#: src/gtkconv.c:1606
msgid "Get Away Message"
msgstr "Get Away Message"
-#: src/gtkconv.c:1526 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Remove"
+#: src/gtkconv.c:1621
+msgid "Last said"
+msgstr "Last said"
-#: src/gtkconv.c:2238
+#: src/gtkconv.c:2407
msgid "Unable to save icon file to disk."
msgstr "Unable to save icon file to disk."
-#: src/gtkconv.c:2261
+#: src/gtkconv.c:2430
msgid "Save Icon"
msgstr "Save Icon"
-#: src/gtkconv.c:2310
+#: src/gtkconv.c:2479
msgid "Animate"
msgstr "Animate"
-#: src/gtkconv.c:2315
+#: src/gtkconv.c:2484
msgid "Hide Icon"
msgstr "Hide Icon"
-#: src/gtkconv.c:2321
+#: src/gtkconv.c:2490
msgid "Save Icon As..."
msgstr "Save Icon As..."
#. Conversation menu
-#: src/gtkconv.c:2369
+#: src/gtkconv.c:2631
msgid "/_Conversation"
msgstr "/_Conversation"
-#: src/gtkconv.c:2371
+#: src/gtkconv.c:2633
msgid "/Conversation/New Instant _Message..."
msgstr "/Conversation/New Instant _Message..."
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:2638
msgid "/Conversation/_Find..."
msgstr "/Conversation/_Find..."
-#: src/gtkconv.c:2378
+#: src/gtkconv.c:2640
msgid "/Conversation/View _Log"
msgstr "/Conversation/View _Log"
-#: src/gtkconv.c:2379
+#: src/gtkconv.c:2641
msgid "/Conversation/_Save As..."
msgstr "/Conversation/_Save As..."
-#: src/gtkconv.c:2381
-msgid "/Conversation/Clear"
-msgstr "/Conversation/Clear"
+#: src/gtkconv.c:2643
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Conversation/Clea_r Scrollback"
-#: src/gtkconv.c:2385
+#: src/gtkconv.c:2647
msgid "/Conversation/Se_nd File..."
msgstr "/Conversation/Se_nd File..."
-#: src/gtkconv.c:2386
+#: src/gtkconv.c:2648
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/Conversation/Add Buddy _Pounce..."
-#: src/gtkconv.c:2388
+#: src/gtkconv.c:2650
msgid "/Conversation/_Get Info"
msgstr "/Conversation/_Get Info"
-#: src/gtkconv.c:2390
+#: src/gtkconv.c:2652
msgid "/Conversation/In_vite..."
msgstr "/Conversation/In_vite..."
-#: src/gtkconv.c:2395
+#: src/gtkconv.c:2657
msgid "/Conversation/Al_ias..."
msgstr "/Conversation/Al_ias..."
-#: src/gtkconv.c:2397
+#: src/gtkconv.c:2659
msgid "/Conversation/_Block..."
msgstr "/Conversation/_Block..."
-#: src/gtkconv.c:2399
+#: src/gtkconv.c:2661
msgid "/Conversation/_Add..."
msgstr "/Conversation/_Add..."
-#: src/gtkconv.c:2401
+#: src/gtkconv.c:2663
msgid "/Conversation/_Remove..."
msgstr "/Conversation/_Remove..."
-#: src/gtkconv.c:2406
+#: src/gtkconv.c:2668
msgid "/Conversation/Insert Lin_k..."
msgstr "/Conversation/Insert Lin_k..."
-#: src/gtkconv.c:2408
+#: src/gtkconv.c:2670
msgid "/Conversation/Insert Imag_e..."
msgstr "/Conversation/Insert Imag_e..."
-#: src/gtkconv.c:2413
+#: src/gtkconv.c:2675
msgid "/Conversation/_Close"
msgstr "/Conversation/_Close"
#. Options
-#: src/gtkconv.c:2417
+#: src/gtkconv.c:2679
msgid "/_Options"
msgstr "/_Options"
-#: src/gtkconv.c:2418
+#: src/gtkconv.c:2680
msgid "/Options/Enable _Logging"
msgstr "/Options/Enable _Logging"
-#: src/gtkconv.c:2419
+#: src/gtkconv.c:2681
msgid "/Options/Enable _Sounds"
msgstr "/Options/Enable _Sounds"
-#: src/gtkconv.c:2420
+#: src/gtkconv.c:2682
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Options/Show Buddy _Icons"
+
+#: src/gtkconv.c:2684
msgid "/Options/Show Formatting _Toolbars"
msgstr "/Options/Show Formatting _Toolbars"
-#: src/gtkconv.c:2421
+#: src/gtkconv.c:2685
msgid "/Options/Show Ti_mestamps"
msgstr "/Options/Show Ti_mestamps"
-#: src/gtkconv.c:2422
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Show Buddy _Icons"
-
-#: src/gtkconv.c:2462
+#: src/gtkconv.c:2777
msgid "/Conversation/View Log"
msgstr "/Conversation/View Log"
-#: src/gtkconv.c:2468
+#: src/gtkconv.c:2783
msgid "/Conversation/Send File..."
msgstr "/Conversation/Send File..."
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2787
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/Conversation/Add Buddy Pounce..."
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2793
msgid "/Conversation/Get Info"
msgstr "/Conversation/Get Info"
-#: src/gtkconv.c:2482
+#: src/gtkconv.c:2797
msgid "/Conversation/Invite..."
msgstr "/Conversation/Invite..."
-#: src/gtkconv.c:2488
+#: src/gtkconv.c:2803
msgid "/Conversation/Alias..."
msgstr "/Conversation/Alias..."
-#: src/gtkconv.c:2492
+#: src/gtkconv.c:2807
msgid "/Conversation/Block..."
msgstr "/Conversation/Block..."
-#: src/gtkconv.c:2496
+#: src/gtkconv.c:2811
msgid "/Conversation/Add..."
msgstr "/Conversation/Add..."
-#: src/gtkconv.c:2500
+#: src/gtkconv.c:2815
msgid "/Conversation/Remove..."
msgstr "/Conversation/Remove..."
-#: src/gtkconv.c:2506
+#: src/gtkconv.c:2821
msgid "/Conversation/Insert Link..."
msgstr "/Conversation/Insert Link..."
-#: src/gtkconv.c:2510
+#: src/gtkconv.c:2825
msgid "/Conversation/Insert Image..."
msgstr "/Conversation/Insert Image..."
-#: src/gtkconv.c:2516
+#: src/gtkconv.c:2831
msgid "/Options/Enable Logging"
msgstr "/Options/Enable Logging"
-#: src/gtkconv.c:2519
+#: src/gtkconv.c:2834
msgid "/Options/Enable Sounds"
msgstr "/Options/Enable Sounds"
-#: src/gtkconv.c:2522
+#: src/gtkconv.c:2847
msgid "/Options/Show Formatting Toolbars"
msgstr "/Options/Show Formatting Toolbars"
-#: src/gtkconv.c:2525
+#: src/gtkconv.c:2850
msgid "/Options/Show Timestamps"
msgstr "/Options/Show Timestamps"
-#: src/gtkconv.c:2528
+#: src/gtkconv.c:2853
msgid "/Options/Show Buddy Icon"
msgstr "/Options/Show Buddy Icons"
-#: src/gtkconv.c:2599
+#: src/gtkconv.c:2933
msgid "User is typing..."
msgstr "User is typing..."
-#: src/gtkconv.c:2604
-msgid "User has typed something and paused"
-msgstr "User has typed something and paused"
+#: src/gtkconv.c:2936
+msgid "User has typed something and stopped"
+msgstr "User has typed something and stopped"
-#. Build the Send As menu
-#: src/gtkconv.c:2742
+#. Build the Send To menu
+#: src/gtkconv.c:3119
msgid "_Send To"
msgstr "_Send To"
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3771
+msgid "_Send"
+msgstr "_Send"
+
+#: src/gtkconv.c:3824 src/protocols/sametime/sametime.c:3477
msgid "Topic:"
msgstr "Topic:"
#. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: src/gtkconv.c:3872
msgid "0 people in room"
msgstr "0 people in room"
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3951
msgid "IM the user"
msgstr "IM the user"
-#: src/gtkconv.c:3513
+#: src/gtkconv.c:3964
msgid "Ignore the user"
msgstr "Ignore the user"
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3976
msgid "Get the user's information"
msgstr "Get the user's information"
-#: src/gtkconv.c:4361 src/gtkconv.c:4466 src/gtkconv.c:4521
+#: src/gtkconv.c:4942 src/gtkconv.c:5051
#, 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:5589
+#: src/gtkconv.c:6516
msgid ""
"say &lt;message&gt;: Send a message normally as if you weren't using a "
"command."
@@ -2684,11 +3215,11 @@ msgstr ""
"say &lt;message&gt;: Send a message normally as if you weren't using a "
"command."
-#: src/gtkconv.c:5592
+#: src/gtkconv.c:6519
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:5595
+#: src/gtkconv.c:6522
msgid ""
"debug &lt;option&gt;: Send various debug information to the current "
"conversation."
@@ -2696,43 +3227,43 @@ msgstr ""
"debug &lt;option&gt;: Send various debug information to the current "
"conversation."
-#: src/gtkconv.c:5598
+#: src/gtkconv.c:6525
msgid "clear: Clears the conversation scrollback."
msgstr "clear: Clears the conversation scrollback."
-#: src/gtkconv.c:5601
+#: src/gtkconv.c:6528
msgid "help &lt;command&gt;: Help on a specific command."
msgstr "help &lt;command&gt;: Help on a specific command."
-#: src/gtkconv.c:5716
+#: src/gtkconv.c:6687
msgid "Confirm close"
msgstr "Confirm close"
-#: src/gtkconv.c:5748
+#: src/gtkconv.c:6719
msgid "You have unread messages. Are you sure you want to close the window?"
msgstr "You have unread messages. Are you sure you want to close the window?"
-#: src/gtkconv.c:6415
+#: src/gtkconv.c:7523
msgid "Close conversation"
msgstr "Close conversation"
-#: src/gtkconv.c:6879
+#: src/gtkconv.c:7987
msgid "Last created window"
msgstr "Last created window"
-#: src/gtkconv.c:6881
+#: src/gtkconv.c:7989
msgid "Separate IM and Chat windows"
msgstr "Separate IM and Chat windows"
-#: src/gtkconv.c:6883 src/gtkprefs.c:1207
+#: src/gtkconv.c:7991 src/gtkprefs.c:1236
msgid "New window"
msgstr "New window"
-#: src/gtkconv.c:6885
+#: src/gtkconv.c:7993
msgid "By group"
msgstr "By group"
-#: src/gtkconv.c:6887
+#: src/gtkconv.c:7995
msgid "By account"
msgstr "By account"
@@ -2772,277 +3303,299 @@ msgstr "Filter"
msgid "Right click for more options."
msgstr "Right click for more options."
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:61 src/gtkdialogs.c:100
msgid "lead developer"
msgstr "lead developer"
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:62 src/gtkdialogs.c:63 src/gtkdialogs.c:65
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:73
+#: src/gtkdialogs.c:74
msgid "developer"
msgstr "developer"
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:64
msgid "win32 port"
msgstr "win32 port"
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:66
+msgid "developer & webmaster"
+msgstr "developer & webmaster"
+
+#: src/gtkdialogs.c:72
msgid "support"
msgstr "support"
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:95
msgid "maintainer"
msgstr "maintainer"
-#: src/gtkdialogs.c:89
+#: src/gtkdialogs.c:96
msgid "libfaim maintainer"
msgstr "libfaim maintainer"
-#: src/gtkdialogs.c:92
+#: src/gtkdialogs.c:97
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker and designated driver [lazy bum]"
+
+#: src/gtkdialogs.c:98
msgid "Jabber developer"
msgstr "Jabber developer"
-#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:99
msgid "original author"
msgstr "original author"
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker and designated driver [lazy bum]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:107 src/gtkdialogs.c:157
msgid "Bulgarian"
msgstr "Bulgarian"
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:109
+msgid "Bengali"
+msgstr "Bengali"
+
+#: src/gtkdialogs.c:110
msgid "Bosnian"
msgstr "Bosnian"
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:147 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:158 src/gtkdialogs.c:159
msgid "Catalan"
msgstr "Catalan"
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:160
msgid "Czech"
msgstr "Czech"
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:113
msgid "Danish"
msgstr "Danish"
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:161
msgid "German"
msgstr "German"
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:116
msgid "Greek"
msgstr "Greek"
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:117
msgid "Australian English"
msgstr "Australian English"
-#: src/gtkdialogs.c:108
-msgid "British English"
-msgstr "British English"
-
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:118
msgid "Canadian English"
msgstr "Canadian English"
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:119
+msgid "British English"
+msgstr "British English"
+
+#: src/gtkdialogs.c:120 src/gtkdialogs.c:162 src/gtkdialogs.c:163
+#: src/gtkdialogs.c:164 src/gtkdialogs.c:165
msgid "Spanish"
msgstr "Spanish"
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:166 src/gtkdialogs.c:167
msgid "Finnish"
msgstr "Finnish"
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:122 src/gtkdialogs.c:168 src/gtkdialogs.c:169
+#: src/gtkdialogs.c:170 src/gtkdialogs.c:171
msgid "French"
msgstr "French"
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:123
msgid "Hebrew"
msgstr "Hebrew"
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:124
msgid "Hindi"
msgstr "Hindi"
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:125
msgid "Hungarian"
msgstr "Hungarian"
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:172
msgid "Italian"
msgstr "Italian"
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:173 src/gtkdialogs.c:174
+#: src/gtkdialogs.c:175
msgid "Japanese"
msgstr "Japanese"
-#: src/gtkdialogs.c:118
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:128 src/gtkdialogs.c:176
msgid "Georgian"
msgstr "Georgian"
-#: src/gtkdialogs.c:120
-msgid "Kurdish"
-msgstr "Kurdish"
-
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:177
msgid "Korean"
msgstr "Korean"
-#: src/gtkdialogs.c:122
-msgid "Dutch, Flemish"
-msgstr "Dutch, Flemish"
+#: src/gtkdialogs.c:130
+msgid "Kurdish"
+msgstr "Kurdish"
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:131 src/gtkdialogs.c:178
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/gtkdialogs.c:132
msgid "Macedonian"
msgstr "Macedonian"
-#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:133
+msgid "Dutch, Flemish"
+msgstr "Dutch, Flemish"
+
+#: src/gtkdialogs.c:134
msgid "Norwegian"
msgstr "Norwegian"
-#: src/gtkdialogs.c:125 src/gtkdialogs.c:126 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:135 src/gtkdialogs.c:136 src/gtkdialogs.c:179
msgid "Polish"
msgstr "Polish"
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:137
msgid "Portuguese"
msgstr "Portuguese"
-#: src/gtkdialogs.c:128
+#: src/gtkdialogs.c:138
msgid "Portuguese-Brazil"
msgstr "Portuguese-Brazil"
-#: src/gtkdialogs.c:129
+#: src/gtkdialogs.c:139
msgid "Romanian"
msgstr "Romanian"
-#: src/gtkdialogs.c:130 src/gtkdialogs.c:158 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:140 src/gtkdialogs.c:180 src/gtkdialogs.c:181
msgid "Russian"
msgstr "Russian"
-#: src/gtkdialogs.c:131 src/gtkdialogs.c:132
+#: src/gtkdialogs.c:141 src/gtkdialogs.c:142
msgid "Serbian"
msgstr "Serbian"
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:143
msgid "Slovenian"
msgstr "Slovenian"
-#: src/gtkdialogs.c:134 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:144 src/gtkdialogs.c:183
msgid "Swedish"
msgstr "Swedish"
-#: src/gtkdialogs.c:135
+#: src/gtkdialogs.c:145
+msgid "Tamil"
+msgstr "Tamil"
+
+#: src/gtkdialogs.c:146
msgid "Telugu"
msgstr "Telugu"
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:147
msgid "Vietnamese"
msgstr "Vietnamese"
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:147
msgid "T.M.Thanh and the Gnome-Vi Team"
msgstr "T.M.Thanh and the Gnome-Vi Team"
-#: src/gtkdialogs.c:137 src/gtkdialogs.c:162
+#: src/gtkdialogs.c:148 src/gtkdialogs.c:184
msgid "Simplified Chinese"
msgstr "Simplified Chinese"
-#: src/gtkdialogs.c:138 src/gtkdialogs.c:139 src/gtkdialogs.c:163
+#: src/gtkdialogs.c:149 src/gtkdialogs.c:150 src/gtkdialogs.c:185
msgid "Traditional Chinese"
msgstr "Traditional Chinese"
-#: src/gtkdialogs.c:145
+#: src/gtkdialogs.c:156
msgid "Amharic"
msgstr "Amharic"
-#: src/gtkdialogs.c:160
+#: src/gtkdialogs.c:182
msgid "Slovak"
msgstr "Slovak"
-#: src/gtkdialogs.c:204
+#: src/gtkdialogs.c:226
msgid "About Gaim"
msgstr "About Gaim"
-#: src/gtkdialogs.c:228
+#: src/gtkdialogs.c:250
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 "
-"at once. It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once. It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later). A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim. Gaim is copyrighted by its contributors. See the 'COPYRIGHT' "
+"file for the complete list of contributors. We provide no warranty for this "
+"program.<BR><BR>"
msgstr ""
"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once. It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:237
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once. It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later). A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim. Gaim is copyrighted by its contributors. See the 'COPYRIGHT' "
+"file for the complete list of contributors. We provide no warranty for this "
+"program.<BR><BR>"
+
+#: src/gtkdialogs.c:264
msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#: src/gtkdialogs.c:240
+#: src/gtkdialogs.c:267
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:246
-msgid "Active Developers"
-msgstr "Active Developers"
+#: src/gtkdialogs.c:273
+msgid "Current Developers"
+msgstr "Current Developers"
-#: src/gtkdialogs.c:261
+#: src/gtkdialogs.c:288
msgid "Crazy Patch Writers"
msgstr "Crazy Patch Writers"
-#: src/gtkdialogs.c:276
+#: src/gtkdialogs.c:303
msgid "Retired Developers"
msgstr "Retired Developers"
-#: src/gtkdialogs.c:291
+#: src/gtkdialogs.c:318
msgid "Current Translators"
msgstr "Current Translators"
-#: src/gtkdialogs.c:311
+#: src/gtkdialogs.c:338
msgid "Past Translators"
msgstr "Past Translators"
-#: src/gtkdialogs.c:329
+#: src/gtkdialogs.c:356
msgid "Debugging Information"
msgstr "Debugging Information"
-#: src/gtkdialogs.c:491 src/gtkdialogs.c:632 src/gtkdialogs.c:687
+#: src/gtkdialogs.c:552 src/gtkdialogs.c:689 src/gtkdialogs.c:756
msgid "_Name"
msgstr "_Name"
-#: src/gtkdialogs.c:496 src/gtkdialogs.c:637 src/gtkdialogs.c:692
+#: src/gtkdialogs.c:557 src/gtkdialogs.c:694 src/gtkdialogs.c:761
msgid "_Account"
msgstr "_Account"
-#: src/gtkdialogs.c:504
+#: src/gtkdialogs.c:565
msgid "New Instant Message"
msgstr "New Instant Message"
-#: src/gtkdialogs.c:506
+#: src/gtkdialogs.c:567
msgid ""
"Please enter the screen name or alias of the person you would like to IM."
msgstr ""
"Please enter the screen name or alias of the person you would like to IM."
-#: src/gtkdialogs.c:645
+#: src/gtkdialogs.c:702
msgid "Get User Info"
msgstr "Get User Info"
-#: src/gtkdialogs.c:647
+#: src/gtkdialogs.c:704
msgid ""
"Please enter the screen name or alias of the person whose info you would "
"like to view."
@@ -3050,11 +3603,11 @@ msgstr ""
"Please enter the screen name or alias of the person whose info you would "
"like to view."
-#: src/gtkdialogs.c:701
+#: src/gtkdialogs.c:770
msgid "View User Log"
msgstr "View User Log"
-#: src/gtkdialogs.c:703
+#: src/gtkdialogs.c:772
msgid ""
"Please enter the screen name or alias of the person whose log you would like "
"to view."
@@ -3062,37 +3615,37 @@ msgstr ""
"Please enter the screen name or alias of the person whose log you would like "
"to view."
-#: src/gtkdialogs.c:722
+#: src/gtkdialogs.c:791
msgid "Alias Contact"
msgstr "Alias Contact"
-#: src/gtkdialogs.c:723
+#: src/gtkdialogs.c:792
msgid "Enter an alias for this contact."
msgstr "Enter an alias for this contact."
-#: src/gtkdialogs.c:725 src/gtkdialogs.c:747 src/gtkdialogs.c:767
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:794 src/gtkdialogs.c:816 src/gtkdialogs.c:836
+#: src/gtkrequest.c:295 src/protocols/silc/chat.c:586
msgid "Alias"
msgstr "Alias"
-#: src/gtkdialogs.c:743
+#: src/gtkdialogs.c:812
#, c-format
msgid "Enter an alias for %s."
msgstr "Enter an alias for %s."
-#: src/gtkdialogs.c:745
+#: src/gtkdialogs.c:814
msgid "Alias Buddy"
msgstr "Alias Buddy"
-#: src/gtkdialogs.c:764
+#: src/gtkdialogs.c:833
msgid "Alias Chat"
msgstr "Alias Chat"
-#: src/gtkdialogs.c:765
+#: src/gtkdialogs.c:834
msgid "Enter an alias for this chat."
msgstr "Enter an alias for this chat."
-#: src/gtkdialogs.c:802
+#: src/gtkdialogs.c:871
#, c-format
msgid ""
"You are about to remove the contact containing %s and %d other buddy from "
@@ -3107,7 +3660,15 @@ msgstr[1] ""
"You are about to remove the contact containing %s and %d other buddies from "
"your buddy list. Do you want to continue?"
-#: src/gtkdialogs.c:869
+#: src/gtkdialogs.c:879
+msgid "Remove Contact"
+msgstr "Remove Contact"
+
+#: src/gtkdialogs.c:880
+msgid "_Remove Contact"
+msgstr "_Remove Contact"
+
+#: src/gtkdialogs.c:931
#, c-format
msgid ""
"You are about to remove the group %s and all its members from your buddy "
@@ -3116,22 +3677,30 @@ 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:872 src/gtkdialogs.c:873
+#: src/gtkdialogs.c:934
msgid "Remove Group"
msgstr "Remove Group"
-#: src/gtkdialogs.c:911
+#: src/gtkdialogs.c:935
+msgid "_Remove Group"
+msgstr "_Remove Group"
+
+#: src/gtkdialogs.c:968
#, 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:914 src/gtkdialogs.c:915
+#: src/gtkdialogs.c:971
msgid "Remove Buddy"
msgstr "Remove Buddy"
-#: src/gtkdialogs.c:953
+#: src/gtkdialogs.c:972
+msgid "_Remove Buddy"
+msgstr "_Remove Buddy"
+
+#: src/gtkdialogs.c:993
#, c-format
msgid ""
"You are about to remove the chat %s from your buddy list. Do you want to "
@@ -3140,166 +3709,174 @@ msgstr ""
"You are about to remove the chat %s from your buddy list. Do you want to "
"continue?"
-#: src/gtkdialogs.c:956 src/gtkdialogs.c:957
+#: src/gtkdialogs.c:996
msgid "Remove Chat"
msgstr "Remove Chat"
-#: src/gtkft.c:138
+#: src/gtkdialogs.c:997
+msgid "_Remove Chat"
+msgstr "_Remove Chat"
+
+#: src/gtkft.c:139
#, c-format
msgid "%.2f KB/s"
msgstr "%.2f KB/s"
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:160 src/gtkft.c:1063
msgid "Finished"
msgstr "Finished"
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:163 src/gtkft.c:1003
msgid "Canceled"
msgstr "Cancelled"
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:166 src/gtkft.c:922
msgid "Waiting for transfer to begin"
msgstr "Waiting for transfer to begin"
-#: src/gtkft.c:218
+#: src/gtkft.c:219
msgid "<b>Receiving As:</b>"
msgstr "<b>Receiving As:</b>"
-#: src/gtkft.c:220
+#: src/gtkft.c:221
msgid "<b>Receiving From:</b>"
msgstr "<b>Receiving From:</b>"
-#: src/gtkft.c:224
+#: src/gtkft.c:225
msgid "<b>Sending To:</b>"
msgstr "<b>Sending To:</b>"
-#: src/gtkft.c:226
+#: src/gtkft.c:227
msgid "<b>Sending As:</b>"
msgstr "<b>Sending As:</b>"
-#: src/gtkft.c:442
+#: src/gtkft.c:443
msgid "There is no application configured to open this type of file."
msgstr "There is no application configured to open this type of file."
-#: src/gtkft.c:447
+#: src/gtkft.c:448
msgid "An error occurred while opening the file."
msgstr "An error occurred while opening the file."
-#: src/gtkft.c:467
+#: src/gtkft.c:485
#, c-format
msgid "Error launching %s: %s"
msgstr "Error launching %s: %s"
-#: src/gtkft.c:476
+#: src/gtkft.c:494
#, c-format
msgid "Error running %s"
msgstr "Error running %s"
-#: src/gtkft.c:477
+#: src/gtkft.c:495
#, c-format
msgid "Process returned error code %d"
msgstr "Process returned error code %d"
-#: src/gtkft.c:572
+#: src/gtkft.c:589
msgid "Progress"
msgstr "Progress"
-#: src/gtkft.c:579
+#: src/gtkft.c:596
msgid "Filename"
msgstr "Filename"
-#: src/gtkft.c:586
+#: src/gtkft.c:603
msgid "Size"
msgstr "Size"
-#: src/gtkft.c:593
+#: src/gtkft.c:610
msgid "Remaining"
msgstr "Remaining"
-#: src/gtkft.c:624
+#: src/gtkft.c:641
msgid "Filename:"
msgstr "Filename:"
-#: src/gtkft.c:625
+#: src/gtkft.c:642
msgid "Local File:"
msgstr "Local File:"
-#: src/gtkft.c:626
+#: src/gtkft.c:643
msgid "Status:"
msgstr "Status:"
-#: src/gtkft.c:627
+#: src/gtkft.c:644
msgid "Speed:"
msgstr "Speed:"
-#: src/gtkft.c:628
+#: src/gtkft.c:645
msgid "Time Elapsed:"
msgstr "Time Elapsed:"
-#: src/gtkft.c:629
+#: src/gtkft.c:646
msgid "Time Remaining:"
msgstr "Time Remaining:"
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "_Keep the dialog open"
+#: src/gtkft.c:708 src/protocols/oscar/oscar.c:8532
+msgid "File Transfers"
+msgstr "File Transfers"
+
+#: src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "Close this window when all transfers _finish"
-#: src/gtkft.c:725
+#: src/gtkft.c:741
msgid "C_lear finished transfers"
msgstr "C_lear finished transfers"
#. "Download Details" arrow
-#: src/gtkft.c:734
+#: src/gtkft.c:750
msgid "File transfer _details"
msgstr "File transfer _details"
#. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: src/gtkft.c:780 src/gtkstock.c:146
msgid "_Pause"
msgstr "_Pause"
#. Resume button
-#: src/gtkft.c:774
+#: src/gtkft.c:790
msgid "_Resume"
msgstr "_Resume"
-#: src/gtkft.c:988
+#: src/gtkft.c:1005
msgid "Failed"
msgstr "Failed"
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "Pa_ste As Text"
+#: src/gtkimhtml.c:818
+msgid "Paste as Plain _Text"
+msgstr "Paste as Plain _Text"
-#: src/gtkimhtml.c:1313
+#: src/gtkimhtml.c:1316
msgid "Hyperlink color"
msgstr "Hyperlink colour"
-#: src/gtkimhtml.c:1314
+#: src/gtkimhtml.c:1317
msgid "Color to draw hyperlinks."
msgstr "Colour to draw hyperlinks."
-#: src/gtkimhtml.c:1317
+#: src/gtkimhtml.c:1320
msgid "Hyperlink prelight color"
msgstr "Hyperlink prelight colour"
-#: src/gtkimhtml.c:1318
+#: src/gtkimhtml.c:1321
msgid "Color to draw hyperlinks when mouse is over them."
msgstr "Colour to draw hyperlinks when mouse is over them."
-#: src/gtkimhtml.c:1537
+#: src/gtkimhtml.c:1542
msgid "_Copy E-Mail Address"
msgstr "_Copy E-Mail Address"
-#: src/gtkimhtml.c:1549
+#: src/gtkimhtml.c:1554
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
-#: src/gtkimhtml.c:1559
+#: src/gtkimhtml.c:1564
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: src/gtkimhtml.c:3241
+#: src/gtkimhtml.c:3261
msgid ""
"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
"\n"
@@ -3309,7 +3886,7 @@ msgstr ""
"\n"
"Defaulting to PNG."
-#: src/gtkimhtml.c:3244
+#: src/gtkimhtml.c:3264
msgid ""
"Unrecognized file type\n"
"\n"
@@ -3319,7 +3896,7 @@ msgstr ""
"\n"
"Defaulting to PNG."
-#: src/gtkimhtml.c:3257
+#: src/gtkimhtml.c:3277
#, c-format
msgid ""
"<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3330,7 +3907,7 @@ msgstr ""
"\n"
"%s"
-#: src/gtkimhtml.c:3260
+#: src/gtkimhtml.c:3280
#, c-format
msgid ""
"Error saving image\n"
@@ -3341,11 +3918,11 @@ msgstr ""
"\n"
"%s"
-#: src/gtkimhtml.c:3340 src/gtkimhtml.c:3352
+#: src/gtkimhtml.c:3360 src/gtkimhtml.c:3372
msgid "Save Image"
msgstr "Save Image"
-#: src/gtkimhtml.c:3380
+#: src/gtkimhtml.c:3400
msgid "_Save Image..."
msgstr "_Save Image..."
@@ -3407,65 +3984,65 @@ msgstr "This theme has no available smileys."
msgid "Smile!"
msgstr "Smile!"
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:923
msgid "Bold"
msgstr "Bold"
-#: src/gtkimhtmltoolbar.c:927
+#: src/gtkimhtmltoolbar.c:934
msgid "Italic"
msgstr "Italic"
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:945
msgid "Underline"
msgstr "Underline"
-#: src/gtkimhtmltoolbar.c:954
+#: src/gtkimhtmltoolbar.c:961
msgid "Larger font size"
msgstr "Larger font size"
-#: src/gtkimhtmltoolbar.c:966
+#: src/gtkimhtmltoolbar.c:973
msgid "Smaller font size"
msgstr "Smaller font size"
-#: src/gtkimhtmltoolbar.c:983
+#: src/gtkimhtmltoolbar.c:990
msgid "Font Face"
msgstr "Font Face"
-#: src/gtkimhtmltoolbar.c:995
+#: src/gtkimhtmltoolbar.c:1002
msgid "Foreground font color"
msgstr "Foreground font colour"
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "Background colour"
-
-#: src/gtkimhtmltoolbar.c:1023
+#: src/gtkimhtmltoolbar.c:1030
msgid "Clear formatting"
-msgstr "Clear Formatting"
+msgstr "Clear formatting"
-#: src/gtkimhtmltoolbar.c:1038
+#: src/gtkimhtmltoolbar.c:1045
msgid "Insert link"
msgstr "Insert link"
-#: src/gtkimhtmltoolbar.c:1048
+#: src/gtkimhtmltoolbar.c:1055
msgid "Insert image"
msgstr "Insert image"
-#: src/gtkimhtmltoolbar.c:1059
+#: src/gtkimhtmltoolbar.c:1066
msgid "Insert smiley"
msgstr "Insert smiley"
-#: src/gtklog.c:200
+#: src/gtklog.c:202
#, c-format
-msgid "Conversation in %s on %s"
-msgstr "Conversation in %s on %s"
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-#: src/gtklog.c:202
+#: src/gtklog.c:207
#, c-format
-msgid "Conversation with %s on %s"
-msgstr "Conversation with %s on %s"
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+
+#: src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
-#: src/gtklog.c:309
+#: src/gtklog.c:311
msgid ""
"System events will only be logged if the \"Log all status changes to system "
"log\" preference is enabled."
@@ -3473,7 +4050,7 @@ msgstr ""
"System events will only be logged if the \"Log all status changes to system "
"log\" preference is enabled."
-#: src/gtklog.c:313
+#: src/gtklog.c:315
msgid ""
"Instant messages will only be logged if the \"Log all instant messages\" "
"preference is enabled."
@@ -3481,40 +4058,40 @@ msgstr ""
"Instant messages will only be logged if the \"Log all instant messages\" "
"preference is enabled."
-#: src/gtklog.c:316
+#: src/gtklog.c:318
msgid ""
"Chats will only be logged if the \"Log all chats\" preference is enabled."
msgstr ""
"Chats will only be logged if the \"Log all chats\" preference is enabled."
-#: src/gtklog.c:320
+#: src/gtklog.c:322
msgid "No logs were found"
msgstr "No logs were found"
-#: src/gtklog.c:396
+#: src/gtklog.c:398
msgid "Total log size:"
msgstr "Total log size:"
-#: src/gtklog.c:472
+#: src/gtklog.c:474
#, c-format
msgid "Conversations in %s"
msgstr "Conversations in %s"
-#: src/gtklog.c:480 src/gtklog.c:531
+#: src/gtklog.c:482 src/gtklog.c:533
#, c-format
msgid "Conversations with %s"
msgstr "Conversations with %s"
-#: src/gtklog.c:556
+#: src/gtklog.c:558
msgid "System Log"
msgstr "System Log"
-#: src/gtkmain.c:326
+#: src/gtkmain.c:312
#, c-format
msgid "Gaim %s. Try `%s -h' for more information.\n"
msgstr "Gaim %s. Try `%s -h' for more information.\n"
-#: src/gtkmain.c:328
+#: src/gtkmain.c:314
#, c-format
msgid ""
"Gaim %s\n"
@@ -3539,44 +4116,104 @@ msgstr ""
" account(s) to use, separated by commas)\n"
" -v, --version display the current version and exit\n"
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:676 src/gtkstatusbox.c:678 src/gtkstatusbox.c:681
-#: src/status.c:1696
-msgid "Default"
-msgstr "Default"
+#: src/gtkmain.c:493
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file. If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php. If you need further\n"
+"assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
+"Contact information for Sean and Luke on other protocols is at\n"
+"%scontactinfo.php.\n"
+msgstr ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please be sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file. If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php. If you need further\n"
+"assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
+"Contact information for Sean and Luke on other protocols is at\n"
+"%scontactinfo.php.\n"
+
+#: src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "Call ended."
-#. Descriptive label
-#: src/gtknotify.c:275
+#: src/gtkmedia.c:69
#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s has %d new message."
-msgstr[1] "%s has %d new messages."
+msgid "Calling %s"
+msgstr "Calling %s"
+
+#: src/gtkmedia.c:73 src/gtkmedia.c:108
+msgid "End Call"
+msgstr "End Call"
-#: src/gtknotify.c:289
+#: src/gtkmedia.c:81
#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">From:</span> %s\n"
+msgid "Receiving call from %s"
+msgstr "Receiving call from %s"
-#: src/gtknotify.c:298
+#: src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "Reject Call"
+
+#: src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "Accept call"
+
+#: src/gtkmedia.c:102
#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">Subject:</span> %s\n"
+msgid "Connected to %s"
+msgstr "Connected to %s"
+
+#: src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "_Mute"
-#: src/gtknotify.c:303
+#: src/gtknotify.c:305
+msgid "New Mail"
+msgstr "New Mail"
+
+#: src/gtknotify.c:321
+msgid "Open All Messages"
+msgstr "Open All Messages"
+
+#: src/gtknotify.c:382 src/protocols/jabber/jabber.c:1032
+msgid "From"
+msgstr "From"
+
+#: src/gtknotify.c:390
+msgid "Subject"
+msgstr "Subject"
+
+#: src/gtknotify.c:399
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+
+#: src/gtknotify.c:451
#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s has %d new message."
+msgstr[1] "%s has %d new messages."
-#: src/gtknotify.c:319
+#: src/gtknotify.c:456
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3587,213 +4224,269 @@ msgstr ""
"\n"
"%s"
-#: src/gtknotify.c:504
+#: src/gtknotify.c:643 src/protocols/sametime/sametime.c:5360
msgid "Search Results"
msgstr "Search Results"
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: src/gtknotify.c:799 src/protocols/oscar/oscar.c:4973
#, c-format
msgid "Info for %s"
msgstr "Info for %s"
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: src/gtknotify.c:800 src/protocols/toc/toc.c:470
msgid "Buddy Information"
msgstr "Buddy Information"
-#: src/gtknotify.c:687
+#: src/gtknotify.c:840
#, c-format
msgid "The browser command <b>%s</b> is invalid."
msgstr "The browser command <b>%s</b> is invalid."
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: src/gtknotify.c:842 src/gtknotify.c:854 src/gtknotify.c:867
+#: src/gtknotify.c:992
msgid "Unable to open URL"
msgstr "Unable to open URL"
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: src/gtknotify.c:852 src/gtknotify.c:865
#, c-format
msgid "Error launching <b>%s</b>: %s"
msgstr "Error launching <b>%s</b>: %s"
-#: src/gtknotify.c:839
+#: src/gtknotify.c:993
msgid ""
"The 'Manual' browser command has been chosen, but no command has been set."
msgstr ""
"The 'Manual' browser command has been chosen, but no command has been set."
-#: src/gtkplugin.c:258
+#: src/gtkplugin.c:275
+msgid "The following plugins will be unloaded."
+msgstr "The following plug-ins will be unloaded."
+
+#: src/gtkplugin.c:294
+msgid "Multiple plugins will be unloaded."
+msgstr "Multiple plug-ins will be unloaded."
+
+#: src/gtkplugin.c:296
+msgid "Unload Plugins"
+msgstr "Unload Plug-ins"
+
+#: src/gtkplugin.c:410
#, c-format
msgid ""
"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
msgstr ""
"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
+"<span weight=\"bold\">Filename:</span>\t%s"
-#: src/gtkplugin.c:352
-msgid "Plugins"
-msgstr "Plugins"
+#: src/gtkplugin.c:420
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plug-in website for an update.</span>"
-#: src/gtkplugin.c:401
+#: src/gtkplugin.c:546
+msgid "Configure Pl_ugin"
+msgstr "Configure Pl_ug-in"
+
+#: src/gtkplugin.c:604
msgid "<b>Plugin Details</b>"
-msgstr "<b>Plugin Details</b>"
+msgstr "<b>Plug-in Details</b>"
-#: src/gtkpounce.c:130
+#: src/gtkpounce.c:162
msgid "Select a file"
msgstr "Select a file"
-#: src/gtkpounce.c:161
+#: src/gtkpounce.c:259
msgid "Please enter a buddy to pounce."
msgstr "Please enter a buddy to pounce."
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:503
msgid "New Buddy Pounce"
msgstr "New Buddy Pounce"
-#: src/gtkpounce.c:391
+#: src/gtkpounce.c:503
msgid "Edit Buddy Pounce"
msgstr "Edit Buddy Pounce"
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
-msgstr "Pounce Who"
+#. Create the "Pounce on Whom" frame.
+#: src/gtkpounce.c:520
+msgid "Pounce on Whom"
+msgstr "Pounce on Whom"
-#: src/gtkpounce.c:435
+#: src/gtkpounce.c:547
msgid "_Buddy name:"
msgstr "_Buddy name:"
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "Pounce When"
+#. Create the "Pounce When Buddy..." frame.
+#: src/gtkpounce.c:571
+msgid "Pounce When Buddy..."
+msgstr "Pounce When Buddy..."
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "Si_gn on"
+#: src/gtkpounce.c:579
+msgid "Si_gns on"
+msgstr "Si_gns on"
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "Sign _off"
+#: src/gtkpounce.c:581
+msgid "Signs o_ff"
+msgstr "Signs o_ff"
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "A_way"
+#: src/gtkpounce.c:583
+msgid "Goes a_way"
+msgstr "Goes a_way"
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "_Return from away"
+#: src/gtkpounce.c:585
+msgid "Ret_urns from away"
+msgstr "Ret_urn from away"
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Idle"
+#: src/gtkpounce.c:587
+msgid "Becomes _idle"
+msgstr "Becomes _idle"
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Retur_n from idle"
+#: src/gtkpounce.c:589
+msgid "Is no longer i_dle"
+msgstr "Is no longer i_dle"
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "Buddy starts _typing"
+#: src/gtkpounce.c:591
+msgid "Starts _typing"
+msgstr "Starts _typing"
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "Buddy stops t_yping"
+#: src/gtkpounce.c:593
+msgid "Stops t_yping"
+msgstr "Stops t_yping"
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "Pounce Action"
+#: src/gtkpounce.c:595
+msgid "Sends a _message"
+msgstr "Sends a _message"
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
-msgstr "Op_en an IM window"
+#. Create the "Action" frame.
+#: src/gtkpounce.c:627
+msgid "Action"
+msgstr "Action"
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
-msgstr "_Popup notification"
+#: src/gtkpounce.c:635
+msgid "Ope_n an IM window"
+msgstr "Ope_n a message window"
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:637
+msgid "_Pop up a notification"
+msgstr "_Pop up a notification"
+
+#: src/gtkpounce.c:639
msgid "Send a _message"
msgstr "Send a _message"
-#: src/gtkpounce.c:524
+#: src/gtkpounce.c:641
msgid "E_xecute a command"
msgstr "E_xecute a command"
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:643
msgid "P_lay a sound"
msgstr "P_lay a sound"
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
-msgstr "B_rowse..."
+#: src/gtkpounce.c:648
+msgid "Brows_e..."
+msgstr "Brows_e..."
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "Bro_wse..."
+#: src/gtkpounce.c:650
+msgid "Br_owse..."
+msgstr "Br_owse..."
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:651
msgid "Pre_view"
msgstr "Pre_view"
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "Sav_e this pounce after activation"
+#. Create the "Options" frame.
+#: src/gtkpounce.c:763
+msgid "Options"
+msgstr "Options"
+
+#: src/gtkpounce.c:771
+msgid "P_ounce only when my status is not available"
+msgstr "P_ounce only when my status is \"not available\""
+
+#: src/gtkpounce.c:776
+msgid "_Recurring"
+msgstr "_Recurring"
+
+#: src/gtkpounce.c:1089
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Are you sure you want to delete the pounce on %s for %s?"
+
+#: src/gtkpounce.c:1237
+msgid "Pounce Target"
+msgstr "Pounce Target"
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Remove Buddy Pounce"
+#: src/gtkpounce.c:1272
+msgid "Recurring"
+msgstr "Recurring"
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:1319
+msgid "Buddy Pounces"
+msgstr "Buddy Pounces"
+
+#: src/gtkpounce.c:1446
#, c-format
msgid "%s has started typing to you (%s)"
msgstr "%s has started typing to you (%s)"
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:1448
#, c-format
msgid "%s has signed on (%s)"
msgstr "%s has signed on (%s)"
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:1450
#, c-format
msgid "%s has returned from being idle (%s)"
msgstr "%s has returned from being idle (%s)"
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:1452
#, c-format
msgid "%s has returned from being away (%s)"
msgstr "%s has returned from being away (%s)"
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:1454
#, c-format
msgid "%s has stopped typing to you (%s)"
msgstr "%s has stopped typing to you (%s)"
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:1456
#, c-format
msgid "%s has signed off (%s)"
msgstr "%s has signed off (%s)"
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:1458
#, c-format
msgid "%s has become idle (%s)"
msgstr "%s has become idle (%s)"
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:1460
#, c-format
msgid "%s has gone away. (%s)"
msgstr "%s has gone away. (%s)"
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:1462
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s has sent you a message. (%s)"
+
+#: src/gtkpounce.c:1463
msgid "Unknown pounce event. Please report this!"
msgstr "Unknown pounce event. Please report this!"
-#: src/gtkprefs.c:623
+#: src/gtkprefs.c:512
+msgid "Smiley theme failed to unpack."
+msgstr "Smiley theme failed to unpack."
+
+#: src/gtkprefs.c:631
msgid ""
"Select a smiley theme that you would like to use from the list below. New "
"themes can be installed by dragging and dropping them onto the theme list."
@@ -3801,40 +4494,52 @@ msgstr ""
"Select a smiley theme that you would like to use from the list below. New "
"themes can be installed by dragging and dropping them onto the theme list."
-#: src/gtkprefs.c:658
+#: src/gtkprefs.c:666
msgid "Icon"
msgstr "Icon"
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:673 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:818 src/protocols/jabber/chat.c:769
msgid "Description"
msgstr "Description"
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:814
+msgid "_Hide new IM conversations"
+msgstr "_Hide new conversations:"
+
+#: src/gtkprefs.c:817 src/gtkprefs.c:1757
+msgid "When away"
+msgstr "When away"
+
+#: src/gtkprefs.c:821
msgid "Send unknown \"_slash\" commands as messages"
msgstr "Send unknown \"_slash\" commands as messages"
-#: src/gtkprefs.c:807
+#: src/gtkprefs.c:823
msgid "Show _formatting on incoming messages"
msgstr "Show _formatting on incoming messages"
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:826
msgid "Show buddy _icons"
msgstr "Show buddy _icons"
-#: src/gtkprefs.c:811
+#: src/gtkprefs.c:828
msgid "Enable buddy ic_on animation"
msgstr "Enable buddy ic_on animation"
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:835
msgid "_Notify buddies that you are typing to them"
msgstr "_Notify buddies that you are typing to them"
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
-msgstr "_Highlight misspelled words"
+#: src/gtkprefs.c:838
+msgid "Highlight _misspelled words"
+msgstr "Highlight _misspelled words"
+
+#: src/gtkprefs.c:842
+msgid "Use smooth-scrolling"
+msgstr "Use smooth-scrolling"
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:858
msgid ""
"This is how your outgoing message text will appear when you use protocols "
"that support formatting. :)"
@@ -3843,160 +4548,160 @@ msgstr ""
"that support formatting. :)"
#. All the tab options!
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:880
msgid "Tab Options"
msgstr "Tab Options"
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:882
msgid "Show IMs and chats in _tabbed windows"
msgstr "Show IMs and chats in _tabbed windows"
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:896
msgid "Show close b_utton on tabs"
msgstr "Show close b_utton on tabs"
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:902
msgid "_Placement:"
msgstr "_Placement"
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:904
msgid "Top"
msgstr "Top"
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:905
msgid "Bottom"
msgstr "Bottom"
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:906
msgid "Left"
msgstr "Left"
-#: src/gtkprefs.c:883
+#: src/gtkprefs.c:907
msgid "Right"
msgstr "Right"
-#: src/gtkprefs.c:885
+#: src/gtkprefs.c:909
msgid "Left Vertical"
msgstr "Left Vertical"
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:910
msgid "Right Vertical"
msgstr "Right Vertical"
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:915
msgid "N_ew conversations:"
msgstr "N_ew conversations:"
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+#: src/gtkprefs.c:966 src/protocols/oscar/oscar.c:803
+#: src/protocols/oscar/oscar.c:6092
msgid "IP Address"
msgstr "IP Address"
-#: src/gtkprefs.c:944
-msgid "STUN Server:"
-msgstr "STUN Server:"
+#: src/gtkprefs.c:968
+msgid "ST_UN server:"
+msgstr "ST_UN Server:"
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
-msgstr "_Autodetect IP Address"
+#: src/gtkprefs.c:970
+msgid "_Autodetect IP address"
+msgstr "_Autodetect IP address"
-#: src/gtkprefs.c:955
+#: src/gtkprefs.c:979
msgid "Public _IP:"
msgstr "Public _IP:"
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:1007
msgid "Ports"
msgstr "Ports"
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:1010
msgid "_Manually specify range of ports to listen on"
msgstr "_Manually specify range of ports to listen on"
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
-msgstr "_Start Port:"
+#: src/gtkprefs.c:1013
+msgid "_Start port:"
+msgstr "_Start port:"
-#: src/gtkprefs.c:992
-msgid "_End Port:"
-msgstr "_End Port:"
+#: src/gtkprefs.c:1020
+msgid "_End port:"
+msgstr "_End port:"
-#: src/gtkprefs.c:1000
+#: src/gtkprefs.c:1028
msgid "Proxy Server"
msgstr "Proxy Server"
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1032
msgid "No proxy"
msgstr "No proxy"
-#: src/gtkprefs.c:1060
+#: src/gtkprefs.c:1088
msgid "_User:"
msgstr "_User:"
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1150
msgid "Epiphany"
msgstr "Epiphany"
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1151
msgid "Firebird"
msgstr "Firebird"
-#: src/gtkprefs.c:1123
+#: src/gtkprefs.c:1152
msgid "Firefox"
msgstr "Firefox"
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1153
msgid "Galeon"
msgstr "Galeon"
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1154
msgid "GNOME Default"
msgstr "GNOME Default"
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1155
msgid "Konqueror"
msgstr "Konqueror"
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:1156
msgid "Mozilla"
msgstr "Mozilla"
-#: src/gtkprefs.c:1128
+#: src/gtkprefs.c:1157
msgid "Netscape"
msgstr "Netscape"
-#: src/gtkprefs.c:1129
+#: src/gtkprefs.c:1158
msgid "Opera"
msgstr "Opera"
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1167
msgid "Manual"
msgstr "Manual"
-#: src/gtkprefs.c:1191
+#: src/gtkprefs.c:1220
msgid "Browser Selection"
msgstr "Browser Selection"
-#: src/gtkprefs.c:1195
+#: src/gtkprefs.c:1224
msgid "_Browser:"
msgstr "_Browser:"
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1232
msgid "_Open link in:"
msgstr "_Open Link in:"
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1234
msgid "Browser default"
msgstr "Browser default"
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1235
msgid "Existing window"
msgstr "Existing window"
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1237
msgid "New tab"
msgstr "New tab"
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1251
#, c-format
msgid ""
"_Manual:\n"
@@ -4005,55 +4710,83 @@ msgstr ""
"_Manual:\n"
"(%s for URL)"
-#: src/gtkprefs.c:1258 src/gtkprefs.c:1740
+#: src/gtkprefs.c:1287 src/gtkprefs.c:1868
msgid "Logging"
msgstr "Logging"
-#: src/gtkprefs.c:1261
-msgid "Log _Format:"
-msgstr "Log _Format:"
+#: src/gtkprefs.c:1290
+msgid "Log _format:"
+msgstr "Log _format:"
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1295
msgid "Log all _instant messages"
msgstr "Log all _instant messages"
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1297
msgid "Log all c_hats"
msgstr "Log all c_hats"
-#: src/gtkprefs.c:1270
+#: src/gtkprefs.c:1299
msgid "Log all _status changes to system log"
msgstr "Log all _status changes to system log"
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1447
msgid "Sound Selection"
msgstr "Sound Selection"
-#: src/gtkprefs.c:1456
+#: src/gtkprefs.c:1455
+msgid "Quietest"
+msgstr "Quietest"
+
+#: src/gtkprefs.c:1457
+msgid "Quieter"
+msgstr "Quieter"
+
+#: src/gtkprefs.c:1459
+msgid "Quiet"
+msgstr "Quiet"
+
+#: src/gtkprefs.c:1461 src/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "Normal"
+
+#: src/gtkprefs.c:1463
+msgid "Loud"
+msgstr "Loud"
+
+#: src/gtkprefs.c:1465
+msgid "Louder"
+msgstr "Louder"
+
+#: src/gtkprefs.c:1467
+msgid "Loudest"
+msgstr "Loudest"
+
+#: src/gtkprefs.c:1530
msgid "Sound Method"
msgstr "Sound Method"
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1531
msgid "_Method:"
msgstr "_Method:"
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1533
msgid "Console beep"
msgstr "Console beep"
-#: src/gtkprefs.c:1461
+#: src/gtkprefs.c:1535
msgid "Automatic"
msgstr "Automatic"
-#: src/gtkprefs.c:1466
+#: src/gtkprefs.c:1540
msgid "Command"
msgstr "Command"
-#: src/gtkprefs.c:1467
+#: src/gtkprefs.c:1541
msgid "No sounds"
msgstr "No sounds"
-#: src/gtkprefs.c:1475
+#: src/gtkprefs.c:1549
#, c-format
msgid ""
"Sound c_ommand:\n"
@@ -4062,109 +4795,113 @@ msgstr ""
"Sound c_ommand:\n"
"(%s for filename)"
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1575
msgid "Sound Options"
msgstr "Sound Options"
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1576
msgid "Sounds when conversation has _focus"
msgstr "Sounds when conversation has _focus"
-#: src/gtkprefs.c:1504
+#: src/gtkprefs.c:1578
msgid "_Sounds while away"
msgstr "_Sounds while away"
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1585
+msgid "Volume:"
+msgstr "Volume:"
+
+#: src/gtkprefs.c:1613
msgid "Sound Events"
msgstr "Sound Events"
-#: src/gtkprefs.c:1565
+#: src/gtkprefs.c:1664
msgid "Play"
msgstr "Play"
-#: src/gtkprefs.c:1572
+#: src/gtkprefs.c:1671
msgid "Event"
msgstr "Event"
-#: src/gtkprefs.c:1591
+#: src/gtkprefs.c:1690
msgid "Test"
msgstr "Test"
-#: src/gtkprefs.c:1595
+#: src/gtkprefs.c:1694
msgid "Reset"
msgstr "Reset"
-#: src/gtkprefs.c:1599
+#: src/gtkprefs.c:1698
msgid "Choose..."
msgstr "Choose..."
-#: src/gtkprefs.c:1653 src/gtkstatusbox.c:353
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "Away"
+#: src/gtkprefs.c:1740
+msgid "_Report idle time:"
+msgstr "_Report idle time:"
-#: src/gtkprefs.c:1654
-msgid "_Queue new messages when away"
-msgstr "_Queue new messages when away"
+#: src/gtkprefs.c:1743
+msgid "From last sent message"
+msgstr "From last sent message"
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1745
+msgid "Based on keyboard or mouse use"
+msgstr "Based on keyboard or mouse use"
+
+#: src/gtkprefs.c:1754
msgid "_Auto-reply:"
msgstr "_Auto-reply:"
-#: src/gtkprefs.c:1660
-msgid "When away"
-msgstr "When away"
-
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1758
msgid "When both away and idle"
msgstr "When both away and idle"
-#: src/gtkprefs.c:1664
-msgid "_Report idle time"
-msgstr "_Report idle time"
-
-#: src/gtkprefs.c:1667
+#. Auto-away stuff
+#: src/gtkprefs.c:1764
msgid "Auto-away"
msgstr "Auto-away"
-#: src/gtkprefs.c:1668
+#: src/gtkprefs.c:1766
msgid "Change status when _idle"
msgstr "Change status when _idle"
-#: src/gtkprefs.c:1672
+#: src/gtkprefs.c:1770
msgid "_Minutes before changing status:"
msgstr "_Minutes before changing status:"
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1778
msgid "Change _status to:"
msgstr "Change _status to:"
-#: src/gtkprefs.c:1730
+#. Signon status stuff
+#: src/gtkprefs.c:1799
+msgid "Status at startup"
+msgstr "Status at startup"
+
+#: src/gtkprefs.c:1801
+msgid "Use status from last _exit at startup"
+msgstr "Use status from last _exit at startup"
+
+#: src/gtkprefs.c:1807
+msgid "Status to a_pply at startup:"
+msgstr "Status to a_pply at startup:"
+
+#: src/gtkprefs.c:1858
msgid "Smiley Themes"
msgstr "Smiley Themes"
-#: src/gtkprefs.c:1731
+#: src/gtkprefs.c:1859
msgid "Sounds"
msgstr "Sounds"
-#: src/gtkprefs.c:1732 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:1860 src/protocols/silc/silc.c:1848
msgid "Network"
msgstr "Network"
-#: src/gtkprefs.c:1737
+#: src/gtkprefs.c:1865
msgid "Browser"
msgstr "Browser"
-#: src/gtkprefs.c:1741
+#: src/gtkprefs.c:1869
msgid "Away / Idle"
msgstr "Away / Idle"
@@ -4188,67 +4925,67 @@ msgstr "Block all users"
msgid "Block only the users below"
msgstr "Block only the users below"
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:372
msgid "Privacy"
msgstr "Privacy"
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:385
msgid "Changes to privacy settings take effect immediately."
msgstr "Changes to privacy settings take effect immediately."
#. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: src/gtkprivacy.c:397
msgid "Set privacy for:"
msgstr "Set privacy for:"
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
msgid "Permit User"
msgstr "Permit User"
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:563
msgid "Type a user you permit to contact you."
msgstr "Type a user you permit to contact you."
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:564
msgid "Please enter the name of the user you wish to be able to contact you."
msgstr "Please enter the name of the user you wish to be able to contact you."
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "Permit"
+#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "_Permit"
-#: src/gtkprivacy.c:599
+#: src/gtkprivacy.c:572
#, c-format
msgid "Allow %s to contact you?"
msgstr "Allow %s to contact you?"
-#: src/gtkprivacy.c:601
+#: src/gtkprivacy.c:574
#, c-format
msgid "Are you sure you wish to allow %s to contact you?"
msgstr "Are you sure you wish to allow %s to contact you?"
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
msgid "Block User"
msgstr "Block User"
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:602
msgid "Type a user to block."
msgstr "Type a user to block."
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:603
msgid "Please enter the name of the user you wish to block."
msgstr "Please enter the name of the user you wish to block."
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Block"
+#: src/gtkprivacy.c:605 src/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Block"
-#: src/gtkprivacy.c:637
+#: src/gtkprivacy.c:610
#, c-format
msgid "Block %s?"
msgstr "Block %s?"
-#: src/gtkprivacy.c:639
+#: src/gtkprivacy.c:612
#, c-format
msgid "Are you sure you want to block %s?"
msgstr "Are you sure you want to block %s?"
@@ -4256,121 +4993,145 @@ msgstr "Are you sure you want to block %s?"
#. *
#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: src/gtkrequest.c:285 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:559 src/protocols/msn/msn.c:568
+#: src/protocols/novell/novell.c:1921 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:117 src/protocols/silc/wb.c:303 src/request.h:1331
msgid "Yes"
msgstr "Yes"
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: src/gtkrequest.c:286 src/protocols/msn/dialog.c:115
+#: src/protocols/msn/msn.c:559 src/protocols/msn/msn.c:568
+#: src/protocols/novell/novell.c:1922 src/protocols/silc/buddy.c:314
+#: src/protocols/silc/pk.c:118 src/protocols/silc/wb.c:304 src/request.h:1331
msgid "No"
msgstr "No"
-#: src/gtkrequest.c:263
+#: src/gtkrequest.c:289
msgid "Apply"
msgstr "Apply"
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: src/gtkrequest.c:290 src/protocols/msn/msn.c:357
+#: src/protocols/silc/util.c:336
msgid "Close"
msgstr "Close"
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1839
msgid "That file already exists"
msgstr "That file already exists"
-#: src/gtkrequest.c:1797
+#: src/gtkrequest.c:1840
msgid "Would you like to overwrite it?"
msgstr "Would you like to overwrite it?"
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1884 src/gtkrequest.c:1925
msgid "Save File..."
msgstr "Save File..."
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: src/gtkrequest.c:1885 src/gtkrequest.c:1926
msgid "Open File..."
msgstr "Open File..."
-#: src/gtkroomlist.c:331
+#: src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "_Add"
+
+#: src/gtkroomlist.c:354
msgid "Room List"
msgstr "Room List"
#. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:424
msgid "_Get List"
msgstr "_Get List"
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "_Add Chat"
+
+#: src/gtksavedstatuses.c:446 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:812 src/protocols/novell/novell.c:1486
msgid "Title"
msgstr "Title"
-#: src/gtksavedstatuses.c:377
+#: src/gtksavedstatuses.c:461
msgid "Type"
msgstr "Type"
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+#. Available status messages are plain text
+#: src/gtksavedstatuses.c:472 src/gtksavedstatuses.c:917
+#: src/protocols/bonjour/bonjour.c:256 src/protocols/bonjour/bonjour.c:263
+#: src/protocols/gg/gg.c:1421 src/protocols/gg/gg.c:1431
+#: src/protocols/gg/gg.c:1437 src/protocols/gg/gg.c:1446
+#: src/protocols/gg/gg.c:1451 src/protocols/irc/irc.c:171
+#: src/protocols/jabber/jabber.c:1099 src/protocols/jabber/jabber.c:1109
+#: src/protocols/jabber/jabber.c:1119 src/protocols/jabber/jabber.c:1129
+#: src/protocols/jabber/jabber.c:1139 src/protocols/jabber/jabber.c:1151
+#: src/protocols/novell/novell.c:2868 src/protocols/novell/novell.c:2974
+#: src/protocols/novell/novell.c:2980 src/protocols/novell/novell.c:2986
+#: src/protocols/oscar/oscar.c:7709 src/protocols/oscar/oscar.c:7723
+#: src/protocols/oscar/oscar.c:7728 src/protocols/oscar/oscar.c:7937
+#: src/protocols/oscar/oscar.c:7949 src/protocols/sametime/sametime.c:3221
+#: src/protocols/sametime/sametime.c:3227
+#: src/protocols/sametime/sametime.c:3233
+#: src/protocols/sametime/sametime.c:3312 src/protocols/silc/buddy.c:1544
+#: src/protocols/simple/simple.c:241 src/protocols/yahoo/yahoo.c:3227
+#: src/protocols/yahoo/yahoo.c:3233 src/protocols/zephyr/zephyr.c:2261
msgid "Message"
msgstr "Message"
-#: src/gtksavedstatuses.c:451
+#: src/gtksavedstatuses.c:535
msgid "Saved Statuses"
msgstr "Saved Statuses"
#. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
+#: src/gtksavedstatuses.c:560 src/gtksavedstatuses.c:1178
msgid "_Use"
msgstr "_Use"
-#: src/gtksavedstatuses.c:584
+#: src/gtksavedstatuses.c:688
msgid "Title already in use. You must choose a unique title."
msgstr "Title already in use. You must choose a unique title."
-#: src/gtksavedstatuses.c:675
-msgid "Custom status"
-msgstr "Custom status"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+#: src/gtksavedstatuses.c:876
+msgid "Different"
+msgstr "Different"
+
+#: src/gtksavedstatuses.c:906 src/gtksavedstatuses.c:1044
+#: src/protocols/gg/gg.c:1403 src/protocols/gg/gg.c:1408
+#: src/protocols/jabber/buddy.c:623 src/protocols/jabber/buddy.c:630
+#: src/protocols/jabber/buddy.c:641 src/protocols/jabber/jabber.c:1070
+#: src/protocols/msn/msn.c:550 src/protocols/novell/novell.c:2867
+#: src/protocols/novell/novell.c:2871 src/protocols/oscar/oscar.c:783
+#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:792
+#: src/protocols/yahoo/yahoo.c:2829
msgid "Status"
msgstr "Status"
-#: src/gtksavedstatuses.c:797
+#: src/gtksavedstatuses.c:1063
msgid "_Title:"
msgstr "_Title:"
-#: src/gtksavedstatuses.c:817
+#: src/gtksavedstatuses.c:1083 src/gtksavedstatuses.c:1430
msgid "_Status:"
msgstr "_Status:"
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+#. Different status message expander
+#: src/gtksavedstatuses.c:1120
msgid "Use a _different status for some accounts"
msgstr "Use a _different status for some accounts"
+#. Save & Use button
+#: src/gtksavedstatuses.c:1187
+msgid "Sa_ve & Use"
+msgstr "Sa_ve & Use"
+
+#: src/gtksavedstatuses.c:1407
+#, c-format
+msgid "Status for %s"
+msgstr "Status for %s"
+
#: src/gtksound.c:61
msgid "Buddy logs in"
msgstr "Buddy logs in"
@@ -4411,12 +5172,12 @@ msgstr "Others talk in chat"
msgid "Someone says your name in chat"
msgstr "Someone says your name in chat"
-#: src/gtksound.c:414
+#: src/gtksound.c:488
#, c-format
msgid "Unable to play sound because the chosen file (%s) does not exist."
msgstr "Unable to play sound because the chosen file (%s) does not exist."
-#: src/gtksound.c:430
+#: src/gtksound.c:504
msgid ""
"Unable to play sound because the 'Command' sound method has been chosen, but "
"no command has been set."
@@ -4424,7 +5185,7 @@ msgstr ""
"Unable to play sound because the 'Command' sound method has been chosen, but "
"no command has been set."
-#: src/gtksound.c:442
+#: src/gtksound.c:516
#, c-format
msgid ""
"Unable to play sound because the configured sound command could not be "
@@ -4433,98 +5194,67 @@ msgstr ""
"Unable to play sound because the configured sound command could not be "
"launched: %s"
-#: src/gtkstatusbox.c:198
+#: src/gtkstatusbox.c:362
msgid "Typing"
msgstr "Typing"
#. connect to the server
-#: src/gtkstatusbox.c:201 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:364 src/protocols/irc/irc.c:256
+#: src/protocols/jabber/jabber.c:897 src/protocols/msn/session.c:349
+#: src/protocols/napster/napster.c:531 src/protocols/novell/novell.c:2183
+#: src/protocols/oscar/oscar.c:1861 src/protocols/sametime/sametime.c:3598
+#: src/protocols/simple/simple.c:1368 src/protocols/yahoo/yahoo.c:2524
+#: src/protocols/zephyr/zephyr.c:1547
msgid "Connecting"
msgstr "Connecting"
-#. hacks
-#: src/gtkstatusbox.c:352 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 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:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/silc/silc.c:48 src/protocols/simple/simple.c:253
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "Available"
+#: src/gtkstatusbox.c:668
+msgid "New..."
+msgstr "New..."
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:354 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "Invisible"
-
-#: src/gtkstatusbox.c:355 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/silc/silc.c:46 src/protocols/simple/simple.c:249
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "Offline"
-
-#: src/gtkstatusbox.c:357
-msgid "Custom..."
-msgstr "Custom..."
-
-#: src/gtkstatusbox.c:358
+#: src/gtkstatusbox.c:669
msgid "Saved..."
msgstr "Saved..."
-#: src/gtkstock.c:117
+#: src/gtkstock.c:138
msgid "_Alias"
msgstr "_Alias"
-#: src/gtkstock.c:119
+#: src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "Close _tabs"
+
+#: src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "_Get Info"
+
+#: src/gtkstock.c:143
msgid "_Invite"
msgstr "_Invite"
-#: src/gtkstock.c:120
+#: src/gtkstock.c:144
msgid "_Modify"
msgstr "_Modify"
-#: src/gtkstock.c:121
+#: src/gtkstock.c:145
msgid "_Open Mail"
msgstr "_Open Mail"
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "_Warn"
-
-#: src/gtkutils.c:1379 src/gtkutils.c:1404
+#: src/gtkutils.c:1313 src/gtkutils.c:1338
#, c-format
msgid "The following error has occurred loading %s: %s"
msgstr "The following error has occurred loading %s: %s"
-#: src/gtkutils.c:1381 src/gtkutils.c:1406
+#: src/gtkutils.c:1315 src/gtkutils.c:1340
msgid "Failed to load image"
msgstr "Failed to load image"
-#: src/gtkutils.c:1481
+#: src/gtkutils.c:1415
#, c-format
msgid "Cannot send folder %s."
msgstr "Cannot send folder %s."
-#: src/gtkutils.c:1483
+#: src/gtkutils.c:1417
msgid ""
"Gaim cannot transfer a folder. You will need to send the files within "
"individually"
@@ -4532,11 +5262,11 @@ msgstr ""
"Gaim cannot transfer a folder. You will need to send the files within "
"individually"
-#: src/gtkutils.c:1511 src/gtkutils.c:1520 src/gtkutils.c:1525
+#: src/gtkutils.c:1445 src/gtkutils.c:1454 src/gtkutils.c:1459
msgid "You have dragged an image"
msgstr "You have dragged an image"
-#: src/gtkutils.c:1512
+#: src/gtkutils.c:1446
msgid ""
"You can send this image as a file transfer, embed it into this message, or "
"use it as the buddy icon for this user."
@@ -4544,23 +5274,23 @@ msgstr ""
"You can send this image as a file transfer, embed it into this message, or "
"use it as the buddy icon for this user."
-#: src/gtkutils.c:1516 src/gtkutils.c:1531
+#: src/gtkutils.c:1450 src/gtkutils.c:1465
msgid "Set as buddy icon"
msgstr "Set as buddy icon"
-#: src/gtkutils.c:1517 src/gtkutils.c:1532
+#: src/gtkutils.c:1451 src/gtkutils.c:1466
msgid "Send image file"
msgstr "Send image file"
-#: src/gtkutils.c:1518 src/gtkutils.c:1532
+#: src/gtkutils.c:1452 src/gtkutils.c:1466
msgid "Insert in message"
msgstr "Insert in message"
-#: src/gtkutils.c:1521
+#: src/gtkutils.c:1455
msgid "Would you like to set it as the buddy icon for this user?"
msgstr "Would you like to set it as the buddy icon for this user?"
-#: src/gtkutils.c:1526
+#: src/gtkutils.c:1460
msgid ""
"You can send this image as a file transfer or embed it into this message, or "
"use it as the buddy icon for this user."
@@ -4568,7 +5298,7 @@ msgstr ""
"You can send this image as a file transfer or embed it into this message, or "
"use it as the buddy icon for this user."
-#: src/gtkutils.c:1528
+#: src/gtkutils.c:1462
msgid ""
"You can insert this image into this message, or use it as the buddy icon for "
"this user"
@@ -4581,11 +5311,11 @@ msgstr ""
#. * send. The only logical one is "Application," but do we really want to send a binary and nothing else?
#. * Probably not. I'll just give an error and return.
#. The original patch sent the icon used by the launcher. That's probably wrong
-#: src/gtkutils.c:1582
+#: src/gtkutils.c:1516
msgid "Cannot send launcher"
msgstr "Cannot send launcher"
-#: src/gtkutils.c:1582
+#: src/gtkutils.c:1516
msgid ""
"You dragged a desktop launcher. Most likely you wanted to send whatever this "
"launcher points to instead of this launcher itself."
@@ -4596,23 +5326,35 @@ msgstr ""
#. Write a local message to this conversation showing that a request for a
#. * Doodle session has been made
#.
-#: src/gtkwhiteboard.c:317 src/protocols/yahoo/yahoo_doodle.c:96
+#: src/gtkwhiteboard.c:344 src/protocols/yahoo/yahoo_doodle.c:96
msgid "Sent Doodle request."
msgstr "Sent Doodle request."
-#: src/log.c:129
+#: src/log.c:158
msgid "<b><font color=\"red\">The logger has no read function</font></b>"
msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
-#: src/log.c:577
+#: src/log.c:540
+msgid "HTML"
+msgstr "HTML"
+
+#: src/log.c:551
+msgid "Plain text"
+msgstr "Plain text"
+
+#: src/log.c:562
+msgid "Old Gaim"
+msgstr "Old Gaim"
+
+#: src/log.c:653
msgid "Logging of this conversation failed."
msgstr "Logging of this conversation failed."
-#: src/log.c:839
+#: src/log.c:948
msgid "XML"
msgstr "XML"
-#: src/log.c:904
+#: src/log.c:1016
#, c-format
msgid ""
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4621,7 +5363,7 @@ msgstr ""
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
"REPLY&gt;:</b></font> %s<br/>\n"
-#: src/log.c:906
+#: src/log.c:1018
#, c-format
msgid ""
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4630,46 +5372,82 @@ msgstr ""
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
"REPLY&gt;:</b></font> %s<br/>\n"
-#: src/log.c:957 src/log.c:1074
+#: src/log.c:1075 src/log.c:1197
msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
-#: src/log.c:967 src/log.c:1086
+#: src/log.c:1087 src/log.c:1209
#, c-format
msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
-#: src/log.c:1019
+#: src/log.c:1140
#, c-format
msgid "(%s) %s <AUTO-REPLY>: %s\n"
msgstr "(%s) %s <AUTO-REPLY>: %s\n"
-#: src/plugin.c:331
+#: src/plugin.c:281 src/protocols/msn/servconn.c:133
+#: src/protocols/msn/session.c:326 src/protocols/oscar/oscar.c:5040
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Plug-in magic mismatch %d (need %d)"
+
+#: src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI version mismatch %d.%d.x (need %d.%d.x)"
+
+#: src/plugin.c:457
+msgid "Plugin does not implement all required functions"
+msgstr "Plug-in does not implement all required functions"
+
+#: src/plugin.c:512
#, c-format
msgid ""
"The required plugin %s was not found. Please install this plugin and try "
"again."
msgstr ""
-"The required plugin %s was not found. Please install this plugin and try "
+"The required plug-in %s was not found. Please install this plug-in and try "
"again."
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim was unable to load your plugin."
+#: src/plugin.c:517
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Gaim encountered an error when loading the plug-in."
-#: src/plugin.c:360
+#: src/plugin.c:540
#, c-format
msgid "The required plugin %s was unable to load."
-msgstr "The required plugin %s was unable to load."
+msgstr "The required plug-in %s could not be loaded."
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Idle"
+#: src/plugin.c:544
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim was unable to load your plug-in."
-#: src/protocols/bonjour/bonjour.c:303
+#: src/plugin.c:646
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "The dependent plug-in %s could not be unloaded."
+
+#: src/plugin.c:651
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Gaim encountered an error when unloading the plug-in."
+
+#. Send a message about the connection error
+#: src/protocols/bonjour/bonjour.c:111
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Unable to listen for incoming IM connections\n"
+
+#: src/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server. Is it running?"
+msgstr ""
+"Unable to establish connection with the local mDNS server - is it running?"
+
+#: src/protocols/bonjour/bonjour.c:337 src/protocols/sametime/sametime.c:3198
#, c-format
msgid ""
"\n"
@@ -4678,7 +5456,7 @@ msgstr ""
"\n"
"<b>Status:</b> %s"
-#: src/protocols/bonjour/bonjour.c:305
+#: src/protocols/bonjour/bonjour.c:339
#, c-format
msgid ""
"\n"
@@ -4697,34 +5475,41 @@ msgstr ""
#. *< version
#. * summary
#. * description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
+#: src/protocols/bonjour/bonjour.c:434 src/protocols/bonjour/bonjour.c:436
msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour Protocol Plugin"
+msgstr "Bonjour Protocol Plug-in"
+
+#: src/protocols/bonjour/bonjour.c:468 src/protocols/bonjour/bonjour.c:476
+#: src/protocols/bonjour/bonjour.c:534
+msgid "Gaim User"
+msgstr "Gaim User"
#. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-msgid "Host name"
-msgstr "Host name"
+#: src/protocols/bonjour/bonjour.c:572 src/protocols/silc/silc.c:931
+msgid "Hostname"
+msgstr "Hostname"
#. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: src/protocols/bonjour/bonjour.c:576 src/protocols/irc/irc.c:829
+#: src/protocols/msn/msn.c:1957 src/protocols/napster/napster.c:720
+#: src/protocols/sametime/sametime.c:5544 src/protocols/silc/silc.c:1856
msgid "Port"
msgstr "Port"
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
+#: src/protocols/bonjour/bonjour.c:579 src/protocols/gg/gg.c:562
+#: src/protocols/gg/gg.c:971
msgid "First name"
-msgstr "First name"
+msgstr "Forename"
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
+#: src/protocols/bonjour/bonjour.c:582 src/protocols/gg/gg.c:557
msgid "Last name"
-msgstr "Last name"
+msgstr "Surname"
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/bonjour/bonjour.c:585 src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:779 src/protocols/jabber/buddy.c:787
+#: src/protocols/silc/silc.c:695 src/protocols/silc/silc.c:935
+#: src/protocols/silc/util.c:512 src/protocols/yahoo/yahoo_profile.c:1030
msgid "Email"
msgstr "Email"
@@ -4732,271 +5517,308 @@ msgstr "Email"
msgid "Bonjour"
msgstr "Bonjour"
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+#: src/protocols/gg/gg.c:80 src/protocols/gg/gg.c:102
+#: src/protocols/gg/gg.c:137
+msgid "Token Error"
+msgstr "Token Error"
+
+#: src/protocols/gg/gg.c:81 src/protocols/gg/gg.c:103
+#: src/protocols/gg/gg.c:138
+msgid "Unable to fetch the token.\n"
+msgstr "Unable to fetch the token.\n"
+
+#: src/protocols/gg/gg.c:226 src/protocols/gg/gg.c:245
msgid "Save Buddylist..."
msgstr "Send Buddylist..."
-#: src/protocols/gg/gg.c:137
+#: src/protocols/gg/gg.c:227
msgid "Your buddylist is empty, nothing was written to the file."
msgstr "Your buddylist is empty, nothing was written to the file."
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
+#: src/protocols/gg/gg.c:233 src/protocols/gg/gg.c:235
msgid "Couldn't open file"
msgstr "Couldn't open file"
-#: src/protocols/gg/gg.c:156
+#: src/protocols/gg/gg.c:246
msgid "Buddylist saved successfully!"
msgstr "Buddylist saved successfully!"
-#: src/protocols/gg/gg.c:178
-msgid "Could't open file"
-msgstr "Couldn't open file"
+#: src/protocols/gg/gg.c:264 src/protocols/gg/gg.c:265
+msgid "Couldn't load buddylist"
+msgstr "Couldn't load buddy list"
-#: src/protocols/gg/gg.c:199
+#: src/protocols/gg/gg.c:281
msgid "Load Buddylist..."
msgstr "Load Buddylist..."
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:282
msgid "Buddylist loaded successfully!"
msgstr "Buddylist loaded successfully!"
-#: src/protocols/gg/gg.c:211
+#: src/protocols/gg/gg.c:293
msgid "Save buddylist..."
msgstr "Save buddylist..."
-#: src/protocols/gg/gg.c:254
+#: src/protocols/gg/gg.c:337
msgid "Fill in the registration fields."
msgstr "Fill in the registration fields."
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:342
msgid "Passwords do not match."
msgstr "Passwords do not match."
-#: src/protocols/gg/gg.c:266
+#: src/protocols/gg/gg.c:351
msgid "Unable to register new account. Error occurred.\n"
msgstr "Unable to register new account. Error occurred.\n"
-#: src/protocols/gg/gg.c:279
+#: src/protocols/gg/gg.c:364
msgid "New Gadu-Gadu Account Registered"
msgstr "New Gadu-Gadu Account Registered"
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:365
msgid "Registration completed successfully!"
msgstr "Registration completed successfully!"
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/gg/gg.c:425
+msgid "e-Mail"
+msgstr "E-Mail"
+
+#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:704
+#: src/protocols/jabber/jabber.c:680 src/protocols/jabber/jabber.c:1224
+msgid "Password"
+msgstr "Password"
+
+#: src/protocols/gg/gg.c:435 src/protocols/gg/gg.c:709
+msgid "Password (retype)"
+msgstr "Password (retype)"
+
+#: src/protocols/gg/gg.c:440 src/protocols/gg/gg.c:714
+msgid "Enter current token"
+msgstr "Enter current token"
+
+#: src/protocols/gg/gg.c:446 src/protocols/gg/gg.c:720
+msgid "Current token"
+msgstr "Current token"
+
+#: src/protocols/gg/gg.c:450 src/protocols/gg/gg.c:451
+msgid "Register New Gadu-Gadu Account"
+msgstr "Register New Gadu-Gadu Account"
+
+#: src/protocols/gg/gg.c:452
+msgid "Please, fill in the following fields"
+msgstr "Please fill in the following fields"
+
+#: src/protocols/gg/gg.c:547 src/protocols/gg/gg.c:1610
+msgid "Unable to initiate a new search"
+msgstr "Unable to initiate a new search"
+
+#: src/protocols/gg/gg.c:548 src/protocols/gg/gg.c:1611
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "You have a pending search. Please wait for it to finish."
+
+#: src/protocols/gg/gg.c:567 src/protocols/gg/gg.c:974
+#: src/protocols/gg/gg.c:1997 src/protocols/jabber/buddy.c:252
+#: src/protocols/jabber/buddy.c:695 src/protocols/jabber/buddy.c:1395
+#: src/protocols/jabber/jabber.c:696 src/protocols/msn/msn.c:1373
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/ops.c:1036
+#: src/protocols/silc/ops.c:1179 src/protocols/silc/ops.c:1328
+#: src/protocols/yahoo/yahoo_profile.c:1035
msgid "Nickname"
msgstr "Nickname"
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: src/protocols/gg/gg.c:572 src/protocols/gg/gg.c:977
+#: src/protocols/jabber/jabber.c:716 src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6146
msgid "City"
msgstr "City"
-#: src/protocols/gg/gg.c:417
+#: src/protocols/gg/gg.c:577
msgid "Year of birth"
msgstr "Year of birth"
-#: src/protocols/gg/gg.c:426
+#: src/protocols/gg/gg.c:580 src/protocols/msn/msn.c:1538
+#: src/protocols/oscar/oscar.c:6112 src/protocols/yahoo/yahoo_profile.c:1060
+msgid "Gender"
+msgstr "Gender"
+
+#: src/protocols/gg/gg.c:581
+msgid "Male or female"
+msgstr "Male or female"
+
+#: src/protocols/gg/gg.c:582 src/protocols/oscar/oscar.c:6112
+msgid "Male"
+msgstr "Male"
+
+#: src/protocols/gg/gg.c:583 src/protocols/oscar/oscar.c:6112
+msgid "Female"
+msgstr "Female"
+
+#: src/protocols/gg/gg.c:587
msgid "Only online"
msgstr "Only online"
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
+#: src/protocols/gg/gg.c:591 src/protocols/gg/gg.c:592
msgid "Find buddies"
msgstr "Find buddies"
-#: src/protocols/gg/gg.c:432
+#: src/protocols/gg/gg.c:593
msgid "Please, enter your search criteria below"
msgstr "Please enter your search criteria below"
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:630
msgid "Fill in the fields."
msgstr "Fill in the fields."
-#: src/protocols/gg/gg.c:476
+#: src/protocols/gg/gg.c:642
msgid "Your current password is different from the one that you specified."
msgstr "Your current password is different from the one that you specified."
-#: src/protocols/gg/gg.c:491
+#: src/protocols/gg/gg.c:656
msgid "Unable to change password. Error occured.\n"
-msgstr "Unable to change password. Error occured.\n"
+msgstr "Unable to change password. An error occured.\n"
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:665
msgid "Change password for the Gadu-Gadu account"
msgstr "Change password for the Gadu-Gadu account"
-#: src/protocols/gg/gg.c:501
+#: src/protocols/gg/gg.c:666
msgid "Password was changed successfully!"
-msgstr "Password changed successfully"
-
-#: src/protocols/gg/gg.c:535
-msgid "Token Error"
-msgstr "Token Error"
-
-#: src/protocols/gg/gg.c:536
-msgid "Unable to fetch the token.\n"
-msgstr "Unable to fetch the token.\n"
+msgstr "Password successfully changed!"
-#: src/protocols/gg/gg.c:551
+#: src/protocols/gg/gg.c:699
msgid "Current password"
msgstr "Current password"
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Password"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-msgid "Password (retype)"
-msgstr "Password (retype)"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-msgid "Enter current token"
-msgstr "Enter current token"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-msgid "Current token"
-msgstr "Current token"
-
-#: src/protocols/gg/gg.c:574
+#: src/protocols/gg/gg.c:724
msgid "Please, enter your current password and your new password for UIN: "
msgstr "Please enter your current password and your new password for UIN: "
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#: src/protocols/gg/gg.c:728 src/protocols/gg/gg.c:729
msgid "Change Gadu-Gadu Password"
msgstr "Change Gadu-Gadu password"
-#: src/protocols/gg/gg.c:649
+#. TODO: s/screenname/alias/
+#: src/protocols/gg/gg.c:804
#, c-format
msgid "Select a chat for buddy: %s"
msgstr "Select a chat for buddy: %s"
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#: src/protocols/gg/gg.c:807 src/protocols/gg/gg.c:808
msgid "Add to chat..."
msgstr "Add to chat..."
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Unable to read socket"
+#: src/protocols/gg/gg.c:950
+msgid "No matching users found"
+msgstr "No matching users found"
+
+#: src/protocols/gg/gg.c:951
+msgid "There are no users matching your search criteria."
+msgstr "There are no users matching your search criteria."
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:962 src/protocols/gg/gg.c:1029
+#: src/protocols/oscar/oscar.c:6249
+msgid "Unable to display the search results."
+msgstr "Unable to display the search results."
+
+#: src/protocols/gg/gg.c:968 src/protocols/oscar/oscar.c:6084
+msgid "UIN"
+msgstr "UIN"
+
+#: src/protocols/gg/gg.c:980
+msgid "Birth year"
+msgstr "Year of birth"
+
+#: src/protocols/gg/gg.c:1020
msgid "Gadu-Gadu Public Directory"
msgstr "Gadu-Gadu Public Directory"
-#: src/protocols/gg/gg.c:960
+#: src/protocols/gg/gg.c:1021
msgid "Search results"
msgstr "Search results"
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Online"
+#: src/protocols/gg/gg.c:1118 src/protocols/gg/gg.c:1265
+msgid "Unable to read socket"
+msgstr "Unable to read socket"
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "Busy"
+#: src/protocols/gg/gg.c:1201
+msgid "Buddy list downloaded"
+msgstr "Buddy list downloaded"
+
+#: src/protocols/gg/gg.c:1202
+msgid "Your buddy list was downloaded from the server."
+msgstr "Your buddy list was downloaded from the server."
+
+#: src/protocols/gg/gg.c:1209
+msgid "Buddy list uploaded"
+msgstr "Buddy list uploaded"
+
+#: src/protocols/gg/gg.c:1210
+msgid "Your buddy list was stored on the server."
+msgstr "Your buddy list was stored on the server."
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1311 src/protocols/gg/gg.c:1532
+msgid "Connection failed."
+msgstr "Connection failed."
+
+#: src/protocols/gg/gg.c:1445 src/protocols/msn/msn.c:566
msgid "Blocked"
msgstr "Blocked"
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1468
msgid "Add to chat"
msgstr "Add to chat"
-#: src/protocols/gg/gg.c:1133
+#: src/protocols/gg/gg.c:1477
msgid "Unblock"
msgstr "Unblock"
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1481
+msgid "Block"
+msgstr "Block"
+
+#: src/protocols/gg/gg.c:1498
msgid "Chat _name:"
msgstr "Chat _name:"
-#: src/protocols/gg/gg.c:1183
-msgid "Connection failed."
-msgstr "Connection failed."
-
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1724
msgid "Chat error"
msgstr "Chat error"
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1725
msgid "This chat name is already in use"
msgstr "This chat name is already in use"
-#: src/protocols/gg/gg.c:1435
+#: src/protocols/gg/gg.c:1808
msgid "Not connected to the server."
msgstr "Not connected to the server."
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr "Token Error: Unable to fetch the token.\n"
-
-#: src/protocols/gg/gg.c:1472
-msgid "e-Mail"
-msgstr "E-Mail"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-msgid "Register New Gadu-Gadu Account"
-msgstr "Register New Gadu-Gadu Account"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr "Please fill in the following fields"
+#: src/protocols/gg/gg.c:1831
+msgid "Find buddies..."
+msgstr "Find buddies..."
-#: src/protocols/gg/gg.c:1515
-msgid "Change password"
-msgstr "Change password"
+#: src/protocols/gg/gg.c:1837
+msgid "Change password..."
+msgstr "Change password..."
-#: src/protocols/gg/gg.c:1520
+#: src/protocols/gg/gg.c:1843
msgid "Upload buddylist to Server"
msgstr "Upload buddylist to Server"
-#: src/protocols/gg/gg.c:1523
+#: src/protocols/gg/gg.c:1847
msgid "Download buddylist from Server"
msgstr "Download buddylist from Server"
-#: src/protocols/gg/gg.c:1526
+#: src/protocols/gg/gg.c:1851
msgid "Delete buddylist from Server"
msgstr "Delete buddylist from Server"
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr "Save buddylist to file"
+#: src/protocols/gg/gg.c:1855
+msgid "Save buddylist to file..."
+msgstr "Save buddylist to file..."
-#: src/protocols/gg/gg.c:1532
-msgid "Load buddylist from file"
-msgstr "Load buddylist from file"
+#: src/protocols/gg/gg.c:1859
+msgid "Load buddylist from file..."
+msgstr "Load buddylist from file..."
#. magic
#. major_version
@@ -5009,117 +5831,119 @@ msgstr "Load buddylist from file"
#. id
#. name
#. version
-#: src/protocols/gg/gg.c:1617
+#: src/protocols/gg/gg.c:1949
msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu Protocol Plugin"
+msgstr "Gadu-Gadu Protocol Plug-in"
#. summary
-#: src/protocols/gg/gg.c:1618
+#: src/protocols/gg/gg.c:1950
msgid "Polish popular IM"
-msgstr "Polish popular IM"
+msgstr "Polish popular IM system"
-#: src/protocols/gg/gg.c:1665
+#: src/protocols/gg/gg.c:1998
msgid "Gadu-Gadu User"
msgstr "Gadu-Gadu User"
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1582
#, c-format
msgid "Unknown command: %s"
msgstr "Unknown command: %s"
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/irc/cmds.c:482 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1290
#, c-format
msgid "current topic is: %s"
msgstr "current topic is: %s"
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: src/protocols/irc/cmds.c:486 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1294
msgid "No topic is set"
msgstr "No topic is set"
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/irc/dcc_send.c:278 src/protocols/irc/dcc_send.c:317
+#: src/protocols/yahoo/yahoo_filexfer.c:173
#: src/protocols/yahoo/yahoo_filexfer.c:182
#: src/protocols/yahoo/yahoo_filexfer.c:191
msgid "File Transfer Failed"
msgstr "File Transfer Failed"
-#: src/protocols/irc/dcc_send.c:273
+#: src/protocols/irc/dcc_send.c:279 src/protocols/irc/dcc_send.c:318
msgid "Gaim could not open a listening port."
msgstr "Gaim could not open a listening port."
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
msgid "Error displaying MOTD"
msgstr "Error displaying MOTD"
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
msgid "No MOTD available"
msgstr "No MOTD available"
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:79
msgid "There is no MOTD associated with this connection."
msgstr "There is no MOTD associated with this connection."
-#: src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:82
#, c-format
msgid "MOTD for %s"
msgstr "MOTD for %s"
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:535
+#: src/protocols/irc/irc.c:557
msgid "Server has disconnected"
msgstr "Server has disconnected"
-#: src/protocols/irc/irc.c:188
+#: src/protocols/irc/irc.c:186
msgid "View MOTD"
msgstr "View MOTD"
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:198 src/protocols/silc/chat.c:33
msgid "_Channel:"
msgstr "_Channel:"
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:204 src/protocols/jabber/chat.c:59
msgid "_Password:"
msgstr "_Password:"
-#: src/protocols/irc/irc.c:238
+#: src/protocols/irc/irc.c:236
msgid "IRC nicks may not contain whitespace"
msgstr "IRC nicks may not contain whitespace"
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: src/protocols/irc/irc.c:264 src/protocols/jabber/jabber.c:481
+#: src/protocols/jabber/jabber.c:818
msgid "SSL support unavailable"
msgstr "SSL support unavailable"
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: src/protocols/irc/irc.c:275 src/protocols/simple/simple.c:422
+#: src/protocols/simple/simple.c:1296
msgid "Couldn't create socket"
msgstr "Couldn't create socket"
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:346 src/protocols/jabber/jabber.c:354
+#: src/protocols/oscar/oscar.c:1789 src/protocols/oscar/oscar.c:1857
msgid "Couldn't connect to host"
msgstr "Couldn't connect to host"
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:371 src/protocols/jabber/jabber.c:381
msgid "Connection Failed"
msgstr "Connection Failed"
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:374 src/protocols/jabber/jabber.c:384
msgid "SSL Handshake Failed"
msgstr "SSL Handshake Failed"
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/irc/irc.c:532 src/protocols/irc/irc.c:554
msgid "Read error"
msgstr "Read error"
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1420
+#: src/protocols/yahoo/yahoochat.c:1397
msgid "Users"
msgstr "Users"
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/irc/irc.c:696 src/protocols/sametime/sametime.c:3309
+#: src/protocols/silc/chat.c:1423 src/protocols/silc/ops.c:1380
+#: src/protocols/yahoo/yahoochat.c:1406
msgid "Topic"
msgstr "Topic"
@@ -5131,34 +5955,36 @@ msgstr "Topic"
#. *< id
#. *< name
#. *< version
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:806
msgid "IRC Protocol Plugin"
-msgstr "IRC Protocol Plugin"
+msgstr "IRC Protocol Plug-in"
#. * summary
-#: src/protocols/irc/irc.c:800
+#: src/protocols/irc/irc.c:807
msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "The IRC Protocol Plugin that Sucks Less"
+msgstr "The IRC Protocol Plug-in that Sucks Less"
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1130
-#: src/protocols/simple/simple.c:1428
+#. host to connect to
+#: src/protocols/irc/irc.c:826 src/protocols/irc/msgs.c:231
+#: src/protocols/jabber/jabber.c:1792 src/protocols/napster/napster.c:715
+#: src/protocols/sametime/sametime.c:5539 src/protocols/silc/ops.c:1242
+#: src/protocols/silc/ops.c:1344 src/protocols/simple/simple.c:1527
msgid "Server"
msgstr "Server"
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:832
msgid "Encodings"
msgstr "Encodings"
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:835 src/protocols/irc/msgs.c:225
+#: src/protocols/jabber/jabber.c:676 src/protocols/silc/buddy.c:1531
+#: src/protocols/silc/ops.c:1189 src/protocols/silc/ops.c:1191
+#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1340
+#: src/protocols/silc/silc.c:929
msgid "Username"
msgstr "Username"
-#: src/protocols/irc/irc.c:831
+#: src/protocols/irc/irc.c:838
msgid "Real name"
msgstr "Real name"
@@ -5166,158 +5992,171 @@ msgstr "Real name"
#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
#.
-#: src/protocols/irc/irc.c:839
+#: src/protocols/irc/irc.c:846
msgid "Use SSL"
msgstr "Use SSL"
-#: src/protocols/irc/msgs.c:105
+#: src/protocols/irc/msgs.c:103
msgid "Bad mode"
msgstr "Bad mode"
-#: src/protocols/irc/msgs.c:116
+#: src/protocols/irc/msgs.c:114
#, c-format
msgid "You are banned from %s."
msgstr "You are banned from %s."
-#: src/protocols/irc/msgs.c:117
+#: src/protocols/irc/msgs.c:115
msgid "Banned"
msgstr "Banned"
-#: src/protocols/irc/msgs.c:134
+#: src/protocols/irc/msgs.c:132
#, c-format
msgid "Cannot ban %s: banlist is full"
msgstr "Cannot ban %s: banlist is full"
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: src/protocols/irc/msgs.c:211 src/protocols/irc/msgs.c:231
+#: src/protocols/irc/msgs.c:244
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/irc/msgs.c:211 src/protocols/oscar/oscar.c:6085
+#: src/protocols/silc/ops.c:1412
msgid "Nick"
msgstr "Nick"
-#: src/protocols/irc/msgs.c:216
+#: src/protocols/irc/msgs.c:214
msgid " <i>(ircop)</i>"
msgstr " <i>(ircop)</i>"
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:215
msgid " <i>(identified)</i>"
msgstr " <i>(identified)</i>"
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:225
+#: src/protocols/irc/msgs.c:226 src/protocols/irc/msgs.c:237
+#: src/protocols/yahoo/yahoo_profile.c:691
#, c-format
msgid "<b>%s:</b> %s<br>"
msgstr "<b>%s:</b> %s<br>"
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:226 src/protocols/silc/ops.c:1183
+#: src/protocols/silc/ops.c:1332 src/protocols/yahoo/yahoo_profile.c:1040
msgid "Realname"
msgstr "Realname"
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:237 src/protocols/silc/ops.c:1255
msgid "Currently on"
msgstr "Currently on"
-#: src/protocols/irc/msgs.c:244
+#: src/protocols/irc/msgs.c:242
#, c-format
msgid "<b>Idle for:</b> %s<br>"
msgstr "<b>Idle for:</b> %s<br>"
-#: src/protocols/irc/msgs.c:246
+#: src/protocols/irc/msgs.c:244
msgid "Online since"
msgstr "Online since"
-#: src/protocols/irc/msgs.c:249
+#: src/protocols/irc/msgs.c:248
msgid "<br><b>Defining adjective:</b> Glorious<br>"
msgstr "<br><b>Defining adjective:</b> Glorious<br>"
-#: src/protocols/irc/msgs.c:317
+#: src/protocols/irc/msgs.c:316
#, c-format
msgid "%s has changed the topic to: %s"
msgstr "%s has changed the topic to: %s"
-#: src/protocols/irc/msgs.c:322
+#: src/protocols/irc/msgs.c:321
#, c-format
msgid "The topic for %s is: %s"
msgstr "The topic for %s is: %s"
-#: src/protocols/irc/msgs.c:339
+#: src/protocols/irc/msgs.c:338
#, c-format
msgid "Unknown message '%s'"
msgstr "Unknown message '%s'"
-#: src/protocols/irc/msgs.c:340
+#: src/protocols/irc/msgs.c:339
msgid "Unknown message"
msgstr "Unknown message"
-#: src/protocols/irc/msgs.c:340
+#: src/protocols/irc/msgs.c:339
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:363
+#: src/protocols/irc/msgs.c:362
#, c-format
msgid "Users on %s: %s"
msgstr "Users on %s: %s"
-#: src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:490
msgid "Time Response"
msgstr "Time Response"
-#: src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:491
msgid "The IRC server's local time is:"
msgstr "The IRC server's local time is:"
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:502
msgid "No such channel"
msgstr "No such channel"
#. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:513
msgid "no such channel"
msgstr "no such channel"
-#: src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:516
msgid "User is not logged in"
msgstr "User is not logged in"
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:521
msgid "No such nick or channel"
msgstr "No such nick or channel"
-#: src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:541
msgid "Could not send"
msgstr "Could not send"
-#: src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:597
#, c-format
msgid "Joining %s requires an invitation."
msgstr "Joining %s requires an invitation."
-#: src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:598
msgid "Invitation only"
msgstr "Invitation only"
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:699
#, c-format
msgid "You have been kicked by %s: (%s)"
msgstr "You have been kicked by %s: (%s)"
-#: src/protocols/irc/msgs.c:697
+#. Remove user from channel
+#: src/protocols/irc/msgs.c:704 src/protocols/silc/ops.c:721
#, c-format
msgid "Kicked by %s (%s)"
msgstr "Kicked by %s (%s)"
-#: src/protocols/irc/msgs.c:721
+#: src/protocols/irc/msgs.c:727
#, c-format
msgid "mode (%s %s) by %s"
msgstr "mode (%s %s) by %s"
-#: src/protocols/irc/msgs.c:805
+#: src/protocols/irc/msgs.c:812 src/protocols/irc/msgs.c:813
+msgid "Invalid nickname"
+msgstr "Invalid nickname"
+
+#: src/protocols/irc/msgs.c:814
+msgid ""
+"Your selected nickname was rejected by the server. It probably contains "
+"invalid characters."
+msgstr ""
+"Your selected nickname was rejected by the server. It probably contains "
+"invalid characters."
+
+#: src/protocols/irc/msgs.c:818
msgid ""
"Your selected account name was rejected by the server. It probably contains "
"invalid characters."
@@ -5325,42 +6164,42 @@ msgstr ""
"Your selected account name was rejected by the server. It probably contains "
"invalid characters."
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:858
msgid "Cannot change nick"
msgstr "Cannot change nick"
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:858
msgid "Could not change nick"
msgstr "Could not change nick"
-#: src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:879
#, c-format
msgid "You have parted the channel%s%s"
msgstr "You have parted the channel%s%s"
-#: src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:921
msgid "Error: invalid PONG from server"
msgstr "Error: invalid PONG from server"
-#: src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:923
#, c-format
msgid "PING reply -- Lag: %lu seconds"
msgstr "PING reply -- Lag: %lu seconds"
-#: src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:998
#, c-format
msgid "Cannot join %s:"
msgstr "Cannot join %s:"
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:999 src/protocols/silc/ops.c:1128
msgid "Cannot join channel"
msgstr "Cannot join channel"
-#: src/protocols/irc/msgs.c:1019
+#: src/protocols/irc/msgs.c:1033
msgid "Nick or channel is temporarily unavailable."
msgstr "Nick or channel is temporarily unavailable."
-#: src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1045
#, c-format
msgid "Wallops from %s"
msgstr "Wallops from %s"
@@ -5378,6 +6217,10 @@ msgstr ""
"away."
#: src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Send a command to chanserv"
+
+#: src/protocols/irc/parse.c:117
msgid ""
"deop &lt;nick1&gt; [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
@@ -5385,7 +6228,7 @@ msgstr ""
"deop &lt;nick1&gt; [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
msgid ""
"devoice &lt;nick1&gt; [nick2] ...: Remove channel voice status from "
"someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5395,7 +6238,7 @@ msgstr ""
"someone, preventing them from speaking if the channel is moderated (+m). You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
msgid ""
"invite &lt;nick&gt; [room]: Invite someone to join you in the specified "
"channel, or the current channel."
@@ -5403,7 +6246,7 @@ msgstr ""
"invite &lt;nick&gt; [room]: Invite someone to join you in the specified "
"channel, or the current channel."
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
msgid ""
"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -5411,7 +6254,7 @@ msgstr ""
"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
msgid ""
"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -5419,7 +6262,7 @@ msgstr ""
"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122
msgid ""
"kick &lt;nick&gt; [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
@@ -5427,7 +6270,7 @@ msgstr ""
"kick &lt;nick&gt; [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123
msgid ""
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
@@ -5435,11 +6278,15 @@ msgstr ""
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
msgid "me &lt;action to perform&gt;: Perform an action."
msgstr "me &lt;action to perform&gt;: Perform an action."
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: Send a command to memoserv"
+
+#: src/protocols/irc/parse.c:126
msgid ""
"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;: Set or unset a channel "
"or user mode."
@@ -5447,7 +6294,7 @@ msgstr ""
"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;: Set or unset a channel "
"or user mode."
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:127
msgid ""
"msg &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
@@ -5455,15 +6302,19 @@ msgstr ""
"msg &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:128
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:127 src/protocols/jabber/jabber.c:1555
+#: src/protocols/irc/parse.c:129 src/protocols/jabber/jabber.c:1635
msgid "nick &lt;new nickname&gt;: Change your nickname."
msgstr "nick &lt;new nickname&gt;: Change your nickname."
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:130
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: Send a command to nickserv"
+
+#: src/protocols/irc/parse.c:131
msgid ""
"op &lt;nick1&gt; [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
@@ -5471,7 +6322,7 @@ msgstr ""
"op &lt;nick1&gt; [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:132
msgid ""
"operwall &lt;message&gt;: If you don't know what this is, you probably "
"can't use it."
@@ -5479,7 +6330,11 @@ msgstr ""
"operwall &lt;message&gt;: If you don't know what this is, you probably "
"can't use it."
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:133
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: Send a command to operserv"
+
+#: src/protocols/irc/parse.c:134
msgid ""
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
@@ -5487,7 +6342,7 @@ msgstr ""
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:135
msgid ""
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
"has."
@@ -5495,7 +6350,7 @@ msgstr ""
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
"has."
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:136
msgid ""
"query &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
@@ -5503,15 +6358,15 @@ msgstr ""
"query &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:137
msgid "quit [message]: Disconnect from the server, with an optional message."
msgstr "quit [message]: Disconnect from the server, with an optional message."
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:138
msgid "quote [...]: Send a raw command to the server."
msgstr "quote [...]: Send a raw command to the server."
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:139
msgid ""
"remove &lt;nick&gt; [message]: Remove someone from a room. You must be a "
"channel operator to do this."
@@ -5519,19 +6374,19 @@ msgstr ""
"remove &lt;nick&gt; [message]: Remove someone from a room. You must be a "
"channel operator to do this."
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:140
msgid "time: Displays the current local time at the IRC server."
msgstr "time: Displays the current local time at the IRC server."
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:141
msgid "topic [new topic]: View or change the channel topic."
msgstr "topic [new topic]: View or change the channel topic."
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:142
msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Set or unset a user mode."
msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Set or unset a user mode."
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:143
msgid ""
"voice &lt;nick1&gt; [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
@@ -5539,7 +6394,7 @@ msgstr ""
"voice &lt;nick1&gt; [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:144
msgid ""
"wallops &lt;message&gt;: If you don't know what this is, you probably can't "
"use it."
@@ -5547,25 +6402,25 @@ msgstr ""
"wallops &lt;message&gt;: If you don't know what this is, you probably can't "
"use it."
-#: src/protocols/irc/parse.c:141
+#: src/protocols/irc/parse.c:145
msgid "whois [server] &lt;nick&gt;: Get information on a user."
msgstr "whois [server] &lt;nick&gt;: Get information on a user."
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:439
#, c-format
msgid "Reply time from %s: %lu seconds"
msgstr "Reply time from %s: %lu seconds"
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
msgid "PONG"
msgstr "PONG"
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
msgid "CTCP PING reply"
msgstr "CTCP PING reply"
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
+#: src/protocols/irc/parse.c:542 src/protocols/irc/parse.c:546
+#: src/protocols/oscar/oscar.c:1698 src/protocols/toc/toc.c:190
#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
#: src/protocols/toc/toc.c:780
msgid "Disconnected."
@@ -5587,18 +6442,18 @@ msgstr "Server requires TLS/SSL for login. No TLS/SSL support found."
msgid "Server requires plaintext authentication over an unencrypted stream"
msgstr "Server requires plaintext authentication over an unencrypted stream"
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Invalid response from server."
+#: src/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr "Server couldn't authenticate you without a password"
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:235 src/protocols/jabber/auth.c:236
+#: src/protocols/jabber/auth.c:396 src/protocols/jabber/auth.c:397
+#: src/protocols/jabber/auth.c:478 src/protocols/jabber/auth.c:479
msgid "Plaintext Authentication"
msgstr "Plaintext Authentication"
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:237 src/protocols/jabber/auth.c:398
+#: src/protocols/jabber/auth.c:480
msgid ""
"This server requires plaintext authentication over an unencrypted "
"connection. Allow this and continue authentication?"
@@ -5606,76 +6461,90 @@ msgstr ""
"This server requires plaintext authentication over an unencrypted "
"connection. Allow this and continue authentication?"
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:243 src/protocols/jabber/auth.c:406
+#: src/protocols/jabber/auth.c:488
msgid "Server does not use any supported authentication method"
msgstr "Server does not use any supported authentication method"
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: src/protocols/jabber/auth.c:319 src/protocols/jabber/auth.c:441
+#: src/protocols/jabber/auth.c:609 src/protocols/jabber/auth.c:742
+#: src/protocols/jabber/auth.c:754 src/protocols/jabber/auth.c:773
+#: src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Invalid response from server."
+
+#: src/protocols/jabber/auth.c:630
msgid "Invalid challenge from server"
msgstr "Invalid challenge from server"
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/auth.c:717
+msgid "SASL error"
+msgstr "SASL error"
+
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:664
+#: src/protocols/silc/ops.c:1020
msgid "Full Name"
msgstr "Full Name"
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:677
+#: src/protocols/silc/ops.c:1032
msgid "Family Name"
msgstr "Family Name"
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:681
msgid "Given Name"
msgstr "Given Name"
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:736
msgid "URL"
msgstr "URL"
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:733
msgid "Street Address"
msgstr "Street Address"
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:729
msgid "Extended Address"
msgstr "Extended Address"
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:737
msgid "Locality"
msgstr "Locality"
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:741
msgid "Region"
msgstr "Region"
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/jabber.c:726
msgid "Postal Code"
msgstr "Postal Code"
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:750
+#: src/protocols/silc/silc.c:939
msgid "Country"
msgstr "Country"
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:768
msgid "Telephone"
msgstr "Telephone"
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:802
msgid "Organization Name"
msgstr "Organisation Name"
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:806
msgid "Organization Unit"
msgstr "Organisation Unit"
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:815
msgid "Role"
msgstr "Role"
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:698
+#: src/protocols/oscar/oscar.c:6118
msgid "Birthday"
msgstr "Birthday"
@@ -5691,125 +6560,120 @@ msgstr ""
"All items below are optional. Enter only the information with which you feel "
"comfortable."
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:1795
msgid "Resource"
msgstr "Resource"
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:685 src/protocols/silc/ops.c:1028
msgid "Middle Name"
msgstr "Middle Name"
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:718 src/protocols/jabber/jabber.c:711
+#: src/protocols/oscar/oscar.c:6137 src/protocols/oscar/oscar.c:6145
+#: src/protocols/silc/ops.c:1064
msgid "Address"
msgstr "Address"
-#: src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:725
msgid "P.O. Box"
msgstr "P.O. Box"
-#: src/protocols/jabber/buddy.c:832
+#: src/protocols/jabber/buddy.c:839
msgid "Photo"
msgstr "Photo"
-#: src/protocols/jabber/buddy.c:832
+#: src/protocols/jabber/buddy.c:839
msgid "Logo"
msgstr "Logo"
-#: src/protocols/jabber/buddy.c:1035
+#: src/protocols/jabber/buddy.c:1042
msgid "Un-hide From"
msgstr "Un-hide From"
-#: src/protocols/jabber/buddy.c:1038
+#: src/protocols/jabber/buddy.c:1046
msgid "Temporarily Hide From"
msgstr "Temporarily Hide From"
#. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: src/protocols/jabber/buddy.c:1054
msgid "Cancel Presence Notification"
msgstr "Cancel Presence Notification"
-#: src/protocols/jabber/buddy.c:1051
+#: src/protocols/jabber/buddy.c:1061
msgid "(Re-)Request authorization"
msgstr "(Re-)Request authorisation"
#. if(NOT ME)
#. shouldn't this just happen automatically when the buddy is
#. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: src/protocols/jabber/buddy.c:1070
msgid "Unsubscribe"
msgstr "Unsubscribe"
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1082
+#: src/protocols/silc/ops.c:1449
msgid "Error"
msgstr "Error"
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/buddy.c:1103 src/protocols/jabber/jabber.c:1107
msgid "Chatty"
msgstr "Chatty"
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: src/protocols/jabber/buddy.c:1107 src/status.c:159
msgid "Extended Away"
msgstr "Extended Away"
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: src/protocols/jabber/buddy.c:1109 src/protocols/jabber/jabber.c:1137
+#: src/protocols/oscar/oscar.c:721 src/protocols/oscar/oscar.c:7966
+#: src/protocols/sametime/sametime.c:3232
msgid "Do Not Disturb"
msgstr "Do Not Disturb"
-#: src/protocols/jabber/buddy.c:1235
+#: src/protocols/jabber/buddy.c:1289
msgid "The following are the results of your search"
msgstr "The following are the results of your search"
-#: src/protocols/jabber/buddy.c:1327
+#: src/protocols/jabber/buddy.c:1381
msgid "Fill in one or more fields to search for any matching Jabber users."
msgstr "Fill in one or more fields to search for any matching Jabber users."
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+#: src/protocols/jabber/buddy.c:1385 src/protocols/jabber/jabber.c:701
+#: src/protocols/oscar/oscar.c:6095 src/protocols/silc/ops.c:1024
msgid "First Name"
msgstr "Forename"
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/jabber/buddy.c:1390 src/protocols/jabber/jabber.c:706
+#: src/protocols/oscar/oscar.c:6096
msgid "Last Name"
msgstr "Surname"
-#: src/protocols/jabber/buddy.c:1346
+#: src/protocols/jabber/buddy.c:1400
msgid "E-Mail Address"
msgstr "E-Mail Address"
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
+#: src/protocols/jabber/buddy.c:1409 src/protocols/jabber/buddy.c:1410
msgid "Search for Jabber users"
msgstr "Search for Jabber users"
-#: src/protocols/jabber/buddy.c:1370
+#: src/protocols/jabber/buddy.c:1424
msgid "Invalid Directory"
msgstr "Invalid Directory"
-#: src/protocols/jabber/buddy.c:1387
+#: src/protocols/jabber/buddy.c:1441
msgid "Enter a User Directory"
msgstr "Enter a User Directory"
-#: src/protocols/jabber/buddy.c:1388
+#: src/protocols/jabber/buddy.c:1442
msgid "Select a user directory to search"
msgstr "Select a user directory to search"
-#: src/protocols/jabber/buddy.c:1391
+#: src/protocols/jabber/buddy.c:1445
msgid "Search Directory"
msgstr "Search Directory"
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7461
+#: src/protocols/yahoo/yahoochat.c:998
msgid "_Room:"
msgstr "_Room:"
@@ -5873,7 +6737,7 @@ msgid "Nick changing not supported in non-MUC chatrooms"
msgstr "Nick changing not supported in non-MUC chatrooms"
#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/silc/ops.c:1449
msgid "Error retrieving room list"
msgstr "Error retrieving room list"
@@ -5897,396 +6761,394 @@ msgstr "Find Rooms"
msgid "Error initializing session"
msgstr "Error initializing session"
-#: src/protocols/jabber/jabber.c:215
+#: src/protocols/jabber/jabber.c:236 src/protocols/jabber/jabber.c:251
msgid "Write error"
msgstr "Write error"
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:289 src/protocols/jabber/jabber.c:321
msgid "Read Error"
msgstr "Read Error"
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:828
msgid "Unable to create socket"
msgstr "Unable to create socket"
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:788
msgid "Invalid Jabber ID"
msgstr "Invalid Jabber ID"
-#: src/protocols/jabber/jabber.c:473
+#: src/protocols/jabber/jabber.c:521
#, c-format
msgid "Registration of %s@%s successful"
msgstr "Registration of %s@%s successful"
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:523 src/protocols/jabber/jabber.c:524
msgid "Registration Successful"
msgstr "Registration Successful"
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:530 src/protocols/jabber/jabber.c:1373
msgid "Unknown Error"
msgstr "Unknown Error"
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:532 src/protocols/jabber/jabber.c:533
msgid "Registration Failed"
msgstr "Registration Failed"
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:644 src/protocols/jabber/jabber.c:645
msgid "Already Registered"
msgstr "Already Registered"
-#: src/protocols/jabber/jabber.c:643
+#: src/protocols/jabber/jabber.c:691
msgid "E-Mail"
msgstr "E-Mail"
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: src/protocols/jabber/jabber.c:721 src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6147
msgid "State"
msgstr "County/State"
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:731 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/silc.c:697 src/protocols/silc/util.c:514
msgid "Phone"
msgstr "Telephone"
-#: src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:741
msgid "Date"
msgstr "Date"
-#: src/protocols/jabber/jabber.c:701
+#: src/protocols/jabber/jabber.c:749
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:704 src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:752 src/protocols/jabber/jabber.c:753
msgid "Register New Jabber Account"
msgstr "Register New Jabber Account"
-#: src/protocols/jabber/jabber.c:842
+#: src/protocols/jabber/jabber.c:901
msgid "Initializing Stream"
msgstr "Initialising Stream"
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:907 src/protocols/msn/session.c:355
msgid "Authenticating"
msgstr "Authenticating"
-#: src/protocols/jabber/jabber.c:857
+#: src/protocols/jabber/jabber.c:916
msgid "Re-initializing Stream"
msgstr "Re-initialising Stream"
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:986 src/protocols/jabber/jabber.c:1351
+#: src/protocols/jabber/jabber.c:1392 src/protocols/jabber/jabber.c:1426
+#: src/protocols/oscar/oscar.c:790 src/protocols/oscar/oscar.c:7756
msgid "Not Authorized"
msgstr "Not Authorised"
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:1028
msgid "Both"
msgstr "Both"
-#: src/protocols/jabber/jabber.c:973
+#: src/protocols/jabber/jabber.c:1030
msgid "From (To pending)"
msgstr "From (To pending)"
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "From"
-
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:1035
msgid "To"
msgstr "To"
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:1037
msgid "None (To pending)"
msgstr "None (To pending)"
-#: src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:1041
msgid "Subscription"
msgstr "Subscription"
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
+#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1108
+#: src/protocols/jabber/jabber.c:1118 src/protocols/jabber/jabber.c:1128
+#: src/protocols/jabber/jabber.c:1138
msgid "Priority"
msgstr "Priority"
-#: src/protocols/jabber/jabber.c:1093
+#: src/protocols/jabber/jabber.c:1167
msgid "Password Changed"
msgstr "Password Changed"
-#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1168
msgid "Your password has been changed."
msgstr "Your password has been changed."
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: src/protocols/jabber/jabber.c:1172 src/protocols/jabber/jabber.c:1173
msgid "Error changing password"
msgstr "Error changing password"
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1229
msgid "Password (again)"
msgstr "Password (again)"
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1234 src/protocols/jabber/jabber.c:1235
msgid "Change Jabber Password"
msgstr "Change Jabber Password"
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1235
msgid "Please enter your new password"
msgstr "Please enter your new password"
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Set User Info"
+#: src/protocols/jabber/jabber.c:1245 src/protocols/oscar/oscar.c:8390
+#: src/protocols/silc/silc.c:1019
+msgid "Set User Info..."
+msgstr "Set User Info..."
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Change Password"
+#: src/protocols/jabber/jabber.c:1250 src/protocols/oscar/oscar.c:8401
+#: src/protocols/silc/silc.c:1015
+msgid "Change Password..."
+msgstr "Change Password..."
#. }
-#: src/protocols/jabber/jabber.c:1181
-msgid "Search for users"
-msgstr "Search for users"
+#: src/protocols/jabber/jabber.c:1255
+msgid "Search for Users..."
+msgstr "Search for Users..."
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1331
msgid "Bad Request"
msgstr "Bad Request"
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1333
msgid "Conflict"
msgstr "Conflict"
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1335
msgid "Feature Not Implemented"
msgstr "Feature Not Implemented"
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1337
msgid "Forbidden"
msgstr "Forbidden"
-#: src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1339
msgid "Gone"
msgstr "Gone"
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: src/protocols/jabber/jabber.c:1341 src/protocols/jabber/jabber.c:1416
msgid "Internal Server Error"
msgstr "Internal Server Error"
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1343
msgid "Item Not Found"
msgstr "Item Not Found"
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1345
msgid "Malformed Jabber ID"
msgstr "Malformed Jabber ID"
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1347
msgid "Not Acceptable"
msgstr "Not Acceptable"
-#: src/protocols/jabber/jabber.c:1275
+#: src/protocols/jabber/jabber.c:1349
msgid "Not Allowed"
msgstr "Not Allowed"
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1353
msgid "Payment Required"
msgstr "Payment Required"
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1355
msgid "Recipient Unavailable"
msgstr "Recipient unavailable"
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1359
msgid "Registration Required"
msgstr "Registration Required"
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1361
msgid "Remote Server Not Found"
msgstr "Remote Server Not Found"
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1363
msgid "Remote Server Timeout"
msgstr "Remote Server Timeout"
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1365
msgid "Server Overloaded"
msgstr "Server Overloaded"
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1367
msgid "Service Unavailable"
msgstr "Service Unavailable"
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1369
msgid "Subscription Required"
msgstr "Subscription Required"
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1371
msgid "Unexpected Request"
msgstr "Unexpected Request"
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1378
msgid "Authorization Aborted"
msgstr "Authorisation Aborted"
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1380
msgid "Incorrect encoding in authorization"
msgstr "Incorrect encoding in authorisation"
-#: src/protocols/jabber/jabber.c:1309
+#: src/protocols/jabber/jabber.c:1383
msgid "Invalid authzid"
msgstr "Invalid authzid"
-#: src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1386
msgid "Invalid Authorization Mechanism"
msgstr "Invalid Authorisation Mechanism"
-#: src/protocols/jabber/jabber.c:1315
+#: src/protocols/jabber/jabber.c:1389
msgid "Authorization mechanism too weak"
msgstr "Authorisation mechanism too weak"
-#: src/protocols/jabber/jabber.c:1320
+#: src/protocols/jabber/jabber.c:1394
msgid "Temporary Authentication Failure"
msgstr "Temporary Authentication Failure"
-#: src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1397
msgid "Authentication Failure"
msgstr "Authentication Failure"
-#: src/protocols/jabber/jabber.c:1326
+#: src/protocols/jabber/jabber.c:1401
msgid "Bad Format"
msgstr "Bad Format"
-#: src/protocols/jabber/jabber.c:1328
+#: src/protocols/jabber/jabber.c:1403
msgid "Bad Namespace Prefix"
msgstr "Bad Namespace Prefix"
-#: src/protocols/jabber/jabber.c:1331
+#: src/protocols/jabber/jabber.c:1406
msgid "Resource Conflict"
msgstr "Resource Conflict"
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1408 src/protocols/silc/ops.c:1728
msgid "Connection Timeout"
msgstr "Connection Timeout"
-#: src/protocols/jabber/jabber.c:1335
+#: src/protocols/jabber/jabber.c:1410
msgid "Host Gone"
msgstr "Host Gone"
-#: src/protocols/jabber/jabber.c:1337
+#: src/protocols/jabber/jabber.c:1412
msgid "Host Unknown"
msgstr "Host Unknown"
-#: src/protocols/jabber/jabber.c:1339
+#: src/protocols/jabber/jabber.c:1414
msgid "Improper Addressing"
msgstr "Improper Addressing"
-#: src/protocols/jabber/jabber.c:1343
+#: src/protocols/jabber/jabber.c:1418
msgid "Invalid ID"
msgstr "Invalid ID"
-#: src/protocols/jabber/jabber.c:1345
+#: src/protocols/jabber/jabber.c:1420
msgid "Invalid Namespace"
msgstr "Invalid Namespace"
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1422
msgid "Invalid XML"
msgstr "Invalid XML"
-#: src/protocols/jabber/jabber.c:1349
+#: src/protocols/jabber/jabber.c:1424
msgid "Non-matching Hosts"
msgstr "Non-matching Hosts"
-#: src/protocols/jabber/jabber.c:1353
+#: src/protocols/jabber/jabber.c:1428
msgid "Policy Violation"
msgstr "Policy Violation"
-#: src/protocols/jabber/jabber.c:1355
+#: src/protocols/jabber/jabber.c:1430
msgid "Remote Connection Failed"
msgstr "Remote Connection Failed"
-#: src/protocols/jabber/jabber.c:1357
+#: src/protocols/jabber/jabber.c:1432
msgid "Resource Constraint"
msgstr "Resource Constraint"
-#: src/protocols/jabber/jabber.c:1359
+#: src/protocols/jabber/jabber.c:1434
msgid "Restricted XML"
msgstr "Restricted XML"
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1436
msgid "See Other Host"
msgstr "See Other Host"
-#: src/protocols/jabber/jabber.c:1363
+#: src/protocols/jabber/jabber.c:1438
msgid "System Shutdown"
msgstr "System Shutdown"
-#: src/protocols/jabber/jabber.c:1365
+#: src/protocols/jabber/jabber.c:1440
msgid "Undefined Condition"
msgstr "Undefined Condition"
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1442
msgid "Unsupported Encoding"
msgstr "Unsupported Encoding"
-#: src/protocols/jabber/jabber.c:1369
+#: src/protocols/jabber/jabber.c:1444
msgid "Unsupported Stanza Type"
msgstr "Unsupported Stanza Type"
-#: src/protocols/jabber/jabber.c:1371
+#: src/protocols/jabber/jabber.c:1446
msgid "Unsupported Version"
msgstr "Unsupported Version"
-#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1448
msgid "XML Not Well Formed"
msgstr "XML Not Well Formed"
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1450
msgid "Stream Error"
msgstr "Stream Error"
-#: src/protocols/jabber/jabber.c:1442
+#: src/protocols/jabber/jabber.c:1517
#, c-format
msgid "Unable to ban user %s"
msgstr "Unable to ban user %s"
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1539
#, c-format
msgid "Unknown affiliation: \"%s\""
msgstr "Unknown affiliation: \"%s\""
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1544
#, c-format
msgid "Unable to affiliate user %s as \"%s\""
msgstr "Unable to affiliate user %s as \"%s\""
-#: src/protocols/jabber/jabber.c:1521
+#: src/protocols/jabber/jabber.c:1596
#, c-format
msgid "Unable to kick user %s"
msgstr "Unable to kick user %s"
-#: src/protocols/jabber/jabber.c:1547
+#: src/protocols/jabber/jabber.c:1627
msgid "config: Configure a chat room."
msgstr "config: Configure a chat room."
-#: src/protocols/jabber/jabber.c:1551
+#: src/protocols/jabber/jabber.c:1631
msgid "configure: Configure a chat room."
msgstr "configure: Configure a chat room."
-#: src/protocols/jabber/jabber.c:1560
+#: src/protocols/jabber/jabber.c:1640
msgid "part [room]: Leave the room."
msgstr "part [room]: Leave the room."
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1645
msgid "register: Register with a chat room."
msgstr "register: Register with a chat room."
-#: src/protocols/jabber/jabber.c:1571
+#: src/protocols/jabber/jabber.c:1651
msgid "topic [new topic]: View or change the topic."
msgstr "topic [new topic]: View or change the topic."
-#: src/protocols/jabber/jabber.c:1577
+#: src/protocols/jabber/jabber.c:1657
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:1583
+#: src/protocols/jabber/jabber.c:1663
msgid ""
"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
"affiliation with the room."
@@ -6294,19 +7156,19 @@ msgstr ""
"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
"affiliation with the room."
-#: src/protocols/jabber/jabber.c:1589
+#: src/protocols/jabber/jabber.c:1669
msgid "invite &lt;user&gt; [message]: Invite a user to the room."
msgstr "invite &lt;user&gt; [message]: Invite a user to the room."
-#: src/protocols/jabber/jabber.c:1595
+#: src/protocols/jabber/jabber.c:1675
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:1601
+#: src/protocols/jabber/jabber.c:1681
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:1606
+#: src/protocols/jabber/jabber.c:1686
msgid ""
"msg &lt;user&gt; &lt;message&gt;: Send a private message to another user."
msgstr ""
@@ -6322,32 +7184,32 @@ msgstr ""
#. *< version
#. * summary
#. * description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1770 src/protocols/jabber/jabber.c:1772
msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgstr "Jabber Protocol Plug-in"
-#: src/protocols/jabber/jabber.c:1714
+#: src/protocols/jabber/jabber.c:1798
msgid "Use TLS if available"
msgstr "Use TLS if available"
-#: src/protocols/jabber/jabber.c:1719
+#: src/protocols/jabber/jabber.c:1803
msgid "Require TLS"
msgstr "Require TLS"
-#: src/protocols/jabber/jabber.c:1722
+#: src/protocols/jabber/jabber.c:1806
msgid "Force old (port 5223) SSL"
msgstr "Force old (port 5223) SSL"
-#: src/protocols/jabber/jabber.c:1727
+#: src/protocols/jabber/jabber.c:1811
msgid "Allow plaintext auth over unencrypted streams"
msgstr "Allow plaintext auth over unencrypted streams"
-#: src/protocols/jabber/jabber.c:1732
+#: src/protocols/jabber/jabber.c:1816 src/protocols/simple/simple.c:1533
msgid "Connect port"
msgstr "Connect port"
#. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1820 src/protocols/silc/silc.c:1852
msgid "Connect server"
msgstr "Connect server"
@@ -6384,32 +7246,30 @@ msgstr " (Code %s)"
msgid "XML Parse error"
msgstr "XML Parse error"
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:305
msgid "Unknown Error in presence"
msgstr "Unknown Error in presence"
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:310 src/protocols/msn/userlist.c:104
#, c-format
msgid "The user %s wants to add %s to his or her buddy list."
msgstr "The user %s wants to add %s to his or her buddy list."
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "Authorise"
+#: src/protocols/jabber/presence.c:319 src/protocols/oscar/oscar.c:4717
+#: src/protocols/oscar/oscar.c:7391
+msgid "_Authorize"
+msgstr "_Authorise"
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "Deny"
+#: src/protocols/jabber/presence.c:320 src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:7392
+msgid "_Deny"
+msgstr "_Deny"
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:376 src/protocols/jabber/presence.c:377
msgid "Create New Room"
msgstr "Create New Room"
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:378
msgid ""
"You are creating a new room. Would you like to configure it, or accept the "
"default settings?"
@@ -6417,39 +7277,39 @@ msgstr ""
"You are creating a new room. Would you like to configure it, or accept the "
"default settings?"
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "Configure Room"
+#: src/protocols/jabber/presence.c:380
+msgid "_Configure Room"
+msgstr "_Configure Room"
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "Accept Defaults"
+#: src/protocols/jabber/presence.c:382
+msgid "_Accept Defaults"
+msgstr "_Accept Defaults"
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:419
#, c-format
msgid "Error in chat %s"
msgstr "Error in chat %s"
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:422
#, c-format
msgid "Error joining chat %s"
msgstr "Error joining chat %s"
-#: src/protocols/jabber/si.c:591
+#: src/protocols/jabber/si.c:626
#, c-format
msgid "Unable to send file to %s, user does not support file transfers"
msgstr "Unable to send file to %s, user does not support file transfers"
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:627 src/protocols/jabber/si.c:628
msgid "File Send Failed"
msgstr "File Send Failed"
-#: src/protocols/msn/dialog.c:91
+#: src/protocols/msn/dialog.c:92
#, c-format
msgid "Buddy list synchronization issue in %s (%s)"
msgstr "Buddy list synchronisation issue in %s (%s)"
-#: src/protocols/msn/dialog.c:97
+#: src/protocols/msn/dialog.c:98
#, c-format
msgid ""
"%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6458,7 +7318,7 @@ msgstr ""
"%s on the local list is inside the group \"%s\" but not on the server list. "
"Do you want this buddy to be added?"
-#: src/protocols/msn/dialog.c:105
+#: src/protocols/msn/dialog.c:106
#, c-format
msgid ""
"%s is on the local list but not on the server list. Do you want this buddy "
@@ -6544,8 +7404,8 @@ msgid "Cannot remove group zero"
msgstr "Cannot remove group zero"
#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Tried to add a contact to a group that doesn't exist"
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "Tried to add a user to a group that doesn't exist"
#: src/protocols/msn/error.c:99
msgid "Switchboard failed"
@@ -6638,7 +7498,7 @@ msgstr "Too many sessions"
#: src/protocols/msn/error.c:174
msgid "Passport not verified"
-msgstr "Passport not yet verified"
+msgstr "Passport not verified"
#: src/protocols/msn/error.c:177
msgid "Bad friend file"
@@ -6656,8 +7516,8 @@ msgstr "Friendly name changes too rapidly"
msgid "Server too busy"
msgstr "Server too busy"
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2847
+#: src/protocols/silc/ops.c:1717 src/protocols/toc/toc.c:722
msgid "Authentication failed"
msgstr "Authentication failed"
@@ -6709,11 +7569,11 @@ msgstr "This is the name that other MSN buddies will see you as."
#: src/protocols/msn/msn.c:263
msgid "Set your home phone number."
-msgstr "Set your home phone number."
+msgstr "Set your home telephone number."
#: src/protocols/msn/msn.c:278
msgid "Set your work phone number."
-msgstr "Set your work phone number."
+msgstr "Set your work telephone number."
#: src/protocols/msn/msn.c:293
msgid "Set your mobile phone number."
@@ -6751,9 +7611,9 @@ msgstr "Send a mobile message."
msgid "Page"
msgstr "Page"
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/msn/msn.c:550 src/protocols/msn/msn.c:557
+#: src/protocols/msn/msn.c:566 src/protocols/sametime/sametime.c:3194
+#: src/protocols/yahoo/yahoo.c:2829 src/protocols/yahoo/yahoo.c:2835
#, c-format
msgid ""
"\n"
@@ -6762,67 +7622,69 @@ msgstr ""
"\n"
"<b>%s:</b> %s"
-#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:557
msgid "Has you"
msgstr "Has you"
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/msn/msn.c:587 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:3237
msgid "Be Right Back"
msgstr "Be Right Back"
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
-msgstr "On The Phone"
-
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
-msgstr "Out To Lunch"
-
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "Hidden"
+#: src/protocols/msn/msn.c:591 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2851 src/protocols/novell/novell.c:2985
+#: src/protocols/silc/buddy.c:1473 src/protocols/silc/silc.c:53
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:3240
+msgid "Busy"
+msgstr "Busy"
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "Set Friendly Name"
+#: src/protocols/msn/msn.c:595 src/protocols/yahoo/yahoo.c:2668
+#: src/protocols/yahoo/yahoo.c:3252
+msgid "On the Phone"
+msgstr "On the Phone"
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Set Home Phone Number"
+#: src/protocols/msn/msn.c:599 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/yahoo/yahoo.c:3258
+msgid "Out to Lunch"
+msgstr "Out to Lunch"
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "Set Work Phone Number"
+#: src/protocols/msn/msn.c:623
+msgid "Set Friendly Name..."
+msgstr "Set Friendly Name..."
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "Set Mobile Phone Number"
+#: src/protocols/msn/msn.c:628
+msgid "Set Home Phone Number..."
+msgstr "Set Home Telephone Number..."
#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Enable/Disable Mobile Devices"
+msgid "Set Work Phone Number..."
+msgstr "Set Work Telephone Number..."
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Allow/Disallow Mobile Pages"
+#: src/protocols/msn/msn.c:636
+msgid "Set Mobile Phone Number..."
+msgstr "Set Mobile Phone Number..."
+
+#: src/protocols/msn/msn.c:642
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Enable/Disable Mobile Devices..."
#: src/protocols/msn/msn.c:647
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Allow/Disallow Mobile Pages..."
+
+#: src/protocols/msn/msn.c:657
msgid "Open Hotmail Inbox"
msgstr "Open Hotmail Inbox"
-#: src/protocols/msn/msn.c:671
+#: src/protocols/msn/msn.c:681
msgid "Send to Mobile"
msgstr "Send to Mobile"
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:691 src/protocols/novell/novell.c:3441
msgid "Initiate _Chat"
msgstr "Initiate _Chat"
-#: src/protocols/msn/msn.c:717
+#: src/protocols/msn/msn.c:729
msgid ""
"SSL support is needed for MSN. Please install a supported SSL library. See "
"http://gaim.sf.net/faq-ssl.php for more information."
@@ -6830,89 +7692,84 @@ 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:745
+#: src/protocols/msn/msn.c:757
msgid "Failed to connect to server."
msgstr "Failed to connect to server."
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo_profile.c:685
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
#, 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:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1373 src/protocols/msn/msn.c:1725
+#: src/protocols/yahoo/yahoo_profile.c:1202 src/util.c:1018
#, c-format
msgid "<b>%s:</b> "
msgstr "<b>%s:</b> "
-#: src/protocols/msn/msn.c:1471
+#: src/protocols/msn/msn.c:1456
msgid "MSN Profile"
msgstr "MSN Profile"
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1712
+#: src/protocols/yahoo/yahoo_profile.c:795
msgid "Error retrieving profile"
msgstr "Error retreiving profile"
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1531 src/protocols/oscar/oscar.c:6124
+#: src/protocols/yahoo/yahoo_profile.c:1050
msgid "Age"
msgstr "Age"
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Gender"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1055
msgid "Marital Status"
msgstr "Marital Status"
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1554 src/protocols/novell/novell.c:1480
+#: src/protocols/yahoo/yahoo_profile.c:1045
msgid "Location"
msgstr "Location"
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1065
msgid "Occupation"
msgstr "Occupation"
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1585
+#: src/protocols/msn/msn.c:1592 src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1607
msgid "A Little About Me"
msgstr "A Little About Me"
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1616 src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1629 src/protocols/msn/msn.c:1636
msgid "Favorite Things"
msgstr "Favourite Things"
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1645 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1658
msgid "Hobbies and Interests"
msgstr "Hobbies and Interests"
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/msn/msn.c:1667 src/protocols/msn/msn.c:1673
+#: src/protocols/yahoo/yahoo_profile.c:1107
msgid "Favorite Quote"
msgstr "Favourite Quote"
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1681
msgid "Last Updated"
msgstr "Last Updated"
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1692 src/protocols/silc/ops.c:1060
msgid "Homepage"
msgstr "Homepage"
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1714
msgid "The user has not created a public profile."
msgstr "The user has not created a public profile."
-#: src/protocols/msn/msn.c:1730
+#: src/protocols/msn/msn.c:1715
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 "
@@ -6922,7 +7779,7 @@ msgstr ""
"that the user does not exist, or that the user exists but has not created a "
"public profile."
-#: src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1719
msgid ""
"Gaim could not find any information in the user's profile. The user most "
"likely does not exist."
@@ -6930,7 +7787,7 @@ msgstr ""
"Gaim could not find any information in the user's profile. The user most "
"likely does not exist."
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: src/protocols/msn/msn.c:1725 src/protocols/yahoo/yahoo_profile.c:1202
msgid "Profile URL"
msgstr "Profile URL"
@@ -6944,24 +7801,28 @@ msgstr "Profile URL"
#. *< version
#. * summary
#. * description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1931 src/protocols/msn/msn.c:1933
msgid "MSN Protocol Plugin"
-msgstr "MSN Protocol Plugin"
+msgstr "MSN Protocol Plug-in"
-#: src/protocols/msn/msn.c:1963
+#: src/protocols/msn/msn.c:1952
msgid "Login server"
msgstr "Login server"
-#: src/protocols/msn/msn.c:1972
+#: src/protocols/msn/msn.c:1961
msgid "Use HTTP Method"
msgstr "Use HTTP Method"
-#: src/protocols/msn/msn.c:1980
-msgid "nudge: nudge a contact to get their attention"
-msgstr "nudge: nudge a contact to get their attention"
+#: src/protocols/msn/msn.c:1966
+msgid "Show custom smileys"
+msgstr "Show custom smileys"
+
+#: src/protocols/msn/msn.c:1974
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: nudge a user to get their attention"
#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: src/protocols/yahoo/yahoochat.c:1345
msgid "Unable to connect"
msgstr "Unable to connect"
@@ -6971,7 +7832,7 @@ msgid "%s is not a valid group."
msgstr "%s is not a valid group."
#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:532
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/session.c:334
msgid "Unknown error."
msgstr "Unknown error."
@@ -7009,15 +7870,15 @@ msgstr "%s is not a valid passport account."
msgid "Service Temporarily Unavailable."
msgstr "Service Temporarily Unavailable."
-#: src/protocols/msn/notification.c:819
+#: src/protocols/msn/notification.c:821
msgid "Unable to rename group"
msgstr "Unable to rename group"
-#: src/protocols/msn/notification.c:874
+#: src/protocols/msn/notification.c:876
msgid "Unable to delete group"
msgstr "Unable to delete group"
-#: src/protocols/msn/notification.c:1307
+#: src/protocols/msn/notification.c:1309
#, c-format
msgid ""
"The MSN server will shut down for maintenance in %d minute. You will "
@@ -7056,76 +7917,71 @@ msgstr "Writing error"
msgid "Reading error"
msgstr "Reading error"
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: src/protocols/msn/servconn.c:136
+#: src/protocols/msn/servconn.c:138
#, c-format
msgid ""
-"Connection error from %s server (%s):\n"
+"Connection error from %s server:\n"
"%s"
msgstr ""
-"Connection error from %s server (%s):\n"
+"Connection error from %s server:\n"
"%s"
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:304
msgid "Our protocol is not supported by the server."
msgstr "Our protocol is not supported by the server."
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:308
msgid "Error parsing HTTP."
msgstr "Error parsing HTTP."
#. MSG_SERVER_GHOST
#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:312 src/protocols/napster/napster.c:456
+#: src/protocols/oscar/oscar.c:5801 src/protocols/yahoo/yahoo.c:193
msgid "You have signed on from another location."
msgstr "You have signed on from another location."
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:315
msgid "The MSN servers are temporarily unavailable. Please wait and try again."
msgstr ""
"The MSN servers are temporarily unavailable. Please wait and try again."
-#: src/protocols/msn/session.c:333
+#: src/protocols/msn/session.c:320
msgid "The MSN servers are going down temporarily."
msgstr "The MSN servers are going down temporarily."
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:324
#, c-format
msgid "Unable to authenticate: %s"
msgstr "Unable to authenticate: %s"
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:329
msgid ""
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
msgstr ""
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:350 src/protocols/msn/session.c:352
msgid "Handshaking"
msgstr "Handshaking"
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:351
msgid "Transferring"
msgstr "Transferring"
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:353
msgid "Starting authentication"
msgstr "Starting authentication"
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:354
msgid "Getting cookie"
msgstr "Getting cookie"
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:356
msgid "Sending cookie"
msgstr "Sending cookie"
-#: src/protocols/msn/session.c:370
+#: src/protocols/msn/session.c:357
msgid "Retrieving buddy list"
msgstr "Retrieving buddy list"
@@ -7133,114 +7989,128 @@ msgstr "Retrieving buddy list"
msgid "Away From Computer"
msgstr "Away From Computer"
-#: src/protocols/msn/switchboard.c:403
+#: src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "On The Phone"
+
+#: src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Out To Lunch"
+
+#: src/protocols/msn/switchboard.c:407
msgid "Message may have not been sent because a timeout occurred:"
msgstr "Message may have not been sent because a timeout occurred:"
-#: src/protocols/msn/switchboard.c:411
+#: src/protocols/msn/switchboard.c:415
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:415
+#: src/protocols/msn/switchboard.c:419
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:419
+#: src/protocols/msn/switchboard.c:423
msgid "Message could not be sent because a connection error occurred:"
msgstr "Message could not be sent because a connection error occured:"
-#: src/protocols/msn/switchboard.c:423
+#: src/protocols/msn/switchboard.c:427
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Message could not be sent because we are sending too quickly:"
+
+#: src/protocols/msn/switchboard.c:431
msgid ""
"Message could not be sent because an error with the switchboard occurred:"
msgstr ""
"Message could not be sent because an error with the switchboard occurred:"
-#: src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:439
msgid "Message may have not been sent because an unknown error occurred:"
msgstr "Message may have not been sent because an unknown error occurred:"
-#: src/protocols/msn/switchboard.c:952
+#: src/protocols/msn/switchboard.c:960
#, c-format
msgid "%s just sent you a Nudge!"
msgstr "%s just sent you a Nudge!"
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:96
#, c-format
msgid "The user %s (%s) wants to add %s to his or her buddy list."
msgstr "The user %s (%s) wants to add %s to his or her buddy list."
-#: src/protocols/msn/userlist.c:275
+#: src/protocols/msn/userlist.c:111 src/protocols/yahoo/yahoo.c:914
+msgid "Authorize"
+msgstr "Authorise"
+
+#: src/protocols/msn/userlist.c:112 src/protocols/yahoo/yahoo.c:916
+msgid "Deny"
+msgstr "Deny"
+
+#: src/protocols/msn/userlist.c:286
#, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "%s has added you to his or her contact list."
+msgid "%s has added you to his or her buddy list."
+msgstr "%s has added you to his or her buddy list."
-#: src/protocols/msn/userlist.c:339
+#: src/protocols/msn/userlist.c:350
#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr "%s has removed you from his or her contact list."
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s has removed you from his or her boddy list."
-#: src/protocols/msn/userlist.c:659
+#: src/protocols/msn/userlist.c:678
#, c-format
msgid "Unable to add \"%s\"."
msgstr "Unable to add \"%s\"."
-#: src/protocols/msn/userlist.c:661
+#: src/protocols/msn/userlist.c:680
msgid "The screen name specified is invalid."
msgstr "The screen name specified is invalid."
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:266
msgid "Unable to read header from server"
msgstr "Unable to read header from server"
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:280
#, c-format
msgid "Unable to read message from server: %s. Command is %hd, length is %hd."
msgstr ""
"Unable to read message from server: %s. Command is %hd, length is %hd."
-#: src/protocols/napster/napster.c:290
+#: src/protocols/napster/napster.c:296
msgid "Unknown server error."
msgstr "Unknown server error."
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:345
#, c-format
msgid "users: %s, files: %s, size: %sGB"
msgstr "users: %s, files: %s, size: %sGB"
#. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: src/protocols/napster/napster.c:356
#, c-format
msgid "Unable to add \"%s\" to your Napster hotlist"
msgstr "Unable to add \"%s\" to your Napster hotlist"
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "You were disconnected from the server."
-
#. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:420
#, c-format
msgid "%s requested your information"
msgstr "%s requested your information"
#. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: src/protocols/napster/napster.c:460
#, c-format
msgid "%s requested a PING"
msgstr "%s requested a PING"
#. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/napster/napster.c:507 src/protocols/napster/napster.c:538
+#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2238
+#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2328
#: src/protocols/yahoo/yahoo_filexfer.c:69
#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
msgid "Unable to connect."
msgstr "Unable to connect."
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:594 src/protocols/toc/toc.c:1367
msgid "_Group:"
msgstr "_Group:"
@@ -7254,9 +8124,9 @@ msgstr "_Group:"
#. *< version
#. * summary
#. * description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:695 src/protocols/napster/napster.c:697
msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER Protocol Plugin"
+msgstr "NAPSTER Protocol Plug-in"
#: src/protocols/novell/nmuser.c:1868
msgid "Required parameters not passed in"
@@ -7387,43 +8257,43 @@ msgstr "The user is either offline or you are blocked"
msgid "Unknown error: 0x%X"
msgstr "Unknown error: 0x%X"
-#: src/protocols/novell/novell.c:117
+#: src/protocols/novell/novell.c:124
#, c-format
msgid "Login failed (%s)."
msgstr "Login failed (%s)."
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:247
#, c-format
msgid "Unable to send message. Could not get details for user (%s)."
msgstr "Unable to send message. Could not get details for user (%s)."
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:396
#, c-format
msgid "Unable to add %s to your buddy list (%s)."
msgstr "Unable to add %s to your buddy list (%s)."
#. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:422
#, c-format
msgid "Unable to send message (%s)."
msgstr "Unable to send message (%s)."
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:493 src/protocols/novell/novell.c:987
#, c-format
msgid "Unable to invite user (%s)."
msgstr "Unable to invite user (%s)."
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:532
#, c-format
msgid "Unable to send message to %s. Could not create the conference (%s)."
msgstr "Unable to send message to %s. Could not create the conference (%s)."
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:537
#, c-format
msgid "Unable to send message. Could not create the conference (%s)."
msgstr "Unable to send message. Could not create the conference (%s)."
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:584
#, c-format
msgid ""
"Unable to move user %s to folder %s in the server side list. Error while "
@@ -7432,7 +8302,7 @@ msgstr ""
"Unable to move user %s to folder %s in the server side list. Error while "
"creating folder (%s)."
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:632
#, c-format
msgid ""
"Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7441,67 +8311,67 @@ msgstr ""
"Unable to add %s to your buddy list. Error creating folder in server side "
"list (%s)."
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:705
#, c-format
msgid "Could not get details for user %s (%s)."
msgstr "Could not get details for user %s (%s)."
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:751 src/protocols/novell/novell.c:897
#, c-format
msgid "Unable to add user to privacy list (%s)."
msgstr "Unable to add user to privacy list (%s)."
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:798
#, c-format
msgid "Unable to add %s to deny list (%s)."
msgstr "Unable to add %s to deny list (%s)."
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:851
#, c-format
msgid "Unable to add %s to permit list (%s)."
msgstr "Unable to add %s to permit list (%s)."
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:919
#, c-format
msgid "Unable to remove %s from privacy list (%s)."
msgstr "Unable to remove %s from privacy list (%s)."
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:942 src/protocols/novell/novell.c:1654
#, c-format
msgid "Unable to change server side privacy settings (%s)."
msgstr "Unable to change server side privacy settings (%s)."
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:1014
#, c-format
msgid "Unable to create conference (%s)."
msgstr "Unable to create conference (%s)."
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1123 src/protocols/novell/novell.c:1693
msgid "Error communicating with server. Closing connection."
msgstr "Error communicating with server. Closing connection."
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1478
msgid "Telephone Number"
msgstr "Telephone Number"
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1482
msgid "Department"
msgstr "Department"
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1484
msgid "Personal Title"
msgstr "Personal Title"
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1488
msgid "Mailstop"
msgstr "Mailstop"
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/novell/novell.c:1490 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6105
msgid "Email Address"
msgstr "Email Address"
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1506
msgid "User ID"
msgstr "User ID"
@@ -7512,46 +8382,41 @@ msgstr "User ID"
#. tag, value);
#. }
#.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1520
msgid "Full name"
msgstr "Full name"
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1644
#, c-format
msgid "GroupWise Conference %d"
msgstr "GroupWise Conference %d"
-#: src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1669
msgid "Unable to make SSL connection to server."
msgstr "Unable to make SSL connection to server."
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "Error processing event or response (%s)."
-
-#: src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1726
msgid "Authenticating..."
msgstr "Authenticating..."
-#: src/protocols/novell/novell.c:1719
+#: src/protocols/novell/novell.c:1738
msgid "Unable to connect to server."
msgstr "Unable to connect to server."
-#: src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1741
msgid "Waiting for response..."
msgstr "Waiting for response..."
-#: src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1876
#, c-format
msgid "%s has been invited to this conversation."
msgstr "%s has been invited to this conversation."
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1904
msgid "Invitation to Conversation"
msgstr "Invitation to Conversation"
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1905
#, c-format
msgid ""
"Invitation from: %s\n"
@@ -7562,15 +8427,15 @@ msgstr ""
"\n"
"Sent: %s"
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1907
msgid "Would you like to join the conversation?"
msgstr "Would you like to join the conversation?"
-#: src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:2014
msgid "You have been logged out because you logged in at another workstation."
msgstr "You have been logged out because you logged in at another workstation."
-#: src/protocols/novell/novell.c:2051
+#: src/protocols/novell/novell.c:2070
#, c-format
msgid ""
"%s appears to be offline and did not receive the message that you just sent."
@@ -7582,7 +8447,7 @@ msgstr ""
#. * gaim_request_fields(gc, _("Server Address"),...);
#.
#. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: src/protocols/novell/novell.c:2168
msgid ""
"Unable to connect to server. Please enter the address of the server you wish "
"to connect to."
@@ -7590,19 +8455,14 @@ msgstr ""
"Unable to connect to server. Please enter the address of the server you wish "
"to connect to."
-#: src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2190
msgid "Error. SSL support is not installed."
msgstr "Error: SSL support is not installed."
-#: src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2499
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:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
#. *< type
#. *< ui_requirement
#. *< flags
@@ -7613,15 +8473,15 @@ msgstr "Appear Offline"
#. *< version
#. * summary
#. * description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3544 src/protocols/novell/novell.c:3546
msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger Protocol Plug-in"
-#: src/protocols/novell/novell.c:3561
+#: src/protocols/novell/novell.c:3565
msgid "Server address"
msgstr "Server address"
-#: src/protocols/novell/novell.c:3565
+#: src/protocols/novell/novell.c:3569
msgid "Server port"
msgstr "Server port"
@@ -7721,7 +8581,7 @@ msgstr "Queue full"
msgid "Not while on AOL"
msgstr "Not while on AOL"
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: src/protocols/oscar/oscar.c:420 src/protocols/oscar/oscar.c:522
msgid ""
"(There was an error receiving this message. The buddy you are speaking to "
"most likely has a buggy client.)"
@@ -7729,158 +8589,158 @@ 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:616
+#: src/protocols/oscar/oscar.c:636
msgid "Voice"
msgstr "Voice"
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:639
msgid "AIM Direct IM"
msgstr "AIM Direct IM"
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: src/protocols/oscar/oscar.c:642 src/protocols/silc/silc.c:693
+#: src/protocols/silc/util.c:510
msgid "Chat"
msgstr "Chat"
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:645 src/protocols/oscar/oscar.c:8081
msgid "Get File"
msgstr "Get File"
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:652
msgid "Games"
msgstr "Games"
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:655
msgid "Add-Ins"
msgstr "Add-Ins"
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:658
msgid "Send Buddy List"
msgstr "Send Buddy List"
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:661
msgid "ICQ Direct Connect"
msgstr "ICQ Direct Connect"
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:664
msgid "AP User"
msgstr "AP User"
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:667
msgid "ICQ RTF"
msgstr "ICQ RTF"
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:670
msgid "Nihilist"
msgstr "Nihilist"
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:673
msgid "ICQ Server Relay"
msgstr "ICQ Server Relay"
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:676
msgid "Old ICQ UTF8"
msgstr "Old ICQ UTF8"
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:679
msgid "Trillian Encryption"
msgstr "Trillian Encryption"
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:682
msgid "ICQ UTF8"
msgstr "ICQ UTF8"
-#: src/protocols/oscar/oscar.c:665
+#: src/protocols/oscar/oscar.c:685
msgid "Hiptop"
msgstr "Hiptop"
-#: src/protocols/oscar/oscar.c:668
+#: src/protocols/oscar/oscar.c:688
msgid "Security Enabled"
msgstr "Security Enabled"
-#: src/protocols/oscar/oscar.c:671
+#: src/protocols/oscar/oscar.c:691
msgid "Video Chat"
msgstr "Video Chat"
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:695
msgid "iChat AV"
msgstr "iChat AV"
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:698
msgid "Live Video"
msgstr "Live Video"
-#: src/protocols/oscar/oscar.c:681
+#: src/protocols/oscar/oscar.c:701
msgid "Camera"
msgstr "Camera"
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:719 src/protocols/oscar/oscar.c:7943
msgid "Free For Chat"
msgstr "Free For Chat"
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:723 src/protocols/oscar/oscar.c:7971
msgid "Not Available"
msgstr "Not Available"
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:725 src/protocols/oscar/oscar.c:7961
msgid "Occupied"
msgstr "Occupied"
-#: src/protocols/oscar/oscar.c:709
+#: src/protocols/oscar/oscar.c:729
msgid "Web Aware"
msgstr "Web Aware"
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:733
+msgid "Online"
+msgstr "Online"
+
+#: src/protocols/oscar/oscar.c:810 src/protocols/oscar/oscar.c:5165
msgid "Warning Level"
msgstr "Warning Level"
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Capabilities"
-
-#: src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:819
msgid "Buddy Comment"
msgstr "Buddy Comment"
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:970
#, c-format
msgid "Direct IM with %s closed"
msgstr "Direct IM with %s closed"
-#: src/protocols/oscar/oscar.c:960
+#: src/protocols/oscar/oscar.c:972
#, c-format
msgid "Direct IM with %s failed"
msgstr "Direct IM with %s failed"
-#: src/protocols/oscar/oscar.c:968
+#: src/protocols/oscar/oscar.c:980
msgid "Direct Connect failed"
msgstr "Direct Connect failed"
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1057 src/protocols/oscar/oscar.c:1188
#, c-format
msgid "Direct IM with %s established"
msgstr "Direct IM with %s established"
-#: src/protocols/oscar/oscar.c:1126
+#: src/protocols/oscar/oscar.c:1138
#, 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:1547
+#: src/protocols/oscar/oscar.c:1544
#, 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:1552
+#: src/protocols/oscar/oscar.c:1549 src/protocols/oscar/oscar.c:1596
msgid "Unable to open Direct IM"
msgstr "Unable to open Direct IM"
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1632
#, 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:1591
+#: src/protocols/oscar/oscar.c:1636
msgid ""
"Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
@@ -7888,24 +8748,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:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "Connect"
+#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:4476
+msgid "_Connect"
+msgstr "_Connect"
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1706
#, c-format
msgid "You have lost your connection to chat room %s."
msgstr "You have lost your connection to chat room %s."
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1729
msgid "Chat is currently unavailable"
msgstr "Chat is currently unavailable"
-#: src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1799
msgid "Screen name sent"
msgstr "Screen name sent"
-#: src/protocols/oscar/oscar.c:1770
+#: src/protocols/oscar/oscar.c:1815
#, c-format
msgid ""
"Unable to login: Could not sign on as %s because the screen name is "
@@ -7916,74 +8776,78 @@ 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:1799
+#: src/protocols/oscar/oscar.c:1844
msgid "Unable to login to AIM"
msgstr "Unable to login to AIM"
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:1948 src/protocols/oscar/oscar.c:2938
msgid "Could Not Connect"
msgstr "Could Not Connect"
-#: src/protocols/oscar/oscar.c:1911
+#: src/protocols/oscar/oscar.c:1956
msgid "Connection established, cookie sent"
msgstr "Connection established, cookie sent"
#. clientip & verifiedip failed, request a redirect
#. * that is, we want the sender to connect to us
+#. *
+#. * Above, we checked if we had previously attempted a connection
+#. * redirect to prevent a conflict with the joscar library
+#.
#. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
+#: src/protocols/oscar/oscar.c:2115
msgid "Attempting connection redirect..."
msgstr "Attempting connection redirect..."
#. proxyip timed out
#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: src/protocols/oscar/oscar.c:2161
#, c-format
msgid ""
"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
msgstr ""
"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/oscar/oscar.c:2259 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:2211
+#: src/protocols/oscar/oscar.c:2264
msgid "Unable to create new connection."
msgstr "Unable to create new connection."
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
+#: src/protocols/oscar/oscar.c:2498 src/protocols/oscar/oscar.c:2507
+#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:2531
msgid "Unable to log into file transfer proxy."
msgstr "Unable to log into file transfer proxy."
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2585
msgid "Unable to establish listener socket or no AOL proxy connection present."
msgstr ""
"Unable to establish listener socket or no AOL proxy connection present."
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2824 src/protocols/toc/toc.c:543
msgid "Incorrect nickname or password."
msgstr "Incorrect nickname or password."
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2829
msgid "Your account is currently suspended."
msgstr "Your account is currently suspended."
#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: src/protocols/oscar/oscar.c:2833
msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "The AOL Instant Messenger service is temporarily unavailable."
-#: src/protocols/oscar/oscar.c:2747
+#: src/protocols/oscar/oscar.c:2838
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."
@@ -7991,33 +8855,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:2752
+#: src/protocols/oscar/oscar.c:2843
#, 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:2783
+#: src/protocols/oscar/oscar.c:2874
msgid "Internal Error"
msgstr "Internal Error"
-#: src/protocols/oscar/oscar.c:2853
+#: src/protocols/oscar/oscar.c:2945
msgid "Received authorization"
msgstr "Received authorisation"
-#: src/protocols/oscar/oscar.c:2877
+#: src/protocols/oscar/oscar.c:2969
msgid "The SecurID key entered is invalid."
msgstr "The SecurID key entered is invalid."
-#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:2983
msgid "Enter SecurID"
msgstr "Enter SecurID"
-#: src/protocols/oscar/oscar.c:2892
+#: src/protocols/oscar/oscar.c:2984
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:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3024 src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3143
#, c-format
msgid ""
"You may be disconnected shortly. You may want to use TOC until this is "
@@ -8026,24 +8890,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:2935 src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:3027 src/protocols/oscar/oscar.c:3057
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:3054
+#: src/protocols/oscar/oscar.c:3146
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:3085
+#: src/protocols/oscar/oscar.c:3167
msgid "Password sent"
msgstr "Password sent"
-#: src/protocols/oscar/oscar.c:4352
+#: src/protocols/oscar/oscar.c:4467
#, 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:4355
+#: src/protocols/oscar/oscar.c:4470
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 "
@@ -8053,19 +8917,19 @@ msgstr ""
"for IM Images. Because your IP address will be revealed, this may be "
"considered a privacy risk."
-#: src/protocols/oscar/oscar.c:4394
+#: src/protocols/oscar/oscar.c:4509
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:4402
+#: src/protocols/oscar/oscar.c:4517
msgid "Authorization Request Message:"
msgstr "Authorisation Request Message:"
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:4518
msgid "Please authorize me!"
msgstr "Please authorise me!"
-#: src/protocols/oscar/oscar.c:4433
+#: src/protocols/oscar/oscar.c:4548
#, c-format
msgid ""
"The user %s requires authorization before being added to a buddy list. Do "
@@ -8074,21 +8938,25 @@ 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:4438 src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4553
msgid "Request Authorization"
msgstr "Request Authorisation"
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4555
+msgid "_Request Authorization"
+msgstr "_Request Authorisation"
+
+#: src/protocols/oscar/oscar.c:4593 src/protocols/oscar/oscar.c:4599
+#: src/protocols/oscar/oscar.c:4703 src/protocols/oscar/oscar.c:4727
+#: src/protocols/oscar/oscar.c:7377 src/protocols/oscar/oscar.c:7429
msgid "No reason given."
msgstr "No reason given."
-#: src/protocols/oscar/oscar.c:4483
+#: src/protocols/oscar/oscar.c:4598
msgid "Authorization Denied Message:"
msgstr "Authorisation Denied Message:"
-#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:4705
#, c-format
msgid ""
"The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8097,11 +8965,11 @@ msgstr ""
"The user %u wants to add %s to their buddy list for the following reason:\n"
"%s"
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4715 src/protocols/oscar/oscar.c:7389
msgid "Authorization Request"
msgstr "Authorisation Request"
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4727
#, c-format
msgid ""
"The user %u has denied your request to add them to your buddy list for the "
@@ -8112,17 +8980,17 @@ msgstr ""
"following reason:\n"
"%s"
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4728
msgid "ICQ authorization denied."
msgstr "ICQ authorisation denied."
#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: src/protocols/oscar/oscar.c:4735
#, 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:4628
+#: src/protocols/oscar/oscar.c:4743
#, c-format
msgid ""
"You have received a special message\n"
@@ -8135,7 +9003,7 @@ msgstr ""
"From: %s [%s]\n"
"%s"
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/oscar/oscar.c:4751
#, c-format
msgid ""
"You have received an ICQ page\n"
@@ -8148,7 +9016,7 @@ msgstr ""
"From: %s [%s]\n"
"%s"
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4759
#, c-format
msgid ""
"You have received an ICQ email from %s [%s]\n"
@@ -8161,34 +9029,34 @@ msgstr ""
"Message is:\n"
"%s"
-#: src/protocols/oscar/oscar.c:4665
+#: src/protocols/oscar/oscar.c:4780
#, 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:4671
+#: src/protocols/oscar/oscar.c:4786
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:4675
-msgid "Decline"
-msgstr "Decline"
+#: src/protocols/oscar/oscar.c:4790
+msgid "_Decline"
+msgstr "_Decline"
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4874
#, 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:4768
+#: src/protocols/oscar/oscar.c:4883
#, 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:4777
+#: src/protocols/oscar/oscar.c:4892
#, c-format
msgid ""
"You missed %hu message from %s because the rate limit has been exceeded."
@@ -8199,77 +9067,85 @@ msgstr[0] ""
msgstr[1] ""
"You missed %hu messages from %s because the rate limit has been exceeded."
-#: src/protocols/oscar/oscar.c:4786
+#: src/protocols/oscar/oscar.c:4901
#, 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:4795
+#: src/protocols/oscar/oscar.c:4910
#, 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:4804
+#: src/protocols/oscar/oscar.c:4919
#, 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:4863
+#: src/protocols/oscar/oscar.c:4978
#, c-format
msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:5039
#, c-format
msgid "SNAC threw error: %s\n"
msgstr "SNAC threw error: %s\n"
#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: src/protocols/oscar/oscar.c:5076
#, c-format
msgid "Unable to send message: %s"
msgstr "Unable to send message: %s"
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:5076 src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5139 src/protocols/oscar/oscar.c:5143
msgid "Unknown reason."
msgstr "Unknown reason."
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:5079 src/protocols/sametime/sametime.c:2322
#, c-format
msgid "Unable to send message to %s:"
msgstr "Unable to send message to %s:"
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5139
#, c-format
msgid "User information not available: %s"
msgstr "User information not available: %s"
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5142
#, c-format
msgid "User information for %s unavailable:"
msgstr "User information for %s unavailable:"
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5169
msgid "Online Since"
msgstr "Online Since"
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:5174 src/protocols/yahoo/yahoo_profile.c:1153
msgid "Member Since"
msgstr "Member Since"
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/oscar/oscar.c:5179
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#: src/protocols/oscar/oscar.c:5197
+msgid "Available Message"
+msgstr "Available Message"
+
+#: src/protocols/oscar/oscar.c:5314
msgid "Your AIM connection may be lost."
msgstr "Your AIM connection may be lost."
#. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: src/protocols/oscar/oscar.c:5500
msgid ""
"[Unable to display a message from this user because it contained invalid "
"characters.]"
@@ -8277,11 +9153,11 @@ msgstr ""
"[Unable to display a message from this user because it contained invalid "
"characters.]"
-#: src/protocols/oscar/oscar.c:5554
+#: src/protocols/oscar/oscar.c:5726
msgid "Rate limiting error."
msgstr "Rate limiting error."
-#: src/protocols/oscar/oscar.c:5555
+#: src/protocols/oscar/oscar.c:5727
msgid ""
"The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -8289,105 +9165,94 @@ 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:5631
+#: src/protocols/oscar/oscar.c:5803
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:5644 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5816 src/protocols/toc/toc.c:971
#, c-format
msgid "You have been disconnected from chat room %s."
msgstr "You have been disconnected from chat room %s."
#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5845
msgid "Finalizing connection"
-msgstr "Finalizing connection"
-
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
+msgstr "Finalising connection"
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:6110 src/protocols/silc/util.c:542
msgid "Mobile Phone"
msgstr "Mobile Phone"
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Female"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Male"
-
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6127
msgid "Personal Web Page"
msgstr "Personal Web Page"
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6131
msgid "Additional Information"
msgstr "Additional Information"
-#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/oscar/oscar.c:6136
msgid "Home Address"
msgstr "Home Address"
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6140 src/protocols/oscar/oscar.c:6148
msgid "Zip Code"
msgstr "Postcode"
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6144
msgid "Work Address"
msgstr "Work Address"
-#: src/protocols/oscar/oscar.c:6020
+#: src/protocols/oscar/oscar.c:6152
msgid "Work Information"
msgstr "Work Information"
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6153
msgid "Company"
msgstr "Company"
-#: src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:6154
msgid "Division"
msgstr "Division"
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6155
msgid "Position"
msgstr "Position"
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6157
msgid "Web Page"
msgstr "Web Page"
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6215
msgid "Pop-Up Message"
msgstr "Pop-Up Message"
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
+#: src/protocols/oscar/oscar.c:6255
#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "The following screen names are associated with %s"
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "The following screen name is associated with %s"
+msgstr[1] "The following screen names are associated with %s"
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6286
#, c-format
msgid "No results found for email address %s"
msgstr "No results found for email address %s"
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6307
#, 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:6163
+#: src/protocols/oscar/oscar.c:6309
msgid "Account Confirmation Requested"
msgstr "Account Confirmation Requested"
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6340
msgid "Error Changing Account Info"
msgstr "Error Changing Account Info"
-#: src/protocols/oscar/oscar.c:6197
+#: src/protocols/oscar/oscar.c:6343
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8396,12 +9261,12 @@ msgstr ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
-#: src/protocols/oscar/oscar.c:6200
+#: src/protocols/oscar/oscar.c:6346
#, c-format
msgid "Error 0x%04x: Unable to format screen name because it is invalid."
msgstr "Error 0x%04x: Unable to format screen name because it is invalid."
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6349
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8410,7 +9275,7 @@ msgstr ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
"is too long."
-#: src/protocols/oscar/oscar.c:6206
+#: src/protocols/oscar/oscar.c:6352
#, c-format
msgid ""
"Error 0x%04x: Unable to change email address because there is already a "
@@ -8419,7 +9284,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:6209
+#: src/protocols/oscar/oscar.c:6355
#, c-format
msgid ""
"Error 0x%04x: Unable to change email address because the given address has "
@@ -8428,7 +9293,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:6212
+#: src/protocols/oscar/oscar.c:6358
#, c-format
msgid ""
"Error 0x%04x: Unable to change email address because the given address is "
@@ -8437,12 +9302,12 @@ msgstr ""
"Error 0x%04x: Unable to change email address because the given address is "
"invalid."
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6361
#, c-format
msgid "Error 0x%04x: Unknown error."
msgstr "Error 0x%04x: Unknown error."
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6371
#, c-format
msgid ""
"Your screen name is currently formatted as follows:\n"
@@ -8451,26 +9316,26 @@ msgstr ""
"Your screen name is currently formatted as follows:\n"
"%s"
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6372 src/protocols/oscar/oscar.c:6379
msgid "Account Info"
msgstr "Account Info"
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6377
#, c-format
msgid "The email address for %s is %s"
msgstr "The email address for %s is %s"
-#: src/protocols/oscar/oscar.c:6298
+#: src/protocols/oscar/oscar.c:6449
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:6480
+#: src/protocols/oscar/oscar.c:6687
msgid "Unable to set AIM profile."
msgstr "Unable to set AIM profile."
-#: src/protocols/oscar/oscar.c:6481
+#: src/protocols/oscar/oscar.c:6688
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 "
@@ -8480,7 +9345,7 @@ msgstr ""
"completed. Your profile remains unset; try setting it again when you are "
"fully connected."
-#: src/protocols/oscar/oscar.c:6495
+#: src/protocols/oscar/oscar.c:6702
#, c-format
msgid ""
"The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -8495,11 +9360,11 @@ msgstr[1] ""
"The maximum profile length of %d bytes has been exceeded. Gaim has "
"truncated it for you."
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6707
msgid "Profile too long."
msgstr "Profile too long."
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: src/protocols/oscar/oscar.c:6749
#, c-format
msgid ""
"The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -8514,25 +9379,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:6528 src/protocols/oscar/oscar.c:6601
+#: src/protocols/oscar/oscar.c:6754
msgid "Away message too long."
msgstr "Away message too long."
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Unable to set AIM away message."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed. You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"You have probably requested to set your away message before the login "
-"procedure completed. You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6823
#, c-format
msgid ""
"Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -8543,16 +9394,16 @@ msgstr ""
"must either start with a letter and contain only letters, numbers and "
"spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: src/protocols/oscar/oscar.c:6825 src/protocols/oscar/oscar.c:7235
+#: src/protocols/oscar/oscar.c:7249
msgid "Unable To Add"
msgstr "Unable To Add"
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6935
msgid "Unable To Retrieve Buddy List"
msgstr "Unable To Retrieve Buddy List"
-#: src/protocols/oscar/oscar.c:6799
+#: src/protocols/oscar/oscar.c:6936
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 "
@@ -8562,13 +9413,13 @@ msgstr ""
"servers. Your buddy list is not lost, and will probably become available in "
"a few hours."
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:7133 src/protocols/oscar/oscar.c:7134
+#: src/protocols/oscar/oscar.c:7139 src/protocols/oscar/oscar.c:7293
+#: src/protocols/oscar/oscar.c:7294 src/protocols/oscar/oscar.c:7299
msgid "Orphans"
msgstr "Orphans"
-#: src/protocols/oscar/oscar.c:7090
+#: src/protocols/oscar/oscar.c:7233
#, c-format
msgid ""
"Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8577,11 +9428,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:7090 src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7233 src/protocols/oscar/oscar.c:7247
msgid "(no name)"
msgstr "(no name)"
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7247
#, c-format
msgid ""
"Could not add the buddy %s for an unknown reason. The most common reason "
@@ -8592,7 +9443,7 @@ msgstr ""
"for this is that you have the maximum number of allowed buddies in your "
"buddy list."
-#: src/protocols/oscar/oscar.c:7187
+#: src/protocols/oscar/oscar.c:7330
#, c-format
msgid ""
"The user %s has given you permission to add you to their buddy list. Do you "
@@ -8601,11 +9452,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:7193
+#: src/protocols/oscar/oscar.c:7336
msgid "Authorization Given"
msgstr "Authorisation Given"
-#: src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7380
#, c-format
msgid ""
"The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8615,17 +9466,17 @@ msgstr ""
"%s"
#. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7425
#, 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:7283
+#: src/protocols/oscar/oscar.c:7426
msgid "Authorization Granted"
msgstr "Authorisation Granted"
#. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7429
#, c-format
msgid ""
"The user %s has denied your request to add them to your buddy list for the "
@@ -8636,92 +9487,88 @@ msgstr ""
"following reason:\n"
"%s"
-#: src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7430
msgid "Authorization Denied"
msgstr "Authorisation Denied"
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7467 src/protocols/toc/toc.c:1372
msgid "_Exchange:"
msgstr "_Exchange:"
-#: src/protocols/oscar/oscar.c:7360
+#: src/protocols/oscar/oscar.c:7503
msgid "Invalid chat name specified."
msgstr "Invalid chat name specified."
-#: src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7573
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:7565
-msgid "Away Message"
-msgstr "Away Message"
+#: src/protocols/oscar/oscar.c:7728
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(retrieving)</i>"
-#: src/protocols/oscar/oscar.c:7854
+#: src/protocols/oscar/oscar.c:8034
#, c-format
msgid "Buddy Comment for %s"
msgstr "Buddy Comment for %s"
-#: src/protocols/oscar/oscar.c:7855
+#: src/protocols/oscar/oscar.c:8035
msgid "Buddy Comment:"
msgstr "Buddy Comment:"
-#: src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:8054
msgid "Edit Buddy Comment"
msgstr "Edit Buddy Comment"
-#: src/protocols/oscar/oscar.c:7880
+#: src/protocols/oscar/oscar.c:8061
msgid "Get Status Msg"
msgstr "Get Status Msg"
-#: src/protocols/oscar/oscar.c:7892
+#: src/protocols/oscar/oscar.c:8074
msgid "Direct IM"
msgstr "Direct IM"
-#: src/protocols/oscar/oscar.c:7909
+#: src/protocols/oscar/oscar.c:8093
msgid "Re-request Authorization"
msgstr "Re-request Authorisation"
-#: src/protocols/oscar/oscar.c:7969
+#: src/protocols/oscar/oscar.c:8150
msgid "Require authorization"
-msgstr "Require Authorisation"
-
-#: src/protocols/oscar/oscar.c:7972
-msgid "Hide IP address"
-msgstr "Hide IP Address"
+msgstr "Require authorisation"
-#: src/protocols/oscar/oscar.c:7975
-msgid "Web aware"
-msgstr "Web aware"
+#: src/protocols/oscar/oscar.c:8153
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Web aware (enabling this will cause you to receive spam!)"
-#: src/protocols/oscar/oscar.c:7980
+#: src/protocols/oscar/oscar.c:8158
msgid "ICQ Privacy Options"
msgstr "ICQ Privacy Options"
-#: src/protocols/oscar/oscar.c:7997
+#: src/protocols/oscar/oscar.c:8175
msgid "The new formatting is invalid."
msgstr "The new formatting is invalid."
-#: src/protocols/oscar/oscar.c:7998
+#: src/protocols/oscar/oscar.c:8176
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:8005
+#: src/protocols/oscar/oscar.c:8183
msgid "New screen name formatting:"
msgstr "New screen name formatting:"
-#: src/protocols/oscar/oscar.c:8057
+#: src/protocols/oscar/oscar.c:8235
msgid "Change Address To:"
msgstr "Change Address To:"
-#: src/protocols/oscar/oscar.c:8102
+#: src/protocols/oscar/oscar.c:8280
msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>you are not waiting for authorisation</i>"
-#: src/protocols/oscar/oscar.c:8105
+#: src/protocols/oscar/oscar.c:8283
msgid "You are awaiting authorization from the following buddies"
msgstr "You are awaiting authorisation from the following buddies"
-#: src/protocols/oscar/oscar.c:8106
+#: src/protocols/oscar/oscar.c:8284
msgid ""
"You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -8729,83 +9576,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:8123
+#: src/protocols/oscar/oscar.c:8301
msgid "Find Buddy by E-mail"
msgstr "Find Buddy by E-mail"
-#: src/protocols/oscar/oscar.c:8124
+#: src/protocols/oscar/oscar.c:8302
msgid "Search for a buddy by e-mail address"
msgstr "Search for a buddy by e-mail address"
-#: src/protocols/oscar/oscar.c:8125
+#: src/protocols/oscar/oscar.c:8303
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:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "Set User Info..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: src/protocols/oscar/oscar.c:8396
msgid "Set User Info (URL)..."
msgstr "Set User Info (URL)..."
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Change Password..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: src/protocols/oscar/oscar.c:8407
msgid "Change Password (URL)"
msgstr "Change Password (URL)"
-#: src/protocols/oscar/oscar.c:8233
+#: src/protocols/oscar/oscar.c:8411
msgid "Configure IM Forwarding (URL)"
msgstr "Configure IM Forwarding (URL)"
#. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-msgid "Show privacy options..."
-msgstr "Show privacy options..."
+#: src/protocols/oscar/oscar.c:8421
+msgid "Set Privacy Options..."
+msgstr "Show Privacy Options..."
#. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: src/protocols/oscar/oscar.c:8428
msgid "Format Screen Name..."
msgstr "Format Screen Name..."
-#: src/protocols/oscar/oscar.c:8254
+#: src/protocols/oscar/oscar.c:8432
msgid "Confirm Account"
msgstr "Confirm Account"
-#: src/protocols/oscar/oscar.c:8258
+#: src/protocols/oscar/oscar.c:8436
msgid "Display Currently Registered Address"
msgstr "Display Currently Registered Address"
-#: src/protocols/oscar/oscar.c:8262
+#: src/protocols/oscar/oscar.c:8440
msgid "Change Currently Registered Address..."
msgstr "Change Currently Registered Address"
-#: src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:8447
msgid "Show Buddies Awaiting Authorization"
msgstr "Show Buddies Awaiting Authorisation"
-#: src/protocols/oscar/oscar.c:8275
+#: src/protocols/oscar/oscar.c:8453
msgid "Search for Buddy by Email..."
msgstr "Search for Buddy by Email..."
-#: src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8458
msgid "Search for Buddy by Information"
msgstr "Search for Buddy by Information"
-#: src/protocols/oscar/oscar.c:8350
+#: src/protocols/oscar/oscar.c:8525
msgid "Use recent buddies group"
msgstr "Use recent buddies group"
-#: src/protocols/oscar/oscar.c:8353
+#: src/protocols/oscar/oscar.c:8528
msgid "Show how long you have been idle"
msgstr "Show how long you have been idle"
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+#: src/protocols/oscar/oscar.c:8537
+msgid "Use AIM/ICQ proxy server (slower, but usually works)"
+msgstr "Use AIM/ICQ proxy server (slower, but usually works)"
#. *< type
#. *< ui_requirement
@@ -8817,113 +9656,555 @@ msgstr "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
#. *< version
#. * summary
#. * description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8670 src/protocols/oscar/oscar.c:8672
msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ Protocol Plugin"
+msgstr "AIM/ICQ Protocol Plug-in"
-#: src/protocols/oscar/oscar.c:8497
+#: src/protocols/oscar/oscar.c:8691
msgid "Auth host"
msgstr "Auth host"
-#: src/protocols/oscar/oscar.c:8500
+#: src/protocols/oscar/oscar.c:8694
msgid "Auth port"
msgstr "Auth port"
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8697 src/protocols/zephyr/zephyr.c:2901
msgid "Encoding"
msgstr "Encoding"
-#: src/protocols/sametime/sametime.c:1134
+#: src/protocols/oscar/oscar.c:8701
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+
+#: src/protocols/sametime/sametime.c:359
+msgid "Connection closed (writing)"
+msgstr "Connection closed (writing)"
+
+#: src/protocols/sametime/sametime.c:1204
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Group Title:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1205
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes Group ID:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1207
+#, c-format
+msgid "Info for Group %s"
+msgstr "Info for Group %s"
+
+#: src/protocols/sametime/sametime.c:1209
+msgid "Notes Address Book Information"
+msgstr "Notes Address Book Information"
+
+#: src/protocols/sametime/sametime.c:1241
+msgid "Invite Group to Conference..."
+msgstr "Invite Group to Conference..."
+
+#: src/protocols/sametime/sametime.c:1251
+msgid "Get Notes Address Book Info"
+msgstr "Get Notes Address Book Info"
+
+#: src/protocols/sametime/sametime.c:1404
msgid "Sending Handshake"
msgstr "Sending Handshake"
-#: src/protocols/sametime/sametime.c:1139
+#: src/protocols/sametime/sametime.c:1409
msgid "Waiting for Handshake Acknowledgement"
msgstr "Waiting for Handshake Acknowledgement"
-#: src/protocols/sametime/sametime.c:1144
+#: src/protocols/sametime/sametime.c:1414
msgid "Handshake Acknowledged, Sending Login"
msgstr "Handshake Acknowledged, Sending Login"
-#: src/protocols/sametime/sametime.c:1149
+#: src/protocols/sametime/sametime.c:1419
msgid "Waiting for Login Acknowledgement"
msgstr "Waiting for Login Acknowledgement"
-#: src/protocols/sametime/sametime.c:1154
+#: src/protocols/sametime/sametime.c:1424
msgid "Login Redirected"
msgstr "Login Redirected"
-#: src/protocols/sametime/sametime.c:1159
+#: src/protocols/sametime/sametime.c:1430
msgid "Forcing Login"
msgstr "Forcing Login"
-#: src/protocols/sametime/sametime.c:1163
+#: src/protocols/sametime/sametime.c:1434
msgid "Login Acknowledged"
msgstr "Login Acknowledged"
-#: src/protocols/sametime/sametime.c:1168
-msgid "Connected to Sametime Community Server"
-msgstr "Connected to Sametime Community Server"
+#: src/protocols/sametime/sametime.c:1439
+msgid "Starting Services"
+msgstr "Starting Services"
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr "Admin Alert"
+#: src/protocols/sametime/sametime.c:1444
+msgid "Connected"
+msgstr "Connected"
+
+#: src/protocols/sametime/sametime.c:1542
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"A Sametime administrator has issued the following announcement on server %s"
+
+#: src/protocols/sametime/sametime.c:1547
+msgid "Sametime Administrator Announcement"
+msgstr "Sametime Administrator Announcement"
+
+#: src/protocols/sametime/sametime.c:1606
+msgid "Connection reset"
+msgstr "Connection reset"
+
+#: src/protocols/sametime/sametime.c:1613
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Error reading from socket: %s"
+
+#. this is a regular connect, error out
+#: src/protocols/sametime/sametime.c:1642
+#: src/protocols/sametime/sametime.c:3601
+msgid "Unable to connect to host"
+msgstr "Unable to connect to host"
+
+#: src/protocols/sametime/sametime.c:1679
+#, c-format
+msgid "Announcement from %s"
+msgstr "Announcement from %s"
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "Active"
+#: src/protocols/sametime/sametime.c:1853
+msgid "Conference Closed"
+msgstr "Conference Closed"
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+#: src/protocols/sametime/sametime.c:2316
+msgid "Unable to send message: "
+msgstr "Unable to send message: "
+
+#: src/protocols/sametime/sametime.c:2875
+msgid "Place Closed"
+msgstr "Place Closed"
+
+#: src/protocols/sametime/sametime.c:3164
+msgid "Microphone"
+msgstr "Microphone"
+
+#: src/protocols/sametime/sametime.c:3165
+msgid "Speakers"
+msgstr "Speakers"
+
+#: src/protocols/sametime/sametime.c:3166
+msgid "Video Camera"
+msgstr "Video Camera"
+
+#: src/protocols/sametime/sametime.c:3170
+msgid "File Transfer"
+msgstr "File Transfer"
+
+#: src/protocols/sametime/sametime.c:3204
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr ""
+"\n"
+"<b>Supports:</b> %s"
+
+#: src/protocols/sametime/sametime.c:3209
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>External User</b>"
+
+#: src/protocols/sametime/sametime.c:3315
+msgid "Create conference with user"
+msgstr "Create conference with user"
+
+#: src/protocols/sametime/sametime.c:3316
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+
+#: src/protocols/sametime/sametime.c:3320
+msgid "New Conference"
+msgstr "New Conference"
+
+#: src/protocols/sametime/sametime.c:3322
+msgid "Create"
+msgstr "Create"
+
+#: src/protocols/sametime/sametime.c:3386
+msgid "Available Conferences"
+msgstr "Available Conference"
+
+#: src/protocols/sametime/sametime.c:3392
+msgid "Create New Conference..."
+msgstr "Create New Conference..."
+
+#: src/protocols/sametime/sametime.c:3399
+msgid "Invite user to a conference"
+msgstr "Invite user to a conference"
+
+#: src/protocols/sametime/sametime.c:3400
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+
+#: src/protocols/sametime/sametime.c:3405
+msgid "Invite to Conference"
+msgstr "Invite to Conference"
+
+#: src/protocols/sametime/sametime.c:3407
+msgid "Invite"
+msgstr "Invite"
+
+#: src/protocols/sametime/sametime.c:3459
+msgid "Invite to Conference..."
+msgstr "Invite to Conference..."
+
+#: src/protocols/sametime/sametime.c:3505
+msgid "No Sametime Community Server specified"
+msgstr "No Sametime Community Server specified"
+
+#: src/protocols/sametime/sametime.c:3527
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+
+#: src/protocols/sametime/sametime.c:3532
+msgid "Meanwhile Connection Setup"
+msgstr "Meanwhile Connection Setup"
+
+#: src/protocols/sametime/sametime.c:3533
+msgid "No Sametime Community Server Specified"
+msgstr "No Sametime Community Server Specified"
+
+#: src/protocols/sametime/sametime.c:3535
+msgid "Connect"
+msgstr "Connect"
+
+#: src/protocols/sametime/sametime.c:3990
+msgid "<b>External User</b><br>"
+msgstr "<b>External User:</b><br>"
+
+#: src/protocols/sametime/sametime.c:3993
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>User ID:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:3999
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Full Name:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4005
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>Last Known Client:</b> "
+
+#: src/protocols/sametime/sametime.c:4013
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Unknown (0x%04x)<br>"
+
+#: src/protocols/sametime/sametime.c:4020
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>Supports:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4026
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>Status:</b> %s"
+
+#: src/protocols/sametime/sametime.c:4169
+#: src/protocols/sametime/sametime.c:5328
+msgid "User Name"
+msgstr "User Name"
+
+#: src/protocols/sametime/sametime.c:4172
+#: src/protocols/sametime/sametime.c:5331
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+#: src/protocols/sametime/sametime.c:4196
+msgid "An ambiguous user ID was entered"
+msgstr "An ambiguous user ID was entered"
+
+#: src/protocols/sametime/sametime.c:4197
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+
+#: src/protocols/sametime/sametime.c:4202
+msgid "Select User"
+msgstr "Select User"
+
+#: src/protocols/sametime/sametime.c:4272
+msgid "Unable to add user: user not found"
+msgstr "Unable to add user: user not found"
+
+#: src/protocols/sametime/sametime.c:4274
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+
+#: src/protocols/sametime/sametime.c:4279
+msgid "Unable to add user"
+msgstr "Unable to add user"
+
+#: src/protocols/sametime/sametime.c:4849
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Error reading file %s: \n"
+"%s\n"
+
+#: src/protocols/sametime/sametime.c:4978
+msgid "Remotely Stored Buddy List"
+msgstr "Remotely Stored Buddy List"
+
+#: src/protocols/sametime/sametime.c:4983
+msgid "Buddy List Storage Mode"
+msgstr "Buddy List Storage Mode"
+
+#: src/protocols/sametime/sametime.c:4986
+msgid "Local Buddy List Only"
+msgstr "Local Buddy List Only"
+
+#: src/protocols/sametime/sametime.c:4988
+msgid "Merge List from Server"
+msgstr "Merge List from Server"
+
+#: src/protocols/sametime/sametime.c:4990
+msgid "Merge and Save List to Server"
+msgstr "Merge and Save List to Server"
+
+#: src/protocols/sametime/sametime.c:4992
+msgid "Synchronize List with Server"
+msgstr "Synchronise List with Server"
+
+#: src/protocols/sametime/sametime.c:5041
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Import Sametime List for Account %s"
+
+#: src/protocols/sametime/sametime.c:5080
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Export Sametime List for Account %s"
+
+#: src/protocols/sametime/sametime.c:5133
+msgid "Unable to add group: group exists"
+msgstr "Unable to add group: group exists"
+
+#: src/protocols/sametime/sametime.c:5134
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "A group named '%s' already exists in your buddy list."
+
+#: src/protocols/sametime/sametime.c:5137
+#: src/protocols/sametime/sametime.c:5266
+msgid "Unable to add group"
+msgstr "Unable to add group"
+
+#: src/protocols/sametime/sametime.c:5196
+msgid "Possible Matches"
+msgstr "Possible Matches"
+
+#: src/protocols/sametime/sametime.c:5212
+msgid "Notes Address Book group results"
+msgstr "Notes Address Book group results"
+
+#: src/protocols/sametime/sametime.c:5213
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+
+#: src/protocols/sametime/sametime.c:5218
+msgid "Select Notes Address Book"
+msgstr "Select Notes Address Book"
+
+#: src/protocols/sametime/sametime.c:5260
+msgid "Unable to add group: group not found"
+msgstr "Unable to add group: group not found"
+
+#: src/protocols/sametime/sametime.c:5262
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+
+#: src/protocols/sametime/sametime.c:5303
+msgid "Notes Address Book Group"
+msgstr "Notes Address Book Group"
+
+#: src/protocols/sametime/sametime.c:5304
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+
+#: src/protocols/sametime/sametime.c:5352
+#, c-format
+msgid "Search results for '%s'"
+msgstr "Search results for '%s'"
+
+#: src/protocols/sametime/sametime.c:5353
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+
+#: src/protocols/sametime/sametime.c:5385
+msgid "No matches"
+msgstr "No matches"
+
+#: src/protocols/sametime/sametime.c:5386
+#, c-format
+msgid "The identifier '%s' did not match and users in your Sametime community."
+msgstr ""
+"The identifier '%s' did not match and users in your Sametime community."
+
+#: src/protocols/sametime/sametime.c:5390
+msgid "No Matches"
+msgstr "No Matches"
+
+#: src/protocols/sametime/sametime.c:5427
+msgid "Search for a user"
+msgstr "Search for a user"
+
+#: src/protocols/sametime/sametime.c:5428
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+
+#: src/protocols/sametime/sametime.c:5431
+msgid "User Search"
+msgstr "User Search"
+
+#: src/protocols/sametime/sametime.c:5443
+msgid "Import Sametime List..."
+msgstr "Import Sametime List..."
+
+#: src/protocols/sametime/sametime.c:5447
+msgid "Export Sametime List..."
+msgstr "Export Sametime List..."
+
+#: src/protocols/sametime/sametime.c:5451
+msgid "Add Notes Address Book Group..."
+msgstr "Add Notes Address Book Group..."
+
+#: src/protocols/sametime/sametime.c:5455
+msgid "User Search..."
+msgstr "User Search..."
+
+#: src/protocols/sametime/sametime.c:5552
+msgid "Force login (ignore server redirects)"
+msgstr "Force login (ignore server redirects)"
+
+#. pretend to be Sametime Connect
+#: src/protocols/sametime/sametime.c:5562
+msgid "Hide client identity"
+msgstr "Hide client identity"
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:420
+#: src/protocols/silc/buddy.c:545 src/protocols/silc/buddy.c:711
#: src/protocols/silc/ft.c:338
#, c-format
msgid "User %s is not present in the network"
msgstr "User %s is not present in the network"
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:53 src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:120 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139 src/protocols/silc/buddy.c:257
msgid "Key Agreement"
msgstr "Key Agreement"
-#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:54
msgid "Cannot perform the key agreement"
msgstr "Cannot perform the key agreement"
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:116
msgid "Error occurred during key agreement"
msgstr "Error occurred during key agreement"
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:120
msgid "Key Agreement failed"
msgstr "Key Agreement failed"
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:125
msgid "Timeout during key agreement"
msgstr "Timeout during key agreement"
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:130
msgid "Key agreement was aborted"
msgstr "Key agreement was aborted"
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:135
msgid "Key agreement is already started"
msgstr "Key agreement is already started"
-#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:140
msgid "Key agreement cannot be started with yourself"
msgstr "Key agreement cannot be started with yourself"
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:258 src/protocols/silc/buddy.c:388
+#: src/protocols/silc/buddy.c:513
msgid "The remote user is not present in the network any more"
msgstr "The remote user is not present in the network any more"
-#: src/protocols/silc/buddy.c:293
+#: src/protocols/silc/buddy.c:294
#, c-format
msgid ""
"Key agreement request received from %s. Would you like to perform the key "
@@ -8932,7 +10213,7 @@ msgstr ""
"Key agreement request received from %s. Would you like to perform the key "
"agreement?"
-#: src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:298
#, c-format
msgid ""
"The remote user is waiting key agreement on:\n"
@@ -8943,50 +10224,50 @@ msgstr ""
"Remote host: %s\n"
"Remote port: %d"
-#: src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:311
msgid "Key Agreement Request"
msgstr "Key Agreement Request"
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:387 src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:464
msgid "IM With Password"
msgstr "IM With Password"
-#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:423
msgid "Cannot set IM key"
msgstr "Cannot set IM key"
-#: src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:465
msgid "Set IM Password"
msgstr "Set IM Password"
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1492 src/protocols/silc/ops.c:1503
msgid "Get Public Key"
msgstr "Get Public Key"
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:548 src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1504
msgid "Cannot fetch the public key"
msgstr "Cannot fetch the public key"
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1647
msgid "Show Public Key"
msgstr "Show Public Key"
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:1030
+#: src/protocols/silc/chat.c:236
msgid "Could not load public key"
msgstr "Could not load public key"
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:1087
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/ops.c:1294
+#: src/protocols/silc/ops.c:1295 src/protocols/silc/ops.c:1313
msgid "User Information"
msgstr "User Information"
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:1160
+#: src/protocols/silc/ops.c:1314
msgid "Cannot get user information"
msgstr "Cannot get user information"
@@ -9004,16 +10285,16 @@ msgstr ""
"You can use the Get Public Key command to get the public key."
#. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1064
msgid "Open..."
msgstr "Open..."
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1073
#, c-format
msgid "The %s buddy is not present in the network"
msgstr "The %s buddy is not present in the network"
-#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1076
msgid ""
"To add the buddy you must import his/her public key. Press Import to import "
"a public key."
@@ -9021,15 +10302,15 @@ msgstr ""
"To add the buddy you must import their public key. Press Import to import a "
"public key."
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
-msgstr "Import..."
+#: src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "_Import..."
-#: src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1175
msgid "Select correct user"
msgstr "Select correct user"
-#: src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/buddy.c:1177
msgid ""
"More than one user was found with the same public key. Select the correct "
"user from the list to add to the buddy list."
@@ -9037,7 +10318,7 @@ msgstr ""
"More than one user was found with the same public key. Select the correct "
"user from the list to add to the buddy list."
-#: src/protocols/silc/buddy.c:1134
+#: src/protocols/silc/buddy.c:1179
msgid ""
"More than one user was found with the same name. Select the correct user "
"from the list to add to the buddy list."
@@ -9045,213 +10326,213 @@ 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:1415
+#: src/protocols/silc/buddy.c:1467
msgid "Detached"
msgstr "Detached"
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/silc.c:55
msgid "Indisposed"
msgstr "Indisposed"
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/silc.c:57
msgid "Wake Me Up"
msgstr "Wake Me Up"
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1477 src/protocols/silc/silc.c:49
msgid "Hyper Active"
msgstr "Hyper Active"
-#: src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1479
msgid "Robot"
msgstr "Robot"
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:473
msgid "Happy"
msgstr "Happy"
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: src/protocols/silc/buddy.c:1488 src/protocols/silc/silc.c:670
+#: src/protocols/silc/util.c:475
msgid "Sad"
msgstr "Sad"
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/silc.c:672
+#: src/protocols/silc/util.c:477
msgid "Angry"
msgstr "Angry"
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: src/protocols/silc/buddy.c:1492 src/protocols/silc/silc.c:674
+#: src/protocols/silc/util.c:479
msgid "Jealous"
msgstr "Jealous"
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: src/protocols/silc/buddy.c:1494 src/protocols/silc/silc.c:676
+#: src/protocols/silc/util.c:481
msgid "Ashamed"
msgstr "Ashamed"
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: src/protocols/silc/buddy.c:1496 src/protocols/silc/silc.c:678
+#: src/protocols/silc/util.c:483
msgid "Invincible"
msgstr "Invincible"
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: src/protocols/silc/buddy.c:1498 src/protocols/silc/silc.c:680
+#: src/protocols/silc/util.c:485
msgid "In Love"
msgstr "In Love"
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: src/protocols/silc/buddy.c:1500 src/protocols/silc/silc.c:682
+#: src/protocols/silc/util.c:487
msgid "Sleepy"
msgstr "Sleepy"
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: src/protocols/silc/buddy.c:1502 src/protocols/silc/silc.c:684
+#: src/protocols/silc/util.c:489
msgid "Bored"
msgstr "Bored"
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/silc.c:686
+#: src/protocols/silc/util.c:491
msgid "Excited"
msgstr "Excited"
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: src/protocols/silc/buddy.c:1506 src/protocols/silc/silc.c:688
+#: src/protocols/silc/util.c:493
msgid "Anxious"
msgstr "Anxious"
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1534 src/protocols/silc/ops.c:1196
msgid "User Modes"
msgstr "User Modes"
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1550 src/protocols/silc/ops.c:1205
msgid "Mood"
msgstr "Mood"
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "Status Text"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1217
msgid "Preferred Contact"
msgstr "Preferred Contact"
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1222
msgid "Preferred Language"
msgstr "Preferred Language"
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1565 src/protocols/silc/ops.c:1227
msgid "Device"
msgstr "Device"
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1570 src/protocols/silc/ops.c:1232
+#: src/protocols/silc/silc.c:736 src/protocols/silc/silc.c:738
msgid "Timezone"
msgstr "Timezone"
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1575 src/protocols/silc/ops.c:1237
msgid "Geolocation"
msgstr "Geolocation"
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1629
msgid "Reset IM Key"
msgstr "Reset IM Key"
-#: src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1635
msgid "IM with Key Exchange"
msgstr "IM with Key Exchange"
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1640
msgid "IM with Password"
msgstr "IM with Password"
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1653
msgid "Get Public Key..."
msgstr "Get Public Key..."
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1660 src/protocols/silc/ops.c:1623
msgid "Kill User"
msgstr "Kill User"
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/buddy.c:1670 src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "Draw On Whiteboard"
+
+#: src/protocols/silc/chat.c:39
msgid "_Passphrase:"
msgstr "_Passphrase:"
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:80
#, c-format
msgid "Channel %s does not exist in the network"
msgstr "Channel %s does not exist in the network"
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:81 src/protocols/silc/chat.c:173
msgid "Channel Information"
msgstr "Channel Information"
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:82
msgid "Cannot get channel information"
msgstr "Cannot get channel information"
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:119
#, c-format
msgid "<b>Channel Name:</b> %s"
msgstr "<b>Channel Name:</b> %s"
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:122
#, c-format
msgid "<br><b>User Count:</b> %d"
msgstr "<br><b>User Count:</b> %d"
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:129
#, c-format
msgid "<br><b>Channel Founder:</b> %s"
msgstr "<br><b>Channel Founder:</b> %s"
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:138
#, c-format
msgid "<br><b>Channel Cipher:</b> %s"
msgstr "<br><b>Channel Cipher:</b> %s"
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:141
#, c-format
msgid "<br><b>Channel HMAC:</b> %s"
msgstr "<br><b>Channel HMAC:</b> %s"
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:146
#, c-format
msgid "<br><b>Channel Topic:</b><br>%s"
msgstr "<br><b>Channel Topic:</b><br>%s"
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:151
msgid "<br><b>Channel Modes:</b> "
msgstr "<br><b>Channel Modes:</b> "
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
#, c-format
msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:165
#, c-format
msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
msgid "Add Channel Public Key"
msgstr "Add Channel Public Key"
#. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:290
msgid "Open Public Key..."
msgstr "Open Public Key..."
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:399
msgid "Channel Passphrase"
msgstr "Channel Passphrase"
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:406
msgid "Channel Public Keys List"
msgstr "Channel Public Keys List"
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:411
msgid ""
"Channel authentication is used to secure the channel from unauthorized "
"access. The authentication may be based on passphrase and digital "
@@ -9265,123 +10546,128 @@ msgstr ""
"channel public keys are set then only users whose public keys are listed are "
"able to join."
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:458 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:905
msgid "Channel Authentication"
msgstr "Channel Authentication"
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
msgid "Add / Remove"
msgstr "Add / Remove"
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:577
msgid "Group Name"
msgstr "Group name"
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:581 src/protocols/silc/ops.c:1908
+#: src/protocols/silc/silc.c:944
msgid "Passphrase"
msgstr "Passphrase"
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:592
#, c-format
msgid "Please enter the %s channel private group name and passphrase."
msgstr "Please enter the %s channel private group name and passphrase."
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:594
msgid "Add Channel Private Group"
msgstr "Add Channel Private Group"
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
msgid "User Limit"
msgstr "User Limit"
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:722
msgid "Set user limit on channel. Set to zero to reset user limit."
msgstr "Set user limit on channel. Set to zero to reset user limit."
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:877
msgid "Get Info"
msgstr "Get Info"
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:885
msgid "Invite List"
msgstr "Invite List"
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:890
msgid "Ban List"
msgstr "Ban List"
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:898
msgid "Add Private Group"
msgstr "Add Private Group"
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:911
msgid "Reset Permanent"
msgstr "Reset Permanent"
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:916
msgid "Set Permanent"
msgstr "Set Permanent"
-#: src/protocols/silc/chat.c:910
+#: src/protocols/silc/chat.c:924
msgid "Set User Limit"
msgstr "Set User Limit"
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:930
msgid "Reset Topic Restriction"
msgstr "Reset Topic Restriction"
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:935
msgid "Set Topic Restriction"
msgstr "Set Topic Restriction"
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:942
msgid "Reset Private Channel"
msgstr "Reset Private Channel"
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:947
msgid "Set Private Channel"
msgstr "Set Private Channel"
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:954
msgid "Reset Secret Channel"
msgstr "Reset Secret Channel"
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:959
msgid "Set Secret Channel"
msgstr "Set Secret Channel"
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:1033
#, c-format
msgid "You are channel founder on <I>%s</I>"
msgstr "You are channel founder on <I>%s</I>"
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:1037
#, c-format
msgid "Channel founder on <I>%s</I> is <I>%s</I>"
msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
-#: src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1096
#, c-format
msgid ""
"You have to join the %s channel before you are able to join the private group"
msgstr ""
"You have to join the %s channel before you are able to join the private group"
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1098
msgid "Join Private Group"
msgstr "Join Private Group"
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1099
msgid "Cannot join private group"
msgstr "Cannot join private group"
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1293 src/protocols/silc/silc.c:1152
+msgid "Call Command"
+msgstr "Call Command"
+
+#: src/protocols/silc/chat.c:1293 src/protocols/silc/silc.c:1152
msgid "Cannot call command"
msgstr "Cannot call command"
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1294 src/protocols/silc/silc.c:1153
msgid "Unknown command"
msgstr "Unknown command"
@@ -9431,150 +10717,154 @@ msgstr "Could not start the file transfer"
msgid "Cannot send file"
msgstr "Cannot send file"
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:555 src/protocols/silc/ops.c:564
+#: src/protocols/silc/ops.c:573
#, c-format
msgid "%s has changed the topic of <I>%s</I> to: %s"
msgstr "%s has changed the topic of <I>%s</I> to: %s"
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:639
#, c-format
msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s"
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:643
#, c-format
msgid "<I>%s</I> removed all channel <I>%s</I> modes"
msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:676
#, c-format
msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:684
#, c-format
msgid "<I>%s</I> removed all <I>%s's</I> modes"
msgstr "<I>%s</I> removed all <I>%s's</I> modes"
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:713
#, c-format
msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:743 src/protocols/silc/ops.c:748
+#: src/protocols/silc/ops.c:753
#, c-format
msgid "You have been killed by %s (%s)"
msgstr "You have been killed by %s (%s)"
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:774 src/protocols/silc/ops.c:779
+#: src/protocols/silc/ops.c:784
#, c-format
msgid "Killed by %s (%s)"
msgstr "Killed by %s (%s)"
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:830
msgid "Server signoff"
msgstr "Server signoff"
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:1017
msgid "Personal Information"
msgstr "Personal Information"
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:1040
msgid "Birth Day"
-msgstr "Birth Day"
+msgstr "Date of Birth"
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:1044
msgid "Job Title"
msgstr "Job Title"
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:1048
msgid "Job Role"
msgstr "Job Role"
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:1052 src/protocols/silc/silc.c:937
msgid "Organization"
msgstr "Organisation"
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:1056
msgid "Unit"
msgstr "Unit"
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:1075
msgid "EMail"
msgstr "E-Mail"
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:1080
msgid "Note"
msgstr "Note"
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:1128
msgid "Join Chat"
msgstr "Join Chat"
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "Status Text"
+
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1354
msgid "Public Key Fingerprint"
msgstr "Public Key Fingerprint"
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1285 src/protocols/silc/ops.c:1355
msgid "Public Key Babbleprint"
msgstr "Public Key Babbleprint"
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
-msgstr "More..."
+#: src/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "_More..."
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1369 src/protocols/silc/silc.c:1003
msgid "Detach From Server"
msgstr "Detach From Server"
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1369
msgid "Cannot detach"
msgstr "Cannot detach"
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1380
msgid "Cannot set topic"
msgstr "Cannot set topic"
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1412
msgid "Failed to change nickname"
msgstr "Failed to change nickname"
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
msgid "Roomlist"
msgstr "Room List"
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
msgid "Cannot get room list"
msgstr "Cannot get room list"
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1505
msgid "No public key was received"
msgstr "No public key was received"
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1518 src/protocols/silc/ops.c:1531
msgid "Server Information"
msgstr "Server Information"
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1519
msgid "Cannot get server information"
msgstr "Cannot get server information"
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1548 src/protocols/silc/ops.c:1557
msgid "Server Statistics"
msgstr "Server Statistics"
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1549
msgid "Cannot get server statistics"
msgstr "Cannot get server statistics"
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1558
msgid "No server statistics available"
msgstr "No server statistics available"
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1580
#, c-format
msgid ""
"Local server start time: %s\n"
@@ -9609,98 +10899,98 @@ msgstr ""
"Total server operators: %d\n"
"Total router operators: %d\n"
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1603
msgid "Network Statistics"
msgstr "Network Statistics"
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1611 src/protocols/silc/ops.c:1616
msgid "Ping"
msgstr "Ping"
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1611
msgid "Ping failed"
msgstr "Ping failed"
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1616
msgid "Ping reply received from server"
msgstr "Ping reply received from server"
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1624
msgid "Could not kill user"
msgstr "Could not kill user"
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1708
msgid "Error during connecting to SILC Server"
msgstr "Error during connecting to SILC Server"
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1713
msgid "Key Exchange failed"
msgstr "Key Exchange failed"
-#: src/protocols/silc/ops.c:1508
+#: src/protocols/silc/ops.c:1722
msgid ""
"Resuming detached session failed. Press Reconnect to create new connection."
msgstr ""
"Resuming detached session failed. Press Reconnect to create new connection."
-#: src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1757
msgid "Disconnected by server"
msgstr "Disconnected by server"
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/ops.c:1819 src/protocols/silc/ops.c:1866
+#: src/protocols/silc/silc.c:195
msgid "Resuming session"
msgstr "Resuming session"
-#: src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1821
msgid "Authenticating connection"
msgstr "Authenticating connection"
-#: src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1868
msgid "Verifying server public key"
msgstr "Verifying server public key"
-#: src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1909
msgid "Passphrase required"
msgstr "Passphrase required"
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1938
msgid "Failure: Version mismatch, upgrade your client"
msgstr "Failure: Version mismatch, upgrade your client"
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1941
msgid "Failure: Remote does not trust/support your public key"
msgstr "Failure: Remote does not trust/support your public key"
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1944
msgid "Failure: Remote does not support proposed KE group"
msgstr "Failure: Remote does not support proposed KE group"
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1947
msgid "Failure: Remote does not support proposed cipher"
msgstr "Failure: Remote does not support proposed cipher"
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1950
msgid "Failure: Remote does not support proposed PKCS"
msgstr "Failure: Remote does not support proposed PKCS"
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1953
msgid "Failure: Remote does not support proposed hash function"
msgstr "Failure: Remote does not support proposed hash function"
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1956
msgid "Failure: Remote does not support proposed HMAC"
msgstr "Failure: Remote does not support proposed HMAC"
-#: src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1958
msgid "Failure: Incorrect signature"
msgstr "Failure: Incorrect signature"
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1960
msgid "Failure: Invalid cookie"
msgstr "Failure: Invalid cookie"
-#: src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1971
msgid "Failure: Authentication failed"
msgstr "Failure: Authentication failed"
@@ -9736,43 +11026,56 @@ msgid "Verify Public Key"
msgstr "Verify Public Key"
#: src/protocols/silc/pk.c:119
-msgid "View..."
-msgstr "View..."
+msgid "_View..."
+msgstr "_View..."
#: src/protocols/silc/pk.c:141
msgid "Unsupported public key type"
msgstr "Unsupported public key type"
-#: src/protocols/silc/silc.c:154
+#: src/protocols/silc/silc.c:155
msgid "Connection failed"
msgstr "Connection failed"
-#: src/protocols/silc/silc.c:186
+#: src/protocols/silc/silc.c:187
msgid "Cannot initialize SILC Client connection"
msgstr "Cannot initialise SILC Client connection"
-#: src/protocols/silc/silc.c:197
+#: src/protocols/silc/silc.c:198
msgid "Performing key exchange"
msgstr "Performing key exchange"
-#: src/protocols/silc/silc.c:270
+#: src/protocols/silc/silc.c:283
msgid "Out of memory"
msgstr "Out of memory"
+#: src/protocols/silc/silc.c:324
+msgid "Cannot initialize SILC protocol"
+msgstr "Cannot initialise SILC protocol"
+
+#: src/protocols/silc/silc.c:331
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Cannot find/access ~/.silc directory"
+
#. Progress
-#: src/protocols/silc/silc.c:309
+#: src/protocols/silc/silc.c:336
msgid "Connecting to SILC Server"
msgstr "Connecting to SILC Server"
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/silc.c:345
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Could not load SILC key pair: %s"
+
+#: src/protocols/silc/silc.c:365
+msgid "Unable to create connection"
+msgstr "Unable to create connection"
+
+#: src/protocols/silc/silc.c:664
msgid "Your Current Mood"
msgstr "Your Current Mood"
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "Normal"
-
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:691
msgid ""
"\n"
"Your Preferred Contact Methods"
@@ -9780,43 +11083,43 @@ msgstr ""
"\n"
"Your Preferred Contact Methods"
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:699 src/protocols/silc/util.c:518
msgid "SMS"
msgstr "SMS"
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:701 src/protocols/silc/util.c:520
msgid "MMS"
msgstr "MMS"
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:703 src/protocols/silc/util.c:522
msgid "Video Conferencing"
msgstr "Video Conferencing"
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:708
msgid "Your Current Status"
msgstr "Your Current Status"
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:715
msgid "Online Services"
msgstr "Online Services"
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:718
msgid "Let others see what services you are using"
msgstr "Let others see what services you are using"
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:724
msgid "Let others see what computer you are using"
msgstr "Let others see what computer you are using"
-#: src/protocols/silc/silc.c:697
+#: src/protocols/silc/silc.c:731
msgid "Your VCard File"
-msgstr "Your VCard File"
+msgstr "Your vCard File"
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:743 src/protocols/silc/silc.c:744
msgid "User Online Status Attributes"
msgstr "User Online Status Attributes"
-#: src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:745
msgid ""
"You can let other users see your online status information and your personal "
"information. Please fill the information you would like other users to see "
@@ -9826,127 +11129,168 @@ msgstr ""
"information. Please fill the information you would like other users to see "
"about yourself."
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: src/protocols/silc/silc.c:785 src/protocols/silc/silc.c:791
+#: src/protocols/silc/silc.c:1431
msgid "Message of the Day"
msgstr "Message of the Day"
-#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:785
msgid "No Message of the Day available"
msgstr "No Message of the Day available"
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:786 src/protocols/silc/silc.c:1426
msgid "There is no Message of the Day associated with this connection"
msgstr "There is no Message of the Day associated with this connection"
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:837 src/protocols/silc/silc.c:881
+#: src/protocols/silc/silc.c:952 src/protocols/silc/silc.c:953
+msgid "Create New SILC Key Pair"
+msgstr "Create New SILC Key Pair"
+
+#: src/protocols/silc/silc.c:837
+msgid "Passphrases do not match"
+msgstr "Passphrases do not match"
+
+#: src/protocols/silc/silc.c:881
+msgid "Key Pair Generation failed"
+msgstr "Key Pair Generation failed"
+
+#: src/protocols/silc/silc.c:920
+msgid "Key Length"
+msgstr "Key Length"
+
+#: src/protocols/silc/silc.c:922
+msgid "Public Key File"
+msgstr "Public Key File"
+
+#: src/protocols/silc/silc.c:924
+msgid "Private Key File"
+msgstr "Private Key File"
+
+#: src/protocols/silc/silc.c:933
+msgid "Real Name"
+msgstr "Real Name"
+
+#: src/protocols/silc/silc.c:947
+msgid "Re-type Passphrase"
+msgstr "Re-type Passphrase"
+
+#: src/protocols/silc/silc.c:954
+msgid "Generate Key Pair"
+msgstr "Generate Key Pair"
+
+#: src/protocols/silc/silc.c:998
msgid "Online Status"
msgstr "Online Status"
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:1007
msgid "View Message of the Day"
msgstr "View Message of the Day"
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:1011
+msgid "Create SILC Key Pair..."
+msgstr "Create SILC key pair..."
+
+#: src/protocols/silc/silc.c:1110
#, c-format
msgid "User <I>%s</I> is not present in the network"
msgstr "User <I>%s</I> is not present in the network"
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/silc/silc.c:1302
msgid "Topic too long"
msgstr "Topic too long."
-#: src/protocols/silc/silc.c:1114
+#: src/protocols/silc/silc.c:1383
msgid "You must specify a nick"
msgstr "You must specify a nick"
-#: src/protocols/silc/silc.c:1216
+#: src/protocols/silc/silc.c:1485
#, c-format
msgid "channel %s not found"
msgstr "channel %s not found"
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1490
#, c-format
msgid "channel modes for %s: %s"
msgstr "channel modes for %s: %s"
-#: src/protocols/silc/silc.c:1223
+#: src/protocols/silc/silc.c:1492
#, c-format
msgid "no channel modes are set on %s"
msgstr "no channel modes are set on %s"
-#: src/protocols/silc/silc.c:1236
+#: src/protocols/silc/silc.c:1505
#, c-format
msgid "Failed to set cmodes for %s"
msgstr "Failed to set cmodes for %s"
-#: src/protocols/silc/silc.c:1266
+#: src/protocols/silc/silc.c:1535
#, c-format
msgid "Unknown command: %s, (may be a Gaim bug)"
msgstr "Unknown command: %s, (may be a Gaim bug)"
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1598
msgid "part [channel]: Leave the chat"
msgstr "part [channel]: Leave the chat"
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1602
msgid "leave [channel]: Leave the chat"
msgstr "leave [channel]: Leave the chat"
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1606
msgid "topic [&lt;new topic&gt;]: View or change the topic"
msgstr "topic [&lt;new topic&gt;]: View or change the topic"
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1611
msgid "join &lt;channel&gt; [&lt;password&gt;]: Join a chat on this network"
msgstr "join &lt;channel&gt; [&lt;password&gt;]: Join a chat on this network"
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1615
msgid "list: List channels on this network"
msgstr "list: List channels on this network"
-#: src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1619
msgid "whois &lt;nick&gt;: View nick's information"
msgstr "whois &lt;nick&gt;: View nick's information"
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1623 src/protocols/zephyr/zephyr.c:2602
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"
-#: src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1627
msgid "query &lt;nick&gt; [&lt;message&gt;]: Send a private message to a user"
msgstr ""
"query &lt;nick&gt; [&lt;message&gt;]: Send a private message to a user"
-#: src/protocols/silc/silc.c:1362
+#: src/protocols/silc/silc.c:1631
msgid "motd: View the server's Message Of The Day"
msgstr "motd: View the server's Message Of The Day"
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1635
msgid "detach: Detach this session"
msgstr "detach: Detach this session"
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1639
msgid "quit [message]: Disconnect from the server, with an optional message"
msgstr "quit [message]: Disconnect from the server, with an optional message"
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1643
msgid "call &lt;command&gt;: Call any silc client command"
msgstr "call &lt;command&gt;: Call any silc client command"
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1649
msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: Kill nick"
msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: Kill nick"
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1653
msgid "nick &lt;newnick&gt;: Change your nickname"
msgstr "nick &lt;newnick&gt;: Change your nickname"
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1657
msgid "whowas &lt;nick&gt;: View nick's information"
msgstr "whowas &lt;nick&gt;: View nick's information"
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1661
msgid ""
"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]: Change or display "
"channel modes"
@@ -9954,7 +11298,7 @@ msgstr ""
"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]: Change or display "
"channel modes"
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1665
msgid ""
"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: Change nick's modes "
"on channel"
@@ -9962,15 +11306,15 @@ msgstr ""
"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: Change nick's modes "
"on channel"
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1669
msgid "umode &lt;usermodes&gt;: Set your modes in the network"
msgstr "umode &lt;usermodes&gt;: Set your modes in the network"
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1673
msgid "oper &lt;nick&gt; [-pubkey]: Get server operator privileges"
msgstr "oper &lt;nick&gt; [-pubkey]: Get server operator privileges"
-#: src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1677
msgid ""
"invite &lt;channel&gt; [-|+]&lt;nick&gt;: invite nick or add/remove from "
"channel invite list"
@@ -9978,35 +11322,35 @@ msgstr ""
"invite &lt;channel&gt; [-|+]&lt;nick&gt;: invite nick or add/remove from "
"channel invite list"
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1681
msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]: Kick client from channel"
msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]: Kick client from channel"
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1685
msgid "info [server]: View server administrative details"
msgstr "info [server]: View server administrative details"
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1689
msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]: Ban client from channel"
msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]: Ban client from channel"
-#: src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1693
msgid "getkey &lt;nick|server&gt;: Retrieve client's or server's public key"
msgstr "getkey &lt;nick|server&gt;: Retrieve client's or server's public key"
-#: src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1697
msgid "stats: View server and network statistics"
msgstr "stats: View server and network statistics"
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1701
msgid "ping: Send PING to the connected server"
msgstr "ping: Send PING to the connected server"
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1706
msgid "users &lt;channel&gt;: List users in channel"
msgstr "users &lt;channel&gt;: List users in channel"
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1710
msgid ""
"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;: List "
"specific users in channel(s)"
@@ -10014,30 +11358,6 @@ msgstr ""
"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;: List "
"specific users in channel(s)"
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Instant Messages"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Digitally sign all IM messages"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "Verify all IM message signatures"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Channel Messages"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Digitally sign all channel messages"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "Verify all channel message signatures"
-
#. *< type
#. *< ui_requirement
#. *< flags
@@ -10047,91 +11367,111 @@ msgstr "Verify all channel message signatures"
#. *< name
#. *< version
#. * summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1820
msgid "SILC Protocol Plugin"
-msgstr "SILC Protocol Plugin"
+msgstr "SILC Protocol Plug-in"
#. * description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1822
msgid "Secure Internet Live Conferencing (SILC) Protocol"
msgstr "Secure Internet Live Conferencing (SILC) Protocol"
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1859
msgid "Public Key file"
msgstr "Public Key file"
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1863
msgid "Private Key file"
msgstr "Private Key file"
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1873
+msgid "Cipher"
+msgstr "Cipher"
+
+#: src/protocols/silc/silc.c:1883
+msgid "HMAC"
+msgstr "HMAC"
+
+#: src/protocols/silc/silc.c:1886
msgid "Public key authentication"
msgstr "Public key authentication"
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1889
msgid "Reject watching by other users"
msgstr "Reject watching by other users"
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1892
msgid "Block invites"
msgstr "Block invites"
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1895
msgid "Block IMs without Key Exchange"
msgstr "Block IMs without Key Exchange"
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1898
msgid "Reject online status attribute requests"
msgstr "Reject online status attribute requests"
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: src/protocols/silc/silc.c:1901
+msgid "Block messages to whiteboard"
+msgstr "Block messages to whiteboard"
+
+#: src/protocols/silc/silc.c:1904
+msgid "Automatically open whiteboard"
+msgstr "Automatically open whiteboard"
+
+#: src/protocols/silc/silc.c:1907
+msgid "Digitally sign and verify all messages"
+msgstr "Digitally sign and verify all messages"
+
+#: src/protocols/silc/util.c:206 src/protocols/silc/util.c:231
msgid "Creating SILC key pair..."
msgstr "Creating SILC key pair..."
#. Hint for translators: Please check the tabulator width here and in
#. the next strings (short strings: 2 tabs, longer strings 1 tab,
#. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: src/protocols/silc/util.c:314
#, c-format
msgid "Real Name: \t%s\n"
msgstr "Real Name: \t%s\n"
-#: src/protocols/silc/util.c:315
+#: src/protocols/silc/util.c:316
#, c-format
msgid "User Name: \t%s\n"
msgstr "User Name: \t%s\n"
-#: src/protocols/silc/util.c:317
+#: src/protocols/silc/util.c:318
#, c-format
msgid "EMail: \t\t%s\n"
msgstr "E-Mail: \t\t%s\n"
-#: src/protocols/silc/util.c:319
+#: src/protocols/silc/util.c:320
#, c-format
msgid "Host Name: \t%s\n"
msgstr "Host Name: \t%s\n"
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:322
#, c-format
msgid "Organization: \t%s\n"
msgstr "Organisation: \t%s\n"
-#: src/protocols/silc/util.c:323
+#: src/protocols/silc/util.c:324
#, c-format
msgid "Country: \t%s\n"
msgstr "Country: \t%s\n"
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:325
#, c-format
msgid "Algorithm: \t%s\n"
msgstr "Algorithm: \t%s\n"
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:326
#, c-format
msgid "Key Length: \t%d bits\n"
msgstr "Key Length: \t%d bits\n"
-#: src/protocols/silc/util.c:327
+#: src/protocols/silc/util.c:328
#, c-format
msgid ""
"Public Key Fingerprint:\n"
@@ -10142,7 +11482,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/protocols/silc/util.c:328
+#: src/protocols/silc/util.c:329
#, c-format
msgid ""
"Public Key Babbleprint:\n"
@@ -10151,40 +11491,54 @@ msgstr ""
"Public Key Babbleprint:\n"
"%s"
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:333 src/protocols/silc/util.c:334
msgid "Public Key Information"
msgstr "Public Key Information"
-#: src/protocols/silc/util.c:515
+#: src/protocols/silc/util.c:516
msgid "Paging"
msgstr "Paging"
-#: src/protocols/silc/util.c:539
+#: src/protocols/silc/util.c:540
msgid "Computer"
msgstr "Computer"
-#: src/protocols/silc/util.c:543
+#: src/protocols/silc/util.c:544
msgid "PDA"
msgstr "PDA"
-#: src/protocols/silc/util.c:545
+#: src/protocols/silc/util.c:546
msgid "Terminal"
msgstr "Terminal"
-#: src/protocols/simple/simple.c:202
+#: src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s sent message to whiteboard. Would you like to open the whiteboard?"
+
+#: src/protocols/silc/wb.c:288
#, c-format
msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
msgstr ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+
+#: src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "Whiteboard"
-#: src/protocols/simple/simple.c:1209
+#: src/protocols/simple/simple.c:1231 src/protocols/simple/simple.c:1270
+#: src/protocols/simple/simple.c:1282 src/protocols/simple/simple.c:1329
msgid "Could not create listen socket"
msgstr "Could not create listen socket"
-#: src/protocols/simple/simple.c:1263
+#: src/protocols/simple/simple.c:1252
+msgid "Couldn't resolve host"
+msgstr "Couldn't resolve host"
+
+#: src/protocols/simple/simple.c:1355
msgid "SIP usernames may not contain whitespaces or @ symbols"
msgstr "SIP usernames may not contain whitespaces or @ symbols"
@@ -10196,36 +11550,39 @@ msgstr "SIP usernames may not contain whitespaces or @ symbols"
#. *< id
#. *< name
#. *< version
-#: src/protocols/simple/simple.c:1408
+#: src/protocols/simple/simple.c:1507
msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE Protocol Plug-in"
#. * summary
-#: src/protocols/simple/simple.c:1409
+#: src/protocols/simple/simple.c:1508
msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "The SIP/SIMPLE Protocol Plugin"
-
-#. * description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr "Thomas Butter <butter@uni-mannheim.de>"
+msgstr "The SIP/SIMPLE Protocol Plug-in"
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr "Publish Status (note: everyone may watch you)"
+#: src/protocols/simple/simple.c:1530
+msgid "Publish status (note: everyone may watch you)"
+msgstr "Publish status (note: anyone can watch you)"
-#: src/protocols/simple/simple.c:1434
+#: src/protocols/simple/simple.c:1537
msgid "Use UDP"
msgstr "Use UDP"
-#: src/protocols/simple/simple.c:1436
-msgid "Use Proxy"
-msgstr "Use Proxy"
+#: src/protocols/simple/simple.c:1539
+msgid "Use proxy"
+msgstr "Use proxy"
-#: src/protocols/simple/simple.c:1438
+#: src/protocols/simple/simple.c:1541
msgid "Proxy"
msgstr "Proxy"
+#: src/protocols/simple/simple.c:1543
+msgid "Auth User"
+msgstr "Auth User"
+
+#: src/protocols/simple/simple.c:1545
+msgid "Auth Domain"
+msgstr "Auth Domain"
+
#: src/protocols/toc/toc.c:139
#, c-format
msgid "Looking up %s"
@@ -10395,10 +11752,18 @@ msgstr ""
msgid "Get Dir Info"
msgstr "Get Dir Info"
+#: src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Set User Info"
+
#: src/protocols/toc/toc.c:1689
msgid "Set Dir Info"
msgstr "Set Dir Info"
+#: src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Change Password"
+
#: src/protocols/toc/toc.c:1811
#, c-format
msgid "Could not open %s for writing!"
@@ -10443,27 +11808,27 @@ msgstr "%s requests you to send them a file"
#. *< version
#. * summary
#. * description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2320 src/protocols/toc/toc.c:2322
msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plugin"
+msgstr "TOC Protocol Plug-in"
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2341
msgid "TOC host"
msgstr "TOC host"
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2345
msgid "TOC port"
msgstr "TOC port"
-#: src/protocols/yahoo/yahoo.c:706
+#: src/protocols/yahoo/yahoo.c:712
msgid "Your Yahoo! message did not get sent."
msgstr "Your Yahoo! message did not get sent."
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:765 src/protocols/yahoo/yahoo.c:3510
msgid "Buzz!!"
msgstr "Buzz!!"
-#: src/protocols/yahoo/yahoo.c:797
+#: src/protocols/yahoo/yahoo.c:810
#, c-format
msgid "Yahoo! system message for %s:"
msgstr "Yahoo! system message for %s:"
@@ -10471,21 +11836,21 @@ msgstr "Yahoo! system message for %s:"
#. TODO: this is almost exactly the same as what MSN does,
#. * this should probably be moved to the core.
#.
-#: src/protocols/yahoo/yahoo.c:887
+#: src/protocols/yahoo/yahoo.c:906
#, c-format
msgid "The user %s wants to add %s to his or her buddy list%s%s."
msgstr "The user %s wants to add %s to his or her buddy list%s%s."
-#: src/protocols/yahoo/yahoo.c:893
+#: src/protocols/yahoo/yahoo.c:912
msgid "Message (optional) :"
msgstr "Message (optional) :"
-#: src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:954
#, c-format
msgid "%s has (retroactively) denied your request to add them to your list."
msgstr "%s has (retroactively) denied your request to add them to your list."
-#: src/protocols/yahoo/yahoo.c:938
+#: src/protocols/yahoo/yahoo.c:957
#, c-format
msgid ""
"%s has (retroactively) denied your request to add them to your list for the "
@@ -10494,11 +11859,11 @@ msgstr ""
"%s has (retroactively) denied your request to add them to your list for the "
"following reason: %s."
-#: src/protocols/yahoo/yahoo.c:941
+#: src/protocols/yahoo/yahoo.c:960
msgid "Add buddy rejected"
msgstr "Add buddy rejected"
-#: src/protocols/yahoo/yahoo.c:1684
+#: src/protocols/yahoo/yahoo.c:1703
#, c-format
msgid ""
"The Yahoo server has requested the use of an unrecognized authentication "
@@ -10509,11 +11874,11 @@ msgstr ""
"method. This version of Gaim will likely not be able to successfully sign "
"on to Yahoo. Check %s for updates."
-#: src/protocols/yahoo/yahoo.c:1687
+#: src/protocols/yahoo/yahoo.c:1706
msgid "Failed Yahoo! Authentication"
msgstr "Failed Yahoo! Authentication"
-#: src/protocols/yahoo/yahoo.c:1760
+#: src/protocols/yahoo/yahoo.c:1772
#, c-format
msgid ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
@@ -10522,19 +11887,19 @@ msgstr ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
"\"Yes\" will remove and ignore the buddy."
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1775
msgid "Ignore buddy?"
msgstr "Ignore buddy?"
-#: src/protocols/yahoo/yahoo.c:1797
+#: src/protocols/yahoo/yahoo.c:1809
msgid "Invalid username."
msgstr "Invalid username."
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1820
msgid "Normal authentication failed!"
msgstr "Normal authentication failed!"
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:1821
msgid ""
"The normal authentication method has failed. This means either your password "
"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10546,121 +11911,134 @@ msgstr ""
"attempt to log in using Web Messenger authentication, will which result in "
"reduced functionality and features."
-#: src/protocols/yahoo/yahoo.c:1817
+#: src/protocols/yahoo/yahoo.c:1829
msgid "Incorrect password."
msgstr "Incorrect password."
-#: src/protocols/yahoo/yahoo.c:1820
+#: src/protocols/yahoo/yahoo.c:1832
msgid "Your account is locked, please log in to the Yahoo! website."
msgstr "Your account is locked, please log in to the Yahoo! website."
-#: src/protocols/yahoo/yahoo.c:1823
+#: src/protocols/yahoo/yahoo.c:1835
#, c-format
msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
-#: src/protocols/yahoo/yahoo.c:1877
+#: src/protocols/yahoo/yahoo.c:1889
#, c-format
msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr "Could not add buddy %s to group %s to the server list on account %s."
-#: src/protocols/yahoo/yahoo.c:1880
+#: src/protocols/yahoo/yahoo.c:1892
msgid "Could not add buddy to server list"
msgstr "Could not add buddy to server list"
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2011
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Audible %s/%s/%s.swf ] %s"
+
+#: src/protocols/yahoo/yahoo.c:2150 src/protocols/yahoo/yahoo.c:2296
#: src/protocols/yahoo/ycht.c:413
msgid "Unable to read"
msgstr "Unable to read"
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2446
+#: src/protocols/yahoo/yahoo.c:2545 src/protocols/yahoo/yahoo.c:2555
+#: src/protocols/yahoo/yahoochat.c:1414 src/protocols/yahoo/yahoochat.c:1484
#: src/protocols/yahoo/ycht.c:517
msgid "Connection problem"
msgstr "Connection problem"
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
-msgstr "Not At Home"
+#: src/protocols/yahoo/yahoo.c:2662 src/protocols/yahoo/yahoo.c:3243
+msgid "Not at Home"
+msgstr "Not at Home"
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
-msgstr "Not At Desk"
+#: src/protocols/yahoo/yahoo.c:2664 src/protocols/yahoo/yahoo.c:3246
+msgid "Not at Desk"
+msgstr "Not at Desk"
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
-msgstr "Not In Office"
+#: src/protocols/yahoo/yahoo.c:2666 src/protocols/yahoo/yahoo.c:3249
+msgid "Not in Office"
+msgstr "Not in Office"
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/yahoo/yahoo.c:2670 src/protocols/yahoo/yahoo.c:3255
msgid "On Vacation"
msgstr "On Vacation"
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: src/protocols/yahoo/yahoo.c:2674 src/protocols/yahoo/yahoo.c:3261
msgid "Stepped Out"
msgstr "Stepped Out"
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2767 src/protocols/yahoo/yahoo.c:2797
msgid "Not on server list"
msgstr "Not on server list"
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2814 src/protocols/yahoo/yahoo.c:2873
msgid "Appear Online"
msgstr "Appear Online"
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+#: src/protocols/yahoo/yahoo.c:2817 src/protocols/yahoo/yahoo.c:2894
msgid "Appear Permanently Offline"
msgstr "Appear Permanently Offline"
-#: src/protocols/yahoo/yahoo.c:2794
-msgid "Stealth"
-msgstr "Stealth"
+#: src/protocols/yahoo/yahoo.c:2836
+msgid "Presence"
+msgstr "Presence"
+
+#: src/protocols/yahoo/yahoo.c:2879
+msgid "Appear Offline"
+msgstr "Appear Offline"
-#: src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/yahoo/yahoo.c:2888
msgid "Don't Appear Permanently Offline"
msgstr "Don't Appear Permanently Offline"
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2936
msgid "Join in Chat"
msgstr "Join in Chat"
-#: src/protocols/yahoo/yahoo.c:2901
+#: src/protocols/yahoo/yahoo.c:2942
msgid "Initiate Conference"
msgstr "Initiate Conference"
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr "Stealth Settings"
+#: src/protocols/yahoo/yahoo.c:2970
+msgid "Presence Settings"
+msgstr "Presence Settings"
-#: src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2976
msgid "Start Doodling"
msgstr "Start Doodling"
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:3008
msgid "Active which ID?"
msgstr "Active which ID?"
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:3017
msgid "Join who in chat?"
msgstr "Join who in chat?"
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3027
msgid "Activate ID..."
msgstr "Activate ID..."
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
-msgstr "Join user in chat..."
+#: src/protocols/yahoo/yahoo.c:3031
+msgid "Join User in Chat..."
+msgstr "Join User in Chat..."
-#: src/protocols/yahoo/yahoo.c:3541
+#: src/protocols/yahoo/yahoo.c:3569
msgid "join &lt;room&gt;: Join a chat room on the Yahoo network"
msgstr "join &lt;room&gt;: Join a chat room on the Yahoo network"
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: Buzz a contact to get their attention"
+#: src/protocols/yahoo/yahoo.c:3574
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: List rooms on the Yahoo network"
+
+#: src/protocols/yahoo/yahoo.c:3578
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Buzz a user to get their attention"
-#: src/protocols/yahoo/yahoo.c:3550
+#: src/protocols/yahoo/yahoo.c:3582
msgid "doodle: Request user to start a Doodle session"
msgstr "doodle: Request user to start a Doodle session"
@@ -10674,118 +12052,72 @@ msgstr "doodle: Request user to start a Doodle session"
#. *< version
#. * summary
#. * description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3676 src/protocols/yahoo/yahoo.c:3678
msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
+msgstr "Yahoo Protocol Plug-in"
-#: src/protocols/yahoo/yahoo.c:3658
+#: src/protocols/yahoo/yahoo.c:3695
msgid "Yahoo Japan"
msgstr "Yahoo Japan"
-#: src/protocols/yahoo/yahoo.c:3661
+#: src/protocols/yahoo/yahoo.c:3698
msgid "Pager host"
msgstr "Pager host"
-#: src/protocols/yahoo/yahoo.c:3664
+#: src/protocols/yahoo/yahoo.c:3701
msgid "Japan Pager host"
msgstr "Japan Pager host"
-#: src/protocols/yahoo/yahoo.c:3667
+#: src/protocols/yahoo/yahoo.c:3704
msgid "Pager port"
msgstr "Pager port"
-#: src/protocols/yahoo/yahoo.c:3670
+#: src/protocols/yahoo/yahoo.c:3707
msgid "File transfer host"
msgstr "File transfer host"
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
-msgstr "Japan File transfer host"
+#: src/protocols/yahoo/yahoo.c:3710
+msgid "Japan file transfer host"
+msgstr "Japan file transfer host"
-#: src/protocols/yahoo/yahoo.c:3676
+#: src/protocols/yahoo/yahoo.c:3713
msgid "File transfer port"
msgstr "File transfer port"
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
-msgstr "Chat Room Locale"
-
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
-msgstr "Chat Room List Url"
+#: src/protocols/yahoo/yahoo.c:3716
+msgid "Chat room locale"
+msgstr "Chat room locale"
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
-msgstr "YCHT Host"
+#: src/protocols/yahoo/yahoo.c:3719
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignore conference and chatroom invitations"
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
-msgstr "YCHT Port"
+#: src/protocols/yahoo/yahoo.c:3723
+msgid "Chat room list URL"
+msgstr "Chat room list URL"
-#: src/protocols/yahoo/yahoochat.c:202
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
-
-#: src/protocols/yahoo/yahoochat.c:204
-msgid "Invitation Rejected"
-msgstr "Invitation Rejected"
+#: src/protocols/yahoo/yahoo.c:3726
+msgid "YCHT host"
+msgstr "YCHT host"
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Failed to join chat"
-msgstr "Failed to join chat"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Perhaps the room is full?"
+#: src/protocols/yahoo/yahoo.c:3729
+msgid "YCHT port"
+msgstr "YCHT port"
-#: src/protocols/yahoo/yahoochat.c:435
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "You are now chatting in %s."
-
-#: src/protocols/yahoo/yahoochat.c:608
-msgid "Failed to join buddy in chat"
-msgstr "Failed to join buddy in chat"
-
-#: src/protocols/yahoo/yahoochat.c:609
-msgid "Maybe they're not in a chat?"
-msgstr "Perhaps they're not in a chat?"
-
-#: src/protocols/yahoo/yahoochat.c:1326
-msgid "Fetching the room list failed."
-msgstr "Fetching the room list failed."
-
-#: src/protocols/yahoo/yahoochat.c:1379
-msgid "Voices"
-msgstr "Voices"
-
-#: src/protocols/yahoo/yahoochat.c:1382
-msgid "Webcams"
-msgstr "Webcams"
-
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-msgid "Unable to fetch room list."
-msgstr "Unable to fetch room list."
-
-#: src/protocols/yahoo/yahoochat.c:1453
-msgid "User Rooms"
-msgstr "User Rooms"
-
-#: src/protocols/yahoo/yahoo_profile.c:672
+#: src/protocols/yahoo/yahoo_profile.c:707
#, c-format
msgid "<b>IP Address:</b> %s<br>"
msgstr "<b>IP Address:</b> %s<br>"
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:783
msgid "Yahoo! Japan Profile"
msgstr "Yahoo! Japan Profile"
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: src/protocols/yahoo/yahoo_profile.c:784
msgid "Yahoo! Profile"
msgstr "Yahoo! Profile"
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: src/protocols/yahoo/yahoo_profile.c:828
msgid ""
"Sorry, profiles marked as containing adult content are not supported at this "
"time."
@@ -10793,7 +12125,7 @@ msgstr ""
"Sorry, profiles marked as containing adult content are not supported at this "
"time."
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: src/protocols/yahoo/yahoo_profile.c:830
msgid ""
"If you wish to view this profile, you will need to visit this link in your "
"web browser"
@@ -10801,55 +12133,55 @@ msgstr ""
"If you wish to view this profile, you will need to visit this link in your "
"web browser"
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: src/protocols/yahoo/yahoo_profile.c:1006
msgid "Yahoo! ID"
msgstr "Yahoo! ID"
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: src/protocols/yahoo/yahoo_profile.c:1078
+#: src/protocols/yahoo/yahoo_profile.c:1082
+#: src/protocols/yahoo/yahoo_profile.c:1086
msgid "Hobbies"
msgstr "Hobbies"
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1096
+#: src/protocols/yahoo/yahoo_profile.c:1100
msgid "Latest News"
msgstr "Latest News"
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1121
msgid "Home Page"
msgstr "Home Page"
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1136
msgid "Cool Link 1"
msgstr "Cool Link 1"
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: src/protocols/yahoo/yahoo_profile.c:1141
msgid "Cool Link 2"
msgstr "Cool Link 2"
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1145
msgid "Cool Link 3"
msgstr "Cool Link 3"
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: src/protocols/yahoo/yahoo_profile.c:1158
msgid "Last Update"
msgstr "Last Update"
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: src/protocols/yahoo/yahoo_profile.c:1164
#, c-format
msgid "User information for %s unavailable"
msgstr "User information for %s unavailable"
-#: src/protocols/yahoo/yahoo_profile.c:1135
+#: src/protocols/yahoo/yahoo_profile.c:1170
msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
msgstr ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: src/protocols/yahoo/yahoo_profile.c:1186
msgid ""
"Could not retrieve the user's profile. This most likely is a temporary "
"server-side problem. Please try again later."
@@ -10857,7 +12189,7 @@ msgstr ""
"Could not retrieve the user's profile. This most likely is a temporary "
"server-side problem. Please try again later."
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: src/protocols/yahoo/yahoo_profile.c:1189
msgid ""
"Could not retrieve the user's profile. This most likely means that the user "
"does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10867,10 +12199,79 @@ msgstr ""
"does not exist; however, Yahoo! sometimes does fail to find a user's "
"profile. If you know that the user exists, please try again later."
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: src/protocols/yahoo/yahoo_profile.c:1197
msgid "The user's profile is empty."
msgstr "The user's profile is empty."
+#: src/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
+
+#: src/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Invitation Rejected"
+
+#: src/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Failed to join chat"
+
+#. -6
+#: src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Unknown room"
+
+#. -15
+#: src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Perhaps the room is full"
+
+#. -35
+#: src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Not available"
+
+#: src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+
+#: src/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "You are now chatting in %s."
+
+#: src/protocols/yahoo/yahoochat.c:626
+msgid "Failed to join buddy in chat"
+msgstr "Failed to join buddy in chat"
+
+#: src/protocols/yahoo/yahoochat.c:627
+msgid "Maybe they're not in a chat?"
+msgstr "Perhaps they're not in a chat?"
+
+#: src/protocols/yahoo/yahoochat.c:1345
+msgid "Fetching the room list failed."
+msgstr "Fetching the room list failed."
+
+#: src/protocols/yahoo/yahoochat.c:1400
+msgid "Voices"
+msgstr "Voices"
+
+#: src/protocols/yahoo/yahoochat.c:1403
+msgid "Webcams"
+msgstr "Webcams"
+
+#: src/protocols/yahoo/yahoochat.c:1414 src/protocols/yahoo/yahoochat.c:1484
+msgid "Unable to fetch room list."
+msgstr "Unable to fetch room list."
+
+#: src/protocols/yahoo/yahoochat.c:1477
+msgid "User Rooms"
+msgstr "User Rooms"
+
#: src/protocols/yahoo/ycht.c:400
msgid "Connection problem with the YCHT server."
msgstr "Connection problem with the YCHT server."
@@ -10888,72 +12289,72 @@ msgstr ""
msgid "Unable to send to chat %s,%s,%s"
msgstr "Unable to send to chat %s,%s,%s"
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1134
#, c-format
msgid "<b>User:</b> %s<br>"
msgstr "<b>User:</b> %s<br>"
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1139
msgid "<br>Hidden or not logged-in"
msgstr "<br>Hidden or not logged-in"
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1141
#, c-format
msgid "<br>At %s since %s"
msgstr "<br>At %s since %s"
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1472 src/protocols/zephyr/zephyr.c:1473
msgid "Anyone"
msgstr "Anyone"
-#: src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2278
msgid "_Class:"
msgstr "_Class:"
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2284
msgid "_Instance:"
msgstr "_Instance:"
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2290
msgid "_Recipient:"
msgstr "_Recipient:"
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2301
#, 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:2602
+#: src/protocols/zephyr/zephyr.c:2607
msgid "zlocate &lt;nick&gt;: Locate user"
msgstr "zlocate &lt;nick&gt;: Locate user"
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2612
msgid "zl &lt;nick&gt;: Locate user"
msgstr "zl &lt;nick&gt;: Locate user"
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2617
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:2617
+#: src/protocols/zephyr/zephyr.c:2622
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:2622
+#: src/protocols/zephyr/zephyr.c:2627
msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
-#: src/protocols/zephyr/zephyr.c:2628
+#: src/protocols/zephyr/zephyr.c:2633
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:2633
+#: src/protocols/zephyr/zephyr.c:2638
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:2639
+#: src/protocols/zephyr/zephyr.c:2644
msgid ""
"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
"<i>instance</i>,*&gt;"
@@ -10961,7 +12362,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:2645
+#: src/protocols/zephyr/zephyr.c:2650
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;"
@@ -10969,7 +12370,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:2651
+#: src/protocols/zephyr/zephyr.c:2656
msgid ""
"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
"<i>instance</i>,<i>recipient</i>&gt;"
@@ -10977,15 +12378,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:2656
+#: src/protocols/zephyr/zephyr.c:2661
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:2762
+#: src/protocols/zephyr/zephyr.c:2767
msgid "Resubscribe"
msgstr "Resubscribe"
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2770
msgid "Retrieve subscriptions from server"
msgstr "Retrieve subscriptions from server"
@@ -10999,51 +12400,50 @@ msgstr "Retrieve subscriptions from server"
#. *< version
#. * summary
#. * description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2856 src/protocols/zephyr/zephyr.c:2858
msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr Protocol Plugin"
+msgstr "Zephyr Protocol Plug-in"
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2883
msgid "Export to .anyone"
msgstr "Export to .anyone"
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2886
msgid "Export to .zephyr.subs"
msgstr "Export to .zephyr.subs"
-#: src/protocols/zephyr/zephyr.c:2880
+#: src/protocols/zephyr/zephyr.c:2889
msgid "Import from .anyone"
msgstr "Import from .anyone"
-#: src/protocols/zephyr/zephyr.c:2883
+#: src/protocols/zephyr/zephyr.c:2892
msgid "Import from .zephyr.subs"
msgstr "Import from .zephyr.subs"
-#: src/protocols/zephyr/zephyr.c:2886
+#: src/protocols/zephyr/zephyr.c:2895
msgid "Realm"
msgstr "Realm"
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2898
msgid "Exposure"
msgstr "Exposure"
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: src/proxy.c:1126 src/proxy.c:1156 src/proxy.c:1178 src/proxy.c:1190
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Proxy connection error %d"
+
#. Forbidden
-#: src/proxy.c:1097
+#: src/proxy.c:1186
#, c-format
msgid "Access denied: proxy server forbids port %d tunnelling."
msgstr "Access denied: proxy server forbids port %d tunnelling."
-#: src/proxy.c:1101
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Proxy connection error %d"
-
-#: src/proxy.c:1937
+#: src/proxy.c:2025
msgid "Invalid proxy settings"
msgstr "Invalid proxy settings"
-#: src/proxy.c:1937
+#: src/proxy.c:2025
msgid ""
"Either the host name or port number specified for your given proxy type is "
"invalid."
@@ -11054,31 +12454,24 @@ msgstr ""
#. *
#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
#.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "Accept"
+#: src/request.h:1350
+msgid "_Accept"
+msgstr "_Accept"
-#: src/savedstatuses.c:372
+#: src/savedstatuses.c:509
msgid "saved statuses"
msgstr "saved statuses"
-#: src/server.c:243
+#: src/savedstatuses.c:757
+msgid "I'm not here right now"
+msgstr "I'm not here right now"
+
+#: src/server.c:225
#, c-format
msgid "%s is now known as %s.\n"
msgstr "%s is now known as %s.\n"
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d message)"
-msgstr[1] "(%d messages)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 message)"
-
-#: src/server.c:859
+#: src/server.c:675
#, c-format
msgid ""
"%s has invited %s to the chat room %s:\n"
@@ -11087,12 +12480,12 @@ msgstr ""
"%s has invited %s to the chat room %s:\n"
"%s"
-#: src/server.c:864
+#: src/server.c:680
#, 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:868
+#: src/server.c:684
msgid "Accept chat invitation?"
msgstr "Accept chat invitation?"
@@ -11104,36 +12497,61 @@ msgstr "Unset"
msgid "Unavailable"
msgstr "Unavailable"
-#: src/status.c:621
+#: src/status.c:160
+msgid "Mobile"
+msgstr "Mobile"
+
+#: src/status.c:623
+#, c-format
+msgid "%s signed on"
+msgstr "%s signed on"
+
+#: src/status.c:627
#, c-format
msgid "%s came back"
msgstr "%s came back"
-#: src/status.c:626
+#: src/status.c:634
+#, c-format
+msgid "%s signed off"
+msgstr "%s signed off"
+
+#: src/status.c:638
#, c-format
msgid "%s went away"
msgstr "%s went away."
-#: src/status.c:1308
+#: src/status.c:1284
#, c-format
msgid "%s became idle"
msgstr "%s became idle"
-#: src/status.c:1323
+#: src/status.c:1297
#, c-format
msgid "%s became unidle"
msgstr "%s is no longer idle"
-#: src/status.c:1697
-msgid "Default auto-away"
-msgstr "Default auto-away"
+#: src/status.c:1359
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s became idle"
+
+#: src/status.c:1361
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s is no longer idle"
-#: src/util.c:2121
+#: src/util.c:632
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: src/util.c:2422
#, c-format
msgid "Error Reading %s"
msgstr "Error reading %s"
-#: src/util.c:2122
+#: src/util.c:2423
#, c-format
msgid ""
"An error was encountered reading your %s. They have not been loaded, and "
@@ -11142,1091 +12560,56 @@ msgstr ""
"An error was encountered reading your %s. They have not been loaded, and "
"the old file has been renamed to %s~."
-#: src/util.c:2582
+#: src/util.c:2916
msgid "Calculating..."
msgstr "Calculating..."
-#: src/util.c:2585
+#: src/util.c:2919
msgid "Unknown."
msgstr "Unknown."
-#: src/util.c:2615
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "second"
-msgstr[1] "seconds"
-
-#: src/util.c:2629
-msgid "day"
-msgid_plural "days"
-msgstr[0] "day"
-msgstr[1] "days"
-
-#: src/util.c:2637
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hour"
-msgstr[1] "hours"
-
-#: src/util.c:2645
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minute"
-msgstr[1] "minutes"
-
-#: src/util.c:3068
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Error opening connection.\n"
-
-#~ msgid "New..."
-#~ msgstr "New..."
-
-#~ msgid "Back"
-#~ msgstr "Back"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Tray Icon Configuration"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Hide new messages until tray icon is clicked"
-
-#~ msgid "Show user details"
-#~ msgstr "Show user details"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Tools/Pl_ugin Actions"
-
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/Tools/_Statuses"
-
-#~ msgid "Reconnect"
-#~ msgstr "Reconnect"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Reason Unknown."
-
-#~ msgid "_Reconnect"
-#~ msgstr "_Reconnect"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Reconnect _All"
-
-#~ msgid "Time"
-#~ msgstr "Time"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Show transfer details"
-
-#~ msgid "Expander Size"
-#~ msgstr "Expander Size"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Size of the expander arrow"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Buddy List Sorting"
-
-#~ msgid "_Sorting:"
-#~ msgstr "_Sorting:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Buddy Display"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "Show more buddy details"
-
-#~ msgid "Message Logs"
-#~ msgstr "Message Logs"
-
-#~ msgid "System Logs"
-#~ msgstr "System Logs"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Enable system log"
-
-#~ msgid "Log when buddies log in/log _out"
-#~ msgstr "Log when buddies log in/log _out"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Log when buddies become _idle/un-idle"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Log when buddies go away/come _back"
-
-#~ msgid "Log your own _signons/idleness/awayness"
-#~ msgstr "Log your own _signons/idleness/awayness"
-
-#~ msgid "Idle _Tracking:"
-#~ msgstr "Idle _Tracking"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Gaim usage"
-
-#~ msgid "X usage"
-#~ msgstr "X usage"
-
-#~ msgid "Windows usage"
-#~ msgstr "Windows usage"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "Away m_essage:"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span> %s\n"
-#~ "<span weight=\"bold\">URL:</span> %s\n"
-#~ "<span weight=\"bold\">File name:</span> %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span> %s\n"
-#~ "<span weight=\"bold\">URL:</span> %s\n"
-#~ "<span weight=\"bold\">File name:</span> %s"
-
-#~ msgid "Load"
-#~ msgstr "Load"
-
-#~ msgid "Summary"
-#~ msgstr "Summary"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Out of the office"
-#~ msgstr "Out of the office"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Plain text"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Slightly less boring default"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "Quit message"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Buddy Information for %s"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profile"
-
-#~ msgid "User Properties"
-#~ msgstr "User Properties"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "ICQ Info for %s"
-
-#~ msgid "Basic Profile"
-#~ msgstr "Basic Profile"
-
-#~ msgid "Profile Information"
-#~ msgstr "Profile Information"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Instant Messagers"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "I'm From"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Set your Trepia profile data."
-
-#~ msgid "Profile"
-#~ msgstr "Profile"
-
-#~ msgid "Set Profile"
-#~ msgstr "Set Profile"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Visit Homepage"
-
-#~ msgid "Local Users"
-#~ msgstr "Local Users"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia Protocol Plugin"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Restore Away State On Reconnect"
-
-#~ msgid "Mail Server"
-#~ msgstr "Mail Server"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d new/%d total)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Check Mail"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Check email every X seconds.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Auto-login"
-
-#~ msgid "Signoff"
-#~ msgstr "Signoff"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientation"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "The orientation of the tray."
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "Not connected to AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "No screenname given."
-
-#~ msgid "No roomname given."
-#~ msgstr "No roomname given."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "Invalid AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "Unable to open socket"
-
-#~ msgid "Remote Control"
-#~ msgstr "Remote Control"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Provides remote control for gaim applications."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Docked _Buddy List is always on top"
-
-#~ msgid "Away!"
-#~ msgstr "Away!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Edit This Message"
-
-#~ msgid "I'm Back!"
-#~ msgstr "I'm Back!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Are you sure you want to remove the away message \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Remove Away Message"
-
-#~ msgid "Set All Away"
-#~ msgstr "Set All Away"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "You cannot save an away message with a blank title"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "You cannot create an empty away message"
-
-#~ msgid "New away message"
-#~ msgstr "New away message"
-
-#~ msgid "Away title: "
-#~ msgstr "Away title: "
-
-#~ msgid "_Save"
-#~ msgstr "_Save"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Sa_ve & Use"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Buddy List Error"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ " COMMANDS:\n"
-#~ " uri Handle AIM: URI\n"
-#~ " away Popup the away dialog with the default "
-#~ "message\n"
-#~ " back Remove the away dialog\n"
-#~ " quit Close running copy of Gaim\n"
-#~ "\n"
-#~ " OPTIONS:\n"
-#~ " -h, --help [command] Show help for command\n"
-#~ msgstr ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ " COMMANDS:\n"
-#~ " uri Handle AIM: URI\n"
-#~ " away Popup the away dialog with the default "
-#~ "message\n"
-#~ " back Remove the away dialog\n"
-#~ " quit Close running copy of Gaim\n"
-#~ "\n"
-#~ " OPTIONS:\n"
-#~ " -h, --help [command] Show help for command\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent. '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent. '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Show fewer options"
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Buddies/_Signoff"
-
-#~ msgid "Rename Group"
-#~ msgstr "Rename Group"
-
-#~ msgid "New group name"
-#~ msgstr "New group name"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Please enter a new name for the selected group."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Account:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Warned (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Tools/Away"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Send a message to the selected buddy"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
-#~ msgid "_Chat"
-#~ msgstr "_Chat"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Join a chat room"
-
-#~ msgid "_Away"
-#~ msgstr "_Away"
-
-#~ msgid "Set an away message"
-#~ msgstr "Set an away message"
-
-#~ msgid "Done."
-#~ msgstr "Done."
-
-#~ msgid "Signon: "
-#~ msgstr "Signon: "
-
-#~ msgid "Signon"
-#~ msgstr "Signon"
-
-#~ msgid "Cancel All"
-#~ msgstr "Cancel All"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Get Away Msg"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Conversation/_Warn..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Conversation/Warn..."
-
-#~ msgid "Warn"
-#~ msgstr "Warn"
-
-#~ msgid "Warn the user"
-#~ msgstr "Warn the user"
-
-#~ msgid "Block the user"
-#~ msgstr "Block the user"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Send a file to the user"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Add the user to your buddy list"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Remove the user from your buddy list"
-
-#~ msgid "Send"
-#~ msgstr "Send"
-
-#~ msgid "Invite"
-#~ msgstr "Invite"
-
-#~ msgid "Invite a user"
-#~ msgstr "Invite a user"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Add the chat to your buddy list"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Conversation/Close"
-
-#~ msgid "former lead developer"
-#~ msgstr "former lead developer"
-
-#~ msgid "former maintainer"
-#~ msgstr "former maintainer"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbaijani"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "Burmese"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norwegian (Nynorsk)"
-
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
-
-#~ msgid "Albanian"
-#~ msgstr "Albanian"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
-
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
-
-#~ msgid "Chinese"
-#~ msgstr "Chinese"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Screen name"
-
-#~ msgid "Warn User"
-#~ msgstr "Warn User"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Warn _anonymously?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Anonymous warnings are less severe.</b>"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "D_isplay remote nicknames if no alias is set"
-
-#~ msgid "Display"
-#~ msgstr "Display"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Show _timestamp on messages"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignore c_olours"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignore font _faces"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignore font si_zes"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Default Formatting"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Send default formatting with outgoing messages"
-
-#~ msgid "Send Message"
-#~ msgstr "Send Message"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter _sends message"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Enter sends message"
-
-#~ msgid "Window Closing"
-#~ msgstr "Window Closing"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape closes window"
-
-#~ msgid "Insertions"
-#~ msgstr "Insertions"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} changes _formatting"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(number) _inserts smileys"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Show _buttons as:"
-
-#~ msgid "Pictures"
-#~ msgstr "Pictures"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Pictures and text"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Raise window on events"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Show _warning levels"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "_Automatically expand contacts"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Enable \"_slash\" commands"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Show _aliases in tabs/titles"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "_Raise IM window on events"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Raise chat _window on events"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Use _multi-coloured screen names in chats"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Tab P_lacement:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "New conversation _placement:"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edit"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Shortcuts"
-
-#~ msgid "Away Messages"
-#~ msgstr "Away Messages"
-
-#~ msgid "Please create an account."
-#~ msgstr "Please create an account."
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Account:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>_Password:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "A_ccounts"
-
-#~ msgid "P_references"
-#~ msgstr "P_references"
-
-#~ msgid "_Sign on"
-#~ msgstr "_Sign on"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ " -a, --acct display account editor window\n"
-#~ " -w, --away[=MESG] make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ " name of away message to use)\n"
-#~ " -l, --login[=NAME] automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ " account(s) to use, seperated by commas)\n"
-#~ " -n, --loginwin don't automatically login; show login window\n"
-#~ " -u, --user=NAME use account NAME\n"
-#~ " -c, --config=DIR use DIR for config files\n"
-#~ " -d, --debug print debugging messages to stdout\n"
-#~ " -v, --version display the current version and exit\n"
-#~ " -h, --help display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ " -a, --acct display account editor window\n"
-#~ " -w, --away[=MESG] make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ " name of away message to use)\n"
-#~ " -l, --login[=NAME] automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ " account(s) to use, seperated by commas)\n"
-#~ " -n, --loginwin don't automatically login; show login window\n"
-#~ " -u, --user=NAME use account NAME\n"
-#~ " -c, --config=DIR use DIR for config files\n"
-#~ " -d, --debug print debugging messages to stdout\n"
-#~ " -v, --version display the current version and exit\n"
-#~ " -h, --help display this help and exit\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Unable to load preferences"
-
-#~ 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 Preferences window."
-#~ msgstr ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used. Please reconfigure your settings "
-#~ "using the Preferences window."
-
-#~ msgid "Available for friends only"
-#~ msgstr "Available for friends only"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Away for friends only"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Invisible for friends only"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Unable to resolve hostname."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Error while reading from socket."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Error while writing to socket."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Authentication failed."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Unknown Error Code."
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "Could not connect"
-
-#~ msgid "Reading data"
-#~ msgstr "Reading data"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Balancer handshake"
-
-#~ msgid "Reading server key"
-#~ msgstr "Reading server key"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Exchanging key hash"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Critical error in GG library\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
-#~ msgid "Send as message"
-#~ msgstr "Send as message"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "Looking up GG server"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "Invalid Gadu-Gadu UIN specified"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "You are trying to send a message to an invalid Gadu-Gadu UIN."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "Couldn't get search results"
-
-#~ msgid "Birth Year"
-#~ msgstr "Birth Year"
-
-#~ msgid "Sex"
-#~ msgstr "Sex"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "There is no Buddy List stored on the Gadu-Gadu server."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "Couldn't Import Buddy List from Server"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Buddy List successfully transferred to Gadu-Gadu server"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Couldn't transfer Buddy List to Gadu-Gadu server"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Buddy List successfully deleted from Gadu-Gadu server"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Couldn't delete Buddy List from Gadu-Gadu server"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Password couldn't be changed"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Error communicating with Gadu-Gadu server"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server. Please try again later."
-#~ msgstr ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server. Please try again later."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Unable to import Gadu-Gadu buddy list"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please "
-#~ "try again later."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Couldn't export buddy list"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server. Please try again "
-#~ "later."
-#~ msgstr ""
-#~ "Gaim was unable to connect to the buddy list server. Please try again "
-#~ "later."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Unable to delete Gadu-Gadu buddy list"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Unable to access directory"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server. Please try again later."
-#~ msgstr ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server. Please try again later."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server. Please try again later."
-#~ msgstr ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server. Please try again later."
-
-#~ msgid "Directory Search"
-#~ msgstr "Directory Search"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "Unable to access user profile."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server. Please try again later."
-#~ msgstr ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server. Please try again later."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim encountered an error communicating with the ICQ server."
-
-#~ 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."
-
-#~ msgid "Send message through server"
-#~ msgstr "Send message through server"
-
-#~ msgid "Connecting..."
-#~ msgstr "Connecting..."
-
-#~ msgid "Nick:"
-#~ msgstr "Nick:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim User"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "File Transfer Aborted"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Invalid nickname '%s'"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "Invalid nickname"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Roomlist Error"
-
-#~ msgid "Logged out"
-#~ msgstr "Logged out"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Hide Operating System"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "The user %s wants to add you to their buddy list."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Display conversation closed notices"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Display timeout notices"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "The conversation has become inactive and timed out."
-
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s has closed the conversation window."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Transfer of file %s timed out."
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-
-#~ msgid "Not specified"
-#~ msgstr "Not specified"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-
-#~ msgid "Visible"
-#~ msgstr "Visible"
-
-#~ msgid "Available Message:"
-#~ msgstr "Available Message:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "I'm doing work and hoping for a distraction--IM me!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Set Available Message..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Failed to leave channel"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Please enter your password"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s logged in."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s signed on"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s signed off"
+#: src/util.c:2945
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
+#: src/util.c:2957
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
-#~ msgid "an anonymous person"
-#~ msgstr "an anonymous person"
+#: src/util.c:2965
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d hour"
+msgstr[1] "%s, %d hours"
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
+#: src/util.c:2971
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Sorry old chap, I've stepped out for a while!"
+#: src/util.c:2979
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minute"
+msgstr[1] "%s, %d minutes"
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Conversation/A_lias..."
+#: src/util.c:2985
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/Options/Show T_imestamps"
+#: src/util.c:3452
+msgid "g003: Error opening connection.\n"
+msgstr "g003: Error opening connection.\n"