Mercurial > pidgin
changeset 19751:dc25fa0ffe9a
fixes #3057
committer: Luke Schierer <lschiere@pidgin.im>
| author | Luke Ross <luke@lukeross.name> |
|---|---|
| date | Wed, 12 Sep 2007 01:14:28 +0000 |
| parents | 0c83ec8cf17c |
| children | fa4cf8e2ae73 |
| files | po/ChangeLog po/en_GB.po |
| diffstat | 2 files changed, 5675 insertions(+), 3583 deletions(-) [+] |
line wrap: on
line diff
--- a/po/ChangeLog Wed Sep 12 01:13:55 2007 +0000 +++ b/po/ChangeLog Wed Sep 12 01:14:28 2007 +0000 @@ -3,6 +3,7 @@ version 2.2.0 * Belarusian Latin translation added (Ihar Hrachyshka) * Czech translation updated (Miloslav Trmac) + * English (British) translation updated (Luke Ross) * Estonian translation updated (Ivar Smolin) * German translation updated (Bjoern Voigt) * Hungarian translation updated (Gabor Kelemen)
--- a/po/en_GB.po Wed Sep 12 01:13:55 2007 +0000 +++ b/po/en_GB.po Wed Sep 12 01:14:28 2007 +0000 @@ -3,11 +3,12 @@ # # This file is distributed under the same license as the Pidgin package. # +#: ../libpurple/certificate.c:543 msgid "" msgstr "" "Project-Id-Version: Pidgin 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-27 13:59+0100\n" +"POT-Creation-Date: 2007-09-11 23:42+0100\n" "PO-Revision-Date: 2006-02-07 13:57+0000\n" "Last-Translator: Luke Ross <luke@lukeross.name>\n" "Language-Team: <en_GB@li.org>\n" @@ -16,12 +17,19 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../finch/finch.c:180 +#. Translators may want to transliterate the name. +#. It is not to be translated. +#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329 +#: ../finch/finch.c:415 +msgid "Finch" +msgstr "Finch" + +#: ../finch/finch.c:206 #, c-format msgid "%s. Try `%s -h' for more information.\n" msgstr "%s. Try `%s -h' for more information.\n" -#: ../finch/finch.c:182 +#: ../finch/finch.c:208 #, c-format msgid "" "%s\n" @@ -42,13 +50,7 @@ " -n, --nologin don't automatically login\n" " -v, --version display the current version and exit\n" -#. Translators may want to transliterate the name. -#. It is not to be translated. -#: ../finch/finch.c:274 ../finch/finch.c:303 -msgid "Finch" -msgstr "Finch" - -#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685 +#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711 #, c-format msgid "" "%s encountered errors migrating your settings from %s to %s. Please " @@ -59,462 +61,510 @@ "investigate and complete the migration by hand. Please report this error at " "http://developer.pidgin.im" -#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415 -#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225 -#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302 -#: ../libpurple/protocols/jabber/buddy.c:1426 +#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299 +#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185 +#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309 +#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 +#: ../finch/plugins/gntclipboard.c:128 +#: ../libpurple/protocols/jabber/buddy.c:2027 #: ../libpurple/protocols/jabber/chat.c:677 #: ../libpurple/protocols/jabber/chat.c:688 -#: ../libpurple/protocols/jabber/jabber.c:1229 -#: ../libpurple/protocols/qq/group_join.c:326 -#: ../libpurple/protocols/silc/ops.c:1451 +#: ../libpurple/protocols/jabber/jabber.c:1511 +#: ../libpurple/protocols/qq/group_join.c:328 +#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57 +#: ../libpurple/protocols/silc/ops.c:1456 +#: ../libpurple/protocols/silc10/ops.c:1451 msgid "Error" msgstr "Error" -#: ../finch/gntaccount.c:119 +#: ../finch/gntaccount.c:123 msgid "Account was not added" msgstr "Account was not added" -#: ../finch/gntaccount.c:120 +#: ../finch/gntaccount.c:124 msgid "Screenname of an account must be non-empty." msgstr "Screen name of an account must not be empty." -#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:599 +#: ../finch/gntaccount.c:436 msgid "New mail notifications" msgstr "New mail notifications" -#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:528 +#: ../finch/gntaccount.c:446 msgid "Remember password" msgstr "Remember password" -#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1473 -#: ../pidgin/gtkblist.c:3965 +#: ../finch/gntaccount.c:484 +msgid "There's no protocol plugins installed." +msgstr "There are no protocol plugins installed." + +#: ../finch/gntaccount.c:485 +msgid "(You probably forgot to 'make install'.)" +msgstr "(You probably forgot to 'make install'.)" + +#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473 +#: ../pidgin/gtkblist.c:4037 msgid "Modify Account" msgstr "Modify Account" -#: ../finch/gntaccount.c:474 +#: ../finch/gntaccount.c:495 msgid "New Account" msgstr "New Account" -#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:429 ../pidgin/gtkft.c:695 +#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695 msgid "Protocol:" msgstr "Protocol:" -#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:437 -#: ../pidgin/gtkblist.c:5389 -#: ../pidgin/plugins/gevolution/new_person_dialog.c:295 +#: ../finch/gntaccount.c:528 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:291 msgid "Screen name:" msgstr "Screen name:" -#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:519 +#: ../finch/gntaccount.c:541 msgid "Password:" msgstr "Password:" -#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410 -#: ../pidgin/gtkblist.c:5773 +#: ../finch/gntaccount.c:551 msgid "Alias:" msgstr "Alias:" #. Cancel button #. Cancel -#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617 -#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403 -#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967 -#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360 -#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246 -#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600 -#: ../libpurple/account.c:984 ../libpurple/account.c:1234 -#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168 -#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502 -#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798 -#: ../libpurple/protocols/gg/gg.c:879 -#: ../libpurple/protocols/jabber/buddy.c:584 -#: ../libpurple/protocols/jabber/buddy.c:1788 -#: ../libpurple/protocols/jabber/buddy.c:1824 +#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637 +#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420 +#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004 +#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 +#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 +#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 +#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609 +#: ../libpurple/account.c:1004 ../libpurple/account.c:1254 +#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215 +#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507 +#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803 +#: ../libpurple/protocols/gg/gg.c:884 +#: ../libpurple/protocols/jabber/buddy.c:728 +#: ../libpurple/protocols/jabber/buddy.c:2389 +#: ../libpurple/protocols/jabber/buddy.c:2425 #: ../libpurple/protocols/jabber/chat.c:786 -#: ../libpurple/protocols/jabber/jabber.c:878 -#: ../libpurple/protocols/jabber/jabber.c:1384 -#: ../libpurple/protocols/jabber/xdata.c:337 -#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276 -#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310 -#: ../libpurple/protocols/msn/msn.c:331 -#: ../libpurple/protocols/oscar/oscar.c:6007 -#: ../libpurple/protocols/oscar/peer.c:1023 +#: ../libpurple/protocols/jabber/jabber.c:1009 +#: ../libpurple/protocols/jabber/jabber.c:1018 +#: ../libpurple/protocols/jabber/jabber.c:1733 +#: ../libpurple/protocols/jabber/si.c:874 +#: ../libpurple/protocols/jabber/usermood.c:185 +#: ../libpurple/protocols/jabber/usernick.c:79 +#: ../libpurple/protocols/jabber/xdata.c:400 +#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304 +#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338 +#: ../libpurple/protocols/msn/msn.c:359 +#: ../libpurple/protocols/oscar/oscar.c:6078 +#: ../libpurple/protocols/oscar/peer.c:1046 #: ../libpurple/protocols/qq/buddy_info.c:484 #: ../libpurple/protocols/qq/buddy_opt.c:214 -#: ../libpurple/protocols/qq/buddy_opt.c:409 +#: ../libpurple/protocols/qq/buddy_opt.c:411 #: ../libpurple/protocols/qq/group.c:124 -#: ../libpurple/protocols/qq/group_join.c:138 -#: ../libpurple/protocols/qq/group_join.c:363 -#: ../libpurple/protocols/qq/group_opt.c:143 -#: ../libpurple/protocols/qq/group_opt.c:398 -#: ../libpurple/protocols/qq/sys_msg.c:115 -#: ../libpurple/protocols/qq/sys_msg.c:174 -#: ../libpurple/protocols/qq/sys_msg.c:269 +#: ../libpurple/protocols/qq/group_join.c:140 +#: ../libpurple/protocols/qq/group_join.c:365 +#: ../libpurple/protocols/qq/group_opt.c:144 +#: ../libpurple/protocols/qq/group_opt.c:399 +#: ../libpurple/protocols/qq/sys_msg.c:113 +#: ../libpurple/protocols/qq/sys_msg.c:172 +#: ../libpurple/protocols/qq/sys_msg.c:266 #: ../libpurple/protocols/sametime/sametime.c:3388 #: ../libpurple/protocols/sametime/sametime.c:3474 #: ../libpurple/protocols/sametime/sametime.c:3645 #: ../libpurple/protocols/sametime/sametime.c:5397 #: ../libpurple/protocols/sametime/sametime.c:5487 #: ../libpurple/protocols/sametime/sametime.c:5612 -#: ../libpurple/protocols/silc/buddy.c:468 -#: ../libpurple/protocols/silc/buddy.c:1084 -#: ../libpurple/protocols/silc/buddy.c:1189 -#: ../libpurple/protocols/silc/chat.c:600 -#: ../libpurple/protocols/silc/chat.c:730 -#: ../libpurple/protocols/silc/ops.c:1913 -#: ../libpurple/protocols/silc/silc.c:744 -#: ../libpurple/protocols/silc/silc.c:950 -#: ../libpurple/protocols/yahoo/yahoo.c:989 -#: ../libpurple/protocols/yahoo/yahoo.c:3233 -#: ../libpurple/protocols/yahoo/yahoo.c:3244 ../pidgin/gtkaccount.c:1911 -#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5831 -#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862 -#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974 -#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020 -#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109 -#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204 -#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:423 -#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102 -#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582 -#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621 -#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337 +#: ../libpurple/protocols/silc/buddy.c:455 +#: ../libpurple/protocols/silc/buddy.c:1076 +#: ../libpurple/protocols/silc/buddy.c:1191 +#: ../libpurple/protocols/silc/chat.c:616 +#: ../libpurple/protocols/silc/chat.c:746 +#: ../libpurple/protocols/silc/ops.c:1816 +#: ../libpurple/protocols/silc/silc.c:823 +#: ../libpurple/protocols/silc/silc.c:1031 +#: ../libpurple/protocols/silc10/buddy.c:468 +#: ../libpurple/protocols/silc10/buddy.c:1084 +#: ../libpurple/protocols/silc10/buddy.c:1189 +#: ../libpurple/protocols/silc10/chat.c:600 +#: ../libpurple/protocols/silc10/chat.c:730 +#: ../libpurple/protocols/silc10/ops.c:1904 +#: ../libpurple/protocols/silc10/silc.c:736 +#: ../libpurple/protocols/silc10/silc.c:942 +#: ../libpurple/protocols/yahoo/yahoo.c:1029 +#: ../libpurple/protocols/yahoo/yahoo.c:3495 +#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908 +#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971 +#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:758 +#: ../pidgin/gtkdialogs.c:897 ../pidgin/gtkdialogs.c:989 +#: ../pidgin/gtkdialogs.c:1009 ../pidgin/gtkdialogs.c:1033 +#: ../pidgin/gtkdialogs.c:1055 ../pidgin/gtkdialogs.c:1103 +#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1200 +#: ../pidgin/gtkdialogs.c:1239 ../pidgin/gtkdialogs.c:1266 +#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327 +#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100 +#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578 +#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617 +#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344 +#: ../pidgin/gtkstatusbox.c:1573 msgid "Cancel" msgstr "Cancel" #. Save button #. Save -#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462 -#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588 -#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50 -#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748 +#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310 +#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264 +#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597 +#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50 +#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748 #: ../pidgin/gtkrequest.c:276 msgid "Save" msgstr "Save" -#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1903 -#: ../pidgin/gtksavedstatuses.c:328 +#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900 +#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567 #, c-format msgid "Are you sure you want to delete %s?" msgstr "Are you sure you want to delete %s?" -#: ../finch/gntaccount.c:614 +#: ../finch/gntaccount.c:634 msgid "Delete Account" msgstr "Delete Account" #. Delete button -#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683 -#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141 -#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1910 ../pidgin/gtklog.c:301 -#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273 -#: ../pidgin/gtksavedstatuses.c:336 +#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706 +#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 +#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209 +#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326 +#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273 +#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572 msgid "Delete" msgstr "Delete" -#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76 -#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522 +#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82 +#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522 msgid "Accounts" msgstr "Accounts" -#: ../finch/gntaccount.c:652 +#: ../finch/gntaccount.c:674 msgid "You can enable/disable accounts from the following list." msgstr "You can enable/disable accounts from the following list." #. Add button -#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333 -#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369 -#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194 -#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116 -#: ../libpurple/protocols/qq/sys_msg.c:175 -#: ../libpurple/protocols/qq/sys_msg.c:270 +#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342 +#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305 +#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198 +#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114 +#: ../libpurple/protocols/qq/sys_msg.c:173 +#: ../libpurple/protocols/qq/sys_msg.c:267 #: ../libpurple/protocols/sametime/sametime.c:5486 -#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2501 -#: ../pidgin/gtkblist.c:5830 ../pidgin/gtkconv.c:1651 +#: ../libpurple/protocols/silc/chat.c:615 +#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494 +#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644 #: ../pidgin/gtkrequest.c:274 msgid "Add" msgstr "Add" #. Modify button -#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706 +#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720 msgid "Modify" msgstr "Modify" -#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2448 +#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441 #, c-format 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" -#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2500 +#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493 msgid "Add buddy to your list?" msgstr "Add buddy to your list?" -#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2552 +#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551 #, c-format msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s" msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s" -#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929 -#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581 +#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966 +#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574 +#: ../pidgin/gtkaccount.c:2580 msgid "Authorize buddy?" msgstr "Authorise buddy?" -#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933 -#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582 +#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997 +#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581 msgid "Authorize" msgstr "Authorise" -#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934 -#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583 +#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998 +#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582 msgid "Deny" msgstr "Deny" -#: ../finch/gntblist.c:279 +#: ../finch/gntblist.c:288 msgid "You must provide a screename for the buddy." msgstr "You must provide a screen name for the buddy." -#: ../finch/gntblist.c:281 +#: ../finch/gntblist.c:290 msgid "You must provide a group." msgstr "You must provide a group." -#: ../finch/gntblist.c:283 +#: ../finch/gntblist.c:292 msgid "You must select an account." msgstr "You must select an account." -#: ../finch/gntblist.c:285 +#: ../finch/gntblist.c:294 msgid "The selected account is not online." msgstr "The selected account is not online." -#: ../finch/gntblist.c:290 +#: ../finch/gntblist.c:299 msgid "Error adding buddy" msgstr "Error adding buddy" -#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2846 -#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:924 +#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881 +#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979 msgid "Screen Name" msgstr "Screen Name" -#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211 -#: ../libpurple/protocols/msn/msn.c:1364 -#: ../libpurple/protocols/silc/chat.c:590 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:680 +#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249 +#: ../libpurple/protocols/msn/msn.c:1392 +#: ../libpurple/protocols/silc/chat.c:606 +#: ../libpurple/protocols/silc10/chat.c:590 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:704 #: ../libpurple/protocols/zephyr/zephyr.c:788 -#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973 -#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019 +#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1008 +#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054 #: ../pidgin/gtkrequest.c:277 msgid "Alias" msgstr "Alias" -#: ../finch/gntblist.c:321 ../finch/gntblist.c:398 +#: ../finch/gntblist.c:330 ../finch/gntblist.c:412 msgid "Group" msgstr "Group" -#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261 -#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566 +#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304 +#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190 -#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476 -#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444 +#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488 +#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445 msgid "Account" msgstr "Account" -#: ../finch/gntblist.c:331 ../finch/gntblist.c:819 -#: ../libpurple/protocols/silc/buddy.c:737 -#: ../libpurple/protocols/silc/buddy.c:1033 -#: ../libpurple/protocols/silc/buddy.c:1080 -#: ../libpurple/protocols/silc/buddy.c:1180 -#: ../libpurple/protocols/yahoo/yahoo.c:3146 ../pidgin/gtkblist.c:5343 -#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447 +#: ../finch/gntblist.c:340 ../finch/gntblist.c:851 +#: ../libpurple/protocols/silc/buddy.c:725 +#: ../libpurple/protocols/silc/buddy.c:1027 +#: ../libpurple/protocols/silc/buddy.c:1072 +#: ../libpurple/protocols/silc/buddy.c:1182 +#: ../libpurple/protocols/silc10/buddy.c:737 +#: ../libpurple/protocols/silc10/buddy.c:1033 +#: ../libpurple/protocols/silc10/buddy.c:1080 +#: ../libpurple/protocols/silc10/buddy.c:1180 +#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477 +#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445 msgid "Add Buddy" msgstr "Add Buddy" -#: ../finch/gntblist.c:331 +#: ../finch/gntblist.c:340 msgid "Please enter buddy information." msgstr "Please enter buddy information." -#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192 +#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190 msgid "Chats" msgstr "Chats" #. Extract their Name and put it in -#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:809 -#: ../libpurple/protocols/msn/msn.c:1537 ../libpurple/protocols/msn/msn.c:1602 -#: ../libpurple/protocols/msn/msn.c:1629 +#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925 +#: ../libpurple/protocols/jabber/jabber.c:928 +#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646 +#: ../libpurple/protocols/msn/msn.c:1673 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581 -#: ../pidgin/gtkroomlist.c:621 +#: ../pidgin/gtkroomlist.c:617 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123 msgid "Name" msgstr "Name" -#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5719 +#: ../finch/gntblist.c:415 ../finch/gntblist.c:818 +msgid "Auto-join" +msgstr "Auto-join" + +#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856 msgid "Add Chat" msgstr "Add Chat" -#: ../finch/gntblist.c:402 +#: ../finch/gntblist.c:419 msgid "You can edit more information from the context menu later." msgstr "You can edit more information from the context menu later." -#: ../finch/gntblist.c:415 ../finch/gntblist.c:428 +#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 msgid "Error adding group" msgstr "Error adding group" -#: ../finch/gntblist.c:416 +#: ../finch/gntblist.c:433 msgid "You must give a name for the group to add." msgstr "You must give a name for the group to add." -#: ../finch/gntblist.c:429 +#: ../finch/gntblist.c:446 msgid "A group with the name already exists." msgstr "A group with that name already exists." -#: ../finch/gntblist.c:436 ../finch/gntblist.c:823 +#: ../finch/gntblist.c:453 ../finch/gntblist.c:855 #: ../libpurple/protocols/sametime/sametime.c:5396 -#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5827 +#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967 msgid "Add Group" msgstr "Add Group" -#: ../finch/gntblist.c:436 +#: ../finch/gntblist.c:453 msgid "Enter the name of the group" msgstr "Enter the name of the group" -#: ../finch/gntblist.c:769 +#: ../finch/gntblist.c:801 msgid "Edit Chat" msgstr "Edit Chat" -#: ../finch/gntblist.c:769 +#: ../finch/gntblist.c:801 msgid "Please Update the necessary fields." msgstr "Please update the necessary fields." -#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199 +#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204 msgid "Edit" msgstr "Edit" -#: ../finch/gntblist.c:786 -msgid "Auto-join" -msgstr "Auto-join" - -#: ../finch/gntblist.c:795 +#: ../finch/gntblist.c:827 msgid "Edit Settings" msgstr "Edit Settings" -#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278 -#: ../pidgin/gtkconv.c:677 +#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930 msgid "Information" msgstr "Information" -#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278 -#: ../pidgin/gtkconv.c:677 +#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930 msgid "Retrieving..." msgstr "Retrieving..." -#: ../finch/gntblist.c:866 ../finch/gntconv.c:418 -#: ../libpurple/protocols/silc/chat.c:883 +#: ../finch/gntblist.c:903 ../finch/gntconv.c:484 +#: ../libpurple/protocols/silc/chat.c:899 +#: ../libpurple/protocols/silc10/chat.c:883 msgid "Get Info" msgstr "Get Info" -#: ../finch/gntblist.c:870 +#: ../finch/gntblist.c:907 msgid "Add Buddy Pounce" msgstr "Add Buddy Pounce" #. if (q_bud && is_online(q_bud->status)) { -#: ../finch/gntblist.c:877 ../finch/gntconv.c:430 -#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585 -#: ../pidgin/gtkconv.c:1599 +#: ../finch/gntblist.c:914 ../finch/gntconv.c:496 +#: ../libpurple/protocols/jabber/si.c:874 +#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587 +#: ../pidgin/gtkconv.c:1592 msgid "Send File" msgstr "Send File" -#: ../finch/gntblist.c:881 +#: ../finch/gntblist.c:918 msgid "View Log" msgstr "View Log" -#: ../finch/gntblist.c:962 +#: ../finch/gntblist.c:999 #, c-format msgid "Please enter the new name for %s" msgstr "Please enter the new name for %s" -#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211 +#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249 msgid "Rename" msgstr "Rename" -#: ../finch/gntblist.c:964 +#: ../finch/gntblist.c:1001 msgid "Set Alias" msgstr "Set Alias" -#: ../finch/gntblist.c:965 +#: ../finch/gntblist.c:1002 msgid "Enter empty string to reset the name." msgstr "Enter empty string to reset the name." -#: ../finch/gntblist.c:1041 +#: ../finch/gntblist.c:1078 msgid "Removing this contact will also remove all the buddies in the contact" msgstr "Removing this contact will also remove all the buddies in the contact" -#: ../finch/gntblist.c:1049 +#: ../finch/gntblist.c:1086 msgid "Removing this group will also remove all the buddies in the group" msgstr "Removing this group will also remove all the buddies in the group" -#: ../finch/gntblist.c:1054 +#: ../finch/gntblist.c:1091 #, c-format msgid "Are you sure you want to remove %s?" msgstr "Are you sure you want to remove %s?" #. XXX: anything to do with the returned ui-handle? -#: ../finch/gntblist.c:1057 +#: ../finch/gntblist.c:1094 msgid "Confirm Remove" msgstr "Confirm Remove" -#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223 -#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648 -#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261 +#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226 +#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275 +#: ../pidgin/gtkstatusbox.c:263 msgid "Remove" msgstr "Remove" #. Buddy List -#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240 -#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:330 +#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257 +#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:326 msgid "Buddy List" msgstr "Buddy List" -#: ../finch/gntblist.c:1218 +#: ../finch/gntblist.c:1256 msgid "Place tagged" msgstr "Place tagged" -#: ../finch/gntblist.c:1223 +#: ../finch/gntblist.c:1261 msgid "Toggle Tag" msgstr "Toggle Tag" #. General -#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632 -#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120 -#: ../libpurple/protocols/gg/gg.c:2204 -#: ../libpurple/protocols/jabber/buddy.c:274 -#: ../libpurple/protocols/jabber/buddy.c:818 -#: ../libpurple/protocols/jabber/buddy.c:1589 -#: ../libpurple/protocols/jabber/buddy.c:1771 -#: ../libpurple/protocols/jabber/jabber.c:819 -#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1540 +#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637 +#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123 +#: ../libpurple/protocols/gg/gg.c:2207 +#: ../libpurple/protocols/jabber/buddy.c:286 +#: ../libpurple/protocols/jabber/buddy.c:1247 +#: ../libpurple/protocols/jabber/buddy.c:2190 +#: ../libpurple/protocols/jabber/buddy.c:2372 +#: ../libpurple/protocols/jabber/jabber.c:938 +#: ../libpurple/protocols/jabber/jabber.c:1540 +#: ../libpurple/protocols/jabber/jabber.c:1563 +#: ../libpurple/protocols/jabber/jabber.c:1586 +#: ../libpurple/protocols/jabber/jabber.c:1609 +#: ../libpurple/protocols/jabber/jabber.c:1632 +#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584 #: ../libpurple/protocols/qq/buddy_info.c:43 #: ../libpurple/protocols/silc/buddy.c:1535 -#: ../libpurple/protocols/silc/ops.c:1036 -#: ../libpurple/protocols/silc/ops.c:1179 -#: ../libpurple/protocols/silc/ops.c:1328 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989 +#: ../libpurple/protocols/silc/ops.c:1002 +#: ../libpurple/protocols/silc/ops.c:1186 +#: ../libpurple/protocols/silc/ops.c:1322 +#: ../libpurple/protocols/silc10/buddy.c:1535 +#: ../libpurple/protocols/silc10/ops.c:1036 +#: ../libpurple/protocols/silc10/ops.c:1179 +#: ../libpurple/protocols/silc10/ops.c:1328 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029 msgid "Nickname" msgstr "Nickname" #. Idle stuff -#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243 -#: ../libpurple/protocols/bonjour/bonjour.c:322 -#: ../libpurple/protocols/jabber/buddy.c:643 -#: ../libpurple/protocols/jabber/buddy.c:683 -#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32 +#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260 +#: ../libpurple/protocols/bonjour/bonjour.c:340 +#: ../libpurple/protocols/jabber/buddy.c:787 +#: ../libpurple/protocols/jabber/buddy.c:951 +#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32 #: ../libpurple/protocols/novell/novell.c:2825 -#: ../libpurple/protocols/oscar/oscar.c:2870 -#: ../libpurple/protocols/yahoo/yahoo.c:2900 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009 -#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1810 +#: ../libpurple/protocols/oscar/oscar.c:2905 +#: ../libpurple/protocols/yahoo/yahoo.c:3094 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057 +#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924 msgid "Idle" msgstr "Idle" -#: ../finch/gntblist.c:1365 +#: ../finch/gntblist.c:1333 +msgid "On Mobile" +msgstr "On Mobile" + +#: ../finch/gntblist.c:1414 #, c-format msgid "" "Online: %d\n" @@ -523,12 +573,12 @@ "Online: %d\n" "Total: %d" -#: ../finch/gntblist.c:1374 +#: ../finch/gntblist.c:1423 #, c-format msgid "Account: %s (%s)" msgstr "Account: %s (%s)" -#: ../finch/gntblist.c:1386 +#: ../finch/gntblist.c:1435 #, c-format msgid "" "\n" @@ -537,101 +587,231 @@ "\n" "Last Seen: %s ago" -#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470 -#: ../pidgin/gtkstatusbox.c:1064 +#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470 +#: ../pidgin/gtkstatusbox.c:1071 msgid "New..." msgstr "New..." -#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471 -#: ../pidgin/gtkstatusbox.c:1065 +#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471 +#: ../pidgin/gtkstatusbox.c:1072 msgid "Saved..." msgstr "Saved..." -#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81 +#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530 msgid "Plugins" msgstr "Plug-ins" -#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705 -#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924 +#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:739 +#: ../pidgin/gtkdialogs.c:878 ../pidgin/gtkdialogs.c:959 msgid "_Name" msgstr "_Name" -#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710 -#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929 +#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:744 +#: ../pidgin/gtkdialogs.c:883 ../pidgin/gtkdialogs.c:964 msgid "_Account" msgstr "_Account" -#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718 +#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:752 msgid "New Instant Message" msgstr "New Instant Message" -#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720 +#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:754 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." -#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983 -#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501 -#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797 -#: ../libpurple/protocols/jabber/jabber.c:1383 -#: ../libpurple/protocols/jabber/xdata.c:336 -#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275 -#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309 -#: ../libpurple/protocols/oscar/oscar.c:6006 -#: ../libpurple/protocols/silc/buddy.c:467 -#: ../libpurple/protocols/silc/buddy.c:1188 -#: ../libpurple/protocols/silc/chat.c:425 -#: ../libpurple/protocols/silc/chat.c:464 -#: ../libpurple/protocols/silc/chat.c:729 -#: ../libpurple/protocols/silc/ops.c:1297 -#: ../libpurple/protocols/silc/ops.c:1912 -#: ../libpurple/protocols/silc/silc.c:743 -#: ../libpurple/protocols/yahoo/yahoo.c:988 -#: ../libpurple/protocols/yahoo/yahoo.c:3232 -#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:3964 -#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861 -#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269 +#. Not multiline +#. Not masked? +#. No hints? +#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79 +#: ../libpurple/account.c:1003 ../libpurple/account.c:1253 +#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665 +#: ../libpurple/protocols/gg/gg.c:802 +#: ../libpurple/protocols/jabber/jabber.c:1732 +#: ../libpurple/protocols/jabber/xdata.c:399 +#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303 +#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337 +#: ../libpurple/protocols/oscar/oscar.c:6077 +#: ../libpurple/protocols/silc/buddy.c:454 +#: ../libpurple/protocols/silc/buddy.c:1190 +#: ../libpurple/protocols/silc/chat.c:447 +#: ../libpurple/protocols/silc/chat.c:482 +#: ../libpurple/protocols/silc/chat.c:745 +#: ../libpurple/protocols/silc/ops.c:1291 +#: ../libpurple/protocols/silc/ops.c:1815 +#: ../libpurple/protocols/silc/silc.c:822 +#: ../libpurple/protocols/silc10/buddy.c:467 +#: ../libpurple/protocols/silc10/buddy.c:1188 +#: ../libpurple/protocols/silc10/chat.c:425 +#: ../libpurple/protocols/silc10/chat.c:464 +#: ../libpurple/protocols/silc10/chat.c:729 +#: ../libpurple/protocols/silc10/ops.c:1297 +#: ../libpurple/protocols/silc10/ops.c:1903 +#: ../libpurple/protocols/silc10/silc.c:735 +#: ../libpurple/protocols/yahoo/yahoo.c:1028 +#: ../libpurple/protocols/yahoo/yahoo.c:3494 +#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036 +#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:757 +#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988 +#: ../pidgin/gtkrequest.c:269 msgid "OK" msgstr "OK" #. Create the "Options" frame. -#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778 +#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789 msgid "Options" msgstr "Options" -#: ../finch/gntblist.c:2185 +#: ../finch/gntblist.c:2246 msgid "Send IM..." msgstr "Send IM..." -#: ../finch/gntblist.c:2189 +#: ../finch/gntblist.c:2250 +msgid "Show empty groups" +msgstr "Show empty groups" + +#: ../finch/gntblist.c:2256 msgid "Show offline buddies" msgstr "Show offline buddies" -#: ../finch/gntblist.c:2195 +#: ../finch/gntblist.c:2262 msgid "Sort by status" msgstr "Sort by status" -#: ../finch/gntblist.c:2199 +#: ../finch/gntblist.c:2266 msgid "Sort alphabetically" msgstr "Sort alphabetically" -#: ../finch/gntblist.c:2203 +#: ../finch/gntblist.c:2270 msgid "Sort by log size" msgstr "Sort by log size" -#: ../finch/gntconn.c:109 +#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187 +msgid "Certificate Import" +msgstr "Certificate Import" + +#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188 +msgid "Specify a hostname" +msgstr "Specify a hostname" + +#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189 +msgid "Type the host name this certificate is for." +msgstr "Type the host name this certificate is for." + +#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209 +#, c-format +msgid "" +"File %s could not be imported.\n" +"Make sure that the file is readable and in PEM format.\n" +msgstr "" +"File %s could not be imported.\n" +"Make sure that the file is readable and in PEM format.\n" + +#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211 +msgid "Certificate Import Error" +msgstr "Certificate Import Error" + +#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212 +msgid "X.509 certificate import failed" +msgstr "X.509 certificate import failed" + +#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223 +msgid "Select a PEM certificate" +msgstr "Select a PEM certificate" + +#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244 +#, c-format +msgid "" +"Export to file %s failed.\n" +"Check that you have write permission to the target path\n" +msgstr "" +"Export to file %s failed.\n" +"Check that you have write permission to the target path\n" + +#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246 +msgid "Certificate Export Error" +msgstr "Certificate Export Error" + +#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247 +msgid "X.509 certificate export failed" +msgstr "X.509 certificate export failed" + +#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298 +msgid "PEM X.509 Certificate Export" +msgstr "PEM X.509 Certificate Export" + +#. Build a notification thing +#. TODO: This needs a better GUI, but a notification will do for now +#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336 +#, c-format +msgid "Certificate for %s" +msgstr "Certificate for %s" + +#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343 +#, c-format +msgid "" +"Common name: %s\n" +"\n" +"SHA1 fingerprint:\n" +"%s" +msgstr "" +"Common name: %s\n" +"\n" +"SHA1 fingerprint:\n" +"%s" + +#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346 +msgid "SSL Host Certificate" +msgstr "SSL Host Certificate" + +#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391 +#, c-format +msgid "Really delete certificate for %s?" +msgstr "Really delete certificate for %s?" + +#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393 +msgid "Confirm certificate delete" +msgstr "Confirm certificate delete" + +#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621 +msgid "Certificate Manager" +msgstr "Certificate Manager" + +#. Creating the user splits +#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652 +#: ../libpurple/protocols/silc/silc.c:1007 +#: ../libpurple/protocols/silc10/silc.c:918 +msgid "Hostname" +msgstr "Hostname" + +#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620 +#: ../pidgin/gtkdebug.c:834 +msgid "Info" +msgstr "Info" + +#. Close button +#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181 +#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 +#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403 +#: ../libpurple/protocols/silc/util.c:382 +#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468 +#: ../pidgin/gtkrequest.c:272 +msgid "Close" +msgstr "Close" + +#: ../finch/gntconn.c:110 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../finch/gntconn.c:112 +#: ../finch/gntconn.c:113 #, c-format msgid "%s disconnected." msgstr "%s disconnected." -#: ../finch/gntconn.c:113 +#: ../finch/gntconn.c:114 #, c-format msgid "" "%s\n" @@ -644,46 +824,46 @@ "Finch will not attempt to reconnect the account until you correct the error " "and re-enable the account." -#: ../finch/gntconv.c:116 +#: ../finch/gntconv.c:119 msgid "No such command." msgstr "No such command." -#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508 +#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469 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." -#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513 +#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475 msgid "Your command failed for an unknown reason." msgstr "Your command failed for an unknown reason." -#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519 +#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482 msgid "That command only works in chats, not IMs." msgstr "That command only works in chats, not IMs." -#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522 +#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485 msgid "That command only works in IMs, not chats." msgstr "That command only works in IMs, not chats." -#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526 +#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490 msgid "That command doesn't work on this protocol." msgstr "That command doesn't work on this protocol." -#: ../finch/gntconv.c:144 -msgid "Commands are not supported yet. Message was NOT sent." -msgstr "Commands are not supported yet. Message was NOT sent." - -#: ../finch/gntconv.c:230 +#: ../finch/gntconv.c:148 +msgid "Message was not sent, because you are not signed on." +msgstr "Message was not sent because you are not signed on." + +#: ../finch/gntconv.c:231 #, c-format msgid "%s (%s -- %s)" msgstr "%s (%s -- %s)" -#: ../finch/gntconv.c:253 +#: ../finch/gntconv.c:254 #, c-format msgid "%s [%s]" msgstr "%s [%s]" -#: ../finch/gntconv.c:258 ../finch/gntconv.c:619 +#: ../finch/gntconv.c:259 ../finch/gntconv.c:747 #, c-format msgid "" "\n" @@ -692,48 +872,66 @@ "\n" "%s is typing..." -#: ../finch/gntconv.c:277 +#: ../finch/gntconv.c:278 msgid "You have left this chat." msgstr "You have left this chat." -#: ../finch/gntconv.c:353 +#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351 +msgid "Logging started. Future messages in this conversation will be logged." +msgstr "Logging started. Future messages in this conversation will be logged." + +#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359 +msgid "" +"Logging stopped. Future messages in this conversation will not be logged." +msgstr "" +"Logging stopped. Future messages in this conversation will not be logged." + +#: ../finch/gntconv.c:419 msgid "Send To" msgstr "Send To" -#: ../finch/gntconv.c:397 +#: ../finch/gntconv.c:463 msgid "Conversation" msgstr "Conversation" -#: ../finch/gntconv.c:403 +#: ../finch/gntconv.c:469 msgid "Clear Scrollback" msgstr "Clear Scrollback" -#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178 +#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190 msgid "Show Timestamps" msgstr "Show Timestamps" -#: ../finch/gntconv.c:423 +#: ../finch/gntconv.c:489 msgid "Add Buddy Pounce..." msgstr "Add Buddy Pounce..." -#: ../finch/gntconv.c:586 +#: ../finch/gntconv.c:504 +msgid "Enable Logging" +msgstr "Enable Logging" + +#: ../finch/gntconv.c:510 +msgid "Enable Sounds" +msgstr "Enable Sounds" + +#: ../finch/gntconv.c:713 msgid "<AUTO-REPLY> " msgstr "<AUTO-REPLY> " #. Print the list of users in the room -#: ../finch/gntconv.c:702 +#: ../finch/gntconv.c:835 msgid "List of users:\n" msgstr "List of users:\n" -#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389 +#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311 msgid "Supported debug options are: version" msgstr "Supported debug options are: version" -#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425 +#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361 msgid "No such command (in this context)." msgstr "No such command (in this context)." -#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428 +#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364 msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" @@ -741,7 +939,7 @@ "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" -#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085 +#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." @@ -749,11 +947,11 @@ "say <message>: Send a message normally as if you weren't using a " "command." -#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088 +#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541 msgid "me <action>: Send an IRC style action to a buddy or chat." msgstr "me <action>: Send an IRC style action to a buddy or chat." -#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091 +#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544 msgid "" "debug <option>: Send various debug information to the current " "conversation." @@ -761,43 +959,43 @@ "debug <option>: Send various debug information to the current " "conversation." -#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094 +#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547 msgid "clear: Clears the conversation scrollback." msgstr "clear: Clears the conversation scrollback." -#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097 +#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553 msgid "help <command>: Help on a specific command." msgstr "help <command>: Help on a specific command." -#: ../finch/gntconv.c:958 +#: ../finch/gntconv.c:1109 msgid "users: Show the list of users in the chat." msgstr "users: Show the list of users in the chat." -#: ../finch/gntconv.c:963 +#: ../finch/gntconv.c:1114 msgid "plugins: Show the plugins window." msgstr "plugins: Show the plugins window" -#: ../finch/gntconv.c:966 +#: ../finch/gntconv.c:1117 msgid "buddylist: Show the buddylist." msgstr "buddylist: Show the buddy list." -#: ../finch/gntconv.c:969 +#: ../finch/gntconv.c:1120 msgid "accounts: Show the accounts window." msgstr "accounts: Show the accounts window." -#: ../finch/gntconv.c:972 +#: ../finch/gntconv.c:1123 msgid "debugwin: Show the debug window." msgstr "debugwin: Show the debug window." -#: ../finch/gntconv.c:975 +#: ../finch/gntconv.c:1126 msgid "prefs: Show the preference window." msgstr "prefs: Show the preference window." -#: ../finch/gntconv.c:978 +#: ../finch/gntconv.c:1129 msgid "statuses: Show the savedstatuses window." msgstr "statuses: Show the saved-statuses window." -#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694 +#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694 msgid "Debug Window" msgstr "Debug Window" @@ -805,15 +1003,15 @@ #. * it's necessary to make the width of the debug window resizable ... like I said, #. * it doesn't make sense. The bug is likely in the packing in gntbox.c. #. -#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753 +#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753 msgid "Clear" msgstr "Clear" -#: ../finch/gntdebug.c:257 +#: ../finch/gntdebug.c:261 msgid "Filter: " msgstr "Filter: " -#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762 +#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762 msgid "Pause" msgstr "Pause" @@ -822,175 +1020,169 @@ msgid "File Transfers - %d%% of %d files" msgstr "File Transfers - %d%% of %d files" -#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80 -#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763 +#. Create the window. +#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87 +#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761 msgid "File Transfers" msgstr "File Transfers" -#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644 msgid "Progress" msgstr "Progress" -#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651 msgid "Filename" msgstr "Filename" -#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658 msgid "Size" msgstr "Size" -#: ../finch/gntft.c:197 +#: ../finch/gntft.c:200 msgid "Speed" msgstr "Speed" -#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665 msgid "Remaining" msgstr "Remaining" #. XXX: Use of ggp_str_to_uin() is an ugly hack! -#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566 -#: ../libpurple/protocols/bonjour/bonjour.c:326 -#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573 -#: ../libpurple/protocols/gg/gg.c:1581 -#: ../libpurple/protocols/jabber/buddy.c:634 -#: ../libpurple/protocols/jabber/buddy.c:638 -#: ../libpurple/protocols/jabber/buddy.c:673 -#: ../libpurple/protocols/jabber/jabber.c:1214 -#: ../libpurple/protocols/msn/msn.c:515 +#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575 +#: ../libpurple/protocols/bonjour/bonjour.c:344 +#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576 +#: ../libpurple/protocols/gg/gg.c:1584 +#: ../libpurple/protocols/jabber/buddy.c:778 +#: ../libpurple/protocols/jabber/buddy.c:782 +#: ../libpurple/protocols/jabber/buddy.c:941 +#: ../libpurple/protocols/jabber/jabber.c:1496 +#: ../libpurple/protocols/msn/msn.c:543 #: ../libpurple/protocols/novell/novell.c:2835 -#: ../libpurple/protocols/oscar/oscar.c:803 -#: ../libpurple/protocols/oscar/oscar.c:808 -#: ../libpurple/protocols/oscar/oscar.c:810 -#: ../libpurple/protocols/oscar/oscar.c:2659 -#: ../libpurple/protocols/oscar/oscar.c:3770 +#: ../libpurple/protocols/oscar/oscar.c:820 +#: ../libpurple/protocols/oscar/oscar.c:825 +#: ../libpurple/protocols/oscar/oscar.c:827 +#: ../libpurple/protocols/oscar/oscar.c:2693 +#: ../libpurple/protocols/oscar/oscar.c:3773 #: ../libpurple/protocols/sametime/sametime.c:3263 #: ../libpurple/protocols/sametime/sametime.c:4150 -#: ../libpurple/protocols/yahoo/yahoo.c:3051 ../pidgin/gtkblist.c:3053 -#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068 -#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090 +#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101 +#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117 +#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143 msgid "Status" msgstr "Status" -#: ../finch/gntft.c:207 +#: ../finch/gntft.c:210 msgid "Close this window when all transfers finish" msgstr "Close this window when all transfers finish" -#: ../finch/gntft.c:214 +#: ../finch/gntft.c:217 msgid "Clear finished transfers" msgstr "Clear finished transfers" -#: ../finch/gntft.c:228 +#: ../finch/gntft.c:231 msgid "Stop" msgstr "Stop" -#. Close button -#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205 -#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209 -#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377 -#: ../pidgin/gtkaccount.c:2475 ../pidgin/gtkrequest.c:272 -msgid "Close" -msgstr "Close" - -#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975 +#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972 msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056 +#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053 msgid "Canceled" msgstr "Cancelled" -#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058 +#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055 msgid "Failed" msgstr "Failed" -#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133 -#, c-format -msgid "%.2f KB/s" -msgstr "%.2f KB/s" - -#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162 -#: ../pidgin/gtkft.c:1118 +#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133 +#, c-format +msgid "%.2f KiB/s" +msgstr "%.2f KiB/s" + +#: ../finch/gntft.c:430 +#, c-format +msgid "The file was saved as %s." +msgstr "The file was saved as %s." + +#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162 +#: ../pidgin/gtkft.c:1115 msgid "Finished" msgstr "Finished" -#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346 +#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347 msgid "Transferring" msgstr "Transferring" -#: ../finch/gntnotify.c:162 +#: ../finch/gntnotify.c:164 msgid "Emails" msgstr "Emails" -#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222 +#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224 msgid "You have mail!" msgstr "You have e-mail!" -#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174 -msgid "From" -msgstr "From" - -#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490 +#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495 +msgid "Sender" +msgstr "Sender" + +#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502 msgid "Subject" msgstr "Subject" -#: ../finch/gntnotify.c:198 +#: ../finch/gntnotify.c:200 #, c-format msgid "%s (%s) has %d new message." msgid_plural "%s (%s) has %d new messages." msgstr[0] "%s (%s) has %d new message." msgstr[1] "%s (%s) has %d new messages." -#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329 +#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340 msgid "New Mail" msgstr "New Mail" -#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906 +#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908 #, c-format msgid "Info for %s" msgstr "Info for %s" -#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476 -#: ../pidgin/gtknotify.c:907 +#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476 +#: ../pidgin/gtknotify.c:909 msgid "Buddy Information" msgstr "Buddy Information" -#: ../finch/gntnotify.c:366 +#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367 msgid "Continue" msgstr "Continue" -#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834 -msgid "Info" -msgstr "Info" - -#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588 +#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581 msgid "IM" msgstr "IM" -#: ../finch/gntnotify.c:378 +#: ../finch/gntnotify.c:388 msgid "Join" msgstr "Join" -#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473 +#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473 msgid "Invite" msgstr "Invite" -#: ../finch/gntnotify.c:384 +#: ../finch/gntnotify.c:394 msgid "(none)" msgstr "(none)" -#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82 +#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83 msgid "ERROR" msgstr "ERROR" -#: ../finch/gntplugin.c:73 +#: ../finch/gntplugin.c:74 msgid "loading plugin failed" msgstr "loading plugin failed" -#: ../finch/gntplugin.c:82 +#: ../finch/gntplugin.c:83 msgid "unloading plugin failed" msgstr "unloading plugin failed" -#: ../finch/gntplugin.c:124 +#: ../finch/gntplugin.c:128 #, c-format msgid "" "Name: %s\n" @@ -1007,382 +1199,600 @@ "Website: %s\n" "Filename: %s\n" -#: ../finch/gntplugin.c:182 +#: ../finch/gntplugin.c:186 msgid "Plugin need to be loaded before you can configure it." msgstr "Plugin needs to be loaded before you can configure it." -#: ../finch/gntplugin.c:226 +#: ../finch/gntplugin.c:234 msgid "No configuration options for this plugin." msgstr "No configuration options for this plugin." -#: ../finch/gntplugin.c:249 +#: ../finch/gntplugin.c:259 msgid "You can (un)load plugins from the following list." msgstr "You are (un)load plugins from the following list." -#: ../finch/gntplugin.c:296 +#: ../finch/gntplugin.c:314 msgid "Configure Plugin" msgstr "Configure Plugin" -#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245 -#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1954 +#. copy the preferences to tmp values... +#. * I liked "take affect immediately" Oh well :-( +#. (that should have been "effect," right?) +#. Back to instant-apply! I win! BU-HAHAHA! +#. Create the window +#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263 +#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066 msgid "Preferences" msgstr "Preferences" -#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253 +#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255 msgid "Please enter a buddy to pounce." msgstr "Please enter a buddy to pounce." -#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507 +#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516 msgid "New Buddy Pounce" msgstr "New Buddy Pounce" -#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507 +#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516 msgid "Edit Buddy Pounce" msgstr "Edit Buddy Pounce" -#: ../finch/gntpounce.c:330 +#: ../finch/gntpounce.c:332 msgid "Pounce Who" msgstr "Pounce on Whom" #. Account: -#. Set up stuff for the account box -#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437 -#: ../pidgin/gtkblist.c:5753 +#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455 msgid "Account:" msgstr "Account:" -#: ../finch/gntpounce.c:355 +#: ../finch/gntpounce.c:357 msgid "Buddy name:" msgstr "Buddy name:" #. Create the "Pounce When Buddy..." frame. -#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577 +#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584 msgid "Pounce When Buddy..." msgstr "Pounce When Buddy..." -#: ../finch/gntpounce.c:373 +#: ../finch/gntpounce.c:375 msgid "Signs on" msgstr "Signs on" -#: ../finch/gntpounce.c:374 +#: ../finch/gntpounce.c:376 msgid "Signs off" msgstr "Signs off" -#: ../finch/gntpounce.c:375 -msgid "Goes away" -msgstr "Goes away" - -#: ../finch/gntpounce.c:376 -msgid "Returns from away" -msgstr "Returns from away" - #: ../finch/gntpounce.c:377 -msgid "Becomes idle" -msgstr "Becomes idle" +msgid "Goes away" +msgstr "Goes away" #: ../finch/gntpounce.c:378 +msgid "Returns from away" +msgstr "Returns from away" + +#: ../finch/gntpounce.c:379 +msgid "Becomes idle" +msgstr "Becomes idle" + +#: ../finch/gntpounce.c:380 msgid "Is no longer idle" msgstr "Is no longer idle" -#: ../finch/gntpounce.c:379 +#: ../finch/gntpounce.c:381 msgid "Starts typing" msgstr "Starts typing" -#: ../finch/gntpounce.c:380 +#: ../finch/gntpounce.c:382 msgid "Pauses while typing" msgstr "Pauses while typing" -#: ../finch/gntpounce.c:381 +#: ../finch/gntpounce.c:383 msgid "Stops typing" msgstr "Stops typing" -#: ../finch/gntpounce.c:382 +#: ../finch/gntpounce.c:384 msgid "Sends a message" msgstr "Sends a message" #. Create the "Action" frame. -#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638 +#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645 msgid "Action" msgstr "Action" -#: ../finch/gntpounce.c:413 +#: ../finch/gntpounce.c:415 msgid "Open an IM window" msgstr "Open a message window" -#: ../finch/gntpounce.c:414 -msgid "Pop up a notification" -msgstr "Pop up a notification" - -#: ../finch/gntpounce.c:415 -msgid "Send a message" -msgstr "Send a message" - #: ../finch/gntpounce.c:416 +msgid "Pop up a notification" +msgstr "Pop up a notification" + +#: ../finch/gntpounce.c:417 +msgid "Send a message" +msgstr "Send a message" + +#: ../finch/gntpounce.c:418 msgid "Execute a command" msgstr "Execute a command" -#: ../finch/gntpounce.c:417 +#: ../finch/gntpounce.c:419 msgid "Play a sound" msgstr "Play a sound" -#: ../finch/gntpounce.c:445 +#: ../finch/gntpounce.c:447 msgid "Pounce only when my status is not available" msgstr "Pounce only when my status is not available" -#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282 +#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280 msgid "Recurring" msgstr "Recurring" -#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097 +#: ../finch/gntpounce.c:617 +msgid "Cannot create pounce" +msgstr "Cannot create pounce" + +#: ../finch/gntpounce.c:618 +msgid "You do not have any accounts." +msgstr "You do not have any accounts." + +#: ../finch/gntpounce.c:619 +msgid "You must create an account first before you can create a pounce." +msgstr "You must create an account first before you can create a pounce." + +#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095 #, 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?" -#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329 +#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324 msgid "Buddy Pounces" msgstr "Buddy Pounces" -#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456 +#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451 #, c-format msgid "%s has started typing to you (%s)" msgstr "%s has started typing to you (%s)" -#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458 +#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453 #, c-format msgid "%s has paused while typing to you (%s)" msgstr "%s has paused while typing to you (%s)" -#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460 +#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455 #, c-format msgid "%s has signed on (%s)" msgstr "%s has signed on (%s)" -#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462 +#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457 #, c-format msgid "%s has returned from being idle (%s)" msgstr "%s has returned from being idle (%s)" -#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464 +#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459 #, c-format msgid "%s has returned from being away (%s)" msgstr "%s has returned from being away (%s)" -#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466 +#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461 #, c-format msgid "%s has stopped typing to you (%s)" msgstr "%s has stopped typing to you (%s)" -#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468 +#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463 #, c-format msgid "%s has signed off (%s)" msgstr "%s has signed off (%s)" -#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470 +#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465 #, c-format msgid "%s has become idle (%s)" msgstr "%s has become idle (%s)" -#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472 +#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467 #, c-format msgid "%s has gone away. (%s)" msgstr "%s has gone away. (%s)" -#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474 +#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469 #, c-format msgid "%s has sent you a message. (%s)" msgstr "%s has sent you a message. (%s)" -#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475 +#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470 msgid "Unknown pounce event. Please report this!" msgstr "Unknown pounce event. Please report this!" -#: ../finch/gntprefs.c:79 +#: ../finch/gntprefs.c:91 msgid "Based on keyboard use" msgstr "Based on keyboard use" -#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1815 +#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929 msgid "From last sent message" msgstr "From last sent message" -#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 -#: ../pidgin/gtkprefs.c:1814 ../pidgin/gtkprefs.c:1828 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:337 +#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906 +#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:333 msgid "Never" msgstr "Never" -#: ../finch/gntprefs.c:171 +#: ../finch/gntprefs.c:183 msgid "Show Idle Time" msgstr "Show Idle Time" -#: ../finch/gntprefs.c:172 +#: ../finch/gntprefs.c:184 msgid "Show Offline Buddies" msgstr "Show Offline Buddies" -#: ../finch/gntprefs.c:179 +#: ../finch/gntprefs.c:191 msgid "Notify buddies when you are typing" msgstr "Notify buddies when you are typing" -#: ../finch/gntprefs.c:185 +#: ../finch/gntprefs.c:197 msgid "Log format" msgstr "Log format" -#: ../finch/gntprefs.c:186 +#: ../finch/gntprefs.c:198 msgid "Log IMs" msgstr "Log IMs" -#: ../finch/gntprefs.c:187 +#: ../finch/gntprefs.c:199 msgid "Log chats" msgstr "Log chats" -#: ../finch/gntprefs.c:188 +#: ../finch/gntprefs.c:200 msgid "Log status change events" msgstr "Log status change events" +#: ../finch/gntprefs.c:206 +msgid "Report Idle time" +msgstr "Report Idle time" + +#: ../finch/gntprefs.c:207 +msgid "Change status when idle" +msgstr "Change status when idle" + +#: ../finch/gntprefs.c:208 +msgid "Minutes before changing status" +msgstr "Minutes before changing status" + +#: ../finch/gntprefs.c:209 +msgid "Change status to" +msgstr "Change status to" + #. Conversations -#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1918 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:344 +#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:340 msgid "Conversations" msgstr "Conversations" -#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1929 +#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043 msgid "Logging" msgstr "Logging" -#: ../finch/gntrequest.c:532 +#: ../finch/gntrequest.c:563 msgid "Not implemented yet." msgstr "Not implemented yet." -#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529 -#: ../pidgin/gtkrequest.c:1575 +#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555 +#: ../pidgin/gtkrequest.c:1601 msgid "Save File..." msgstr "Save File..." -#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530 -#: ../pidgin/gtkrequest.c:1576 +#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556 +#: ../pidgin/gtkrequest.c:1602 msgid "Open File..." msgstr "Open File..." -#: ../finch/gntstatus.c:135 +#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63 +msgid "Buddy logs in" +msgstr "Buddy logs in" + +#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64 +msgid "Buddy logs out" +msgstr "Buddy logs out" + +#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65 +msgid "Message received" +msgstr "Message received" + +#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66 +msgid "Message received begins conversation" +msgstr "Message received begins conversation" + +#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67 +msgid "Message sent" +msgstr "Message sent" + +#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68 +msgid "Person enters chat" +msgstr "Person enters chat" + +#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69 +msgid "Person leaves chat" +msgstr "Person leaves chat" + +#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70 +msgid "You talk in chat" +msgstr "You talk in chat" + +#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71 +msgid "Others talk in chat" +msgstr "Others talk in chat" + +#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74 +msgid "Someone says your screen name in chat" +msgstr "Someone says your screen name in chat" + +#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310 +msgid "GStreamer Failure" +msgstr "GStreamer Failure" + +#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311 +msgid "GStreamer failed to initialize." +msgstr "GStreamer failed to initialize." + +#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586 +#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871 +msgid "(default)" +msgstr "(default)" + +#: ../finch/gntsound.c:728 +msgid "Select Sound File ..." +msgstr "Select Sound File ..." + +#: ../finch/gntsound.c:903 +msgid "Sound Preferences" +msgstr "Sound Preferences" + +#: ../finch/gntsound.c:914 +msgid "Profiles" +msgstr "Profiles" + +#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716 +msgid "Automatic" +msgstr "Automatic" + +#: ../finch/gntsound.c:956 +msgid "Console Beep" +msgstr "Console Beep" + +#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720 +msgid "Command" +msgstr "Command" + +#: ../finch/gntsound.c:958 +msgid "No Sound" +msgstr "No Sounds" + +#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711 +msgid "Sound Method" +msgstr "Sound Method" + +#: ../finch/gntsound.c:965 +msgid "Method: " +msgstr "Method: " + +#: ../finch/gntsound.c:972 +#, c-format +msgid "" +"Sound Command\n" +"(%s for filename)" +msgstr "" +"Sound Command\n" +"(%s for filename)" + +#. Sound options +#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755 +msgid "Sound Options" +msgstr "Sound Options" + +#: ../finch/gntsound.c:981 +msgid "Sounds when conversation has focus" +msgstr "Sounds when conversation has focus" + +#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 +#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42 +#: ../pidgin/plugins/timestamp_format.c:51 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:334 +msgid "Always" +msgstr "Always" + +#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760 +msgid "Only when available" +msgstr "Only when available" + +#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761 +msgid "Only when not available" +msgstr "Only when not available" + +#: ../finch/gntsound.c:998 +msgid "Volume(0-100):" +msgstr "Volume(0-100):" + +#. Sound events +#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797 +msgid "Sound Events" +msgstr "Sound Events" + +#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856 +msgid "Event" +msgstr "Event" + +#: ../finch/gntsound.c:1019 +msgid "File" +msgstr "File" + +#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875 +msgid "Test" +msgstr "Test" + +#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879 +msgid "Reset" +msgstr "Reset" + +#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883 +msgid "Choose..." +msgstr "Choose..." + +#: ../finch/gntstatus.c:137 #, c-format msgid "Are you sure you want to delete \"%s\"" msgstr "Are you sure you want to delete \"%s\"?" -#: ../finch/gntstatus.c:138 +#: ../finch/gntstatus.c:140 msgid "Delete Status" msgstr "Delete Status" -#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557 +#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596 msgid "Saved Statuses" msgstr "Saved Statuses" -#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529 -#: ../libpurple/protocols/jabber/buddy.c:286 -#: ../libpurple/protocols/jabber/buddy.c:935 +#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538 +#: ../libpurple/protocols/jabber/buddy.c:298 +#: ../libpurple/protocols/jabber/buddy.c:1359 #: ../libpurple/protocols/novell/novell.c:1484 -#: ../pidgin/gtksavedstatuses.c:464 +#: ../pidgin/gtksavedstatuses.c:499 msgid "Title" msgstr "Title" -#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479 +#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514 msgid "Type" msgstr "Type" -#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566 -#: ../libpurple/protocols/bonjour/bonjour.c:258 -#: ../libpurple/protocols/bonjour/bonjour.c:265 -#: ../libpurple/protocols/bonjour/bonjour.c:328 -#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576 -#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604 -#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619 -#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234 -#: ../libpurple/protocols/jabber/jabber.c:1246 -#: ../libpurple/protocols/jabber/jabber.c:1256 -#: ../libpurple/protocols/jabber/jabber.c:1266 -#: ../libpurple/protocols/jabber/jabber.c:1276 -#: ../libpurple/protocols/jabber/jabber.c:1286 -#: ../libpurple/protocols/jabber/jabber.c:1298 +#. Statuses are almost all the same. Define a macro to reduce code repetition. +#. PurpleStatusPrimitive +#. id - use default +#. name - use default +#. savable +#. user_settable +#. not independent +#. Attributes - each status can have a message. +#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575 +#: ../libpurple/protocols/bonjour/bonjour.c:256 +#: ../libpurple/protocols/bonjour/bonjour.c:263 +#: ../libpurple/protocols/bonjour/bonjour.c:346 +#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579 +#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607 +#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622 +#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234 +#: ../libpurple/protocols/jabber/jabber.c:1528 +#: ../libpurple/protocols/jabber/jabber.c:1551 +#: ../libpurple/protocols/jabber/jabber.c:1574 +#: ../libpurple/protocols/jabber/jabber.c:1597 +#: ../libpurple/protocols/jabber/jabber.c:1620 +#: ../libpurple/protocols/jabber/jabber.c:1645 +#: ../libpurple/protocols/myspace/myspace.c:148 #: ../libpurple/protocols/novell/novell.c:2838 #: ../libpurple/protocols/novell/novell.c:2941 #: ../libpurple/protocols/novell/novell.c:2947 #: ../libpurple/protocols/novell/novell.c:2953 -#: ../libpurple/protocols/oscar/oscar.c:5467 -#: ../libpurple/protocols/oscar/oscar.c:5685 -#: ../libpurple/protocols/oscar/oscar.c:5699 -#: ../libpurple/protocols/oscar/oscar.c:5715 -#: ../libpurple/protocols/oscar/oscar.c:5722 -#: ../libpurple/protocols/oscar/oscar.c:5729 +#: ../libpurple/protocols/oscar/oscar.c:5538 +#: ../libpurple/protocols/oscar/oscar.c:5756 +#: ../libpurple/protocols/oscar/oscar.c:5770 +#: ../libpurple/protocols/oscar/oscar.c:5786 +#: ../libpurple/protocols/oscar/oscar.c:5793 +#: ../libpurple/protocols/oscar/oscar.c:5800 #: ../libpurple/protocols/sametime/sametime.c:3286 #: ../libpurple/protocols/sametime/sametime.c:3292 #: ../libpurple/protocols/sametime/sametime.c:3298 #: ../libpurple/protocols/sametime/sametime.c:3377 #: ../libpurple/protocols/silc/buddy.c:1551 +#: ../libpurple/protocols/silc10/buddy.c:1551 #: ../libpurple/protocols/simple/simple.c:246 -#: ../libpurple/protocols/yahoo/yahoo.c:3479 -#: ../libpurple/protocols/yahoo/yahoo.c:3485 +#: ../libpurple/protocols/yahoo/yahoo.c:3748 +#: ../libpurple/protocols/yahoo/yahoo.c:3754 #: ../libpurple/protocols/zephyr/zephyr.c:2337 -#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954 +#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009 msgid "Message" msgstr "Message" #. Use -#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583 +#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592 msgid "Use" msgstr "Use" -#: ../finch/gntstatus.c:294 +#: ../finch/gntstatus.c:300 msgid "Invalid title" msgstr "Invalid title" -#: ../finch/gntstatus.c:295 +#: ../finch/gntstatus.c:301 msgid "Please enter a non-empty title for the status." msgstr "Please enter a non-empty title for the status." -#: ../finch/gntstatus.c:302 +#: ../finch/gntstatus.c:309 msgid "Duplicate title" msgstr "Duplicate title" -#: ../finch/gntstatus.c:303 +#: ../finch/gntstatus.c:310 msgid "Please enter a different title for the status." msgstr "Please enter a different title for the status." -#: ../finch/gntstatus.c:443 +#: ../finch/gntstatus.c:451 msgid "Substatus" msgstr "Sub-status" -#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698 +#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698 msgid "Status:" msgstr "Status:" -#: ../finch/gntstatus.c:469 +#: ../finch/gntstatus.c:478 msgid "Message:" msgstr "Message:" -#: ../finch/gntstatus.c:518 +#: ../finch/gntstatus.c:527 msgid "Edit Status" msgstr "Edit Status" -#: ../finch/gntstatus.c:560 +#: ../finch/gntstatus.c:569 msgid "Use different status for following accounts" msgstr "Use different status for the following accounts" #. Save & Use -#: ../finch/gntstatus.c:594 +#: ../finch/gntstatus.c:603 msgid "Save & Use" msgstr "Save & Use" -#: ../finch/gntui.c:83 +#: ../finch/gntui.c:85 +msgid "Certificates" +msgstr "Certificates" + +#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034 +msgid "Sounds" +msgstr "Sounds" + +#: ../finch/gntui.c:91 msgid "Statuses" msgstr "Statuses" -#: ../finch/plugins/gntclipboard.c:149 +#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 +#: ../finch/plugins/gntclipboard.c:128 +msgid "Error loading the plugin." +msgstr "Error loading the plugin." + +#: ../finch/plugins/gntclipboard.c:116 +msgid "Couldn't find X display" +msgstr "Couldn't find X display" + +#: ../finch/plugins/gntclipboard.c:122 +msgid "Couldn't find window" +msgstr "Couldn't find window" + +#: ../finch/plugins/gntclipboard.c:129 +msgid "This plugin cannot be loaded because it was not built with X11 support." +msgstr "" +"This plugin cannot be loaded because it was not built with X11 support." + +#: ../finch/plugins/gntclipboard.c:158 msgid "GntClipboard" msgstr "GntClipboard" -#: ../finch/plugins/gntclipboard.c:151 +#: ../finch/plugins/gntclipboard.c:160 msgid "Clipboard plugin" msgstr "Clipboard plugin" -#: ../finch/plugins/gntclipboard.c:152 +#: ../finch/plugins/gntclipboard.c:161 msgid "" "When the gnt clipboard contents change, the contents are made available to " "X, if possible." @@ -1508,185 +1918,352 @@ msgid "accounts" msgstr "accounts" -#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194 -#: ../libpurple/protocols/jabber/auth.c:233 +#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194 +#: ../libpurple/protocols/jabber/auth.c:256 msgid "Password is required to sign on." msgstr "Password is required to sign on." -#: ../libpurple/account.c:963 +#: ../libpurple/account.c:983 #, c-format msgid "Enter password for %s (%s)" msgstr "Enter password for %s (%s)" -#: ../libpurple/account.c:970 +#: ../libpurple/account.c:990 msgid "Enter Password" msgstr "Enter Password" -#: ../libpurple/account.c:975 +#: ../libpurple/account.c:995 msgid "Save password" msgstr "Save password" -#: ../libpurple/account.c:1010 ../libpurple/connection.c:104 +#: ../libpurple/account.c:1030 ../libpurple/connection.c:104 +#: ../libpurple/connection.c:177 #, c-format msgid "Missing protocol plugin for %s" msgstr "Missing protocol plug-in for %s" -#: ../libpurple/account.c:1012 ../libpurple/connection.c:107 -#: ../pidgin/gtkblist.c:3961 +#: ../libpurple/account.c:1032 ../libpurple/connection.c:107 +#: ../pidgin/gtkblist.c:4033 msgid "Connection Error" msgstr "Connection Error" -#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702 -#: ../libpurple/protocols/jabber/jabber.c:1336 +#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707 +#: ../libpurple/protocols/jabber/jabber.c:1683 msgid "New passwords do not match." msgstr "New passwords do not match." -#: ../libpurple/account.c:1179 +#: ../libpurple/account.c:1199 msgid "Fill out all fields completely." msgstr "Fill out all fields completely." -#: ../libpurple/account.c:1202 +#: ../libpurple/account.c:1222 msgid "Original password" msgstr "Original password" -#: ../libpurple/account.c:1209 +#: ../libpurple/account.c:1229 msgid "New password" msgstr "New password" -#: ../libpurple/account.c:1216 +#: ../libpurple/account.c:1236 msgid "New password (again)" msgstr "New password (again)" -#: ../libpurple/account.c:1222 +#: ../libpurple/account.c:1242 #, c-format msgid "Change password for %s" msgstr "Change password for %s" -#: ../libpurple/account.c:1230 +#: ../libpurple/account.c:1250 msgid "Please enter your current password and your new password." msgstr "Please enter your current password and your new password." -#: ../libpurple/account.c:1261 +#: ../libpurple/account.c:1281 #, c-format msgid "Change user information for %s" msgstr "Change user information for %s" -#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670 +#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670 msgid "Set User Info" msgstr "Set User Info" -#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012 -#: ../libpurple/protocols/jabber/buddy.c:638 -#: ../libpurple/protocols/jabber/buddy.c:1424 -#: ../libpurple/protocols/jabber/buddy.c:1441 +#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017 +#: ../libpurple/protocols/jabber/buddy.c:782 +#: ../libpurple/protocols/jabber/buddy.c:2025 +#: ../libpurple/protocols/jabber/buddy.c:2042 #: ../libpurple/protocols/novell/novell.c:2831 -#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159 +#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159 msgid "Unknown" msgstr "Unknown" -#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291 -#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68 -#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97 +#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301 +#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69 +#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367 #: ../pidgin/plugins/gevolution/gevo-util.c:64 +#: ../pidgin/plugins/gevolution/gevolution.c:96 msgid "Buddies" msgstr "Buddies" -#: ../libpurple/blist.c:550 +#: ../libpurple/blist.c:548 msgid "buddy list" msgstr "buddy list" +#: ../libpurple/certificate.c:545 +msgid "(DOES NOT MATCH)" +msgstr "(DOES NOT MATCH)" + +#. Make messages +#: ../libpurple/certificate.c:549 +#, c-format +msgid "%s has presented the following certificate for just-this-once use:" +msgstr "%s has presented the following certificate for just-this-once use:" + +#: ../libpurple/certificate.c:550 +#, c-format +msgid "" +"Common name: %s %s\n" +"Fingerprint (SHA1): %s" +msgstr "" +"Common name: %s %s\n" +"Fingerprint (SHA1): %s" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:555 +msgid "Single-use Certificate Verification" +msgstr "Single-use Certificate Verification" + +#. Scheme name +#. Pool name +#: ../libpurple/certificate.c:872 +msgid "Certificate Authorities" +msgstr "Certificate Authorities" + +#. Scheme name +#. Pool name +#: ../libpurple/certificate.c:1040 +msgid "SSL Peers Cache" +msgstr "SSL Peers Cache" + +#. Make messages +#: ../libpurple/certificate.c:1171 +#, c-format +msgid "Accept certificate for %s?" +msgstr "Accept certificate for %s?" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:1177 +msgid "SSL Certificate Verification" +msgstr "SSL Certificate Verification" + +#. Number of actions +#: ../libpurple/certificate.c:1186 +msgid "Accept" +msgstr "Accept" + +#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214 +#: ../libpurple/protocols/qq/group_im.c:144 +#: ../libpurple/protocols/qq/group_opt.c:127 +#: ../libpurple/protocols/qq/sys_msg.c:90 +#: ../libpurple/protocols/qq/sys_msg.c:246 +msgid "Reject" +msgstr "Reject" + +#: ../libpurple/certificate.c:1188 +msgid "_View Certificate..." +msgstr "_View Certificate..." + +#. Prompt the user to authenticate the certificate +#. TODO: Provide the user with more guidance about why he is +#. being prompted +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1288 +#, c-format +msgid "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." +msgstr "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." + +#. Prompt the user to authenticate the certificate +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1313 +#, c-format +msgid "" +"The certificate presented by \"%s\" is self-signed. It cannot be " +"automatically checked." +msgstr "" +"The certificate presented by \"%s\" is self-signed. It cannot be " +"automatically checked." + +#: ../libpurple/certificate.c:1331 +#, c-format +msgid "The certificate chain presented for %s is not valid." +msgstr "The certificate chain presented for %s is not valid." + +#. TODO: Make this error either block the ensuing SSL +#. connection error until the user dismisses this one, or +#. stifle it. +#. TODO: Probably wrong. +#. TODO: Probably wrong +#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416 +msgid "SSL Certificate Error" +msgstr "SSL Certificate Error" + +#: ../libpurple/certificate.c:1340 +msgid "Invalid certificate chain" +msgstr "Invalid certificate chain" + +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1360 +msgid "" +"You have no database of root certificates, so this certificate cannot be " +"validated." +msgstr "" +"You have no database of root certificates, so this certificate cannot be " +"validated." + +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1382 +msgid "" +"The root certificate this one claims to be issued by is unknown to Pidgin." +msgstr "" +"The root certificate this one claims to be issued by is unknown to Pidgin." + +#: ../libpurple/certificate.c:1408 +#, c-format +msgid "" +"The certificate chain presented by %s does not have a valid digital " +"signature from the Certificate Authority from which it claims to have a " +"signature." +msgstr "" +"The certificate chain presented by %s does not have a valid digital " +"signature from the Certificate Authority from which it claims to have a " +"signature." + +#: ../libpurple/certificate.c:1417 +msgid "Invalid certificate authority signature" +msgstr "Invalid certificate authority signature" + +#. Make messages +#: ../libpurple/certificate.c:1882 +#, c-format +msgid "" +"Common name: %s\n" +"\n" +"Fingerprint (SHA1): %s\n" +"\n" +"Activation date: %s\n" +"Expiration date: %s\n" +msgstr "" +"Common name: %s\n" +"\n" +"Fingerprint (SHA1): %s\n" +"\n" +"Activation date: %s\n" +"Expiration date: %s\n" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:1891 +msgid "Certificate Information" +msgstr "Certificate Information" + #: ../libpurple/connection.c:106 msgid "Registration Error" msgstr "Registration Error" -#: ../libpurple/connection.c:293 +#: ../libpurple/connection.c:179 +msgid "Unregistration Error" +msgstr "Unregistration Error" + +#: ../libpurple/connection.c:349 #, c-format msgid "+++ %s signed on" msgstr "+++ %s signed on" -#: ../libpurple/connection.c:323 +#: ../libpurple/connection.c:379 #, c-format msgid "+++ %s signed off" msgstr "+++ %s signed off" -#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282 -#: ../libpurple/protocols/jabber/buddy.c:1712 +#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282 +#: ../libpurple/protocols/jabber/buddy.c:2313 #: ../libpurple/protocols/msn/servconn.c:139 -#: ../libpurple/protocols/msn/session.c:321 +#: ../libpurple/protocols/msn/session.c:322 msgid "Unknown error" msgstr "Unknown error" -#: ../libpurple/conversation.c:165 +#: ../libpurple/conversation.c:170 msgid "Unable to send message: The message is too large." msgstr "Unable to send message: The message is too large." -#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181 +#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186 #, c-format msgid "Unable to send message to %s." msgstr "Unable to send message to %s." -#: ../libpurple/conversation.c:169 +#: ../libpurple/conversation.c:174 msgid "The message is too large." msgstr "The message is too large." -#: ../libpurple/conversation.c:178 +#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255 +#: ../libpurple/protocols/bonjour/jabber.c:298 msgid "Unable to send message." msgstr "Unable to send message." -#: ../libpurple/conversation.c:1164 +#: ../libpurple/conversation.c:1211 msgid "Send Message" msgstr "Send Message" -#: ../libpurple/conversation.c:1167 +#: ../libpurple/conversation.c:1214 msgid "_Send Message" msgstr "_Send Message" -#: ../libpurple/conversation.c:1570 +#: ../libpurple/conversation.c:1620 #, c-format msgid "%s entered the room." msgstr "%s entered the room." -#: ../libpurple/conversation.c:1573 +#: ../libpurple/conversation.c:1623 #, c-format msgid "%s [<I>%s</I>] entered the room." msgstr "%s [<I>%s</I>] entered the room." -#: ../libpurple/conversation.c:1678 +#: ../libpurple/conversation.c:1733 #, c-format msgid "You are now known as %s" msgstr "You are now known as %s" -#: ../libpurple/conversation.c:1698 +#: ../libpurple/conversation.c:1753 #, c-format msgid "%s is now known as %s" msgstr "%s is now known as %s" -#: ../libpurple/conversation.c:1771 +#: ../libpurple/conversation.c:1828 #, c-format msgid "%s left the room." msgstr "%s left the room." -#: ../libpurple/conversation.c:1774 +#: ../libpurple/conversation.c:1831 #, c-format msgid "%s left the room (%s)." msgstr "%s left the room (%s)." -#: ../libpurple/dbus-server.c:578 +#: ../libpurple/dbus-server.c:584 #, c-format msgid "Failed to get connection: %s" msgstr "Failed to get connection: %s" -#: ../libpurple/dbus-server.c:590 +#: ../libpurple/dbus-server.c:596 #, c-format msgid "Failed to get name: %s" msgstr "Failed to get name: %s" -#: ../libpurple/dbus-server.c:603 +#: ../libpurple/dbus-server.c:610 #, c-format msgid "Failed to get serv name: %s" msgstr "Failed to get serv name: %s" -#: ../libpurple/dbus-server.h:83 +#: ../libpurple/dbus-server.h:84 msgid "Purple's D-BUS server is not running for the reason listed below" msgstr "Purple's D-BUS server is not running for the reason listed below" @@ -1739,7 +2316,7 @@ msgid "Unknown reason" msgstr "Unknown reason" -#: ../libpurple/ft.c:204 +#: ../libpurple/ft.c:207 #, c-format msgid "" "Error reading %s: \n" @@ -1748,7 +2325,7 @@ "Error reading %s: \n" "%s.\n" -#: ../libpurple/ft.c:208 +#: ../libpurple/ft.c:211 #, c-format msgid "" "Error writing %s: \n" @@ -1757,7 +2334,7 @@ "Error writing %s: \n" "%s.\n" -#: ../libpurple/ft.c:212 +#: ../libpurple/ft.c:215 #, c-format msgid "" "Error accessing %s: \n" @@ -1766,39 +2343,39 @@ "Error accessing %s: \n" "%s.\n" -#: ../libpurple/ft.c:248 +#: ../libpurple/ft.c:251 msgid "Directory is not writable." msgstr "Directory is not writable." -#: ../libpurple/ft.c:263 +#: ../libpurple/ft.c:266 msgid "Cannot send a file of 0 bytes." msgstr "Cannot send a file of 0 bytes." -#: ../libpurple/ft.c:273 +#: ../libpurple/ft.c:276 msgid "Cannot send a directory." msgstr "Cannot send a directory." -#: ../libpurple/ft.c:282 +#: ../libpurple/ft.c:285 #, 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" -#: ../libpurple/ft.c:342 +#: ../libpurple/ft.c:345 #, c-format msgid "%s wants to send you %s (%s)" msgstr "%s wants to send you %s (%s)" -#: ../libpurple/ft.c:349 +#: ../libpurple/ft.c:352 #, c-format msgid "%s wants to send you a file" msgstr "%s wants to send you a file" -#: ../libpurple/ft.c:392 +#: ../libpurple/ft.c:395 #, c-format msgid "Accept file transfer request from %s?" msgstr "Accept file transfer request from %s?" -#: ../libpurple/ft.c:396 +#: ../libpurple/ft.c:399 #, c-format msgid "" "A file is available for download from:\n" @@ -1809,60 +2386,60 @@ "Remote host: %s\n" "Remote port: %d" -#: ../libpurple/ft.c:431 +#: ../libpurple/ft.c:434 #, c-format msgid "%s is offering to send file %s" msgstr "%s is offering to send file %s" -#: ../libpurple/ft.c:483 +#: ../libpurple/ft.c:486 #, c-format msgid "%s is not a valid filename.\n" msgstr "%s is not a valid filename.\n" -#: ../libpurple/ft.c:504 +#: ../libpurple/ft.c:507 #, c-format msgid "Offering to send %s to %s" msgstr "Offering to send %s to %s" -#: ../libpurple/ft.c:516 +#: ../libpurple/ft.c:519 #, c-format msgid "Starting transfer of %s from %s" msgstr "Starting transfer of %s from %s" -#: ../libpurple/ft.c:670 +#: ../libpurple/ft.c:680 #, c-format msgid "Transfer of file %s complete" msgstr "Transfer of file %s complete" -#: ../libpurple/ft.c:673 +#: ../libpurple/ft.c:683 msgid "File transfer complete" msgstr "File transfer complete" -#: ../libpurple/ft.c:1091 +#: ../libpurple/ft.c:1101 #, c-format msgid "You canceled the transfer of %s" msgstr "You cancelled the transfer of %s" -#: ../libpurple/ft.c:1096 +#: ../libpurple/ft.c:1106 msgid "File transfer cancelled" msgstr "File transfer cancelled" -#: ../libpurple/ft.c:1154 +#: ../libpurple/ft.c:1164 #, c-format msgid "%s canceled the transfer of %s" msgstr "%s cancelled the transfer of %s" -#: ../libpurple/ft.c:1159 +#: ../libpurple/ft.c:1169 #, c-format msgid "%s canceled the file transfer" msgstr "%s cancelled the file transfer" -#: ../libpurple/ft.c:1216 +#: ../libpurple/ft.c:1226 #, c-format msgid "File transfer to %s failed." msgstr "File transfer to %s failed." -#: ../libpurple/ft.c:1218 +#: ../libpurple/ft.c:1228 #, c-format msgid "File transfer from %s failed." msgstr "File transfer from %s failed." @@ -2039,31 +2616,31 @@ msgid "Whether the specified command should handle \"ymsgr\" URLs" msgstr "Whether the specified command should handle \"ymsgr\" URLs" -#: ../libpurple/log.c:181 +#: ../libpurple/log.c:182 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>" -#: ../libpurple/log.c:593 +#: ../libpurple/log.c:597 msgid "HTML" msgstr "HTML" -#: ../libpurple/log.c:607 +#: ../libpurple/log.c:611 msgid "Plain text" msgstr "Plain text" -#: ../libpurple/log.c:621 +#: ../libpurple/log.c:625 msgid "Old flat format" msgstr "Old flat format" -#: ../libpurple/log.c:732 +#: ../libpurple/log.c:838 msgid "Logging of this conversation failed." msgstr "Logging of this conversation failed." -#: ../libpurple/log.c:1175 +#: ../libpurple/log.c:1281 msgid "XML" msgstr "XML" -#: ../libpurple/log.c:1251 +#: ../libpurple/log.c:1365 #, c-format msgid "" "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" @@ -2072,7 +2649,7 @@ "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" "REPLY>:</b></font> %s<br/>\n" -#: ../libpurple/log.c:1253 +#: ../libpurple/log.c:1367 #, c-format msgid "" "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" @@ -2081,16 +2658,16 @@ "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-" "REPLY>:</b></font> %s<br/>\n" -#: ../libpurple/log.c:1311 ../libpurple/log.c:1444 +#: ../libpurple/log.c:1425 ../libpurple/log.c:1558 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>" msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>" -#: ../libpurple/log.c:1323 ../libpurple/log.c:1453 +#: ../libpurple/log.c:1437 ../libpurple/log.c:1567 #, 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>" -#: ../libpurple/log.c:1385 +#: ../libpurple/log.c:1499 #, c-format msgid "(%s) %s <AUTO-REPLY>: %s\n" msgstr "(%s) %s <AUTO-REPLY>: %s\n" @@ -2181,13 +2758,13 @@ #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230 -#: ../libpurple/protocols/oscar/oscar.c:1440 -#: ../libpurple/protocols/oscar/oscar.c:2234 -#: ../libpurple/protocols/oscar/oscar.c:2281 -#: ../libpurple/protocols/oscar/oscar.c:5799 -#: ../libpurple/protocols/oscar/oscar.c:5854 -#: ../libpurple/protocols/oscar/oscar.c:6080 -#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387 +#: ../libpurple/protocols/oscar/oscar.c:1451 +#: ../libpurple/protocols/oscar/oscar.c:2226 +#: ../libpurple/protocols/oscar/oscar.c:2275 +#: ../libpurple/protocols/oscar/oscar.c:5870 +#: ../libpurple/protocols/oscar/oscar.c:5925 +#: ../libpurple/protocols/oscar/oscar.c:6151 +#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387 #: ../libpurple/request.h:1397 msgid "_Cancel" msgstr "_Cancel" @@ -2204,12 +2781,12 @@ msgid "Auto Reject" msgstr "Auto Reject" -#: ../libpurple/plugins/autoaccept.c:184 +#: ../libpurple/plugins/autoaccept.c:185 msgid "Autoaccept File Transfers..." msgstr "Autoaccept File Transfers..." #. XXX: Is there a better way than this? There really should be. -#: ../libpurple/plugins/autoaccept.c:214 +#: ../libpurple/plugins/autoaccept.c:215 msgid "" "Path to save the files in\n" "(Please provide the full path)" @@ -2217,11 +2794,11 @@ "Path to save the files in\n" "(Please provide the full path)" -#: ../libpurple/plugins/autoaccept.c:219 +#: ../libpurple/plugins/autoaccept.c:220 msgid "Automatically reject from users not in buddy list" msgstr "Automatically reject from users not in buddy list" -#: ../libpurple/plugins/autoaccept.c:223 +#: ../libpurple/plugins/autoaccept.c:224 msgid "" "Notify with a popup when an autoaccepted file transfer is complete\n" "(only when there's no conversation with the sender)" @@ -2229,8 +2806,8 @@ "Notify with a popup when an autoaccepted file transfer is complete\n" "(only when there's no conversation with the sender)" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1613 -#: ../libpurple/protocols/msn/msn.c:1643 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657 +#: ../libpurple/protocols/msn/msn.c:1687 msgid "Notes" msgstr "Notes" @@ -2238,7 +2815,7 @@ msgid "Enter your notes below..." msgstr "Enter your notes below..." -#: ../libpurple/plugins/buddynote.c:62 +#: ../libpurple/plugins/buddynote.c:65 msgid "Edit Notes..." msgstr "Edit Notes..." @@ -2250,18 +2827,18 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/buddynote.c:87 +#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71 msgid "Buddy Notes" msgstr "Buddy Notes" #. *< name #. *< version -#: ../libpurple/plugins/buddynote.c:89 +#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73 msgid "Store notes on particular buddies." msgstr "Store notes on particular buddies." #. *< summary -#: ../libpurple/plugins/buddynote.c:90 +#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74 msgid "Adds the option to store notes for buddies on your buddy list." msgstr "Adds the option to store notes for buddies on your buddy list." @@ -2454,34 +3031,34 @@ #. * offset is way off. The user should never really see it, but #. * it's here just in case. The parens are to make it clear it's #. * not a real timezone. -#: ../libpurple/plugins/log_reader.c:497 +#: ../libpurple/plugins/log_reader.c:493 msgid "(UTC)" msgstr "(UTC)" -#: ../libpurple/plugins/log_reader.c:1552 +#: ../libpurple/plugins/log_reader.c:1577 msgid "User is offline." msgstr "User is offline." -#: ../libpurple/plugins/log_reader.c:1558 +#: ../libpurple/plugins/log_reader.c:1583 msgid "Auto-response sent:" msgstr "Auto-response sent:" -#: ../libpurple/plugins/log_reader.c:1568 -#: ../libpurple/plugins/log_reader.c:1571 +#: ../libpurple/plugins/log_reader.c:1593 +#: ../libpurple/plugins/log_reader.c:1596 #: ../libpurple/plugins/statenotify.c:80 #, c-format msgid "%s has signed off." msgstr "%s has signed off." -#: ../libpurple/plugins/log_reader.c:1585 +#: ../libpurple/plugins/log_reader.c:1610 msgid "One or more messages may have been undeliverable." msgstr "One or more messages may not have been delivered." -#: ../libpurple/plugins/log_reader.c:1595 +#: ../libpurple/plugins/log_reader.c:1620 msgid "You were disconnected from the server." msgstr "You were disconnected from the server." -#: ../libpurple/plugins/log_reader.c:1603 +#: ../libpurple/plugins/log_reader.c:1628 msgid "" "You are currently disconnected. Messages will not be received unless you are " "logged in." @@ -2489,69 +3066,77 @@ "You are currently disconnected. Messages will not be received unless you are " "logged in." -#: ../libpurple/plugins/log_reader.c:1618 +#: ../libpurple/plugins/log_reader.c:1643 msgid "Message could not be sent because the maximum length was exceeded." msgstr "Message could not be sent because the maximum length was exceeded." -#: ../libpurple/plugins/log_reader.c:1623 +#: ../libpurple/plugins/log_reader.c:1648 msgid "Message could not be sent." msgstr "Message could not be sent." #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:1976 -#: ../libpurple/plugins/log_reader.c:2085 +#: ../libpurple/plugins/log_reader.c:2349 +#: ../libpurple/plugins/log_reader.c:2472 msgid "Adium" msgstr "Adium" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:1989 -#: ../libpurple/plugins/log_reader.c:2090 +#: ../libpurple/plugins/log_reader.c:2362 +#: ../libpurple/plugins/log_reader.c:2477 msgid "Fire" msgstr "Fire" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2001 -#: ../libpurple/plugins/log_reader.c:2094 +#: ../libpurple/plugins/log_reader.c:2374 +#: ../libpurple/plugins/log_reader.c:2481 msgid "Messenger Plus!" msgstr "Messenger Plus!" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2014 -#: ../libpurple/plugins/log_reader.c:2099 +#: ../libpurple/plugins/log_reader.c:2388 +#: ../libpurple/plugins/log_reader.c:2486 +msgid "QIP" +msgstr "QIP" + +#. The names of IM clients are marked for translation at the request of +#. translators who wanted to transliterate them. Many translators +#. choose to leave them alone. Choose what's best for your language. +#: ../libpurple/plugins/log_reader.c:2400 +#: ../libpurple/plugins/log_reader.c:2490 msgid "MSN Messenger" msgstr "MSN Messenger" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2026 -#: ../libpurple/plugins/log_reader.c:2103 +#: ../libpurple/plugins/log_reader.c:2412 +#: ../libpurple/plugins/log_reader.c:2494 msgid "Trillian" msgstr "Trillian" #. Add general preferences. -#: ../libpurple/plugins/log_reader.c:2067 +#: ../libpurple/plugins/log_reader.c:2454 msgid "General Log Reading Configuration" msgstr "General Log Reading Configuration" -#: ../libpurple/plugins/log_reader.c:2071 +#: ../libpurple/plugins/log_reader.c:2458 msgid "Fast size calculations" msgstr "Fast size calculations" -#: ../libpurple/plugins/log_reader.c:2075 +#: ../libpurple/plugins/log_reader.c:2462 msgid "Use name heuristics" msgstr "Use name heuristics" #. Add Log Directory preferences. -#: ../libpurple/plugins/log_reader.c:2081 +#: ../libpurple/plugins/log_reader.c:2468 msgid "Log Directory" msgstr "Log Directory" @@ -2561,19 +3146,19 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/log_reader.c:2132 +#: ../libpurple/plugins/log_reader.c:2523 msgid "Log Reader" msgstr "Log Reader" #. *< name #. *< version #. * summary -#: ../libpurple/plugins/log_reader.c:2136 +#: ../libpurple/plugins/log_reader.c:2527 msgid "Includes other IM clients' logs in the log viewer." msgstr "Includes other IM clients' logs in the log viewer." #. * description -#: ../libpurple/plugins/log_reader.c:2140 +#: ../libpurple/plugins/log_reader.c:2531 msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, and Trillian.\n" @@ -2640,7 +3225,7 @@ "The rest of the messages will be saved as pounce. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." -#: ../libpurple/plugins/offlinemsg.c:152 +#: ../libpurple/plugins/offlinemsg.c:156 #, c-format msgid "" "\"%s\" is currently offline. Do you want to save the rest of the messages in " @@ -2649,39 +3234,43 @@ "\"%s\" is currently offline. Do you want to save the rest of the messages in " "a pounce and automatically send them when \"%s\" logs back in?" -#: ../libpurple/plugins/offlinemsg.c:156 +#: ../libpurple/plugins/offlinemsg.c:160 msgid "Offline Message" msgstr "Offline Message" -#: ../libpurple/plugins/offlinemsg.c:157 +#: ../libpurple/plugins/offlinemsg.c:161 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog" msgstr "You can edit/delete the pounce from the `Buddy Pounces' dialog" -#: ../libpurple/plugins/offlinemsg.c:161 +#: ../libpurple/plugins/offlinemsg.c:165 #: ../libpurple/protocols/msn/dialog.c:133 -#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 #: ../libpurple/protocols/novell/novell.c:1917 -#: ../libpurple/protocols/silc/buddy.c:314 -#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304 -#: ../pidgin/gtkrequest.c:267 +#: ../libpurple/protocols/silc/buddy.c:317 +#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304 +#: ../libpurple/protocols/silc10/buddy.c:314 +#: ../libpurple/protocols/silc10/pk.c:119 +#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267 msgid "Yes" msgstr "Yes" -#: ../libpurple/plugins/offlinemsg.c:162 +#: ../libpurple/plugins/offlinemsg.c:166 #: ../libpurple/protocols/msn/dialog.c:134 -#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 #: ../libpurple/protocols/novell/novell.c:1918 -#: ../libpurple/protocols/silc/buddy.c:315 -#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305 -#: ../pidgin/gtkrequest.c:268 +#: ../libpurple/protocols/silc/buddy.c:318 +#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305 +#: ../libpurple/protocols/silc10/buddy.c:315 +#: ../libpurple/protocols/silc10/pk.c:120 +#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268 msgid "No" msgstr "No" -#: ../libpurple/plugins/offlinemsg.c:189 +#: ../libpurple/plugins/offlinemsg.c:193 msgid "Save offline messages in pounce" msgstr "Save offline messages in pounce" -#: ../libpurple/plugins/offlinemsg.c:193 +#: ../libpurple/plugins/offlinemsg.c:197 msgid "Do not ask. Always save in pounce." msgstr "Do not ask. Always save in pounce." @@ -2744,7 +3333,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/signals-test.c:684 +#: ../libpurple/plugins/signals-test.c:711 msgid "Signals Test" msgstr "Signals Test" @@ -2752,8 +3341,8 @@ #. *< version #. * summary #. * description -#: ../libpurple/plugins/signals-test.c:687 -#: ../libpurple/plugins/signals-test.c:689 +#: ../libpurple/plugins/signals-test.c:714 +#: ../libpurple/plugins/signals-test.c:716 msgid "Test to see that all signals are working properly." msgstr "Test to see that all signals are working properly." @@ -2775,6 +3364,50 @@ msgid "Tests to see that most things are working." msgstr "Tests to see that most things are working." +#. Scheme name +#: ../libpurple/plugins/ssl/ssl-gnutls.c:903 +#: ../libpurple/plugins/ssl/ssl-nss.c:657 +msgid "X.509 Certificates" +msgstr "X.509 Certificates" + +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: ../libpurple/plugins/ssl/ssl-gnutls.c:987 +msgid "GNUTLS" +msgstr "GNUTLS" + +#. *< name +#. *< version +#. * summary +#. * description +#: ../libpurple/plugins/ssl/ssl-gnutls.c:990 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:992 +msgid "Provides SSL support through GNUTLS." +msgstr "Provides SSL support through GNUTLS." + +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: ../libpurple/plugins/ssl/ssl-nss.c:742 +msgid "NSS" +msgstr "NSS" + +#. *< name +#. *< version +#. * summary +#. * description +#: ../libpurple/plugins/ssl/ssl-nss.c:745 +#: ../libpurple/plugins/ssl/ssl-nss.c:747 +msgid "Provides SSL support through Mozilla NSS." +msgstr "Provides SSL support through Mozilla NSS." + #. *< type #. *< ui_requirement #. *< flags @@ -2793,44 +3426,6 @@ msgid "Provides a wrapper around SSL support libraries." msgstr "Provides a wrapper around SSL support libraries." -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../libpurple/plugins/ssl/ssl-gnutls.c:275 -msgid "GNUTLS" -msgstr "GNUTLS" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/plugins/ssl/ssl-gnutls.c:278 -#: ../libpurple/plugins/ssl/ssl-gnutls.c:280 -msgid "Provides SSL support through GNUTLS." -msgstr "Provides SSL support through GNUTLS." - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../libpurple/plugins/ssl/ssl-nss.c:415 -msgid "NSS" -msgstr "NSS" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/plugins/ssl/ssl-nss.c:418 -#: ../libpurple/plugins/ssl/ssl-nss.c:420 -msgid "Provides SSL support through Mozilla NSS." -msgstr "Provides SSL support through Mozilla NSS." - #: ../libpurple/plugins/statenotify.c:50 #, c-format msgid "%s is no longer away." @@ -2903,7 +3498,7 @@ msgid "Provides support for loading Tcl plugins" msgstr "Provides support for loading Tcl plug-ins" -#: ../libpurple/plugins/tcl/tcl.c:495 +#: ../libpurple/plugins/tcl/tcl.c:507 msgid "" "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, " "install ActiveTCL from http://www.activestate.com\n" @@ -2912,34 +3507,53 @@ "install ActiveTCL from http://www.activestate.com\n" #. Send a message about the connection error -#: ../libpurple/protocols/bonjour/bonjour.c:113 +#: ../libpurple/protocols/bonjour/bonjour.c:112 msgid "Unable to listen for incoming IM connections\n" msgstr "Unable to listen for incoming IM connections\n" -#: ../libpurple/protocols/bonjour/bonjour.c:148 +#: ../libpurple/protocols/bonjour/bonjour.c:137 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?" -#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for -#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message -#. Away stuff -#: ../libpurple/protocols/bonjour/bonjour.c:302 -#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530 -#: ../libpurple/protocols/irc/msgs.c:310 -#: ../libpurple/protocols/jabber/buddy.c:1434 -#: ../libpurple/protocols/novell/novell.c:2819 -#: ../libpurple/protocols/oscar/oscar.c:715 -#: ../libpurple/protocols/oscar/oscar.c:4500 -#: ../libpurple/protocols/oscar/oscar.c:5545 -#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476 -#: ../libpurple/protocols/yahoo/yahoo.c:3382 -#: ../libpurple/protocols/yahoo/yahoo.c:3455 ../libpurple/status.c:157 -#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1824 -#: ../pidgin/gtkstatusbox.c:1052 -msgid "Away" -msgstr "Away" +#. Creating the options for the protocol +#: ../libpurple/protocols/bonjour/bonjour.c:351 +#: ../libpurple/protocols/bonjour/bonjour.c:656 +#: ../libpurple/protocols/gg/gg.c:632 +#: ../libpurple/protocols/jabber/jabber.c:943 +msgid "First name" +msgstr "Forename" + +#: ../libpurple/protocols/bonjour/bonjour.c:353 +#: ../libpurple/protocols/bonjour/bonjour.c:659 +#: ../libpurple/protocols/gg/gg.c:627 +#: ../libpurple/protocols/jabber/jabber.c:948 +msgid "Last name" +msgstr "Surname" + +#: ../libpurple/protocols/bonjour/bonjour.c:357 +#: ../libpurple/protocols/jabber/buddy.c:295 +#: ../libpurple/protocols/jabber/buddy.c:1325 +#: ../libpurple/protocols/jabber/buddy.c:1335 +#: ../libpurple/protocols/jabber/buddy.c:2192 +#: ../libpurple/protocols/silc/ops.c:1041 +#: ../libpurple/protocols/silc/util.c:555 +#: ../libpurple/protocols/silc10/ops.c:1075 +#: ../libpurple/protocols/silc10/util.c:551 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061 +msgid "E-Mail" +msgstr "E-Mail" + +#: ../libpurple/protocols/bonjour/bonjour.c:360 +#: ../libpurple/protocols/bonjour/bonjour.c:665 +msgid "AIM Account" +msgstr "AIM Account" + +#: ../libpurple/protocols/bonjour/bonjour.c:363 +#: ../libpurple/protocols/bonjour/bonjour.c:668 +msgid "XMPP Account" +msgstr "XMPP Account" #. *< type #. *< ui_requirement @@ -2951,86 +3565,61 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/bonjour/bonjour.c:431 -#: ../libpurple/protocols/bonjour/bonjour.c:433 +#: ../libpurple/protocols/bonjour/bonjour.c:467 +#: ../libpurple/protocols/bonjour/bonjour.c:469 msgid "Bonjour Protocol Plugin" msgstr "Bonjour Protocol Plug-in" -#: ../libpurple/protocols/bonjour/bonjour.c:476 -#: ../libpurple/protocols/bonjour/bonjour.c:483 -#: ../libpurple/protocols/bonjour/bonjour.c:541 +#: ../libpurple/protocols/bonjour/bonjour.c:610 msgid "Purple Person" msgstr "Purple Person" -#. Creating the user splits -#: ../libpurple/protocols/bonjour/bonjour.c:589 -#: ../libpurple/protocols/silc/silc.c:926 -msgid "Hostname" -msgstr "Hostname" - -#. Creating the options for the protocol -#: ../libpurple/protocols/bonjour/bonjour.c:593 -#: ../libpurple/protocols/gg/gg.c:627 -#: ../libpurple/protocols/jabber/jabber.c:824 -msgid "First name" -msgstr "Forename" - -#: ../libpurple/protocols/bonjour/bonjour.c:596 -#: ../libpurple/protocols/gg/gg.c:622 -#: ../libpurple/protocols/jabber/jabber.c:829 -msgid "Last name" -msgstr "Surname" - -#: ../libpurple/protocols/bonjour/bonjour.c:599 -#: ../libpurple/protocols/gg/gg.c:472 -#: ../libpurple/protocols/jabber/jabber.c:814 -#: ../libpurple/protocols/silc/silc.c:689 -#: ../libpurple/protocols/silc/silc.c:930 +#: ../libpurple/protocols/bonjour/bonjour.c:662 +#: ../libpurple/protocols/gg/gg.c:477 +#: ../libpurple/protocols/jabber/jabber.c:933 +#: ../libpurple/protocols/silc/silc.c:770 +#: ../libpurple/protocols/silc/silc.c:1011 +#: ../libpurple/protocols/silc10/silc.c:681 +#: ../libpurple/protocols/silc10/silc.c:922 msgid "E-mail" msgstr "E-mail" -#: ../libpurple/protocols/bonjour/bonjour.c:602 -msgid "AIM Account" -msgstr "AIM Account" - -#: ../libpurple/protocols/bonjour/bonjour.c:605 -msgid "XMPP Account" -msgstr "XMPP Account" - -#: ../libpurple/protocols/bonjour/bonjour.h:35 +#: ../libpurple/protocols/bonjour/bonjour.h:33 msgid "Bonjour" msgstr "Bonjour" -#: ../libpurple/protocols/bonjour/jabber.c:374 +#: ../libpurple/protocols/bonjour/jabber.c:380 #, c-format msgid "%s has closed the conversation." msgstr "%s has closed the conversation." -#: ../libpurple/protocols/bonjour/jabber.c:461 +#: ../libpurple/protocols/bonjour/jabber.c:437 +#: ../libpurple/protocols/bonjour/jabber.c:660 +#: ../libpurple/protocols/bonjour/jabber.c:678 +msgid "Unable to send the message, the conversation couldn't be started." +msgstr "Unable to send the message: the conversation couldn't be started." + +#: ../libpurple/protocols/bonjour/jabber.c:583 msgid "Cannot open socket" msgstr "Cannot open socket" -#: ../libpurple/protocols/bonjour/jabber.c:469 +#: ../libpurple/protocols/bonjour/jabber.c:591 msgid "Error setting socket options" msgstr "Error setting socket options" -#: ../libpurple/protocols/bonjour/jabber.c:493 +#: ../libpurple/protocols/bonjour/jabber.c:615 msgid "Could not bind socket to port" msgstr "Could not bind socket to port" -#: ../libpurple/protocols/bonjour/jabber.c:501 +#: ../libpurple/protocols/bonjour/jabber.c:623 msgid "Could not listen on socket" msgstr "Could not listen on socket" -#: ../libpurple/protocols/bonjour/jabber.c:599 -msgid "Unable to send the message, the conversation couldn't be started." -msgstr "Unable to send the message: the conversation couldn't be started." - -#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800 +#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812 msgid "Invalid proxy settings" msgstr "Invalid proxy settings" -#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800 +#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812 msgid "" "Either the host name or port number specified for your given proxy type is " "invalid." @@ -3100,267 +3689,292 @@ msgid "Registration completed successfully!" msgstr "Registration completed successfully!" -#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770 -#: ../libpurple/protocols/jabber/jabber.c:803 -#: ../libpurple/protocols/jabber/jabber.c:1371 +#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775 +#: ../libpurple/protocols/jabber/jabber.c:914 +#: ../libpurple/protocols/jabber/jabber.c:917 +#: ../libpurple/protocols/jabber/jabber.c:1718 msgid "Password" msgstr "Password" -#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775 +#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780 msgid "Password (retype)" msgstr "Password (retype)" -#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780 +#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785 msgid "Enter current token" msgstr "Enter current token" -#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786 +#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791 msgid "Current token" msgstr "Current token" -#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498 +#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503 msgid "Register New Gadu-Gadu Account" msgstr "Register New Gadu-Gadu Account" -#: ../libpurple/protocols/gg/gg.c:499 +#: ../libpurple/protocols/gg/gg.c:504 msgid "Please, fill in the following fields" msgstr "Please fill in the following fields" -#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049 -#: ../libpurple/protocols/gg/gg.c:1123 -#: ../libpurple/protocols/jabber/jabber.c:839 -#: ../libpurple/protocols/oscar/oscar.c:3779 -#: ../libpurple/protocols/oscar/oscar.c:3792 +#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054 +#: ../libpurple/protocols/gg/gg.c:1126 +#: ../libpurple/protocols/jabber/jabber.c:958 +#: ../libpurple/protocols/oscar/oscar.c:3782 +#: ../libpurple/protocols/oscar/oscar.c:3795 #: ../libpurple/protocols/qq/buddy_info.c:49 msgid "City" msgstr "City" -#: ../libpurple/protocols/gg/gg.c:642 +#: ../libpurple/protocols/gg/gg.c:647 msgid "Year of birth" msgstr "Year of birth" -#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1542 -#: ../libpurple/protocols/oscar/oscar.c:3722 +#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586 +#: ../libpurple/protocols/myspace/user.c:115 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:46 -#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227 -#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067 +#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229 +#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091 msgid "Gender" msgstr "Gender" -#: ../libpurple/protocols/gg/gg.c:646 +#: ../libpurple/protocols/gg/gg.c:651 msgid "Male or female" msgstr "Male or female" -#: ../libpurple/protocols/gg/gg.c:647 -#: ../libpurple/protocols/oscar/oscar.c:3722 +#: ../libpurple/protocols/gg/gg.c:652 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:83 -#: ../libpurple/protocols/qq/qq.c:224 +#: ../libpurple/protocols/qq/qq.c:226 msgid "Male" msgstr "Male" -#: ../libpurple/protocols/gg/gg.c:648 -#: ../libpurple/protocols/oscar/oscar.c:3722 +#: ../libpurple/protocols/gg/gg.c:653 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:84 -#: ../libpurple/protocols/qq/qq.c:227 +#: ../libpurple/protocols/qq/qq.c:229 msgid "Female" msgstr "Female" -#: ../libpurple/protocols/gg/gg.c:652 +#: ../libpurple/protocols/gg/gg.c:657 msgid "Only online" msgstr "Only online" -#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657 +#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662 msgid "Find buddies" msgstr "Find buddies" -#: ../libpurple/protocols/gg/gg.c:658 +#: ../libpurple/protocols/gg/gg.c:663 msgid "Please, enter your search criteria below" msgstr "Please enter your search criteria below" -#: ../libpurple/protocols/gg/gg.c:696 +#: ../libpurple/protocols/gg/gg.c:701 msgid "Fill in the fields." msgstr "Fill in the fields." -#: ../libpurple/protocols/gg/gg.c:708 +#: ../libpurple/protocols/gg/gg.c:713 msgid "Your current password is different from the one that you specified." msgstr "Your current password is different from the one that you specified." -#: ../libpurple/protocols/gg/gg.c:722 +#: ../libpurple/protocols/gg/gg.c:727 msgid "Unable to change password. Error occurred.\n" msgstr "Unable to change password. An error occured.\n" -#: ../libpurple/protocols/gg/gg.c:731 +#: ../libpurple/protocols/gg/gg.c:736 msgid "Change password for the Gadu-Gadu account" msgstr "Change password for the Gadu-Gadu account" -#: ../libpurple/protocols/gg/gg.c:732 +#: ../libpurple/protocols/gg/gg.c:737 msgid "Password was changed successfully!" msgstr "Password successfully changed!" -#: ../libpurple/protocols/gg/gg.c:765 +#: ../libpurple/protocols/gg/gg.c:770 msgid "Current password" msgstr "Current password" -#: ../libpurple/protocols/gg/gg.c:790 +#: ../libpurple/protocols/gg/gg.c:795 msgid "Please, enter your current password and your new password for UIN: " msgstr "Please enter your current password and your new password for UIN: " -#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795 +#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800 msgid "Change Gadu-Gadu Password" msgstr "Change Gadu-Gadu password" -#: ../libpurple/protocols/gg/gg.c:871 +#: ../libpurple/protocols/gg/gg.c:876 #, c-format msgid "Select a chat for buddy: %s" msgstr "Select a chat for buddy: %s" -#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875 +#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880 msgid "Add to chat..." msgstr "Add to chat..." -#: ../libpurple/protocols/gg/gg.c:1003 -#: ../libpurple/protocols/jabber/buddy.c:1428 +#: ../libpurple/protocols/gg/gg.c:1008 +#: ../libpurple/protocols/jabber/buddy.c:2029 #: ../libpurple/protocols/novell/novell.c:2828 -#: ../libpurple/protocols/oscar/oscar.c:810 -#: ../libpurple/protocols/oscar/oscar.c:5517 +#: ../libpurple/protocols/oscar/oscar.c:827 +#: ../libpurple/protocols/oscar/oscar.c:5588 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177 -#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:153 -#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378 -#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054 +#: ../libpurple/protocols/qq/qq.c:292 +#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153 +#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433 +#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060 msgid "Offline" msgstr "Offline" -#: ../libpurple/protocols/gg/gg.c:1006 -#: ../libpurple/protocols/jabber/buddy.c:1430 +#: ../libpurple/protocols/gg/gg.c:1011 +#: ../libpurple/protocols/jabber/buddy.c:2031 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38 #: ../libpurple/protocols/novell/novell.c:2816 -#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154 -#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051 +#: ../libpurple/protocols/qq/qq.c:280 +#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154 +#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056 msgid "Available" msgstr "Available" -#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114 -#: ../libpurple/protocols/oscar/oscar.c:2658 -#: ../libpurple/protocols/oscar/oscar.c:3689 +#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for +#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message +#. Away stuff +#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528 +#: ../libpurple/protocols/irc/msgs.c:310 +#: ../libpurple/protocols/jabber/buddy.c:2035 +#: ../libpurple/protocols/novell/novell.c:2819 +#: ../libpurple/protocols/oscar/oscar.c:732 +#: ../libpurple/protocols/oscar/oscar.c:4540 +#: ../libpurple/protocols/oscar/oscar.c:5616 +#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284 +#: ../libpurple/protocols/silc/buddy.c:1476 +#: ../libpurple/protocols/silc10/buddy.c:1476 +#: ../libpurple/protocols/yahoo/yahoo.c:3650 +#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157 +#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938 +#: ../pidgin/gtkstatusbox.c:1057 +msgid "Away" +msgstr "Away" + +#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117 +#: ../libpurple/protocols/oscar/oscar.c:2692 +#: ../libpurple/protocols/oscar/oscar.c:3692 msgid "UIN" msgstr "UIN" -#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117 -#: ../libpurple/protocols/jabber/buddy.c:1585 -#: ../libpurple/protocols/jabber/buddy.c:1761 -#: ../libpurple/protocols/oscar/oscar.c:3700 -#: ../libpurple/protocols/silc/ops.c:1024 +#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120 +#: ../libpurple/protocols/jabber/buddy.c:2186 +#: ../libpurple/protocols/jabber/buddy.c:2362 +#: ../libpurple/protocols/oscar/oscar.c:3703 +#: ../libpurple/protocols/silc/ops.c:990 +#: ../libpurple/protocols/silc10/ops.c:1024 msgid "First Name" msgstr "Forename" -#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126 +#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129 msgid "Birth Year" msgstr "Year of birth" -#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177 -#: ../libpurple/protocols/oscar/oscar.c:3901 +#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180 +#: ../libpurple/protocols/oscar/oscar.c:3904 msgid "Unable to display the search results." msgstr "Unable to display the search results." -#: ../libpurple/protocols/gg/gg.c:1168 +#: ../libpurple/protocols/gg/gg.c:1171 msgid "Gadu-Gadu Public Directory" msgstr "Gadu-Gadu Public Directory" -#: ../libpurple/protocols/gg/gg.c:1169 +#: ../libpurple/protocols/gg/gg.c:1172 msgid "Search results" msgstr "Search results" -#: ../libpurple/protocols/gg/gg.c:1212 +#: ../libpurple/protocols/gg/gg.c:1215 msgid "No matching users found" msgstr "No matching users found" -#: ../libpurple/protocols/gg/gg.c:1213 +#: ../libpurple/protocols/gg/gg.c:1216 msgid "There are no users matching your search criteria." msgstr "There are no users matching your search criteria." -#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460 +#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463 msgid "Unable to read socket" msgstr "Unable to read socket" -#: ../libpurple/protocols/gg/gg.c:1392 +#: ../libpurple/protocols/gg/gg.c:1395 msgid "Buddy list downloaded" msgstr "Buddy list downloaded" -#: ../libpurple/protocols/gg/gg.c:1393 +#: ../libpurple/protocols/gg/gg.c:1396 msgid "Your buddy list was downloaded from the server." msgstr "Your buddy list was downloaded from the server." -#: ../libpurple/protocols/gg/gg.c:1400 +#: ../libpurple/protocols/gg/gg.c:1403 msgid "Buddy list uploaded" msgstr "Buddy list uploaded" -#: ../libpurple/protocols/gg/gg.c:1401 +#: ../libpurple/protocols/gg/gg.c:1404 msgid "Your buddy list was stored on the server." msgstr "Your buddy list was stored on the server." -#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712 +#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715 msgid "Connection failed." msgstr "Connection failed." -#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531 +#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559 msgid "Blocked" msgstr "Blocked" -#: ../libpurple/protocols/gg/gg.c:1641 +#: ../libpurple/protocols/gg/gg.c:1644 msgid "Add to chat" msgstr "Add to chat" -#: ../libpurple/protocols/gg/gg.c:1650 +#: ../libpurple/protocols/gg/gg.c:1653 msgid "Unblock" msgstr "Unblock" -#: ../libpurple/protocols/gg/gg.c:1654 +#: ../libpurple/protocols/gg/gg.c:1657 msgid "Block" msgstr "Block" -#: ../libpurple/protocols/gg/gg.c:1671 +#: ../libpurple/protocols/gg/gg.c:1674 msgid "Chat _name:" msgstr "Chat _name:" -#: ../libpurple/protocols/gg/gg.c:1911 +#: ../libpurple/protocols/gg/gg.c:1914 msgid "Chat error" msgstr "Chat error" -#: ../libpurple/protocols/gg/gg.c:1912 +#: ../libpurple/protocols/gg/gg.c:1915 msgid "This chat name is already in use" msgstr "This chat name is already in use" -#: ../libpurple/protocols/gg/gg.c:1995 +#: ../libpurple/protocols/gg/gg.c:1998 msgid "Not connected to the server." msgstr "Not connected to the server." -#: ../libpurple/protocols/gg/gg.c:2018 +#: ../libpurple/protocols/gg/gg.c:2021 msgid "Find buddies..." msgstr "Find buddies..." -#: ../libpurple/protocols/gg/gg.c:2024 +#: ../libpurple/protocols/gg/gg.c:2027 msgid "Change password..." msgstr "Change password..." -#: ../libpurple/protocols/gg/gg.c:2030 +#: ../libpurple/protocols/gg/gg.c:2033 msgid "Upload buddylist to Server" msgstr "Upload buddylist to Server" -#: ../libpurple/protocols/gg/gg.c:2034 +#: ../libpurple/protocols/gg/gg.c:2037 msgid "Download buddylist from Server" msgstr "Download buddylist from Server" -#: ../libpurple/protocols/gg/gg.c:2038 +#: ../libpurple/protocols/gg/gg.c:2041 msgid "Delete buddylist from Server" msgstr "Delete buddylist from Server" -#: ../libpurple/protocols/gg/gg.c:2042 +#: ../libpurple/protocols/gg/gg.c:2045 msgid "Save buddylist to file..." msgstr "Save buddylist to file..." -#: ../libpurple/protocols/gg/gg.c:2046 +#: ../libpurple/protocols/gg/gg.c:2049 msgid "Load buddylist from file..." msgstr "Load buddylist from file..." @@ -3375,43 +3989,46 @@ #. id #. name #. version -#: ../libpurple/protocols/gg/gg.c:2150 +#: ../libpurple/protocols/gg/gg.c:2153 msgid "Gadu-Gadu Protocol Plugin" msgstr "Gadu-Gadu Protocol Plug-in" #. summary -#: ../libpurple/protocols/gg/gg.c:2151 +#: ../libpurple/protocols/gg/gg.c:2154 msgid "Polish popular IM" msgstr "Polish popular IM system" -#: ../libpurple/protocols/gg/gg.c:2205 +#: ../libpurple/protocols/gg/gg.c:2208 msgid "Gadu-Gadu User" msgstr "Gadu-Gadu User" #: ../libpurple/protocols/irc/cmds.c:43 -#: ../libpurple/protocols/silc/silc.c:1577 +#: ../libpurple/protocols/silc/silc.c:1637 +#: ../libpurple/protocols/silc10/silc.c:1566 #, c-format msgid "Unknown command: %s" msgstr "Unknown command: %s" #: ../libpurple/protocols/irc/cmds.c:503 #: ../libpurple/protocols/jabber/chat.c:591 -#: ../libpurple/protocols/silc/silc.c:1285 +#: ../libpurple/protocols/silc/silc.c:1345 +#: ../libpurple/protocols/silc10/silc.c:1274 #, c-format msgid "current topic is: %s" msgstr "current topic is: %s" #: ../libpurple/protocols/irc/cmds.c:507 #: ../libpurple/protocols/jabber/chat.c:595 -#: ../libpurple/protocols/silc/silc.c:1289 +#: ../libpurple/protocols/silc/silc.c:1349 +#: ../libpurple/protocols/silc10/silc.c:1278 msgid "No topic is set" msgstr "No topic is set" #: ../libpurple/protocols/irc/dcc_send.c:296 #: ../libpurple/protocols/irc/dcc_send.c:337 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291 msgid "File Transfer Failed" msgstr "File Transfer Failed" @@ -3438,7 +4055,8 @@ msgstr "MOTD for %s" #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165 -#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639 +#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637 +#: ../libpurple/protocols/myspace/myspace.c:2350 msgid "Server has disconnected" msgstr "Server has disconnected" @@ -3447,11 +4065,12 @@ msgstr "View MOTD" #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33 +#: ../libpurple/protocols/silc10/chat.c:33 msgid "_Channel:" msgstr "_Channel:" #: ../libpurple/protocols/irc/irc.c:267 -#: ../libpurple/protocols/jabber/chat.c:59 +#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524 msgid "_Password:" msgstr "_Password:" @@ -3459,63 +4078,62 @@ msgid "IRC nicks may not contain whitespace" msgstr "IRC nicks may not contain whitespace" +#. 1. connect to server #. connect to the server #: ../libpurple/protocols/irc/irc.c:319 -#: ../libpurple/protocols/jabber/jabber.c:1044 -#: ../libpurple/protocols/msn/session.c:344 +#: ../libpurple/protocols/jabber/jabber.c:1276 +#: ../libpurple/protocols/msn/session.c:345 +#: ../libpurple/protocols/myspace/myspace.c:301 #: ../libpurple/protocols/novell/novell.c:2182 -#: ../libpurple/protocols/oscar/oscar.c:1270 +#: ../libpurple/protocols/oscar/oscar.c:1285 #: ../libpurple/protocols/qq/qq.c:136 #: ../libpurple/protocols/sametime/sametime.c:3723 -#: ../libpurple/protocols/simple/simple.c:1671 -#: ../libpurple/protocols/yahoo/yahoo.c:2747 -#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659 +#: ../libpurple/protocols/simple/simple.c:1677 +#: ../libpurple/protocols/yahoo/yahoo.c:2936 +#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661 msgid "Connecting" msgstr "Connecting" #: ../libpurple/protocols/irc/irc.c:327 -#: ../libpurple/protocols/jabber/jabber.c:599 -#: ../libpurple/protocols/jabber/jabber.c:946 +#: ../libpurple/protocols/jabber/jabber.c:611 +#: ../libpurple/protocols/jabber/jabber.c:1096 msgid "SSL support unavailable" msgstr "SSL support unavailable" +#. TODO: try other ports if in auto mode, then save +#. * working port and try that first next time. #: ../libpurple/protocols/irc/irc.c:338 +#: ../libpurple/protocols/myspace/myspace.c:317 #: ../libpurple/protocols/simple/simple.c:464 -#: ../libpurple/protocols/simple/simple.c:1586 +#: ../libpurple/protocols/simple/simple.c:1592 msgid "Couldn't create socket" msgstr "Couldn't create socket" -#: ../libpurple/protocols/irc/irc.c:416 -#: ../libpurple/protocols/jabber/jabber.c:466 -#: ../libpurple/protocols/oscar/oscar.c:1266 +#: ../libpurple/protocols/irc/irc.c:421 +#: ../libpurple/protocols/myspace/myspace.c:2463 +#: ../libpurple/protocols/oscar/oscar.c:1281 msgid "Couldn't connect to host" msgstr "Couldn't connect to host" -#: ../libpurple/protocols/irc/irc.c:438 -#: ../libpurple/protocols/jabber/jabber.c:495 -msgid "Connection Failed" -msgstr "Connection Failed" - -#: ../libpurple/protocols/irc/irc.c:441 -#: ../libpurple/protocols/jabber/jabber.c:498 -msgid "SSL Handshake Failed" -msgstr "SSL Handshake Failed" - -#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636 +#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634 +#: ../libpurple/protocols/myspace/myspace.c:2346 msgid "Read error" msgstr "Read error" -#: ../libpurple/protocols/irc/irc.c:775 -#: ../libpurple/protocols/silc/chat.c:1426 -#: ../libpurple/protocols/yahoo/yahoochat.c:1438 +#: ../libpurple/protocols/irc/irc.c:773 +#: ../libpurple/protocols/silc/chat.c:1412 +#: ../libpurple/protocols/silc10/chat.c:1426 +#: ../libpurple/protocols/yahoo/yahoochat.c:1497 msgid "Users" msgstr "Users" -#: ../libpurple/protocols/irc/irc.c:778 +#: ../libpurple/protocols/irc/irc.c:776 #: ../libpurple/protocols/sametime/sametime.c:3374 -#: ../libpurple/protocols/silc/chat.c:1429 -#: ../libpurple/protocols/silc/ops.c:1382 -#: ../libpurple/protocols/yahoo/yahoochat.c:1447 +#: ../libpurple/protocols/silc/chat.c:1415 +#: ../libpurple/protocols/silc/ops.c:1389 +#: ../libpurple/protocols/silc10/chat.c:1429 +#: ../libpurple/protocols/silc10/ops.c:1382 +#: ../libpurple/protocols/yahoo/yahoochat.c:1506 msgid "Topic" msgstr "Topic" @@ -3527,55 +4145,66 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/irc/irc.c:915 +#: ../libpurple/protocols/irc/irc.c:914 msgid "IRC Protocol Plugin" msgstr "IRC Protocol Plug-in" #. * summary -#: ../libpurple/protocols/irc/irc.c:916 +#: ../libpurple/protocols/irc/irc.c:915 msgid "The IRC Protocol Plugin that Sucks Less" msgstr "The IRC Protocol Plug-in that Sucks Less" #. host to connect to -#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323 -#: ../libpurple/protocols/msn/msn.c:2135 -#: ../libpurple/protocols/oscar/oscar.c:6584 -#: ../libpurple/protocols/qq/qq.c:756 +#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323 +#: ../libpurple/protocols/msn/msn.c:2182 +#: ../libpurple/protocols/oscar/oscar.c:6655 +#: ../libpurple/protocols/qq/qq.c:755 #: ../libpurple/protocols/sametime/sametime.c:5727 -#: ../libpurple/protocols/silc/ops.c:1244 -#: ../libpurple/protocols/silc/ops.c:1347 -#: ../libpurple/protocols/simple/simple.c:1850 +#: ../libpurple/protocols/silc/ops.c:1249 +#: ../libpurple/protocols/silc/ops.c:1341 +#: ../libpurple/protocols/silc10/ops.c:1244 +#: ../libpurple/protocols/silc10/ops.c:1347 +#: ../libpurple/protocols/simple/simple.c:1856 #: ../libpurple/protocols/toc/toc.c:2327 msgid "Server" msgstr "Server" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2140 -#: ../libpurple/protocols/oscar/oscar.c:6587 -#: ../libpurple/protocols/qq/qq.c:759 +#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187 +#: ../libpurple/protocols/oscar/oscar.c:6658 +#: ../libpurple/protocols/qq/qq.c:758 #: ../libpurple/protocols/sametime/sametime.c:5732 -#: ../libpurple/protocols/silc/silc.c:1870 +#: ../libpurple/protocols/silc/silc.c:1918 +#: ../libpurple/protocols/silc10/silc.c:1861 #: ../libpurple/protocols/toc/toc.c:2331 msgid "Port" msgstr "Port" -#: ../libpurple/protocols/irc/irc.c:947 +#: ../libpurple/protocols/irc/irc.c:946 msgid "Encodings" msgstr "Encodings" -#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316 -#: ../libpurple/protocols/jabber/jabber.c:799 +#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316 +#: ../libpurple/protocols/jabber/jabber.c:905 +#: ../libpurple/protocols/jabber/jabber.c:908 #: ../libpurple/protocols/silc/buddy.c:1539 -#: ../libpurple/protocols/silc/ops.c:1191 -#: ../libpurple/protocols/silc/ops.c:1194 -#: ../libpurple/protocols/silc/ops.c:1340 -#: ../libpurple/protocols/silc/ops.c:1343 -#: ../libpurple/protocols/silc/silc.c:924 +#: ../libpurple/protocols/silc/ops.c:1197 +#: ../libpurple/protocols/silc/ops.c:1200 +#: ../libpurple/protocols/silc/ops.c:1334 +#: ../libpurple/protocols/silc/ops.c:1337 +#: ../libpurple/protocols/silc/silc.c:1005 +#: ../libpurple/protocols/silc10/buddy.c:1539 +#: ../libpurple/protocols/silc10/ops.c:1191 +#: ../libpurple/protocols/silc10/ops.c:1194 +#: ../libpurple/protocols/silc10/ops.c:1340 +#: ../libpurple/protocols/silc10/ops.c:1343 +#: ../libpurple/protocols/silc10/silc.c:916 msgid "Username" msgstr "Username" -#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317 -#: ../libpurple/protocols/silc/silc.c:928 +#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317 +#: ../libpurple/protocols/silc/silc.c:1009 +#: ../libpurple/protocols/silc10/silc.c:920 msgid "Real name" msgstr "Real name" @@ -3583,7 +4212,7 @@ #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT); #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); #. -#: ../libpurple/protocols/irc/irc.c:961 +#: ../libpurple/protocols/irc/irc.c:960 msgid "Use SSL" msgstr "Use SSL" @@ -3614,13 +4243,15 @@ msgstr " <i>(identified)</i>" #: ../libpurple/protocols/irc/msgs.c:303 -#: ../libpurple/protocols/oscar/oscar.c:3690 -#: ../libpurple/protocols/silc/ops.c:1414 +#: ../libpurple/protocols/oscar/oscar.c:3693 +#: ../libpurple/protocols/silc/ops.c:1418 +#: ../libpurple/protocols/silc10/ops.c:1414 msgid "Nick" msgstr "Nick" #: ../libpurple/protocols/irc/msgs.c:329 -#: ../libpurple/protocols/silc/ops.c:1272 +#: ../libpurple/protocols/silc/ops.c:1268 +#: ../libpurple/protocols/silc10/ops.c:1272 msgid "Currently on" msgstr "Currently on" @@ -3640,98 +4271,99 @@ msgid "Glorious" msgstr "Glorious" -#: ../libpurple/protocols/irc/msgs.c:417 +#: ../libpurple/protocols/irc/msgs.c:420 #, c-format msgid "%s has changed the topic to: %s" msgstr "%s has changed the topic to: %s" -#: ../libpurple/protocols/irc/msgs.c:419 +#: ../libpurple/protocols/irc/msgs.c:422 #, c-format msgid "%s has cleared the topic." msgstr "%s has cleared the topic." -#: ../libpurple/protocols/irc/msgs.c:427 +#: ../libpurple/protocols/irc/msgs.c:430 #, c-format msgid "The topic for %s is: %s" msgstr "The topic for %s is: %s" -#: ../libpurple/protocols/irc/msgs.c:445 +#: ../libpurple/protocols/irc/msgs.c:448 #, c-format msgid "Unknown message '%s'" msgstr "Unknown message '%s'" -#: ../libpurple/protocols/irc/msgs.c:446 +#: ../libpurple/protocols/irc/msgs.c:449 msgid "Unknown message" msgstr "Unknown message" -#: ../libpurple/protocols/irc/msgs.c:446 +#: ../libpurple/protocols/irc/msgs.c:449 msgid "The IRC server received a message it did not understand." msgstr "The IRC server received a message it did not understand." -#: ../libpurple/protocols/irc/msgs.c:467 +#: ../libpurple/protocols/irc/msgs.c:470 #, c-format msgid "Users on %s: %s" msgstr "Users on %s: %s" -#: ../libpurple/protocols/irc/msgs.c:572 +#: ../libpurple/protocols/irc/msgs.c:575 msgid "Time Response" msgstr "Time Response" -#: ../libpurple/protocols/irc/msgs.c:573 +#: ../libpurple/protocols/irc/msgs.c:576 msgid "The IRC server's local time is:" msgstr "The IRC server's local time is:" -#: ../libpurple/protocols/irc/msgs.c:584 +#: ../libpurple/protocols/irc/msgs.c:587 msgid "No such channel" msgstr "No such channel" #. does this happen? -#: ../libpurple/protocols/irc/msgs.c:595 +#: ../libpurple/protocols/irc/msgs.c:598 msgid "no such channel" msgstr "no such channel" -#: ../libpurple/protocols/irc/msgs.c:598 +#: ../libpurple/protocols/irc/msgs.c:601 msgid "User is not logged in" msgstr "User is not logged in" -#: ../libpurple/protocols/irc/msgs.c:603 +#: ../libpurple/protocols/irc/msgs.c:606 msgid "No such nick or channel" msgstr "No such nick or channel" -#: ../libpurple/protocols/irc/msgs.c:623 +#: ../libpurple/protocols/irc/msgs.c:626 msgid "Could not send" msgstr "Could not send" -#: ../libpurple/protocols/irc/msgs.c:679 +#: ../libpurple/protocols/irc/msgs.c:682 #, c-format msgid "Joining %s requires an invitation." msgstr "Joining %s requires an invitation." -#: ../libpurple/protocols/irc/msgs.c:680 +#: ../libpurple/protocols/irc/msgs.c:683 msgid "Invitation only" msgstr "Invitation only" -#: ../libpurple/protocols/irc/msgs.c:792 +#: ../libpurple/protocols/irc/msgs.c:795 #, c-format msgid "You have been kicked by %s: (%s)" msgstr "You have been kicked by %s: (%s)" #. Remove user from channel -#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720 +#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699 +#: ../libpurple/protocols/silc10/ops.c:720 #, c-format msgid "Kicked by %s (%s)" msgstr "Kicked by %s (%s)" -#: ../libpurple/protocols/irc/msgs.c:820 +#: ../libpurple/protocols/irc/msgs.c:823 #, c-format msgid "mode (%s %s) by %s" msgstr "mode (%s %s) by %s" -#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906 +#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909 msgid "Invalid nickname" msgstr "Invalid nickname" -#: ../libpurple/protocols/irc/msgs.c:907 +#: ../libpurple/protocols/irc/msgs.c:910 msgid "" "Your selected nickname was rejected by the server. It probably contains " "invalid characters." @@ -3739,7 +4371,7 @@ "Your selected nickname was rejected by the server. It probably contains " "invalid characters." -#: ../libpurple/protocols/irc/msgs.c:912 +#: ../libpurple/protocols/irc/msgs.c:915 msgid "" "Your selected account name was rejected by the server. It probably contains " "invalid characters." @@ -3747,43 +4379,44 @@ "Your selected account name was rejected by the server. It probably contains " "invalid characters." -#: ../libpurple/protocols/irc/msgs.c:951 +#: ../libpurple/protocols/irc/msgs.c:954 msgid "Cannot change nick" msgstr "Cannot change nick" -#: ../libpurple/protocols/irc/msgs.c:951 +#: ../libpurple/protocols/irc/msgs.c:954 msgid "Could not change nick" msgstr "Could not change nick" -#: ../libpurple/protocols/irc/msgs.c:972 +#: ../libpurple/protocols/irc/msgs.c:975 #, c-format msgid "You have parted the channel%s%s" msgstr "You have parted the channel%s%s" -#: ../libpurple/protocols/irc/msgs.c:1014 +#: ../libpurple/protocols/irc/msgs.c:1017 msgid "Error: invalid PONG from server" msgstr "Error: invalid PONG from server" -#: ../libpurple/protocols/irc/msgs.c:1016 +#: ../libpurple/protocols/irc/msgs.c:1019 #, c-format msgid "PING reply -- Lag: %lu seconds" msgstr "PING reply -- Lag: %lu seconds" -#: ../libpurple/protocols/irc/msgs.c:1107 +#: ../libpurple/protocols/irc/msgs.c:1110 #, c-format msgid "Cannot join %s: Registration is required." msgstr "Cannot join %s: Registration required." -#: ../libpurple/protocols/irc/msgs.c:1108 -#: ../libpurple/protocols/silc/ops.c:1128 +#: ../libpurple/protocols/irc/msgs.c:1111 +#: ../libpurple/protocols/silc/ops.c:1093 +#: ../libpurple/protocols/silc10/ops.c:1128 msgid "Cannot join channel" msgstr "Cannot join channel" -#: ../libpurple/protocols/irc/msgs.c:1142 +#: ../libpurple/protocols/irc/msgs.c:1145 msgid "Nick or channel is temporarily unavailable." msgstr "Nick or channel is temporarily unavailable." -#: ../libpurple/protocols/irc/msgs.c:1154 +#: ../libpurple/protocols/irc/msgs.c:1157 #, c-format msgid "Wallops from %s" msgstr "Wallops from %s" @@ -3891,7 +4524,7 @@ msgstr "names [channel]: List the users currently in a channel." #: ../libpurple/protocols/irc/parse.c:137 -#: ../libpurple/protocols/jabber/jabber.c:1813 +#: ../libpurple/protocols/jabber/jabber.c:2254 msgid "nick <new nickname>: Change your nickname." msgstr "nick <new nickname>: Change your nickname." @@ -3999,26 +4632,42 @@ msgid "whowas <nick>: Get information on a user that has logged off." msgstr "whowas <nick>: Get information on a user that has logged off." -#: ../libpurple/protocols/irc/parse.c:449 +#: ../libpurple/protocols/irc/parse.c:465 #, c-format msgid "Reply time from %s: %lu seconds" msgstr "Reply time from %s: %lu seconds" -#: ../libpurple/protocols/irc/parse.c:450 +#: ../libpurple/protocols/irc/parse.c:466 msgid "PONG" msgstr "PONG" -#: ../libpurple/protocols/irc/parse.c:450 +#: ../libpurple/protocols/irc/parse.c:466 msgid "CTCP PING reply" msgstr "CTCP PING reply" -#: ../libpurple/protocols/irc/parse.c:561 -#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191 +#: ../libpurple/protocols/irc/parse.c:577 +#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710 #: ../libpurple/protocols/toc/toc.c:786 msgid "Disconnected." msgstr "Disconnected." +#: ../libpurple/protocols/jabber/adhoccommands.c:138 +#: ../libpurple/protocols/jabber/jabber.c:672 +#: ../libpurple/protocols/jabber/jabber.c:702 +#: ../libpurple/protocols/jabber/jabber.c:1883 +msgid "Unknown Error" +msgstr "Unknown Error" + +#: ../libpurple/protocols/jabber/adhoccommands.c:140 +#: ../libpurple/protocols/jabber/adhoccommands.c:141 +msgid "Ad-Hoc Command Failed" +msgstr "Ad-Hoc Command Failed" + +#: ../libpurple/protocols/jabber/adhoccommands.c:174 +msgid "execute" +msgstr "execute" + #: ../libpurple/protocols/jabber/auth.c:52 msgid "Server requires TLS/SSL for login. No TLS/SSL support found." msgstr "Server requires TLS/SSL for login. No TLS/SSL support found." @@ -4027,8 +4676,8 @@ msgid "Server requires plaintext authentication over an unencrypted stream" msgstr "Server requires plaintext authentication over an unencrypted stream" -#: ../libpurple/protocols/jabber/auth.c:294 -#: ../libpurple/protocols/jabber/auth.c:483 +#: ../libpurple/protocols/jabber/auth.c:317 +#: ../libpurple/protocols/jabber/auth.c:506 #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " @@ -4037,33 +4686,33 @@ "%s requires plaintext authentication over an unencrypted connection. Allow " "this and continue authentication?" -#: ../libpurple/protocols/jabber/auth.c:296 -#: ../libpurple/protocols/jabber/auth.c:297 -#: ../libpurple/protocols/jabber/auth.c:485 -#: ../libpurple/protocols/jabber/auth.c:486 -#: ../libpurple/protocols/jabber/auth.c:570 -#: ../libpurple/protocols/jabber/auth.c:571 +#: ../libpurple/protocols/jabber/auth.c:319 +#: ../libpurple/protocols/jabber/auth.c:320 +#: ../libpurple/protocols/jabber/auth.c:508 +#: ../libpurple/protocols/jabber/auth.c:509 +#: ../libpurple/protocols/jabber/auth.c:593 +#: ../libpurple/protocols/jabber/auth.c:594 msgid "Plaintext Authentication" msgstr "Plaintext Authentication" -#: ../libpurple/protocols/jabber/auth.c:309 -#: ../libpurple/protocols/jabber/auth.c:498 -#: ../libpurple/protocols/jabber/auth.c:582 +#: ../libpurple/protocols/jabber/auth.c:332 +#: ../libpurple/protocols/jabber/auth.c:521 +#: ../libpurple/protocols/jabber/auth.c:605 msgid "Server does not use any supported authentication method" msgstr "Server does not use any supported authentication method" #. This should never happen! -#: ../libpurple/protocols/jabber/auth.c:437 -#: ../libpurple/protocols/jabber/auth.c:533 -#: ../libpurple/protocols/jabber/auth.c:748 -#: ../libpurple/protocols/jabber/auth.c:889 -#: ../libpurple/protocols/jabber/auth.c:914 -#: ../libpurple/protocols/jabber/auth.c:933 -#: ../libpurple/protocols/jabber/jabber.c:115 +#: ../libpurple/protocols/jabber/auth.c:460 +#: ../libpurple/protocols/jabber/auth.c:556 +#: ../libpurple/protocols/jabber/auth.c:771 +#: ../libpurple/protocols/jabber/auth.c:912 +#: ../libpurple/protocols/jabber/auth.c:937 +#: ../libpurple/protocols/jabber/auth.c:956 +#: ../libpurple/protocols/jabber/jabber.c:125 msgid "Invalid response from server." msgstr "Invalid response from server." -#: ../libpurple/protocols/jabber/auth.c:572 +#: ../libpurple/protocols/jabber/auth.c:595 msgid "" "This server requires plaintext authentication over an unencrypted " "connection. Allow this and continue authentication?" @@ -4071,120 +4720,114 @@ "This server requires plaintext authentication over an unencrypted " "connection. Allow this and continue authentication?" -#: ../libpurple/protocols/jabber/auth.c:769 #: ../libpurple/protocols/jabber/auth.c:792 +#: ../libpurple/protocols/jabber/auth.c:815 msgid "Invalid challenge from server" msgstr "Invalid challenge from server" -#: ../libpurple/protocols/jabber/auth.c:864 +#: ../libpurple/protocols/jabber/auth.c:887 msgid "SASL error" msgstr "SASL error" -#: ../libpurple/protocols/jabber/buddy.c:271 -#: ../libpurple/protocols/jabber/buddy.c:787 +#: ../libpurple/protocols/jabber/buddy.c:283 +#: ../libpurple/protocols/jabber/buddy.c:1219 #: ../libpurple/protocols/sametime/sametime.c:4128 -#: ../libpurple/protocols/silc/ops.c:1020 +#: ../libpurple/protocols/silc/ops.c:986 +#: ../libpurple/protocols/silc10/ops.c:1020 msgid "Full Name" msgstr "Full Name" -#: ../libpurple/protocols/jabber/buddy.c:272 -#: ../libpurple/protocols/jabber/buddy.c:800 -#: ../libpurple/protocols/silc/ops.c:1032 +#: ../libpurple/protocols/jabber/buddy.c:284 +#: ../libpurple/protocols/jabber/buddy.c:1231 +#: ../libpurple/protocols/silc/ops.c:998 +#: ../libpurple/protocols/silc10/ops.c:1032 msgid "Family Name" msgstr "Family Name" -#: ../libpurple/protocols/jabber/buddy.c:273 -#: ../libpurple/protocols/jabber/buddy.c:804 +#: ../libpurple/protocols/jabber/buddy.c:285 +#: ../libpurple/protocols/jabber/buddy.c:1234 msgid "Given Name" msgstr "Given Name" -#: ../libpurple/protocols/jabber/buddy.c:275 -#: ../libpurple/protocols/jabber/jabber.c:859 +#: ../libpurple/protocols/jabber/buddy.c:287 +#: ../libpurple/protocols/jabber/jabber.c:978 msgid "URL" msgstr "URL" -#: ../libpurple/protocols/jabber/buddy.c:276 -#: ../libpurple/protocols/jabber/buddy.c:856 +#: ../libpurple/protocols/jabber/buddy.c:288 +#: ../libpurple/protocols/jabber/buddy.c:1282 msgid "Street Address" msgstr "Street Address" -#: ../libpurple/protocols/jabber/buddy.c:277 -#: ../libpurple/protocols/jabber/buddy.c:852 +#: ../libpurple/protocols/jabber/buddy.c:289 +#: ../libpurple/protocols/jabber/buddy.c:1279 msgid "Extended Address" msgstr "Extended Address" -#: ../libpurple/protocols/jabber/buddy.c:278 -#: ../libpurple/protocols/jabber/buddy.c:860 +#: ../libpurple/protocols/jabber/buddy.c:290 +#: ../libpurple/protocols/jabber/buddy.c:1285 msgid "Locality" msgstr "Locality" -#: ../libpurple/protocols/jabber/buddy.c:279 -#: ../libpurple/protocols/jabber/buddy.c:864 +#: ../libpurple/protocols/jabber/buddy.c:291 +#: ../libpurple/protocols/jabber/buddy.c:1288 msgid "Region" msgstr "Region" -#: ../libpurple/protocols/jabber/buddy.c:280 -#: ../libpurple/protocols/jabber/buddy.c:868 +#: ../libpurple/protocols/jabber/buddy.c:292 +#: ../libpurple/protocols/jabber/buddy.c:1291 msgid "Postal Code" msgstr "Postal Code" -#: ../libpurple/protocols/jabber/buddy.c:281 -#: ../libpurple/protocols/jabber/buddy.c:873 -#: ../libpurple/protocols/silc/silc.c:934 +#: ../libpurple/protocols/jabber/buddy.c:293 +#: ../libpurple/protocols/jabber/buddy.c:1295 +#: ../libpurple/protocols/silc/silc.c:1015 +#: ../libpurple/protocols/silc10/silc.c:926 msgid "Country" msgstr "Country" -#: ../libpurple/protocols/jabber/buddy.c:282 -#: ../libpurple/protocols/jabber/buddy.c:884 -#: ../libpurple/protocols/jabber/buddy.c:891 +#: ../libpurple/protocols/jabber/buddy.c:294 +#: ../libpurple/protocols/jabber/buddy.c:1306 +#: ../libpurple/protocols/jabber/buddy.c:1313 msgid "Telephone" msgstr "Telephone" -#: ../libpurple/protocols/jabber/buddy.c:283 -#: ../libpurple/protocols/jabber/buddy.c:902 -#: ../libpurple/protocols/jabber/buddy.c:910 -#: ../libpurple/protocols/jabber/buddy.c:1591 -#: ../libpurple/protocols/silc/ops.c:1075 -#: ../libpurple/protocols/silc/util.c:551 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037 -msgid "E-Mail" -msgstr "E-Mail" - -#: ../libpurple/protocols/jabber/buddy.c:284 -#: ../libpurple/protocols/jabber/buddy.c:925 +#: ../libpurple/protocols/jabber/buddy.c:296 +#: ../libpurple/protocols/jabber/buddy.c:1350 msgid "Organization Name" msgstr "Organisation Name" -#: ../libpurple/protocols/jabber/buddy.c:285 -#: ../libpurple/protocols/jabber/buddy.c:929 +#: ../libpurple/protocols/jabber/buddy.c:297 +#: ../libpurple/protocols/jabber/buddy.c:1353 msgid "Organization Unit" msgstr "Organisation Unit" -#: ../libpurple/protocols/jabber/buddy.c:287 -#: ../libpurple/protocols/jabber/buddy.c:938 +#: ../libpurple/protocols/jabber/buddy.c:299 +#: ../libpurple/protocols/jabber/buddy.c:1362 msgid "Role" msgstr "Role" -#: ../libpurple/protocols/jabber/buddy.c:288 -#: ../libpurple/protocols/jabber/buddy.c:821 -#: ../libpurple/protocols/msn/msn.c:1611 -#: ../libpurple/protocols/oscar/oscar.c:3739 +#: ../libpurple/protocols/jabber/buddy.c:300 +#: ../libpurple/protocols/jabber/buddy.c:1250 +#: ../libpurple/protocols/msn/msn.c:1655 +#: ../libpurple/protocols/oscar/oscar.c:3742 msgid "Birthday" msgstr "Birthday" -#: ../libpurple/protocols/jabber/buddy.c:289 -#: ../libpurple/protocols/jabber/buddy.c:941 -#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064 -#: ../pidgin/gtkprefs.c:680 +#: ../libpurple/protocols/jabber/buddy.c:301 +#: ../libpurple/protocols/jabber/buddy.c:1365 +#: ../libpurple/protocols/jabber/chat.c:775 +#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113 +#: ../pidgin/gtkprefs.c:738 msgid "Description" msgstr "Description" -#: ../libpurple/protocols/jabber/buddy.c:578 -#: ../libpurple/protocols/jabber/buddy.c:579 +#: ../libpurple/protocols/jabber/buddy.c:722 +#: ../libpurple/protocols/jabber/buddy.c:723 msgid "Edit XMPP vCard" msgstr "Edit XMPP vCard" -#: ../libpurple/protocols/jabber/buddy.c:580 +#: ../libpurple/protocols/jabber/buddy.c:724 msgid "" "All items below are optional. Enter only the information with which you feel " "comfortable." @@ -4192,113 +4835,385 @@ "All items below are optional. Enter only the information with which you feel " "comfortable." -#: ../libpurple/protocols/jabber/buddy.c:651 -#: ../libpurple/protocols/jabber/buddy.c:692 +#: ../libpurple/protocols/jabber/buddy.c:795 +#: ../libpurple/protocols/jabber/buddy.c:960 msgid "Client" msgstr "Client" -#: ../libpurple/protocols/jabber/buddy.c:655 -#: ../libpurple/protocols/jabber/buddy.c:696 +#: ../libpurple/protocols/jabber/buddy.c:799 +#: ../libpurple/protocols/jabber/buddy.c:964 msgid "Operating System" msgstr "Operating System" -#: ../libpurple/protocols/jabber/buddy.c:665 -#: ../libpurple/protocols/jabber/libxmpp.c:198 +#: ../libpurple/protocols/jabber/buddy.c:815 +#: ../libpurple/protocols/jabber/buddy.c:975 +msgid "Last Activity" +msgstr "Last Activity" + +#: ../libpurple/protocols/jabber/buddy.c:817 +#: ../libpurple/protocols/jabber/buddy.c:977 +msgid "Service Discovery Info" +msgstr "Service Discovery Info" + +#: ../libpurple/protocols/jabber/buddy.c:819 +#: ../libpurple/protocols/jabber/buddy.c:979 +msgid "Service Discovery Items" +msgstr "Service Discovery Items" + +#: ../libpurple/protocols/jabber/buddy.c:821 +#: ../libpurple/protocols/jabber/buddy.c:981 +msgid "Extended Stanza Addressing" +msgstr "Extended Stanza Addressing" + +#: ../libpurple/protocols/jabber/buddy.c:823 +#: ../libpurple/protocols/jabber/buddy.c:983 +msgid "Multi-User Chat" +msgstr "Multi-User Chat" + +#: ../libpurple/protocols/jabber/buddy.c:825 +#: ../libpurple/protocols/jabber/buddy.c:985 +msgid "Multi-User Chat Extended Presence Information" +msgstr "Multi-User Chat Extended Presence Information" + +#: ../libpurple/protocols/jabber/buddy.c:827 +#: ../libpurple/protocols/jabber/buddy.c:987 +msgid "In-Band Bytestreams" +msgstr "In-Band Bytestreams" + +#: ../libpurple/protocols/jabber/buddy.c:829 +#: ../libpurple/protocols/jabber/buddy.c:989 +msgid "Ad-Hoc Commands" +msgstr "Ad-Hoc Commands" + +#: ../libpurple/protocols/jabber/buddy.c:831 +#: ../libpurple/protocols/jabber/buddy.c:991 +msgid "PubSub Service" +msgstr "PubSub Service" + +#: ../libpurple/protocols/jabber/buddy.c:833 +#: ../libpurple/protocols/jabber/buddy.c:993 +msgid "SOCKS5 Bytestreams" +msgstr "SOCKS5 Bytestreams" + +#: ../libpurple/protocols/jabber/buddy.c:835 +#: ../libpurple/protocols/jabber/buddy.c:995 +msgid "Out of Band Data" +msgstr "Out of Band Data" + +#: ../libpurple/protocols/jabber/buddy.c:837 +#: ../libpurple/protocols/jabber/buddy.c:997 +msgid "XHTML-IM" +msgstr "XHTML-IM" + +#: ../libpurple/protocols/jabber/buddy.c:839 +#: ../libpurple/protocols/jabber/buddy.c:999 +msgid "In-Band Registration" +msgstr "In-Band Registration" + +#: ../libpurple/protocols/jabber/buddy.c:841 +#: ../libpurple/protocols/jabber/buddy.c:1001 +msgid "User Location" +msgstr "User Location" + +#: ../libpurple/protocols/jabber/buddy.c:843 +#: ../libpurple/protocols/jabber/buddy.c:1003 +msgid "User Avatar" +msgstr "User Avatar" + +#: ../libpurple/protocols/jabber/buddy.c:845 +#: ../libpurple/protocols/jabber/buddy.c:1005 +msgid "Chat State Notifications" +msgstr "Chat State Notifications" + +#: ../libpurple/protocols/jabber/buddy.c:847 +#: ../libpurple/protocols/jabber/buddy.c:1007 +msgid "Software Version" +msgstr "Software Version" + +#: ../libpurple/protocols/jabber/buddy.c:849 +#: ../libpurple/protocols/jabber/buddy.c:1009 +msgid "Stream Initiation" +msgstr "Stream Initiation" + +#: ../libpurple/protocols/jabber/buddy.c:851 +#: ../libpurple/protocols/jabber/buddy.c:1011 +#: ../libpurple/protocols/sametime/sametime.c:3235 +msgid "File Transfer" +msgstr "File Transfer" + +#: ../libpurple/protocols/jabber/buddy.c:853 +#: ../libpurple/protocols/jabber/buddy.c:1013 +msgid "User Mood" +msgstr "User Mood" + +#: ../libpurple/protocols/jabber/buddy.c:855 +#: ../libpurple/protocols/jabber/buddy.c:1015 +msgid "User Activity" +msgstr "User Activity" + +#: ../libpurple/protocols/jabber/buddy.c:857 +#: ../libpurple/protocols/jabber/buddy.c:1017 +msgid "Entity Capabilities" +msgstr "Entity Capabilities" + +#: ../libpurple/protocols/jabber/buddy.c:859 +#: ../libpurple/protocols/jabber/buddy.c:1019 +msgid "Encrypted Session Negotiations" +msgstr "Encrypted Session Negotiations" + +#: ../libpurple/protocols/jabber/buddy.c:861 +#: ../libpurple/protocols/jabber/buddy.c:1021 +msgid "User Tune" +msgstr "User Tune" + +#: ../libpurple/protocols/jabber/buddy.c:863 +#: ../libpurple/protocols/jabber/buddy.c:1023 +msgid "Roster Item Exchange" +msgstr "Roster Item Exchange" + +#: ../libpurple/protocols/jabber/buddy.c:865 +#: ../libpurple/protocols/jabber/buddy.c:1025 +msgid "Reachability Address" +msgstr "Reachability Address" + +#: ../libpurple/protocols/jabber/buddy.c:867 +#: ../libpurple/protocols/jabber/buddy.c:1027 +msgid "User Profile" +msgstr "User Profile" + +#: ../libpurple/protocols/jabber/buddy.c:869 +#: ../libpurple/protocols/jabber/buddy.c:1029 +msgid "Jingle" +msgstr "Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:871 +#: ../libpurple/protocols/jabber/buddy.c:1031 +msgid "Jingle Audio" +msgstr "Jingle Audio" + +#: ../libpurple/protocols/jabber/buddy.c:873 +#: ../libpurple/protocols/jabber/buddy.c:1033 +msgid "User Nickname" +msgstr "User Nickname" + +#: ../libpurple/protocols/jabber/buddy.c:875 +#: ../libpurple/protocols/jabber/buddy.c:1035 +msgid "Jingle ICE UDP" +msgstr "Jingle ICE UDP" + +#: ../libpurple/protocols/jabber/buddy.c:877 +#: ../libpurple/protocols/jabber/buddy.c:1037 +msgid "Jingle ICE TCP" +msgstr "Jingle ICE TCP" + +#: ../libpurple/protocols/jabber/buddy.c:879 +#: ../libpurple/protocols/jabber/buddy.c:1039 +msgid "Jingle Raw UDP" +msgstr "Jingle Raw UDP" + +#: ../libpurple/protocols/jabber/buddy.c:881 +#: ../libpurple/protocols/jabber/buddy.c:1041 +msgid "Jingle Video" +msgstr "Jingle Video" + +#: ../libpurple/protocols/jabber/buddy.c:883 +#: ../libpurple/protocols/jabber/buddy.c:1043 +msgid "Jingle DTMF" +msgstr "Jingle DTMF" + +#: ../libpurple/protocols/jabber/buddy.c:885 +#: ../libpurple/protocols/jabber/buddy.c:1045 +msgid "Message Receipts" +msgstr "Message Receipts" + +#: ../libpurple/protocols/jabber/buddy.c:887 +#: ../libpurple/protocols/jabber/buddy.c:1047 +msgid "Public Key Publishing" +msgstr "Public Key Publishing" + +#: ../libpurple/protocols/jabber/buddy.c:889 +#: ../libpurple/protocols/jabber/buddy.c:1049 +msgid "User Chatting" +msgstr "User Chatting" + +#: ../libpurple/protocols/jabber/buddy.c:891 +#: ../libpurple/protocols/jabber/buddy.c:1051 +msgid "User Browsing" +msgstr "User Browsing" + +#: ../libpurple/protocols/jabber/buddy.c:893 +#: ../libpurple/protocols/jabber/buddy.c:1053 +msgid "User Gaming" +msgstr "User Gaming" + +#: ../libpurple/protocols/jabber/buddy.c:895 +#: ../libpurple/protocols/jabber/buddy.c:1055 +msgid "User Viewing" +msgstr "User Viewing" + +#: ../libpurple/protocols/jabber/buddy.c:897 +#: ../libpurple/protocols/jabber/buddy.c:1057 +#: ../libpurple/protocols/silc/ops.c:1596 +#: ../libpurple/protocols/silc/ops.c:1601 +#: ../libpurple/protocols/silc10/ops.c:1612 +#: ../libpurple/protocols/silc10/ops.c:1617 +msgid "Ping" +msgstr "Ping" + +#: ../libpurple/protocols/jabber/buddy.c:899 +#: ../libpurple/protocols/jabber/buddy.c:1059 +msgid "Stanza Encryption" +msgstr "Stanza Encryption" + +#: ../libpurple/protocols/jabber/buddy.c:901 +#: ../libpurple/protocols/jabber/buddy.c:1061 +msgid "Entity Time" +msgstr "Entity Time" + +#: ../libpurple/protocols/jabber/buddy.c:903 +#: ../libpurple/protocols/jabber/buddy.c:1063 +msgid "Delayed Delivery" +msgstr "Delayed Delivery" + +#: ../libpurple/protocols/jabber/buddy.c:905 +#: ../libpurple/protocols/jabber/buddy.c:1065 +msgid "Collaborative Data Objects" +msgstr "Collaborative Data Objects" + +#: ../libpurple/protocols/jabber/buddy.c:907 +#: ../libpurple/protocols/jabber/buddy.c:1067 +msgid "File Repository and Sharing" +msgstr "File Repository and Sharing" + +#: ../libpurple/protocols/jabber/buddy.c:909 +#: ../libpurple/protocols/jabber/buddy.c:1069 +msgid "STUN Service Discovery for Jingle" +msgstr "STUN Service Discovery for Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:911 +#: ../libpurple/protocols/jabber/buddy.c:1071 +msgid "Simplified Encrypted Session Negotiation" +msgstr "Simplified Encrypted Session Negotiation" + +#: ../libpurple/protocols/jabber/buddy.c:913 +#: ../libpurple/protocols/jabber/buddy.c:1073 +msgid "Hop Check" +msgstr "Hop Check" + +#: ../libpurple/protocols/jabber/buddy.c:921 +#: ../libpurple/protocols/jabber/buddy.c:1081 +#: ../libpurple/protocols/oscar/oscar.c:2899 +msgid "Capabilities" +msgstr "Capabilities" + +#: ../libpurple/protocols/jabber/buddy.c:933 +#: ../libpurple/protocols/jabber/libxmpp.c:205 +#: ../libpurple/protocols/jabber/si.c:859 msgid "Resource" msgstr "Resource" -#: ../libpurple/protocols/jabber/buddy.c:667 -#: ../libpurple/protocols/jabber/jabber.c:1245 -#: ../libpurple/protocols/jabber/jabber.c:1255 -#: ../libpurple/protocols/jabber/jabber.c:1265 -#: ../libpurple/protocols/jabber/jabber.c:1275 -#: ../libpurple/protocols/jabber/jabber.c:1285 +#: ../libpurple/protocols/jabber/buddy.c:935 +#: ../libpurple/protocols/jabber/jabber.c:1527 +#: ../libpurple/protocols/jabber/jabber.c:1550 +#: ../libpurple/protocols/jabber/jabber.c:1573 +#: ../libpurple/protocols/jabber/jabber.c:1596 +#: ../libpurple/protocols/jabber/jabber.c:1619 msgid "Priority" msgstr "Priority" -#: ../libpurple/protocols/jabber/buddy.c:808 -#: ../libpurple/protocols/silc/ops.c:1028 +#: ../libpurple/protocols/jabber/buddy.c:1237 +#: ../libpurple/protocols/silc/ops.c:994 +#: ../libpurple/protocols/silc10/ops.c:1028 msgid "Middle Name" msgstr "Middle Name" -#: ../libpurple/protocols/jabber/buddy.c:841 -#: ../libpurple/protocols/jabber/jabber.c:834 -#: ../libpurple/protocols/oscar/oscar.c:3778 -#: ../libpurple/protocols/oscar/oscar.c:3791 +#: ../libpurple/protocols/jabber/buddy.c:1270 +#: ../libpurple/protocols/jabber/jabber.c:953 +#: ../libpurple/protocols/oscar/oscar.c:3781 +#: ../libpurple/protocols/oscar/oscar.c:3794 #: ../libpurple/protocols/qq/buddy_info.c:56 -#: ../libpurple/protocols/silc/ops.c:1064 +#: ../libpurple/protocols/silc/ops.c:1030 +#: ../libpurple/protocols/silc10/ops.c:1064 msgid "Address" msgstr "Address" -#: ../libpurple/protocols/jabber/buddy.c:848 +#: ../libpurple/protocols/jabber/buddy.c:1276 msgid "P.O. Box" msgstr "P.O. Box" -#: ../libpurple/protocols/jabber/buddy.c:962 +#: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Photo" msgstr "Photo" -#: ../libpurple/protocols/jabber/buddy.c:962 +#: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Logo" msgstr "Logo" -#: ../libpurple/protocols/jabber/buddy.c:1371 +#: ../libpurple/protocols/jabber/buddy.c:1940 msgid "Un-hide From" msgstr "Un-hide From" -#: ../libpurple/protocols/jabber/buddy.c:1375 +#: ../libpurple/protocols/jabber/buddy.c:1944 msgid "Temporarily Hide From" msgstr "Temporarily Hide From" #. && NOT ME -#: ../libpurple/protocols/jabber/buddy.c:1383 +#: ../libpurple/protocols/jabber/buddy.c:1952 msgid "Cancel Presence Notification" msgstr "Cancel Presence Notification" -#: ../libpurple/protocols/jabber/buddy.c:1390 +#: ../libpurple/protocols/jabber/buddy.c:1959 msgid "(Re-)Request authorization" msgstr "(Re-)Request authorisation" #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? -#: ../libpurple/protocols/jabber/buddy.c:1399 +#: ../libpurple/protocols/jabber/buddy.c:1968 msgid "Unsubscribe" msgstr "Unsubscribe" -#: ../libpurple/protocols/jabber/buddy.c:1432 -#: ../libpurple/protocols/jabber/jabber.c:1254 +#: ../libpurple/protocols/jabber/buddy.c:1983 +msgid "Log In" +msgstr "Log In" + +#: ../libpurple/protocols/jabber/buddy.c:1987 +msgid "Log Out" +msgstr "Log Out" + +#: ../libpurple/protocols/jabber/buddy.c:2033 +#: ../libpurple/protocols/jabber/jabber.c:1549 msgid "Chatty" msgstr "Chatty" -#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158 +#: ../libpurple/protocols/jabber/buddy.c:2037 msgid "Extended Away" msgstr "Extended Away" -#: ../libpurple/protocols/jabber/buddy.c:1438 -#: ../libpurple/protocols/jabber/jabber.c:1284 -#: ../libpurple/protocols/oscar/oscar.c:709 -#: ../libpurple/protocols/oscar/oscar.c:5721 +#: ../libpurple/protocols/jabber/buddy.c:2039 +#: ../libpurple/protocols/jabber/jabber.c:1618 +#: ../libpurple/protocols/oscar/oscar.c:726 +#: ../libpurple/protocols/oscar/oscar.c:5792 #: ../libpurple/protocols/sametime/sametime.c:3297 msgid "Do Not Disturb" msgstr "Do Not Disturb" -#: ../libpurple/protocols/jabber/buddy.c:1583 +#: ../libpurple/protocols/jabber/buddy.c:2184 msgid "JID" msgstr "JID" -#: ../libpurple/protocols/jabber/buddy.c:1587 -#: ../libpurple/protocols/jabber/buddy.c:1766 -#: ../libpurple/protocols/oscar/oscar.c:3701 +#: ../libpurple/protocols/jabber/buddy.c:2188 +#: ../libpurple/protocols/jabber/buddy.c:2367 +#: ../libpurple/protocols/oscar/oscar.c:3704 msgid "Last Name" msgstr "Surname" -#: ../libpurple/protocols/jabber/buddy.c:1619 +#: ../libpurple/protocols/jabber/buddy.c:2220 msgid "The following are the results of your search" msgstr "The following are the results of your search" #. current comment from Jabber User Directory users.jabber.org -#: ../libpurple/protocols/jabber/buddy.c:1694 +#: ../libpurple/protocols/jabber/buddy.c:2295 msgid "" "Find a contact by entering the search criteria in the given fields. Note: " "Each field supports wild card searches (%)" @@ -4306,69 +5221,69 @@ "Find a contact by entering the search criteria in the given fields. Note: " "Each field supports wild card searches (%)" -#: ../libpurple/protocols/jabber/buddy.c:1714 +#: ../libpurple/protocols/jabber/buddy.c:2315 msgid "Directory Query Failed" msgstr "Directory Query Failed" -#: ../libpurple/protocols/jabber/buddy.c:1715 +#: ../libpurple/protocols/jabber/buddy.c:2316 msgid "Could not query the directory server." msgstr "Could not query the directory server." #. Try to translate the message (see static message #. list in jabber_user_dir_comments[]) -#: ../libpurple/protocols/jabber/buddy.c:1749 +#: ../libpurple/protocols/jabber/buddy.c:2350 #, c-format msgid "Server Instructions: %s" msgstr "Server Instructions: %s" -#: ../libpurple/protocols/jabber/buddy.c:1756 +#: ../libpurple/protocols/jabber/buddy.c:2357 msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "Fill in one or more fields to search for any matching XMPP users." -#: ../libpurple/protocols/jabber/buddy.c:1776 +#: ../libpurple/protocols/jabber/buddy.c:2377 #: ../libpurple/protocols/novell/novell.c:1488 -#: ../libpurple/protocols/oscar/oscar.c:3704 -#: ../libpurple/protocols/oscar/oscar.c:3713 +#: ../libpurple/protocols/oscar/oscar.c:3707 +#: ../libpurple/protocols/oscar/oscar.c:3716 msgid "E-Mail Address" msgstr "E-Mail Address" -#: ../libpurple/protocols/jabber/buddy.c:1785 -#: ../libpurple/protocols/jabber/buddy.c:1786 +#: ../libpurple/protocols/jabber/buddy.c:2386 +#: ../libpurple/protocols/jabber/buddy.c:2387 msgid "Search for XMPP users" msgstr "Search for XMPP users" #. "Search" -#: ../libpurple/protocols/jabber/buddy.c:1787 +#: ../libpurple/protocols/jabber/buddy.c:2388 #: ../libpurple/protocols/qq/group.c:123 -#: ../libpurple/protocols/qq/group_im.c:145 -#: ../libpurple/protocols/qq/sys_msg.c:176 -#: ../libpurple/protocols/qq/sys_msg.c:253 -#: ../libpurple/protocols/qq/sys_msg.c:271 +#: ../libpurple/protocols/qq/group_im.c:147 +#: ../libpurple/protocols/qq/sys_msg.c:174 +#: ../libpurple/protocols/qq/sys_msg.c:250 +#: ../libpurple/protocols/qq/sys_msg.c:268 #: ../libpurple/protocols/sametime/sametime.c:5611 -#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473 -#: ../pidgin/plugins/gevolution/assoc-buddy.c:358 +#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470 +#: ../pidgin/plugins/gevolution/assoc-buddy.c:356 msgid "Search" msgstr "Search" -#: ../libpurple/protocols/jabber/buddy.c:1802 +#: ../libpurple/protocols/jabber/buddy.c:2403 msgid "Invalid Directory" msgstr "Invalid Directory" -#: ../libpurple/protocols/jabber/buddy.c:1819 +#: ../libpurple/protocols/jabber/buddy.c:2420 msgid "Enter a User Directory" msgstr "Enter a User Directory" -#: ../libpurple/protocols/jabber/buddy.c:1820 +#: ../libpurple/protocols/jabber/buddy.c:2421 msgid "Select a user directory to search" msgstr "Select a user directory to search" -#: ../libpurple/protocols/jabber/buddy.c:1823 +#: ../libpurple/protocols/jabber/buddy.c:2424 msgid "Search Directory" msgstr "Search Directory" #: ../libpurple/protocols/jabber/chat.c:41 -#: ../libpurple/protocols/oscar/oscar.c:5227 -#: ../libpurple/protocols/yahoo/yahoochat.c:999 +#: ../libpurple/protocols/oscar/oscar.c:5278 +#: ../libpurple/protocols/yahoo/yahoochat.c:1048 msgid "_Room:" msgstr "_Room:" @@ -4437,7 +5352,8 @@ #: ../libpurple/protocols/jabber/chat.c:678 #: ../libpurple/protocols/jabber/chat.c:689 -#: ../libpurple/protocols/silc/ops.c:1451 +#: ../libpurple/protocols/silc/ops.c:1456 +#: ../libpurple/protocols/silc10/ops.c:1451 msgid "Error retrieving room list" msgstr "Error retrieving room list" @@ -4457,439 +5373,642 @@ msgid "Find Rooms" msgstr "Find Rooms" -#: ../libpurple/protocols/jabber/jabber.c:84 +#: ../libpurple/protocols/jabber/jabber.c:94 msgid "Error initializing session" msgstr "Error initializing session" -#: ../libpurple/protocols/jabber/jabber.c:247 -#: ../libpurple/protocols/jabber/jabber.c:300 -#: ../libpurple/protocols/jabber/jabber.c:328 +#: ../libpurple/protocols/jabber/jabber.c:146 +msgid "You require encryption, but it is not available on this server." +msgstr "You require encryption, but it is not available on this server." + +#: ../libpurple/protocols/jabber/jabber.c:260 +#: ../libpurple/protocols/jabber/jabber.c:313 +#: ../libpurple/protocols/jabber/jabber.c:341 msgid "Write error" msgstr "Write error" -#: ../libpurple/protocols/jabber/jabber.c:396 -#: ../libpurple/protocols/jabber/jabber.c:433 +#: ../libpurple/protocols/jabber/jabber.c:409 +#: ../libpurple/protocols/jabber/jabber.c:446 msgid "Read Error" msgstr "Read Error" -#: ../libpurple/protocols/jabber/jabber.c:519 +#: ../libpurple/protocols/jabber/jabber.c:483 +#: ../libpurple/protocols/oscar/flap_connection.c:394 +#: ../libpurple/protocols/yahoo/yahoo.c:2555 +#: ../libpurple/protocols/yahoo/yahoo.c:2587 +#, c-format +msgid "" +"Could not establish a connection with the server:\n" +"%s" +msgstr "" +"Could not establish a connection with the server:\n" +"%s" + +#: ../libpurple/protocols/jabber/jabber.c:530 msgid "Unable to create socket" msgstr "Unable to create socket" -#: ../libpurple/protocols/jabber/jabber.c:564 -#: ../libpurple/protocols/jabber/jabber.c:914 +#: ../libpurple/protocols/jabber/jabber.c:576 +#: ../libpurple/protocols/jabber/jabber.c:1064 msgid "Invalid XMPP ID" msgstr "Invalid XMPP ID" -#: ../libpurple/protocols/jabber/jabber.c:569 +#: ../libpurple/protocols/jabber/jabber.c:581 msgid "Invalid XMPP ID. Domain must be set." msgstr "Invalid XMPP ID. Domain must be set." -#: ../libpurple/protocols/jabber/jabber.c:640 +#: ../libpurple/protocols/jabber/jabber.c:657 #, c-format msgid "Registration of %s@%s successful" msgstr "Registration of %s@%s successful" -#: ../libpurple/protocols/jabber/jabber.c:642 -#: ../libpurple/protocols/jabber/jabber.c:643 +#: ../libpurple/protocols/jabber/jabber.c:663 +#, c-format +msgid "Registration to %s successful" +msgstr "Registration to %s successful" + +#: ../libpurple/protocols/jabber/jabber.c:665 +#: ../libpurple/protocols/jabber/jabber.c:666 msgid "Registration Successful" msgstr "Registration Successful" -#: ../libpurple/protocols/jabber/jabber.c:649 -#: ../libpurple/protocols/jabber/jabber.c:1524 -msgid "Unknown Error" -msgstr "Unknown Error" - -#: ../libpurple/protocols/jabber/jabber.c:651 -#: ../libpurple/protocols/jabber/jabber.c:652 +#: ../libpurple/protocols/jabber/jabber.c:674 +#: ../libpurple/protocols/jabber/jabber.c:675 msgid "Registration Failed" msgstr "Registration Failed" -#: ../libpurple/protocols/jabber/jabber.c:767 -#: ../libpurple/protocols/jabber/jabber.c:768 +#: ../libpurple/protocols/jabber/jabber.c:693 +#, c-format +msgid "Registration from %s successfully removed" +msgstr "Registration from %s successfully removed" + +#: ../libpurple/protocols/jabber/jabber.c:695 +#: ../libpurple/protocols/jabber/jabber.c:696 +msgid "Unregistration Successful" +msgstr "Unregistration Successful" + +#: ../libpurple/protocols/jabber/jabber.c:704 +#: ../libpurple/protocols/jabber/jabber.c:705 +msgid "Unregistration Failed" +msgstr "Unregistration Failed" + +#: ../libpurple/protocols/jabber/jabber.c:865 +#: ../libpurple/protocols/jabber/jabber.c:866 msgid "Already Registered" msgstr "Already Registered" -#: ../libpurple/protocols/jabber/jabber.c:844 -#: ../libpurple/protocols/oscar/oscar.c:3780 -#: ../libpurple/protocols/oscar/oscar.c:3793 +#: ../libpurple/protocols/jabber/jabber.c:963 +#: ../libpurple/protocols/oscar/oscar.c:3783 +#: ../libpurple/protocols/oscar/oscar.c:3796 msgid "State" msgstr "County/State" -#: ../libpurple/protocols/jabber/jabber.c:849 +#: ../libpurple/protocols/jabber/jabber.c:968 msgid "Postal code" msgstr "Postcode" -#: ../libpurple/protocols/jabber/jabber.c:854 -#: ../libpurple/protocols/silc/ops.c:1069 -#: ../libpurple/protocols/silc/silc.c:691 -#: ../libpurple/protocols/silc/util.c:553 +#: ../libpurple/protocols/jabber/jabber.c:973 +#: ../libpurple/protocols/silc/ops.c:1035 +#: ../libpurple/protocols/silc/silc.c:772 +#: ../libpurple/protocols/silc/util.c:557 +#: ../libpurple/protocols/silc10/ops.c:1069 +#: ../libpurple/protocols/silc10/silc.c:683 +#: ../libpurple/protocols/silc10/util.c:553 msgid "Phone" msgstr "Telephone" -#: ../libpurple/protocols/jabber/jabber.c:864 +#: ../libpurple/protocols/jabber/jabber.c:983 msgid "Date" msgstr "Date" -#: ../libpurple/protocols/jabber/jabber.c:872 +#: ../libpurple/protocols/jabber/jabber.c:988 +msgid "Unregister" +msgstr "Unregister" + +#: ../libpurple/protocols/jabber/jabber.c:995 +msgid "" +"Please fill out the information below to change your account registration." +msgstr "" +"Please fill out the information below to change your account registration." + +#: ../libpurple/protocols/jabber/jabber.c:998 msgid "Please fill out the information below to register your new account." msgstr "Please fill out the information below to register your new account." -#: ../libpurple/protocols/jabber/jabber.c:875 -#: ../libpurple/protocols/jabber/jabber.c:876 +#: ../libpurple/protocols/jabber/jabber.c:1006 +#: ../libpurple/protocols/jabber/jabber.c:1007 msgid "Register New XMPP Account" msgstr "Register New XMPP Account" -#. Register button -#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1521 +#: ../libpurple/protocols/jabber/jabber.c:1008 +#: ../libpurple/protocols/jabber/jabber.c:1017 msgid "Register" msgstr "Register" -#: ../libpurple/protocols/jabber/jabber.c:1048 +#: ../libpurple/protocols/jabber/jabber.c:1013 +#, c-format +msgid "Change Account Registration at %s" +msgstr "Change Account Registration at %s" + +#: ../libpurple/protocols/jabber/jabber.c:1014 +#, c-format +msgid "Register New Account at %s" +msgstr "Register New Account at %s" + +#: ../libpurple/protocols/jabber/jabber.c:1017 +msgid "Change Registration" +msgstr "Change Registration" + +#: ../libpurple/protocols/jabber/jabber.c:1121 +#: ../libpurple/protocols/jabber/jabber.c:1122 +msgid "Error unregistering account" +msgstr "Error unregistering account" + +#: ../libpurple/protocols/jabber/jabber.c:1127 +#: ../libpurple/protocols/jabber/jabber.c:1128 +msgid "Account successfully unregistered" +msgstr "Account successfully unregistered" + +#: ../libpurple/protocols/jabber/jabber.c:1280 msgid "Initializing Stream" msgstr "Initialising Stream" -#: ../libpurple/protocols/jabber/jabber.c:1053 -#: ../libpurple/protocols/msn/session.c:350 +#: ../libpurple/protocols/jabber/jabber.c:1285 +msgid "Initializing SSL/TLS" +msgstr "Initialising SSL/TLS" + +#: ../libpurple/protocols/jabber/jabber.c:1289 +#: ../libpurple/protocols/msn/session.c:351 msgid "Authenticating" msgstr "Authenticating" -#: ../libpurple/protocols/jabber/jabber.c:1062 +#: ../libpurple/protocols/jabber/jabber.c:1298 msgid "Re-initializing Stream" msgstr "Re-initialising Stream" -#: ../libpurple/protocols/jabber/jabber.c:1128 -#: ../libpurple/protocols/jabber/jabber.c:1502 -#: ../libpurple/protocols/jabber/jabber.c:1543 -#: ../libpurple/protocols/jabber/jabber.c:1579 -#: ../libpurple/protocols/oscar/oscar.c:808 -#: ../libpurple/protocols/oscar/oscar.c:5515 +#: ../libpurple/protocols/jabber/jabber.c:1392 +#: ../libpurple/protocols/jabber/jabber.c:1861 +#: ../libpurple/protocols/jabber/jabber.c:1902 +#: ../libpurple/protocols/jabber/jabber.c:1938 +#: ../libpurple/protocols/oscar/oscar.c:825 +#: ../libpurple/protocols/oscar/oscar.c:5586 msgid "Not Authorized" msgstr "Not Authorised" -#: ../libpurple/protocols/jabber/jabber.c:1170 +#: ../libpurple/protocols/jabber/jabber.c:1438 msgid "Both" msgstr "Both" -#: ../libpurple/protocols/jabber/jabber.c:1172 +#: ../libpurple/protocols/jabber/jabber.c:1440 msgid "From (To pending)" msgstr "From (To pending)" -#: ../libpurple/protocols/jabber/jabber.c:1177 +#: ../libpurple/protocols/jabber/jabber.c:1442 +msgid "From" +msgstr "From" + +#: ../libpurple/protocols/jabber/jabber.c:1445 msgid "To" msgstr "To" -#: ../libpurple/protocols/jabber/jabber.c:1179 +#: ../libpurple/protocols/jabber/jabber.c:1447 msgid "None (To pending)" msgstr "None (To pending)" -#: ../libpurple/protocols/jabber/jabber.c:1181 +#: ../libpurple/protocols/jabber/jabber.c:1449 #: ../pidgin/plugins/gevolution/eds-utils.c:73 #: ../pidgin/plugins/gevolution/eds-utils.c:86 msgid "None" msgstr "None" -#: ../libpurple/protocols/jabber/jabber.c:1184 +#: ../libpurple/protocols/jabber/jabber.c:1452 msgid "Subscription" msgstr "Subscription" -#: ../libpurple/protocols/jabber/jabber.c:1314 +#: ../libpurple/protocols/jabber/jabber.c:1462 +#: ../libpurple/protocols/jabber/jabber.c:1465 +#: ../libpurple/protocols/jabber/jabber.c:1529 +#: ../libpurple/protocols/jabber/jabber.c:1552 +#: ../libpurple/protocols/jabber/jabber.c:1575 +#: ../libpurple/protocols/jabber/jabber.c:1598 +#: ../libpurple/protocols/jabber/jabber.c:1621 +#: ../libpurple/protocols/jabber/usermood.c:167 +#: ../libpurple/protocols/silc/buddy.c:1557 +#: ../libpurple/protocols/silc/ops.c:1212 +#: ../libpurple/protocols/silc10/buddy.c:1557 +#: ../libpurple/protocols/silc10/ops.c:1207 +msgid "Mood" +msgstr "Mood" + +#: ../libpurple/protocols/jabber/jabber.c:1530 +#: ../libpurple/protocols/jabber/jabber.c:1553 +#: ../libpurple/protocols/jabber/jabber.c:1576 +#: ../libpurple/protocols/jabber/jabber.c:1599 +#: ../libpurple/protocols/jabber/jabber.c:1622 +msgid "Mood Text" +msgstr "Mood Text" + +#: ../libpurple/protocols/jabber/jabber.c:1531 +#: ../libpurple/protocols/jabber/jabber.c:1554 +#: ../libpurple/protocols/jabber/jabber.c:1577 +#: ../libpurple/protocols/jabber/jabber.c:1600 +#: ../libpurple/protocols/jabber/jabber.c:1623 +msgid "Tune Artist" +msgstr "Tune Artist" + +#: ../libpurple/protocols/jabber/jabber.c:1532 +#: ../libpurple/protocols/jabber/jabber.c:1555 +#: ../libpurple/protocols/jabber/jabber.c:1578 +#: ../libpurple/protocols/jabber/jabber.c:1601 +#: ../libpurple/protocols/jabber/jabber.c:1624 +msgid "Tune Title" +msgstr "Tune Title" + +#: ../libpurple/protocols/jabber/jabber.c:1533 +#: ../libpurple/protocols/jabber/jabber.c:1556 +#: ../libpurple/protocols/jabber/jabber.c:1579 +#: ../libpurple/protocols/jabber/jabber.c:1602 +#: ../libpurple/protocols/jabber/jabber.c:1625 +msgid "Tune Album" +msgstr "Tune Album" + +#: ../libpurple/protocols/jabber/jabber.c:1534 +#: ../libpurple/protocols/jabber/jabber.c:1557 +#: ../libpurple/protocols/jabber/jabber.c:1580 +#: ../libpurple/protocols/jabber/jabber.c:1603 +#: ../libpurple/protocols/jabber/jabber.c:1626 +msgid "Tune Genre" +msgstr "Tune Genre" + +#: ../libpurple/protocols/jabber/jabber.c:1535 +#: ../libpurple/protocols/jabber/jabber.c:1558 +#: ../libpurple/protocols/jabber/jabber.c:1581 +#: ../libpurple/protocols/jabber/jabber.c:1604 +#: ../libpurple/protocols/jabber/jabber.c:1627 +msgid "Tune Comment" +msgstr "Tune Comment" + +#: ../libpurple/protocols/jabber/jabber.c:1536 +#: ../libpurple/protocols/jabber/jabber.c:1559 +#: ../libpurple/protocols/jabber/jabber.c:1582 +#: ../libpurple/protocols/jabber/jabber.c:1605 +#: ../libpurple/protocols/jabber/jabber.c:1628 +msgid "Tune Track" +msgstr "Tune Track" + +#: ../libpurple/protocols/jabber/jabber.c:1537 +#: ../libpurple/protocols/jabber/jabber.c:1560 +#: ../libpurple/protocols/jabber/jabber.c:1583 +#: ../libpurple/protocols/jabber/jabber.c:1606 +#: ../libpurple/protocols/jabber/jabber.c:1629 +msgid "Tune Time" +msgstr "Tune Time" + +#: ../libpurple/protocols/jabber/jabber.c:1538 +#: ../libpurple/protocols/jabber/jabber.c:1561 +#: ../libpurple/protocols/jabber/jabber.c:1584 +#: ../libpurple/protocols/jabber/jabber.c:1607 +#: ../libpurple/protocols/jabber/jabber.c:1630 +msgid "Tune Year" +msgstr "Tune Year" + +#: ../libpurple/protocols/jabber/jabber.c:1539 +#: ../libpurple/protocols/jabber/jabber.c:1562 +#: ../libpurple/protocols/jabber/jabber.c:1585 +#: ../libpurple/protocols/jabber/jabber.c:1608 +#: ../libpurple/protocols/jabber/jabber.c:1631 +msgid "Tune URL" +msgstr "Tune URL" + +#: ../libpurple/protocols/jabber/jabber.c:1541 +#: ../libpurple/protocols/jabber/jabber.c:1564 +#: ../libpurple/protocols/jabber/jabber.c:1587 +#: ../libpurple/protocols/jabber/jabber.c:1610 +#: ../libpurple/protocols/jabber/jabber.c:1633 +msgid "Allow Buzz" +msgstr "Allow Buzz" + +#: ../libpurple/protocols/jabber/jabber.c:1661 msgid "Password Changed" msgstr "Password Changed" -#: ../libpurple/protocols/jabber/jabber.c:1315 +#: ../libpurple/protocols/jabber/jabber.c:1662 msgid "Your password has been changed." msgstr "Your password has been changed." -#: ../libpurple/protocols/jabber/jabber.c:1319 -#: ../libpurple/protocols/jabber/jabber.c:1320 +#: ../libpurple/protocols/jabber/jabber.c:1666 +#: ../libpurple/protocols/jabber/jabber.c:1667 msgid "Error changing password" msgstr "Error changing password" -#: ../libpurple/protocols/jabber/jabber.c:1376 +#: ../libpurple/protocols/jabber/jabber.c:1724 msgid "Password (again)" msgstr "Password (again)" -#: ../libpurple/protocols/jabber/jabber.c:1381 -#: ../libpurple/protocols/jabber/jabber.c:1382 +#: ../libpurple/protocols/jabber/jabber.c:1730 +#: ../libpurple/protocols/jabber/jabber.c:1731 msgid "Change XMPP Password" msgstr "Change XMPP Password" -#: ../libpurple/protocols/jabber/jabber.c:1382 +#: ../libpurple/protocols/jabber/jabber.c:1731 msgid "Please enter your new password" msgstr "Please enter your new password" -#: ../libpurple/protocols/jabber/jabber.c:1394 -#: ../libpurple/protocols/oscar/oscar.c:6301 -#: ../libpurple/protocols/silc/silc.c:1015 +#: ../libpurple/protocols/jabber/jabber.c:1745 +#: ../libpurple/protocols/oscar/oscar.c:6372 +#: ../libpurple/protocols/silc/silc.c:1093 +#: ../libpurple/protocols/silc10/silc.c:1004 msgid "Set User Info..." msgstr "Set User Info..." #. if (js->protocol_options & CHANGE_PASSWORD) { -#: ../libpurple/protocols/jabber/jabber.c:1399 -#: ../libpurple/protocols/oscar/oscar.c:6312 -#: ../libpurple/protocols/silc/silc.c:1011 +#: ../libpurple/protocols/jabber/jabber.c:1750 +#: ../libpurple/protocols/oscar/oscar.c:6383 +#: ../libpurple/protocols/silc/silc.c:1089 +#: ../libpurple/protocols/silc10/silc.c:1000 msgid "Change Password..." msgstr "Change Password..." #. } -#: ../libpurple/protocols/jabber/jabber.c:1404 +#: ../libpurple/protocols/jabber/jabber.c:1755 msgid "Search for Users..." msgstr "Search for Users..." -#: ../libpurple/protocols/jabber/jabber.c:1482 +#: ../libpurple/protocols/jabber/jabber.c:1841 msgid "Bad Request" msgstr "Bad Request" -#: ../libpurple/protocols/jabber/jabber.c:1484 +#: ../libpurple/protocols/jabber/jabber.c:1843 msgid "Conflict" msgstr "Conflict" -#: ../libpurple/protocols/jabber/jabber.c:1486 +#: ../libpurple/protocols/jabber/jabber.c:1845 msgid "Feature Not Implemented" msgstr "Feature Not Implemented" -#: ../libpurple/protocols/jabber/jabber.c:1488 +#: ../libpurple/protocols/jabber/jabber.c:1847 msgid "Forbidden" msgstr "Forbidden" -#: ../libpurple/protocols/jabber/jabber.c:1490 +#: ../libpurple/protocols/jabber/jabber.c:1849 msgid "Gone" msgstr "Gone" -#: ../libpurple/protocols/jabber/jabber.c:1492 -#: ../libpurple/protocols/jabber/jabber.c:1569 +#: ../libpurple/protocols/jabber/jabber.c:1851 +#: ../libpurple/protocols/jabber/jabber.c:1928 msgid "Internal Server Error" msgstr "Internal Server Error" -#: ../libpurple/protocols/jabber/jabber.c:1494 +#: ../libpurple/protocols/jabber/jabber.c:1853 msgid "Item Not Found" msgstr "Item Not Found" -#: ../libpurple/protocols/jabber/jabber.c:1496 +#: ../libpurple/protocols/jabber/jabber.c:1855 msgid "Malformed XMPP ID" msgstr "Malformed XMPP ID" -#: ../libpurple/protocols/jabber/jabber.c:1498 +#: ../libpurple/protocols/jabber/jabber.c:1857 msgid "Not Acceptable" msgstr "Not Acceptable" -#: ../libpurple/protocols/jabber/jabber.c:1500 +#: ../libpurple/protocols/jabber/jabber.c:1859 msgid "Not Allowed" msgstr "Not Allowed" -#: ../libpurple/protocols/jabber/jabber.c:1504 +#: ../libpurple/protocols/jabber/jabber.c:1863 msgid "Payment Required" msgstr "Payment Required" -#: ../libpurple/protocols/jabber/jabber.c:1506 +#: ../libpurple/protocols/jabber/jabber.c:1865 msgid "Recipient Unavailable" msgstr "Recipient unavailable" -#: ../libpurple/protocols/jabber/jabber.c:1510 +#: ../libpurple/protocols/jabber/jabber.c:1869 msgid "Registration Required" msgstr "Registration Required" -#: ../libpurple/protocols/jabber/jabber.c:1512 +#: ../libpurple/protocols/jabber/jabber.c:1871 msgid "Remote Server Not Found" msgstr "Remote Server Not Found" -#: ../libpurple/protocols/jabber/jabber.c:1514 +#: ../libpurple/protocols/jabber/jabber.c:1873 msgid "Remote Server Timeout" msgstr "Remote Server Timeout" -#: ../libpurple/protocols/jabber/jabber.c:1516 +#: ../libpurple/protocols/jabber/jabber.c:1875 msgid "Server Overloaded" msgstr "Server Overloaded" -#: ../libpurple/protocols/jabber/jabber.c:1518 +#: ../libpurple/protocols/jabber/jabber.c:1877 msgid "Service Unavailable" msgstr "Service Unavailable" -#: ../libpurple/protocols/jabber/jabber.c:1520 +#: ../libpurple/protocols/jabber/jabber.c:1879 msgid "Subscription Required" msgstr "Subscription Required" -#: ../libpurple/protocols/jabber/jabber.c:1522 +#: ../libpurple/protocols/jabber/jabber.c:1881 msgid "Unexpected Request" msgstr "Unexpected Request" -#: ../libpurple/protocols/jabber/jabber.c:1529 +#: ../libpurple/protocols/jabber/jabber.c:1888 msgid "Authorization Aborted" msgstr "Authorisation Aborted" -#: ../libpurple/protocols/jabber/jabber.c:1531 +#: ../libpurple/protocols/jabber/jabber.c:1890 msgid "Incorrect encoding in authorization" msgstr "Incorrect encoding in authorisation" -#: ../libpurple/protocols/jabber/jabber.c:1534 +#: ../libpurple/protocols/jabber/jabber.c:1893 msgid "Invalid authzid" msgstr "Invalid authzid" -#: ../libpurple/protocols/jabber/jabber.c:1537 +#: ../libpurple/protocols/jabber/jabber.c:1896 msgid "Invalid Authorization Mechanism" msgstr "Invalid Authorisation Mechanism" -#: ../libpurple/protocols/jabber/jabber.c:1540 +#: ../libpurple/protocols/jabber/jabber.c:1899 msgid "Authorization mechanism too weak" msgstr "Authorisation mechanism too weak" -#: ../libpurple/protocols/jabber/jabber.c:1545 +#: ../libpurple/protocols/jabber/jabber.c:1904 msgid "Temporary Authentication Failure" msgstr "Temporary Authentication Failure" -#: ../libpurple/protocols/jabber/jabber.c:1548 +#: ../libpurple/protocols/jabber/jabber.c:1907 msgid "Authentication Failure" msgstr "Authentication Failure" -#: ../libpurple/protocols/jabber/jabber.c:1554 +#: ../libpurple/protocols/jabber/jabber.c:1913 msgid "Bad Format" msgstr "Bad Format" -#: ../libpurple/protocols/jabber/jabber.c:1556 +#: ../libpurple/protocols/jabber/jabber.c:1915 msgid "Bad Namespace Prefix" msgstr "Bad Namespace Prefix" -#: ../libpurple/protocols/jabber/jabber.c:1559 +#: ../libpurple/protocols/jabber/jabber.c:1918 msgid "Resource Conflict" msgstr "Resource Conflict" -#: ../libpurple/protocols/jabber/jabber.c:1561 -#: ../libpurple/protocols/silc/ops.c:1729 +#: ../libpurple/protocols/jabber/jabber.c:1920 +#: ../libpurple/protocols/silc/silc.c:244 +#: ../libpurple/protocols/silc10/ops.c:1720 msgid "Connection Timeout" msgstr "Connection Timeout" -#: ../libpurple/protocols/jabber/jabber.c:1563 +#: ../libpurple/protocols/jabber/jabber.c:1922 msgid "Host Gone" msgstr "Host Gone" -#: ../libpurple/protocols/jabber/jabber.c:1565 +#: ../libpurple/protocols/jabber/jabber.c:1924 msgid "Host Unknown" msgstr "Host Unknown" -#: ../libpurple/protocols/jabber/jabber.c:1567 +#: ../libpurple/protocols/jabber/jabber.c:1926 msgid "Improper Addressing" msgstr "Improper Addressing" -#: ../libpurple/protocols/jabber/jabber.c:1571 +#: ../libpurple/protocols/jabber/jabber.c:1930 msgid "Invalid ID" msgstr "Invalid ID" -#: ../libpurple/protocols/jabber/jabber.c:1573 +#: ../libpurple/protocols/jabber/jabber.c:1932 msgid "Invalid Namespace" msgstr "Invalid Namespace" -#: ../libpurple/protocols/jabber/jabber.c:1575 +#: ../libpurple/protocols/jabber/jabber.c:1934 msgid "Invalid XML" msgstr "Invalid XML" -#: ../libpurple/protocols/jabber/jabber.c:1577 +#: ../libpurple/protocols/jabber/jabber.c:1936 msgid "Non-matching Hosts" msgstr "Non-matching Hosts" -#: ../libpurple/protocols/jabber/jabber.c:1581 +#: ../libpurple/protocols/jabber/jabber.c:1940 msgid "Policy Violation" msgstr "Policy Violation" -#: ../libpurple/protocols/jabber/jabber.c:1583 +#: ../libpurple/protocols/jabber/jabber.c:1942 msgid "Remote Connection Failed" msgstr "Remote Connection Failed" -#: ../libpurple/protocols/jabber/jabber.c:1585 +#: ../libpurple/protocols/jabber/jabber.c:1944 msgid "Resource Constraint" msgstr "Resource Constraint" -#: ../libpurple/protocols/jabber/jabber.c:1587 +#: ../libpurple/protocols/jabber/jabber.c:1946 msgid "Restricted XML" msgstr "Restricted XML" -#: ../libpurple/protocols/jabber/jabber.c:1589 +#: ../libpurple/protocols/jabber/jabber.c:1948 msgid "See Other Host" msgstr "See Other Host" -#: ../libpurple/protocols/jabber/jabber.c:1591 +#: ../libpurple/protocols/jabber/jabber.c:1950 msgid "System Shutdown" msgstr "System Shutdown" -#: ../libpurple/protocols/jabber/jabber.c:1593 +#: ../libpurple/protocols/jabber/jabber.c:1952 msgid "Undefined Condition" msgstr "Undefined Condition" -#: ../libpurple/protocols/jabber/jabber.c:1595 +#: ../libpurple/protocols/jabber/jabber.c:1954 msgid "Unsupported Encoding" msgstr "Unsupported Encoding" -#: ../libpurple/protocols/jabber/jabber.c:1597 +#: ../libpurple/protocols/jabber/jabber.c:1956 msgid "Unsupported Stanza Type" msgstr "Unsupported Stanza Type" -#: ../libpurple/protocols/jabber/jabber.c:1599 +#: ../libpurple/protocols/jabber/jabber.c:1958 msgid "Unsupported Version" msgstr "Unsupported Version" -#: ../libpurple/protocols/jabber/jabber.c:1601 +#: ../libpurple/protocols/jabber/jabber.c:1960 msgid "XML Not Well Formed" msgstr "XML Not Well Formed" -#: ../libpurple/protocols/jabber/jabber.c:1603 +#: ../libpurple/protocols/jabber/jabber.c:1962 msgid "Stream Error" msgstr "Stream Error" -#: ../libpurple/protocols/jabber/jabber.c:1670 +#: ../libpurple/protocols/jabber/jabber.c:2045 #, c-format msgid "Unable to ban user %s" msgstr "Unable to ban user %s" -#: ../libpurple/protocols/jabber/jabber.c:1690 +#: ../libpurple/protocols/jabber/jabber.c:2065 #, c-format msgid "Unknown affiliation: \"%s\"" msgstr "Unknown affiliation: \"%s\"" -#: ../libpurple/protocols/jabber/jabber.c:1695 +#: ../libpurple/protocols/jabber/jabber.c:2070 #, c-format msgid "Unable to affiliate user %s as \"%s\"" msgstr "Unable to affiliate user %s as \"%s\"" -#: ../libpurple/protocols/jabber/jabber.c:1714 +#: ../libpurple/protocols/jabber/jabber.c:2089 #, c-format msgid "Unknown role: \"%s\"" msgstr "Unknown role: \"%s\"" -#: ../libpurple/protocols/jabber/jabber.c:1721 +#: ../libpurple/protocols/jabber/jabber.c:2094 #, c-format msgid "Unable to set role \"%s\" for user: %s" msgstr "Unable to set role \"%s\" for user: %s" -#: ../libpurple/protocols/jabber/jabber.c:1774 +#: ../libpurple/protocols/jabber/jabber.c:2147 #, c-format msgid "Unable to kick user %s" msgstr "Unable to kick user %s" -#: ../libpurple/protocols/jabber/jabber.c:1805 +#: ../libpurple/protocols/jabber/jabber.c:2178 +#, c-format +msgid "Unable to ping user %s" +msgstr "Unable to ping user %s" + +#: ../libpurple/protocols/jabber/jabber.c:2200 +#: ../libpurple/protocols/jabber/jabber.c:2210 +#, c-format +msgid "Unable to buzz, because there is nothing known about user %s." +msgstr "Unable to buzz, because there is nothing known about user %s." + +#: ../libpurple/protocols/jabber/jabber.c:2206 +#, c-format +msgid "Unable to buzz, because user %s might be offline." +msgstr "Unable to buzz, because user %s might be offline." + +#: ../libpurple/protocols/jabber/jabber.c:2232 +#, c-format +msgid "Unable to buzz, because the user %s does not support it." +msgstr "Unable to buzz, because the user %s does not support it." + +#: ../libpurple/protocols/jabber/jabber.c:2246 msgid "config: Configure a chat room." msgstr "config: Configure a chat room." -#: ../libpurple/protocols/jabber/jabber.c:1809 +#: ../libpurple/protocols/jabber/jabber.c:2250 msgid "configure: Configure a chat room." msgstr "configure: Configure a chat room." -#: ../libpurple/protocols/jabber/jabber.c:1818 +#: ../libpurple/protocols/jabber/jabber.c:2259 msgid "part [room]: Leave the room." msgstr "part [room]: Leave the room." -#: ../libpurple/protocols/jabber/jabber.c:1823 +#: ../libpurple/protocols/jabber/jabber.c:2264 msgid "register: Register with a chat room." msgstr "register: Register with a chat room." -#: ../libpurple/protocols/jabber/jabber.c:1829 +#: ../libpurple/protocols/jabber/jabber.c:2270 msgid "topic [new topic]: View or change the topic." msgstr "topic [new topic]: View or change the topic." -#: ../libpurple/protocols/jabber/jabber.c:1835 +#: ../libpurple/protocols/jabber/jabber.c:2276 msgid "ban <user> [room]: Ban a user from the room." msgstr "ban <user> [room]: Ban a user from the room." -#: ../libpurple/protocols/jabber/jabber.c:1841 +#: ../libpurple/protocols/jabber/jabber.c:2282 msgid "" "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." @@ -4897,7 +6016,7 @@ "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." -#: ../libpurple/protocols/jabber/jabber.c:1847 +#: ../libpurple/protocols/jabber/jabber.c:2288 msgid "" "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." @@ -4905,24 +6024,33 @@ "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." -#: ../libpurple/protocols/jabber/jabber.c:1853 +#: ../libpurple/protocols/jabber/jabber.c:2294 msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <user> [message]: Invite a user to the room." -#: ../libpurple/protocols/jabber/jabber.c:1859 +#: ../libpurple/protocols/jabber/jabber.c:2300 msgid "join: <room> [server]: Join a chat on this server." msgstr "join: <room> [server]: Join a chat on this server." -#: ../libpurple/protocols/jabber/jabber.c:1865 +#: ../libpurple/protocols/jabber/jabber.c:2306 msgid "kick <user> [room]: Kick a user from the room." msgstr "kick <user> [room]: Kick a user from the room." -#: ../libpurple/protocols/jabber/jabber.c:1870 +#: ../libpurple/protocols/jabber/jabber.c:2311 msgid "" "msg <user> <message>: Send a private message to another user." msgstr "" "msg <user> <message>: Send a private message to another user." +#: ../libpurple/protocols/jabber/jabber.c:2317 +msgid "ping <jid>:\tPing a user/component/server." +msgstr "ping <jid>:\tPing a user/component/server." + +#: ../libpurple/protocols/jabber/jabber.c:2322 +#: ../libpurple/protocols/yahoo/yahoo.c:4142 +msgid "buzz: Buzz a user to get their attention" +msgstr "buzz: Buzz a user to get their attention" + #. *< type #. *< ui_requirement #. *< flags @@ -4933,83 +6061,98 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/jabber/libxmpp.c:166 -#: ../libpurple/protocols/jabber/libxmpp.c:168 +#: ../libpurple/protocols/jabber/libxmpp.c:172 +#: ../libpurple/protocols/jabber/libxmpp.c:174 msgid "XMPP Protocol Plugin" msgstr "XMPP Protocol Plug-in" #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im -#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:501 +#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506 msgid "Domain" msgstr "Domain" -#: ../libpurple/protocols/jabber/libxmpp.c:201 +#: ../libpurple/protocols/jabber/libxmpp.c:209 +msgid "Require SSL/TLS" +msgstr "Require SSL/TLS" + +#: ../libpurple/protocols/jabber/libxmpp.c:213 msgid "Force old (port 5223) SSL" msgstr "Force old (port 5223) SSL" -#: ../libpurple/protocols/jabber/libxmpp.c:206 +#: ../libpurple/protocols/jabber/libxmpp.c:218 msgid "Allow plaintext auth over unencrypted streams" msgstr "Allow plaintext auth over unencrypted streams" -#: ../libpurple/protocols/jabber/libxmpp.c:211 -#: ../libpurple/protocols/simple/simple.c:1856 +#: ../libpurple/protocols/jabber/libxmpp.c:223 +#: ../libpurple/protocols/myspace/myspace.c:3271 +#: ../libpurple/protocols/simple/simple.c:1862 msgid "Connect port" msgstr "Connect port" +#. TODO: default to automatically try different ports. Make the user be +#. * able to set the first port to try (like LastConnectedPort in Windows client). #. Account options -#: ../libpurple/protocols/jabber/libxmpp.c:215 -#: ../libpurple/protocols/silc/silc.c:1866 ../pidgin/gtkaccount.c:830 +#: ../libpurple/protocols/jabber/libxmpp.c:227 +#: ../libpurple/protocols/myspace/myspace.c:3268 +#: ../libpurple/protocols/silc/silc.c:1914 +#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837 msgid "Connect server" msgstr "Connect server" -#: ../libpurple/protocols/jabber/message.c:102 +#: ../libpurple/protocols/jabber/message.c:103 #, c-format msgid "%s has left the conversation." msgstr "%s has left the conversation." -#: ../libpurple/protocols/jabber/message.c:153 +#: ../libpurple/protocols/jabber/message.c:158 #, c-format msgid "Message from %s" msgstr "Message from %s" -#: ../libpurple/protocols/jabber/message.c:217 +#: ../libpurple/protocols/jabber/message.c:222 #, c-format msgid "%s has set the topic to: %s" msgstr "%s has set the topic to: %s" -#: ../libpurple/protocols/jabber/message.c:219 +#: ../libpurple/protocols/jabber/message.c:224 #, c-format msgid "The topic is: %s" msgstr "The topic is: %s" -#: ../libpurple/protocols/jabber/message.c:267 +#: ../libpurple/protocols/jabber/message.c:272 #, c-format msgid "Message delivery to %s failed: %s" msgstr "Message delivery to %s failed: %s" -#: ../libpurple/protocols/jabber/message.c:270 +#: ../libpurple/protocols/jabber/message.c:275 msgid "XMPP Message Error" msgstr "XMPP Message Error" -#: ../libpurple/protocols/jabber/message.c:359 +#: ../libpurple/protocols/jabber/message.c:304 +#: ../libpurple/protocols/yahoo/yahoo.c:4117 +#, c-format +msgid "%s has buzzed you!" +msgstr "%s has buzzed you!" + +#: ../libpurple/protocols/jabber/message.c:404 #, c-format msgid " (Code %s)" msgstr " (Code %s)" -#: ../libpurple/protocols/jabber/parser.c:193 +#: ../libpurple/protocols/jabber/parser.c:196 msgid "XML Parse error" msgstr "XML Parse error" -#: ../libpurple/protocols/jabber/presence.c:278 +#: ../libpurple/protocols/jabber/presence.c:427 msgid "Unknown Error in presence" msgstr "Unknown Error in presence" -#: ../libpurple/protocols/jabber/presence.c:352 -#: ../libpurple/protocols/jabber/presence.c:353 +#: ../libpurple/protocols/jabber/presence.c:508 +#: ../libpurple/protocols/jabber/presence.c:509 msgid "Create New Room" msgstr "Create New Room" -#: ../libpurple/protocols/jabber/presence.c:354 +#: ../libpurple/protocols/jabber/presence.c:510 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" @@ -5017,34 +6160,105 @@ "You are creating a new room. Would you like to configure it, or accept the " "default settings?" -#: ../libpurple/protocols/jabber/presence.c:360 +#: ../libpurple/protocols/jabber/presence.c:516 msgid "_Configure Room" msgstr "_Configure Room" -#: ../libpurple/protocols/jabber/presence.c:361 +#: ../libpurple/protocols/jabber/presence.c:517 msgid "_Accept Defaults" msgstr "_Accept Defaults" -#: ../libpurple/protocols/jabber/presence.c:398 +#: ../libpurple/protocols/jabber/presence.c:559 #, c-format msgid "Error in chat %s" msgstr "Error in chat %s" -#: ../libpurple/protocols/jabber/presence.c:401 +#: ../libpurple/protocols/jabber/presence.c:563 #, c-format msgid "Error joining chat %s" msgstr "Error joining chat %s" -#: ../libpurple/protocols/jabber/si.c:765 +#: ../libpurple/protocols/jabber/si.c:775 #, 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" -#: ../libpurple/protocols/jabber/si.c:766 -#: ../libpurple/protocols/jabber/si.c:767 +#: ../libpurple/protocols/jabber/si.c:776 +#: ../libpurple/protocols/jabber/si.c:777 +#: ../libpurple/protocols/jabber/si.c:845 msgid "File Send Failed" msgstr "File Send Failed" +#: ../libpurple/protocols/jabber/si.c:838 +#, c-format +msgid "Unable to send file to %s, invalid JID" +msgstr "Unable to send file to %s, invalid JID" + +#: ../libpurple/protocols/jabber/si.c:840 +#, c-format +msgid "Unable to send file to %s, user is not online" +msgstr "Unable to send file to %s, user is not online" + +#: ../libpurple/protocols/jabber/si.c:842 +#, c-format +msgid "Unable to send file to %s, not subscribed to user presence" +msgstr "Unable to send file to %s, not subscribed to user presence" + +#: ../libpurple/protocols/jabber/si.c:857 +#, c-format +msgid "Please select which resource of %s you would like to send a file to" +msgstr "Please select which resource of %s you would like to send a file to" + +#: ../libpurple/protocols/jabber/si.c:873 +msgid "Select a Resource" +msgstr "Select a Resource" + +#: ../libpurple/protocols/jabber/usermood.c:180 +#: ../libpurple/protocols/jabber/usermood.c:181 +msgid "Edit User Mood" +msgstr "Edit User Mood" + +#: ../libpurple/protocols/jabber/usermood.c:182 +msgid "Please select your mood from the list." +msgstr "Please select your mood from the list." + +#: ../libpurple/protocols/jabber/usermood.c:184 +#: ../libpurple/protocols/jabber/usernick.c:79 +msgid "Set" +msgstr "Set" + +#: ../libpurple/protocols/jabber/usermood.c:192 +msgid "Set Mood..." +msgstr "Set Mood..." + +#: ../libpurple/protocols/jabber/usernick.c:77 +msgid "Set User Nickname" +msgstr "Set User Nickname" + +#: ../libpurple/protocols/jabber/usernick.c:77 +msgid "Please specify a new nickname for you." +msgstr "Please specify a new nickname for yourself." + +#: ../libpurple/protocols/jabber/usernick.c:78 +msgid "" +"This information is visible to all contacts on your contact list, so choose " +"something appropriate." +msgstr "" +"This information is visible to all contacts on your contact list, so choose " +"something appropriate." + +#: ../libpurple/protocols/jabber/usernick.c:100 +msgid "Set Nickname..." +msgstr "Set Nickname..." + +#: ../libpurple/protocols/jabber/xdata.c:378 +msgid "Actions" +msgstr "Actions" + +#: ../libpurple/protocols/jabber/xdata.c:380 +msgid "Select an action" +msgstr "Select an action" + #: ../libpurple/protocols/msn/dialog.c:110 #, c-format msgid "Buddy list synchronization issue in %s (%s)" @@ -5261,9 +6475,10 @@ msgstr "Server too busy" #: ../libpurple/protocols/msn/error.c:222 -#: ../libpurple/protocols/oscar/oscar.c:1363 -#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728 -#: ../libpurple/proxy.c:1351 +#: ../libpurple/protocols/oscar/oscar.c:1378 +#: ../libpurple/protocols/silc/silc.c:233 +#: ../libpurple/protocols/silc10/ops.c:1709 +#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363 msgid "Authentication failed" msgstr "Authentication failed" @@ -5297,39 +6512,49 @@ msgid "MSN Error: %s\n" msgstr "MSN Error: %s\n" -#: ../libpurple/protocols/msn/msn.c:121 -msgid "You have just sent a Nudge!" -msgstr "You have just sent a Nudge!" - -#: ../libpurple/protocols/msn/msn.c:146 +#: ../libpurple/protocols/msn/msn.c:130 +msgid "Nudge" +msgstr "Nudge" + +#: ../libpurple/protocols/msn/msn.c:131 +#, c-format +msgid "%s has nudged you!" +msgstr "%s has nudged you!" + +#: ../libpurple/protocols/msn/msn.c:132 +#, c-format +msgid "Nudging %s..." +msgstr "Nudging %s..." + +#: ../libpurple/protocols/msn/msn.c:174 msgid "Your new MSN friendly name is too long." msgstr "Your new MSN friendly name is too long." -#: ../libpurple/protocols/msn/msn.c:254 +#: ../libpurple/protocols/msn/msn.c:282 msgid "Set your friendly name." msgstr "Set your friendly name." -#: ../libpurple/protocols/msn/msn.c:255 +#: ../libpurple/protocols/msn/msn.c:283 msgid "This is the name that other MSN buddies will see you as." msgstr "This is the name that other MSN buddies will see you as." -#: ../libpurple/protocols/msn/msn.c:273 +#: ../libpurple/protocols/msn/msn.c:301 msgid "Set your home phone number." msgstr "Set your home telephone number." -#: ../libpurple/protocols/msn/msn.c:290 +#: ../libpurple/protocols/msn/msn.c:318 msgid "Set your work phone number." msgstr "Set your work telephone number." -#: ../libpurple/protocols/msn/msn.c:307 +#: ../libpurple/protocols/msn/msn.c:335 msgid "Set your mobile phone number." msgstr "Set your mobile phone number." -#: ../libpurple/protocols/msn/msn.c:322 +#: ../libpurple/protocols/msn/msn.c:350 msgid "Allow MSN Mobile pages?" msgstr "Allow MSN Mobile pages?" -#: ../libpurple/protocols/msn/msn.c:323 +#: ../libpurple/protocols/msn/msn.c:351 msgid "" "Do you want to allow or disallow people on your buddy list to send you MSN " "Mobile pages to your cell phone or other mobile device?" @@ -5337,315 +6562,321 @@ "Do you want to allow or disallow people on your buddy list to send you MSN " "Mobile pages to your mobile phone or other mobile device?" -#: ../libpurple/protocols/msn/msn.c:329 +#: ../libpurple/protocols/msn/msn.c:357 msgid "Allow" msgstr "Allow" -#: ../libpurple/protocols/msn/msn.c:330 +#: ../libpurple/protocols/msn/msn.c:358 msgid "Disallow" msgstr "Disallow" -#: ../libpurple/protocols/msn/msn.c:346 +#: ../libpurple/protocols/msn/msn.c:374 msgid "This Hotmail account may not be active." msgstr "This Hotmail account may not be active." -#: ../libpurple/protocols/msn/msn.c:372 +#: ../libpurple/protocols/msn/msn.c:400 msgid "Send a mobile message." msgstr "Send a mobile message." -#: ../libpurple/protocols/msn/msn.c:374 +#: ../libpurple/protocols/msn/msn.c:402 msgid "Page" msgstr "Page" -#: ../libpurple/protocols/msn/msn.c:521 +#: ../libpurple/protocols/msn/msn.c:549 msgid "Has you" msgstr "Has you" -#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33 -#: ../libpurple/protocols/yahoo/yahoo.c:2880 -#: ../libpurple/protocols/yahoo/yahoo.c:3489 +#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33 +#: ../libpurple/protocols/yahoo/yahoo.c:3074 +#: ../libpurple/protocols/yahoo/yahoo.c:3758 msgid "Be Right Back" msgstr "Be Right Back" -#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31 +#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31 #: ../libpurple/protocols/novell/novell.c:2822 #: ../libpurple/protocols/novell/novell.c:2952 #: ../libpurple/protocols/silc/buddy.c:1480 -#: ../libpurple/protocols/silc/silc.c:47 -#: ../libpurple/protocols/yahoo/yahoo.c:2882 -#: ../libpurple/protocols/yahoo/yahoo.c:3492 +#: ../libpurple/protocols/silc/silc.c:56 +#: ../libpurple/protocols/silc10/buddy.c:1480 +#: ../libpurple/protocols/silc10/silc.c:47 +#: ../libpurple/protocols/yahoo/yahoo.c:3076 +#: ../libpurple/protocols/yahoo/yahoo.c:3761 msgid "Busy" msgstr "Busy" -#: ../libpurple/protocols/msn/msn.c:559 -#: ../libpurple/protocols/yahoo/yahoo.c:2890 -#: ../libpurple/protocols/yahoo/yahoo.c:3504 +#: ../libpurple/protocols/msn/msn.c:587 +#: ../libpurple/protocols/yahoo/yahoo.c:3084 +#: ../libpurple/protocols/yahoo/yahoo.c:3773 msgid "On the Phone" msgstr "On the Phone" -#: ../libpurple/protocols/msn/msn.c:563 -#: ../libpurple/protocols/yahoo/yahoo.c:2894 -#: ../libpurple/protocols/yahoo/yahoo.c:3510 +#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/yahoo/yahoo.c:3088 +#: ../libpurple/protocols/yahoo/yahoo.c:3779 msgid "Out to Lunch" msgstr "Out to Lunch" -#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/msn/msn.c:619 msgid "Set Friendly Name..." msgstr "Set Friendly Name..." -#: ../libpurple/protocols/msn/msn.c:596 +#: ../libpurple/protocols/msn/msn.c:624 msgid "Set Home Phone Number..." msgstr "Set Home Telephone Number..." -#: ../libpurple/protocols/msn/msn.c:600 +#: ../libpurple/protocols/msn/msn.c:628 msgid "Set Work Phone Number..." msgstr "Set Work Telephone Number..." -#: ../libpurple/protocols/msn/msn.c:604 +#: ../libpurple/protocols/msn/msn.c:632 msgid "Set Mobile Phone Number..." msgstr "Set Mobile Phone Number..." -#: ../libpurple/protocols/msn/msn.c:610 +#: ../libpurple/protocols/msn/msn.c:638 msgid "Enable/Disable Mobile Devices..." msgstr "Enable/Disable Mobile Devices..." -#: ../libpurple/protocols/msn/msn.c:615 +#: ../libpurple/protocols/msn/msn.c:643 msgid "Allow/Disallow Mobile Pages..." msgstr "Allow/Disallow Mobile Pages..." -#: ../libpurple/protocols/msn/msn.c:626 +#: ../libpurple/protocols/msn/msn.c:654 msgid "Open Hotmail Inbox" msgstr "Open Hotmail Inbox" -#: ../libpurple/protocols/msn/msn.c:650 +#: ../libpurple/protocols/msn/msn.c:678 msgid "Send to Mobile" msgstr "Send to Mobile" -#: ../libpurple/protocols/msn/msn.c:660 +#: ../libpurple/protocols/msn/msn.c:688 #: ../libpurple/protocols/novell/novell.c:3408 msgid "Initiate _Chat" msgstr "Initiate _Chat" -#: ../libpurple/protocols/msn/msn.c:698 +#: ../libpurple/protocols/msn/msn.c:726 msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "SSL support is needed for MSN. Please install a supported SSL library." -#: ../libpurple/protocols/msn/msn.c:723 +#: ../libpurple/protocols/msn/msn.c:751 msgid "Failed to connect to server." msgstr "Failed to connect to server." -#: ../libpurple/protocols/msn/msn.c:1463 ../libpurple/protocols/msn/msn.c:1808 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:784 +#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:808 msgid "Error retrieving profile" msgstr "Error retreiving profile" -#: ../libpurple/protocols/msn/msn.c:1534 ../pidgin/plugins/convcolors.c:309 -#: ../pidgin/plugins/pidginrc.c:448 +#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309 +#: ../pidgin/plugins/pidginrc.c:366 msgid "General" msgstr "General" -#: ../libpurple/protocols/msn/msn.c:1541 -#: ../libpurple/protocols/oscar/oscar.c:3745 +#: ../libpurple/protocols/msn/msn.c:1585 +#: ../libpurple/protocols/myspace/user.c:110 +#: ../libpurple/protocols/oscar/oscar.c:3748 #: ../libpurple/protocols/qq/buddy_info.c:45 -#: ../libpurple/protocols/qq/qq.c:219 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057 +#: ../libpurple/protocols/qq/qq.c:221 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081 msgid "Age" msgstr "Age" -#: ../libpurple/protocols/msn/msn.c:1543 +#: ../libpurple/protocols/msn/msn.c:1587 #: ../libpurple/protocols/qq/buddy_info.c:51 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096 msgid "Occupation" msgstr "Occupation" -#: ../libpurple/protocols/msn/msn.c:1544 +#: ../libpurple/protocols/msn/msn.c:1588 +#: ../libpurple/protocols/myspace/user.c:119 #: ../libpurple/protocols/novell/novell.c:1478 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076 #: ../libpurple/protocols/zephyr/zephyr.c:798 #: ../libpurple/protocols/zephyr/zephyr.c:1215 msgid "Location" msgstr "Location" -#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1741 -#: ../libpurple/protocols/msn/msn.c:1747 ../libpurple/protocols/msn/msn.c:1754 +#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785 +#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798 msgid "Hobbies and Interests" msgstr "Hobbies and Interests" -#: ../libpurple/protocols/msn/msn.c:1555 ../libpurple/protocols/msn/msn.c:1675 -#: ../libpurple/protocols/msn/msn.c:1681 ../libpurple/protocols/msn/msn.c:1688 -#: ../libpurple/protocols/msn/msn.c:1696 ../libpurple/protocols/msn/msn.c:1703 +#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719 +#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732 +#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747 msgid "A Little About Me" msgstr "A Little About Me" -#: ../libpurple/protocols/msn/msn.c:1572 +#: ../libpurple/protocols/msn/msn.c:1616 msgid "Social" msgstr "Social" -#: ../libpurple/protocols/msn/msn.c:1574 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062 +#: ../libpurple/protocols/msn/msn.c:1618 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086 msgid "Marital Status" msgstr "Marital Status" -#: ../libpurple/protocols/msn/msn.c:1575 +#: ../libpurple/protocols/msn/msn.c:1619 msgid "Interests" msgstr "Interests" -#: ../libpurple/protocols/msn/msn.c:1576 +#: ../libpurple/protocols/msn/msn.c:1620 msgid "Pets" msgstr "Pets" -#: ../libpurple/protocols/msn/msn.c:1577 +#: ../libpurple/protocols/msn/msn.c:1621 msgid "Hometown" msgstr "Home town" -#: ../libpurple/protocols/msn/msn.c:1578 +#: ../libpurple/protocols/msn/msn.c:1622 msgid "Places Lived" msgstr "Places Lived" -#: ../libpurple/protocols/msn/msn.c:1579 +#: ../libpurple/protocols/msn/msn.c:1623 msgid "Fashion" msgstr "Fashion" -#: ../libpurple/protocols/msn/msn.c:1580 +#: ../libpurple/protocols/msn/msn.c:1624 msgid "Humor" msgstr "Humour" -#: ../libpurple/protocols/msn/msn.c:1581 +#: ../libpurple/protocols/msn/msn.c:1625 msgid "Music" msgstr "Music" -#: ../libpurple/protocols/msn/msn.c:1582 ../libpurple/protocols/msn/msn.c:1763 -#: ../libpurple/protocols/msn/msn.c:1769 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114 +#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807 +#: ../libpurple/protocols/msn/msn.c:1813 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138 msgid "Favorite Quote" msgstr "Favourite Quote" -#: ../libpurple/protocols/msn/msn.c:1599 +#: ../libpurple/protocols/msn/msn.c:1643 msgid "Contact Info" msgstr "Contact Info" -#: ../libpurple/protocols/msn/msn.c:1600 +#: ../libpurple/protocols/msn/msn.c:1644 msgid "Personal" msgstr "Personal" -#: ../libpurple/protocols/msn/msn.c:1603 +#: ../libpurple/protocols/msn/msn.c:1647 msgid "Significant Other" msgstr "Partner" -#: ../libpurple/protocols/msn/msn.c:1604 +#: ../libpurple/protocols/msn/msn.c:1648 msgid "Home Phone" msgstr "Home Telephone" -#: ../libpurple/protocols/msn/msn.c:1605 +#: ../libpurple/protocols/msn/msn.c:1649 msgid "Home Phone 2" msgstr "Home Telephone 2" -#: ../libpurple/protocols/msn/msn.c:1606 -#: ../libpurple/protocols/oscar/oscar.c:3783 +#: ../libpurple/protocols/msn/msn.c:1650 +#: ../libpurple/protocols/oscar/oscar.c:3786 msgid "Home Address" msgstr "Home Address" -#: ../libpurple/protocols/msn/msn.c:1607 +#: ../libpurple/protocols/msn/msn.c:1651 msgid "Personal Mobile" msgstr "Personal Mobile" -#: ../libpurple/protocols/msn/msn.c:1608 +#: ../libpurple/protocols/msn/msn.c:1652 msgid "Home Fax" msgstr "Home Fax" -#: ../libpurple/protocols/msn/msn.c:1609 +#: ../libpurple/protocols/msn/msn.c:1653 msgid "Personal E-Mail" msgstr "Personal E-mail" -#: ../libpurple/protocols/msn/msn.c:1610 +#: ../libpurple/protocols/msn/msn.c:1654 msgid "Personal IM" msgstr "Personal IM" -#: ../libpurple/protocols/msn/msn.c:1612 +#: ../libpurple/protocols/msn/msn.c:1656 msgid "Anniversary" msgstr "Anniversary" #. Business -#: ../libpurple/protocols/msn/msn.c:1628 +#: ../libpurple/protocols/msn/msn.c:1672 msgid "Work" msgstr "Work" -#: ../libpurple/protocols/msn/msn.c:1630 -#: ../libpurple/protocols/silc/ops.c:1044 +#: ../libpurple/protocols/msn/msn.c:1674 +#: ../libpurple/protocols/silc/ops.c:1010 +#: ../libpurple/protocols/silc10/ops.c:1044 msgid "Job Title" msgstr "Job Title" -#: ../libpurple/protocols/msn/msn.c:1631 -#: ../libpurple/protocols/oscar/oscar.c:3804 +#: ../libpurple/protocols/msn/msn.c:1675 +#: ../libpurple/protocols/oscar/oscar.c:3807 msgid "Company" msgstr "Company" -#: ../libpurple/protocols/msn/msn.c:1632 +#: ../libpurple/protocols/msn/msn.c:1676 #: ../libpurple/protocols/novell/novell.c:1480 msgid "Department" msgstr "Department" -#: ../libpurple/protocols/msn/msn.c:1633 +#: ../libpurple/protocols/msn/msn.c:1677 msgid "Profession" msgstr "Profession" -#: ../libpurple/protocols/msn/msn.c:1634 +#: ../libpurple/protocols/msn/msn.c:1678 msgid "Work Phone" msgstr "Work Telephone" -#: ../libpurple/protocols/msn/msn.c:1635 +#: ../libpurple/protocols/msn/msn.c:1679 msgid "Work Phone 2" msgstr "Work Telephone 2" -#: ../libpurple/protocols/msn/msn.c:1636 -#: ../libpurple/protocols/oscar/oscar.c:3796 +#: ../libpurple/protocols/msn/msn.c:1680 +#: ../libpurple/protocols/oscar/oscar.c:3799 msgid "Work Address" msgstr "Work Address" -#: ../libpurple/protocols/msn/msn.c:1637 +#: ../libpurple/protocols/msn/msn.c:1681 msgid "Work Mobile" msgstr "Work Mobile" -#: ../libpurple/protocols/msn/msn.c:1638 +#: ../libpurple/protocols/msn/msn.c:1682 msgid "Work Pager" msgstr "Work Pager" -#: ../libpurple/protocols/msn/msn.c:1639 +#: ../libpurple/protocols/msn/msn.c:1683 msgid "Work Fax" msgstr "Work Fax" -#: ../libpurple/protocols/msn/msn.c:1640 +#: ../libpurple/protocols/msn/msn.c:1684 msgid "Work E-Mail" msgstr "Work E-mail" -#: ../libpurple/protocols/msn/msn.c:1641 +#: ../libpurple/protocols/msn/msn.c:1685 msgid "Work IM" msgstr "Work IM" -#: ../libpurple/protocols/msn/msn.c:1642 +#: ../libpurple/protocols/msn/msn.c:1686 msgid "Start Date" msgstr "Start Date" -#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1718 -#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732 +#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762 +#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776 msgid "Favorite Things" msgstr "Favourite Things" -#: ../libpurple/protocols/msn/msn.c:1777 +#: ../libpurple/protocols/msn/msn.c:1821 msgid "Last Updated" msgstr "Last Updated" -#: ../libpurple/protocols/msn/msn.c:1788 +#: ../libpurple/protocols/msn/msn.c:1832 #: ../libpurple/protocols/qq/buddy_info.c:60 -#: ../libpurple/protocols/silc/ops.c:1060 +#: ../libpurple/protocols/silc/ops.c:1026 +#: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "Homepage" -#: ../libpurple/protocols/msn/msn.c:1809 +#: ../libpurple/protocols/msn/msn.c:1856 msgid "The user has not created a public profile." msgstr "The user has not created a public profile." -#: ../libpurple/protocols/msn/msn.c:1810 +#: ../libpurple/protocols/msn/msn.c:1857 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 " @@ -5655,7 +6886,7 @@ "that the user does not exist, or that the user exists but has not created a " "public profile." -#: ../libpurple/protocols/msn/msn.c:1814 +#: ../libpurple/protocols/msn/msn.c:1861 msgid "" "Could not find any information in the user's profile. The user most likely " "does not exist." @@ -5663,8 +6894,8 @@ "Could not find any information in the user's profile. The user most likely " "does not exist." -#: ../libpurple/protocols/msn/msn.c:1822 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216 +#: ../libpurple/protocols/msn/msn.c:1869 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240 msgid "Profile URL" msgstr "Profile URL" @@ -5678,19 +6909,19 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/msn/msn.c:2108 ../libpurple/protocols/msn/msn.c:2110 +#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157 msgid "MSN Protocol Plugin" msgstr "MSN Protocol Plug-in" -#: ../libpurple/protocols/msn/msn.c:2144 +#: ../libpurple/protocols/msn/msn.c:2191 msgid "Use HTTP Method" msgstr "Use HTTP Method" -#: ../libpurple/protocols/msn/msn.c:2149 +#: ../libpurple/protocols/msn/msn.c:2196 msgid "Show custom smileys" msgstr "Show custom smileys" -#: ../libpurple/protocols/msn/msn.c:2157 +#: ../libpurple/protocols/msn/msn.c:2204 msgid "nudge: nudge a user to get their attention" msgstr "nudge: nudge a user to get their attention" @@ -5709,8 +6940,8 @@ #: ../libpurple/protocols/qq/udp_proxy_s5.c:268 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332 -#: ../libpurple/protocols/yahoo/yahoochat.c:1357 -#: ../libpurple/protocols/yahoo/yahoochat.c:1383 +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 msgid "Unable to connect" msgstr "Unable to connect" @@ -5721,7 +6952,7 @@ #: ../libpurple/protocols/msn/notification.c:184 #: ../libpurple/protocols/msn/notification.c:532 -#: ../libpurple/protocols/msn/session.c:329 +#: ../libpurple/protocols/msn/session.c:330 msgid "Unknown error." msgstr "Unknown error." @@ -5759,15 +6990,15 @@ msgid "Service Temporarily Unavailable." msgstr "Service Temporarily Unavailable." -#: ../libpurple/protocols/msn/notification.c:840 +#: ../libpurple/protocols/msn/notification.c:851 msgid "Unable to rename group" msgstr "Unable to rename group" -#: ../libpurple/protocols/msn/notification.c:895 +#: ../libpurple/protocols/msn/notification.c:906 msgid "Unable to delete group" msgstr "Unable to delete group" -#: ../libpurple/protocols/msn/notification.c:1323 +#: ../libpurple/protocols/msn/notification.c:1325 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -5824,8 +7055,8 @@ msgstr "Error parsing HTTP." #: ../libpurple/protocols/msn/session.c:307 -#: ../libpurple/protocols/oscar/oscar.c:3457 -#: ../libpurple/protocols/yahoo/yahoo.c:202 +#: ../libpurple/protocols/oscar/flap_connection.c:384 +#: ../libpurple/protocols/yahoo/yahoo.c:205 msgid "You have signed on from another location." msgstr "You have signed on from another location." @@ -5838,35 +7069,35 @@ msgid "The MSN servers are going down temporarily." msgstr "The MSN servers are going down temporarily." -#: ../libpurple/protocols/msn/session.c:319 +#: ../libpurple/protocols/msn/session.c:320 #, c-format msgid "Unable to authenticate: %s" msgstr "Unable to authenticate: %s" -#: ../libpurple/protocols/msn/session.c:324 +#: ../libpurple/protocols/msn/session.c:325 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." -#: ../libpurple/protocols/msn/session.c:345 -#: ../libpurple/protocols/msn/session.c:347 +#: ../libpurple/protocols/msn/session.c:346 +#: ../libpurple/protocols/msn/session.c:348 msgid "Handshaking" msgstr "Handshaking" -#: ../libpurple/protocols/msn/session.c:348 +#: ../libpurple/protocols/msn/session.c:349 msgid "Starting authentication" msgstr "Starting authentication" -#: ../libpurple/protocols/msn/session.c:349 +#: ../libpurple/protocols/msn/session.c:350 msgid "Getting cookie" msgstr "Getting cookie" -#: ../libpurple/protocols/msn/session.c:351 +#: ../libpurple/protocols/msn/session.c:352 msgid "Sending cookie" msgstr "Sending cookie" -#: ../libpurple/protocols/msn/session.c:352 +#: ../libpurple/protocols/msn/session.c:353 msgid "Retrieving buddy list" msgstr "Retrieving buddy list" @@ -5904,38 +7135,435 @@ #: ../libpurple/protocols/msn/switchboard.c:424 msgid "" +"Message could not be sent because we were unable to establish a session with " +"the server. This is likely a server problem, try again in a few minutes:" +msgstr "" +"Message could not be sent because we were unable to establish a session with " +"the server. This is likely a server problem, try again in a few minutes:" + +#: ../libpurple/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:" -#: ../libpurple/protocols/msn/switchboard.c:432 +#: ../libpurple/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:" -#: ../libpurple/protocols/msn/switchboard.c:956 -#, c-format -msgid "%s just sent you a Nudge!" -msgstr "%s just sent you a Nudge!" - -#: ../libpurple/protocols/msn/userlist.c:250 +#: ../libpurple/protocols/msn/userlist.c:252 #, c-format msgid "%s has added you to his or her buddy list." msgstr "%s has added you to his or her buddy list." -#: ../libpurple/protocols/msn/userlist.c:319 +#: ../libpurple/protocols/msn/userlist.c:321 #, c-format msgid "%s has removed you from his or her buddy list." msgstr "%s has removed you from his or her buddy list." -#: ../libpurple/protocols/msn/userlist.c:641 +#: ../libpurple/protocols/msn/userlist.c:643 #, c-format msgid "Unable to add \"%s\"." msgstr "Unable to add \"%s\"." -#: ../libpurple/protocols/msn/userlist.c:643 +#: ../libpurple/protocols/msn/userlist.c:645 msgid "The screen name specified is invalid." msgstr "The screen name specified is invalid." +#: ../libpurple/protocols/myspace/myspace.c:111 +msgid "Missing Cipher" +msgstr "Missing Cipher" + +#: ../libpurple/protocols/myspace/myspace.c:112 +msgid "The RC4 cipher could not be found" +msgstr "The RC4 cipher could not be found" + +#: ../libpurple/protocols/myspace/myspace.c:113 +msgid "" +"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will " +"not be loaded." +msgstr "" +"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will " +"not be loaded." + +#: ../libpurple/protocols/myspace/myspace.c:286 +#, c-format +msgid "" +"Sorry, passwords over %d characters in length (yours is %d) are not " +"supported by MySpace." +msgstr "" +"Sorry, passwords over %d characters in length (yours is %d) are not " +"supported by MySpace." + +#. Notify an error message also, because this is important! +#: ../libpurple/protocols/myspace/myspace.c:292 +#: ../libpurple/protocols/myspace/myspace.c:1795 +msgid "MySpaceIM Error" +msgstr "MySpaceIM Error" + +#: ../libpurple/protocols/myspace/myspace.c:348 +msgid "Reading challenge" +msgstr "Reading challenge" + +#: ../libpurple/protocols/myspace/myspace.c:354 +msgid "Unexpected challenge length from server" +msgstr "Unexpected challenge length from server" + +#: ../libpurple/protocols/myspace/myspace.c:358 +msgid "Logging in" +msgstr "Logging in" + +#: ../libpurple/protocols/myspace/myspace.c:1276 +#, c-format +msgid "Connection to server lost (no data received within %d seconds)" +msgstr "Connection to server lost (no data received within %d seconds)" + +#. Can't write _()'d strings in array initializers. Workaround. +#: ../libpurple/protocols/myspace/myspace.c:1319 +msgid "New mail messages" +msgstr "New mail messages" + +#: ../libpurple/protocols/myspace/myspace.c:1320 +msgid "New blog comments" +msgstr "New blog comments" + +#: ../libpurple/protocols/myspace/myspace.c:1321 +msgid "New profile comments" +msgstr "New profile comments" + +#: ../libpurple/protocols/myspace/myspace.c:1322 +msgid "New friend requests!" +msgstr "New friend requests!" + +#: ../libpurple/protocols/myspace/myspace.c:1323 +msgid "New picture comments" +msgstr "New picture comments" + +#: ../libpurple/protocols/myspace/myspace.c:1353 +msgid "MySpace" +msgstr "MySpace" + +#. The session is now set up, ready to be connected. This emits the +#. * signedOn signal, so clients can now do anything with msimprpl, and +#. * we're ready for it (session key, userid, username all setup). +#: ../libpurple/protocols/myspace/myspace.c:1537 +#: ../libpurple/protocols/sametime/sametime.c:1544 +msgid "Connected" +msgstr "Connected" + +#: ../libpurple/protocols/myspace/myspace.c:1548 +#: ../libpurple/protocols/myspace/myspace.c:1550 +msgid "No username set" +msgstr "No username set" + +#: ../libpurple/protocols/myspace/myspace.c:1549 +msgid "" +"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile." +"username and choose a username and try to login again." +msgstr "" +"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile." +"username and choose a username and try to login again." + +#: ../libpurple/protocols/myspace/myspace.c:1776 +#, c-format +msgid "Protocol error, code %d: %s" +msgstr "Protocol error, code %d: %s" + +#: ../libpurple/protocols/myspace/myspace.c:1966 +#: ../libpurple/protocols/myspace/myspace.c:2000 +msgid "Failed to add buddy" +msgstr "Failed to add buddy" + +#: ../libpurple/protocols/myspace/myspace.c:1966 +msgid "'addbuddy' command failed." +msgstr "'addbuddy' command failed." + +#: ../libpurple/protocols/myspace/myspace.c:2000 +#: ../libpurple/protocols/myspace/myspace.c:2241 +msgid "persist command failed" +msgstr "persist command failed" + +#: ../libpurple/protocols/myspace/myspace.c:2109 +#, c-format +msgid "No such user: %s" +msgstr "No such user: %s" + +#: ../libpurple/protocols/myspace/myspace.c:2110 +msgid "User lookup" +msgstr "User lookup" + +#: ../libpurple/protocols/myspace/myspace.c:2222 +#: ../libpurple/protocols/myspace/myspace.c:2241 +#: ../libpurple/protocols/myspace/myspace.c:2263 +msgid "Failed to remove buddy" +msgstr "Failed to remove buddy" + +#: ../libpurple/protocols/myspace/myspace.c:2222 +msgid "'delbuddy' command failed" +msgstr "'delbuddy' command failed" + +#: ../libpurple/protocols/myspace/myspace.c:2263 +msgid "blocklist command failed" +msgstr "blocklist command failed" + +#: ../libpurple/protocols/myspace/myspace.c:2309 +msgid "Invalid input condition" +msgstr "Invalid input condition" + +#. TODO: g_realloc like msn, yahoo, irc, jabber? +#: ../libpurple/protocols/myspace/myspace.c:2327 +#: ../libpurple/protocols/myspace/myspace.c:2358 +msgid "Read buffer full" +msgstr "Read buffer full" + +#: ../libpurple/protocols/myspace/myspace.c:2396 +msgid "Unparseable message" +msgstr "Unparseable message" + +#: ../libpurple/protocols/myspace/myspace.c:2465 +#, c-format +msgid "Couldn't connect to host: %s (%d)" +msgstr "Couldn't connect to host: %s (%d)" + +#: ../libpurple/protocols/myspace/myspace.c:2636 +msgid "IM Friends" +msgstr "IM Friends" + +#: ../libpurple/protocols/myspace/myspace.c:2735 +#, c-format +msgid "" +"%d buddies were added or updated from the server (including buddies already " +"on the server-side list)" +msgstr "" +"%d buddies were added or updated from the server (including buddies already " +"on the server-side list)" + +#: ../libpurple/protocols/myspace/myspace.c:2736 +msgid "Add contacts from server" +msgstr "Add contacts from server" + +#: ../libpurple/protocols/myspace/myspace.c:2788 +#: ../libpurple/protocols/myspace/myspace.c:2853 +msgid "Add friends from MySpace.com" +msgstr "Add friends from MySpace.com" + +#: ../libpurple/protocols/myspace/myspace.c:2789 +msgid "Importing friends failed" +msgstr "Importing friends failed" + +#. TODO: find out how +#: ../libpurple/protocols/myspace/myspace.c:2845 +msgid "Find people..." +msgstr "Find people..." + +#: ../libpurple/protocols/myspace/myspace.c:2848 +msgid "Change IM name..." +msgstr "Change IM name..." + +#: ../libpurple/protocols/myspace/myspace.c:3150 +msgid "myim URL handler" +msgstr "myim URL handler" + +#: ../libpurple/protocols/myspace/myspace.c:3151 +msgid "No suitable MySpaceIM account could be found to open this myim URL." +msgstr "No suitable MySpaceIM account could be found to open this myim URL." + +#: ../libpurple/protocols/myspace/myspace.c:3152 +msgid "Enable the proper MySpaceIM account and try again." +msgstr "Enable the proper MySpaceIM account and try again." + +#: ../libpurple/protocols/myspace/myspace.c:3275 +msgid "Show display name in status text" +msgstr "Show display name in status text" + +#: ../libpurple/protocols/myspace/myspace.c:3278 +msgid "Show headline in status text" +msgstr "Show headline in status text" + +#: ../libpurple/protocols/myspace/myspace.c:3283 +msgid "Send emoticons" +msgstr "Send emoticons" + +#: ../libpurple/protocols/myspace/myspace.c:3288 +msgid "Screen resolution (dots per inch)" +msgstr "Screen resolution (dots per inch)" + +#: ../libpurple/protocols/myspace/myspace.c:3291 +msgid "Base font size (points)" +msgstr "Base font size (points)" + +#: ../libpurple/protocols/myspace/user.c:95 +#: ../libpurple/protocols/zephyr/zephyr.c:786 +#: ../libpurple/protocols/zephyr/zephyr.c:1204 +msgid "User" +msgstr "User" + +#. TODO: link to username, if available +#: ../libpurple/protocols/myspace/user.c:102 +#: ../libpurple/protocols/oscar/oscar.c:2957 +msgid "Profile" +msgstr "Profile" + +#: ../libpurple/protocols/myspace/user.c:124 +msgid "Headline" +msgstr "Headline" + +#: ../libpurple/protocols/myspace/user.c:129 +msgid "Song" +msgstr "Song" + +#: ../libpurple/protocols/myspace/user.c:134 +msgid "Total Friends" +msgstr "Total Friends" + +#: ../libpurple/protocols/myspace/user.c:145 +#: ../libpurple/protocols/myspace/user.c:148 +#: ../libpurple/protocols/myspace/user.c:151 +msgid "Client Version" +msgstr "Client Version" + +#. TODO: icons for each zap +#: ../libpurple/protocols/myspace/zap.c:44 +#: ../libpurple/protocols/myspace/zap.c:177 +msgid "Zap" +msgstr "Zap" + +#: ../libpurple/protocols/myspace/zap.c:44 +#, c-format +msgid "%s has zapped you!" +msgstr "%s has zapped you!" + +#: ../libpurple/protocols/myspace/zap.c:44 +#, c-format +msgid "Zapping %s..." +msgstr "Zapping %s..." + +#: ../libpurple/protocols/myspace/zap.c:45 +msgid "Whack" +msgstr "Whack" + +#: ../libpurple/protocols/myspace/zap.c:45 +#, c-format +msgid "%s has whacked you!" +msgstr "%s has whacked you!" + +#: ../libpurple/protocols/myspace/zap.c:45 +#, c-format +msgid "Whacking %s..." +msgstr "Whacking %s..." + +#: ../libpurple/protocols/myspace/zap.c:46 +msgid "Torch" +msgstr "Torch" + +#: ../libpurple/protocols/myspace/zap.c:46 +#, c-format +msgid "%s has torched you!" +msgstr "%s has torched you!" + +#: ../libpurple/protocols/myspace/zap.c:46 +#, c-format +msgid "Torching %s..." +msgstr "Torching %s..." + +#: ../libpurple/protocols/myspace/zap.c:47 +msgid "Smooch" +msgstr "Smooch" + +#: ../libpurple/protocols/myspace/zap.c:47 +#, c-format +msgid "%s has smooched you!" +msgstr "%s has smooched you!" + +#: ../libpurple/protocols/myspace/zap.c:47 +#, c-format +msgid "Smooching %s..." +msgstr "Smooching %s..." + +#: ../libpurple/protocols/myspace/zap.c:48 +msgid "Hug" +msgstr "Hug" + +#: ../libpurple/protocols/myspace/zap.c:48 +#, c-format +msgid "%s has hugged you!" +msgstr "%s has hugged you!" + +#: ../libpurple/protocols/myspace/zap.c:48 +#, c-format +msgid "Hugging %s..." +msgstr "Hugging %s..." + +#: ../libpurple/protocols/myspace/zap.c:49 +msgid "Slap" +msgstr "Slap" + +#: ../libpurple/protocols/myspace/zap.c:49 +#, c-format +msgid "%s has slapped you!" +msgstr "%s has slapped you!" + +#: ../libpurple/protocols/myspace/zap.c:49 +#, c-format +msgid "Slapping %s..." +msgstr "Slapping %s..." + +#: ../libpurple/protocols/myspace/zap.c:50 +msgid "Goose" +msgstr "Goose" + +#: ../libpurple/protocols/myspace/zap.c:50 +#, c-format +msgid "%s has goosed you!" +msgstr "%s has goosed you!" + +#: ../libpurple/protocols/myspace/zap.c:50 +#, c-format +msgid "Goosing %s..." +msgstr "Goosing %s..." + +#: ../libpurple/protocols/myspace/zap.c:51 +msgid "High-five" +msgstr "High-five" + +#: ../libpurple/protocols/myspace/zap.c:51 +#, c-format +msgid "%s has high-fived you!" +msgstr "%s has high-fived you!" + +#: ../libpurple/protocols/myspace/zap.c:51 +#, c-format +msgid "High-fiving %s..." +msgstr "High-fiving %s..." + +#: ../libpurple/protocols/myspace/zap.c:52 +msgid "Punk" +msgstr "Punk" + +#: ../libpurple/protocols/myspace/zap.c:52 +#, c-format +msgid "%s has punk'd you!" +msgstr "%s has punk'd you!" + +#: ../libpurple/protocols/myspace/zap.c:52 +#, c-format +msgid "Punking %s..." +msgstr "Punking %s..." + +#: ../libpurple/protocols/myspace/zap.c:53 +msgid "Raspberry" +msgstr "Raspberry" + +#: ../libpurple/protocols/myspace/zap.c:53 +#, c-format +msgid "%s has raspberried you!" +msgstr "%s has raspberried you!" + +#: ../libpurple/protocols/myspace/zap.c:53 +#, c-format +msgid "Raspberrying %s..." +msgstr "Raspberrying %s..." + #: ../libpurple/protocols/novell/nmuser.c:1864 msgid "Required parameters not passed in" msgstr "Required parameters not passed in" @@ -6290,20 +7918,20 @@ msgid "Server port" msgstr "Server port" -#: ../libpurple/protocols/oscar/flap_connection.c:379 -#: ../libpurple/protocols/yahoo/yahoo.c:2292 -#: ../libpurple/protocols/yahoo/yahoo.c:2451 +#: ../libpurple/protocols/oscar/flap_connection.c:387 +#: ../libpurple/protocols/yahoo/yahoo.c:2466 +#: ../libpurple/protocols/yahoo/yahoo.c:2633 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580 -#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196 -#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424 +#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208 +#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436 msgid "Server closed the connection." msgstr "Server closed the connection." -#: ../libpurple/protocols/oscar/flap_connection.c:381 -#: ../libpurple/protocols/yahoo/yahoo.c:2286 -#: ../libpurple/protocols/yahoo/yahoo.c:2445 ../libpurple/proxy.c:592 -#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208 -#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436 +#: ../libpurple/protocols/oscar/flap_connection.c:389 +#: ../libpurple/protocols/yahoo/yahoo.c:2460 +#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592 +#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220 +#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448 #, c-format msgid "" "Lost connection with server:\n" @@ -6312,22 +7940,13 @@ "Lost connection with server:\n" "%s" -#: ../libpurple/protocols/oscar/flap_connection.c:384 -#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221 -#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392 -#: ../libpurple/proxy.c:1449 +#: ../libpurple/protocols/oscar/flap_connection.c:392 +#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233 +#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404 +#: ../libpurple/proxy.c:1461 msgid "Received invalid data on connection with server." msgstr "Received invalid data on connection with server." -#: ../libpurple/protocols/oscar/flap_connection.c:386 -#, c-format -msgid "" -"Could not establish a connection with the server:\n" -"%s" -msgstr "" -"Could not establish a connection with the server:\n" -"%s" - #. *< type #. *< ui_requirement #. *< flags @@ -6359,7 +7978,7 @@ msgstr "ICQ Protocol Plugin" #: ../libpurple/protocols/oscar/libicq.c:147 -#: ../libpurple/protocols/yahoo/yahoo.c:4096 +#: ../libpurple/protocols/yahoo/yahoo.c:4407 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "Encoding" @@ -6389,7 +8008,7 @@ msgid "Direct IM established" msgstr "Direct IM established" -#: ../libpurple/protocols/oscar/oft.c:657 +#: ../libpurple/protocols/oscar/oft.c:656 #, c-format msgid "File %s is %s, which is larger than the maximum size of %s." msgstr "File %s is %s, which is larger than the maximum size of %s." @@ -6490,7 +8109,7 @@ msgid "Not while on AOL" msgstr "Not while on AOL" -#: ../libpurple/protocols/oscar/oscar.c:330 +#: ../libpurple/protocols/oscar/oscar.c:347 msgid "" "(There was an error receiving this message. The buddy you are speaking with " "is probably using a different encoding than expected. If you know what " @@ -6502,7 +8121,7 @@ "encoding he is using, you can specify it in the advanced account options for " "your AIM/ICQ account.)" -#: ../libpurple/protocols/oscar/oscar.c:439 +#: ../libpurple/protocols/oscar/oscar.c:456 #, c-format msgid "" "(There was an error receiving this message. Either you and %s have " @@ -6512,144 +8131,147 @@ "different encodings selected, or %s has a buggy client.)" #. Label -#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2306 -#: ../pidgin/gtkutils.c:2336 -#: ../pidgin/plugins/gevolution/new_person_dialog.c:338 +#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386 +#: ../pidgin/gtkutils.c:2416 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:334 msgid "Buddy Icon" msgstr "Buddy Icon" -#: ../libpurple/protocols/oscar/oscar.c:624 +#: ../libpurple/protocols/oscar/oscar.c:641 msgid "Voice" msgstr "Voice" -#: ../libpurple/protocols/oscar/oscar.c:627 +#: ../libpurple/protocols/oscar/oscar.c:644 msgid "AIM Direct IM" msgstr "AIM Direct IM" -#: ../libpurple/protocols/oscar/oscar.c:630 -#: ../libpurple/protocols/silc/silc.c:687 -#: ../libpurple/protocols/silc/util.c:549 +#: ../libpurple/protocols/oscar/oscar.c:647 +#: ../libpurple/protocols/silc/silc.c:768 +#: ../libpurple/protocols/silc/util.c:553 +#: ../libpurple/protocols/silc10/silc.c:679 +#: ../libpurple/protocols/silc10/util.c:549 msgid "Chat" msgstr "Chat" -#: ../libpurple/protocols/oscar/oscar.c:633 -#: ../libpurple/protocols/oscar/oscar.c:5923 +#: ../libpurple/protocols/oscar/oscar.c:650 +#: ../libpurple/protocols/oscar/oscar.c:5994 msgid "Get File" msgstr "Get File" -#: ../libpurple/protocols/oscar/oscar.c:640 +#: ../libpurple/protocols/oscar/oscar.c:657 msgid "Games" msgstr "Games" -#: ../libpurple/protocols/oscar/oscar.c:643 +#: ../libpurple/protocols/oscar/oscar.c:660 msgid "Add-Ins" msgstr "Add-Ins" -#: ../libpurple/protocols/oscar/oscar.c:646 +#: ../libpurple/protocols/oscar/oscar.c:663 msgid "Send Buddy List" msgstr "Send Buddy List" -#: ../libpurple/protocols/oscar/oscar.c:649 +#: ../libpurple/protocols/oscar/oscar.c:666 msgid "ICQ Direct Connect" msgstr "ICQ Direct Connect" -#: ../libpurple/protocols/oscar/oscar.c:652 +#: ../libpurple/protocols/oscar/oscar.c:669 msgid "AP User" msgstr "AP User" -#: ../libpurple/protocols/oscar/oscar.c:655 +#: ../libpurple/protocols/oscar/oscar.c:672 msgid "ICQ RTF" msgstr "ICQ RTF" -#: ../libpurple/protocols/oscar/oscar.c:658 +#: ../libpurple/protocols/oscar/oscar.c:675 msgid "Nihilist" msgstr "Nihilist" -#: ../libpurple/protocols/oscar/oscar.c:661 +#: ../libpurple/protocols/oscar/oscar.c:678 msgid "ICQ Server Relay" msgstr "ICQ Server Relay" -#: ../libpurple/protocols/oscar/oscar.c:664 +#: ../libpurple/protocols/oscar/oscar.c:681 msgid "Old ICQ UTF8" msgstr "Old ICQ UTF8" -#: ../libpurple/protocols/oscar/oscar.c:667 +#: ../libpurple/protocols/oscar/oscar.c:684 msgid "Trillian Encryption" msgstr "Trillian Encryption" -#: ../libpurple/protocols/oscar/oscar.c:670 +#: ../libpurple/protocols/oscar/oscar.c:687 msgid "ICQ UTF8" msgstr "ICQ UTF8" -#: ../libpurple/protocols/oscar/oscar.c:673 +#: ../libpurple/protocols/oscar/oscar.c:690 msgid "Hiptop" msgstr "Hiptop" -#: ../libpurple/protocols/oscar/oscar.c:676 +#: ../libpurple/protocols/oscar/oscar.c:693 msgid "Security Enabled" msgstr "Security Enabled" -#: ../libpurple/protocols/oscar/oscar.c:679 +#: ../libpurple/protocols/oscar/oscar.c:696 msgid "Video Chat" msgstr "Video Chat" -#: ../libpurple/protocols/oscar/oscar.c:683 +#: ../libpurple/protocols/oscar/oscar.c:700 msgid "iChat AV" msgstr "iChat AV" -#: ../libpurple/protocols/oscar/oscar.c:686 +#: ../libpurple/protocols/oscar/oscar.c:703 msgid "Live Video" msgstr "Live Video" -#: ../libpurple/protocols/oscar/oscar.c:689 +#: ../libpurple/protocols/oscar/oscar.c:706 msgid "Camera" msgstr "Camera" -#: ../libpurple/protocols/oscar/oscar.c:707 -#: ../libpurple/protocols/oscar/oscar.c:5693 +#: ../libpurple/protocols/oscar/oscar.c:724 +#: ../libpurple/protocols/oscar/oscar.c:5764 msgid "Free For Chat" msgstr "Free For Chat" -#: ../libpurple/protocols/oscar/oscar.c:711 -#: ../libpurple/protocols/oscar/oscar.c:5728 +#: ../libpurple/protocols/oscar/oscar.c:728 +#: ../libpurple/protocols/oscar/oscar.c:5799 msgid "Not Available" msgstr "Not Available" -#: ../libpurple/protocols/oscar/oscar.c:713 -#: ../libpurple/protocols/oscar/oscar.c:5714 +#: ../libpurple/protocols/oscar/oscar.c:730 +#: ../libpurple/protocols/oscar/oscar.c:5785 msgid "Occupied" msgstr "Occupied" -#: ../libpurple/protocols/oscar/oscar.c:717 +#: ../libpurple/protocols/oscar/oscar.c:734 msgid "Web Aware" msgstr "Web Aware" -#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183 -#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:156 -#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053 +#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183 +#: ../libpurple/protocols/qq/qq.c:288 +#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156 +#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059 msgid "Invisible" msgstr "Invisible" -#: ../libpurple/protocols/oscar/oscar.c:721 +#: ../libpurple/protocols/oscar/oscar.c:738 msgid "Online" msgstr "Online" -#: ../libpurple/protocols/oscar/oscar.c:820 -#: ../libpurple/protocols/oscar/oscar.c:3697 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015 +#: ../libpurple/protocols/oscar/oscar.c:837 +#: ../libpurple/protocols/oscar/oscar.c:3700 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125 msgid "IP Address" msgstr "IP Address" -#: ../libpurple/protocols/oscar/oscar.c:827 -#: ../libpurple/protocols/oscar/oscar.c:2849 +#: ../libpurple/protocols/oscar/oscar.c:844 +#: ../libpurple/protocols/oscar/oscar.c:2884 msgid "Warning Level" msgstr "Warning Level" -#: ../libpurple/protocols/oscar/oscar.c:837 +#: ../libpurple/protocols/oscar/oscar.c:854 msgid "Buddy Comment" msgstr "Buddy Comment" -#: ../libpurple/protocols/oscar/oscar.c:977 +#: ../libpurple/protocols/oscar/oscar.c:994 #, c-format msgid "" "Could not connect to authentication server:\n" @@ -6658,7 +8280,7 @@ "Could not connect to authentication server:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:985 +#: ../libpurple/protocols/oscar/oscar.c:1002 #, c-format msgid "" "Could not connect to BOS server:\n" @@ -6667,53 +8289,53 @@ "Could not connect to BOS server:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:1025 +#: ../libpurple/protocols/oscar/oscar.c:1042 msgid "Screen name sent" msgstr "Screen name sent" -#: ../libpurple/protocols/oscar/oscar.c:1030 +#: ../libpurple/protocols/oscar/oscar.c:1047 msgid "Connection established, cookie sent" msgstr "Connection established, cookie sent" #. TODO: Don't call this with ssi -#: ../libpurple/protocols/oscar/oscar.c:1059 +#: ../libpurple/protocols/oscar/oscar.c:1076 msgid "Finalizing connection" msgstr "Finalising connection" -#: ../libpurple/protocols/oscar/oscar.c:1243 +#: ../libpurple/protocols/oscar/oscar.c:1258 #, c-format msgid "" "Unable to login: Could not sign on as %s because the screen name is " -"invalid. Screen names must either start with a letter and contain only " -"letters, numbers and spaces, or contain only numbers." +"invalid. Screen names must be a valid email address, or start with a letter " +"and contain only letters, numbers and spaces, or contain only numbers." msgstr "" "Unable to login: Could not sign on as %s because the screen name is " -"invalid. Screen names must either start with a letter and contain only " -"letters, numbers and spaces, or contain only numbers." - -#: ../libpurple/protocols/oscar/oscar.c:1328 -#: ../libpurple/protocols/yahoo/yahoo.c:1934 +"invalid. Screen names must be a valid email address, or start with a letter " +"and contain only letters, numbers and spaces, or contain only numbers." + +#: ../libpurple/protocols/oscar/oscar.c:1343 +#: ../libpurple/protocols/yahoo/yahoo.c:2102 msgid "Invalid screen name." msgstr "Invalid screen name." -#: ../libpurple/protocols/oscar/oscar.c:1335 +#: ../libpurple/protocols/oscar/oscar.c:1350 #: ../libpurple/protocols/qq/login_logout.c:483 -#: ../libpurple/protocols/simple/simple.c:1037 -#: ../libpurple/protocols/yahoo/yahoo.c:1952 +#: ../libpurple/protocols/simple/simple.c:1039 +#: ../libpurple/protocols/yahoo/yahoo.c:2123 msgid "Incorrect password." msgstr "Incorrect password." -#: ../libpurple/protocols/oscar/oscar.c:1340 +#: ../libpurple/protocols/oscar/oscar.c:1355 msgid "Your account is currently suspended." msgstr "Your account is currently suspended." #. service temporarily unavailable -#: ../libpurple/protocols/oscar/oscar.c:1344 +#: ../libpurple/protocols/oscar/oscar.c:1359 msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "The AOL Instant Messenger service is temporarily unavailable." -#: ../libpurple/protocols/oscar/oscar.c:1349 -#: ../libpurple/protocols/oscar/oscar.c:1360 +#: ../libpurple/protocols/oscar/oscar.c:1364 +#: ../libpurple/protocols/oscar/oscar.c:1375 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." @@ -6721,44 +8343,44 @@ "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." -#: ../libpurple/protocols/oscar/oscar.c:1354 +#: ../libpurple/protocols/oscar/oscar.c:1369 #, 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" -#: ../libpurple/protocols/oscar/oscar.c:1394 +#: ../libpurple/protocols/oscar/oscar.c:1408 msgid "Could Not Connect" msgstr "Could Not Connect" -#: ../libpurple/protocols/oscar/oscar.c:1399 +#: ../libpurple/protocols/oscar/oscar.c:1412 msgid "Received authorization" msgstr "Received authorisation" -#: ../libpurple/protocols/oscar/oscar.c:1422 +#: ../libpurple/protocols/oscar/oscar.c:1434 msgid "The SecurID key entered is invalid." msgstr "The SecurID key entered is invalid." -#: ../libpurple/protocols/oscar/oscar.c:1436 +#: ../libpurple/protocols/oscar/oscar.c:1447 msgid "Enter SecurID" msgstr "Enter SecurID" -#: ../libpurple/protocols/oscar/oscar.c:1437 +#: ../libpurple/protocols/oscar/oscar.c:1448 msgid "Enter the 6 digit number from the digital display." msgstr "Enter the 6 digit number from the digital display." #. * #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. #. -#: ../libpurple/protocols/oscar/oscar.c:1439 -#: ../libpurple/protocols/oscar/oscar.c:2233 -#: ../libpurple/protocols/oscar/oscar.c:2280 -#: ../libpurple/protocols/oscar/oscar.c:5798 -#: ../libpurple/protocols/oscar/oscar.c:6079 ../libpurple/request.h:1387 +#: ../libpurple/protocols/oscar/oscar.c:1450 +#: ../libpurple/protocols/oscar/oscar.c:2225 +#: ../libpurple/protocols/oscar/oscar.c:2274 +#: ../libpurple/protocols/oscar/oscar.c:5869 +#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387 msgid "_OK" msgstr "_OK" -#: ../libpurple/protocols/oscar/oscar.c:1478 -#: ../libpurple/protocols/oscar/oscar.c:1521 +#: ../libpurple/protocols/oscar/oscar.c:1489 +#: ../libpurple/protocols/oscar/oscar.c:1532 #, c-format msgid "" "You may be disconnected shortly. You may want to use TOC until this is " @@ -6767,53 +8389,53 @@ "You may be disconnected shortly. You may want to use TOC until this is " "fixed. Check %s for updates." -#: ../libpurple/protocols/oscar/oscar.c:1481 -#: ../libpurple/protocols/oscar/oscar.c:1524 +#: ../libpurple/protocols/oscar/oscar.c:1492 +#: ../libpurple/protocols/oscar/oscar.c:1535 msgid "Unable to get a valid AIM login hash." msgstr "Unable to get a valid AIM login hash." -#: ../libpurple/protocols/oscar/oscar.c:1610 +#: ../libpurple/protocols/oscar/oscar.c:1620 #, c-format msgid "You may be disconnected shortly. Check %s for updates." msgstr "You may be disconnected shortly. Check %s for updates." -#: ../libpurple/protocols/oscar/oscar.c:1613 +#: ../libpurple/protocols/oscar/oscar.c:1623 msgid "Unable to get a valid login hash." msgstr "Unable to get a valid login hash." -#: ../libpurple/protocols/oscar/oscar.c:1642 +#: ../libpurple/protocols/oscar/oscar.c:1652 msgid "Password sent" msgstr "Password sent" -#: ../libpurple/protocols/oscar/oscar.c:1698 +#: ../libpurple/protocols/oscar/oscar.c:1708 msgid "Unable to initialize connection" msgstr "Unable to initialise connection" -#: ../libpurple/protocols/oscar/oscar.c:2203 +#: ../libpurple/protocols/oscar/oscar.c:2195 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." -#: ../libpurple/protocols/oscar/oscar.c:2231 +#: ../libpurple/protocols/oscar/oscar.c:2223 msgid "Authorization Request Message:" msgstr "Authorisation Request Message:" -#: ../libpurple/protocols/oscar/oscar.c:2232 +#: ../libpurple/protocols/oscar/oscar.c:2224 msgid "Please authorize me!" msgstr "Please authorise me!" +#: ../libpurple/protocols/oscar/oscar.c:2265 +#: ../libpurple/protocols/oscar/oscar.c:2273 +#: ../libpurple/protocols/oscar/oscar.c:2400 +#: ../libpurple/protocols/oscar/oscar.c:5247 +#: ../libpurple/protocols/yahoo/yahoo.c:1027 +msgid "No reason given." +msgstr "No reason given." + #: ../libpurple/protocols/oscar/oscar.c:2272 -#: ../libpurple/protocols/oscar/oscar.c:2279 -#: ../libpurple/protocols/oscar/oscar.c:2406 -#: ../libpurple/protocols/oscar/oscar.c:5196 -#: ../libpurple/protocols/yahoo/yahoo.c:987 -msgid "No reason given." -msgstr "No reason given." - -#: ../libpurple/protocols/oscar/oscar.c:2278 msgid "Authorization Denied Message:" msgstr "Authorisation Denied Message:" -#: ../libpurple/protocols/oscar/oscar.c:2406 +#: ../libpurple/protocols/oscar/oscar.c:2400 #, c-format msgid "" "The user %u has denied your request to add them to your buddy list for the " @@ -6824,17 +8446,17 @@ "following reason:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2407 +#: ../libpurple/protocols/oscar/oscar.c:2401 msgid "ICQ authorization denied." msgstr "ICQ authorisation denied." #. Someone has granted you authorization -#: ../libpurple/protocols/oscar/oscar.c:2414 +#: ../libpurple/protocols/oscar/oscar.c:2408 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:2422 +#: ../libpurple/protocols/oscar/oscar.c:2416 #, c-format msgid "" "You have received a special message\n" @@ -6847,7 +8469,7 @@ "From: %s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2430 +#: ../libpurple/protocols/oscar/oscar.c:2424 #, c-format msgid "" "You have received an ICQ page\n" @@ -6860,7 +8482,7 @@ "From: %s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2438 +#: ../libpurple/protocols/oscar/oscar.c:2432 #, c-format msgid "" "You have received an ICQ e-mail from %s [%s]\n" @@ -6873,38 +8495,38 @@ "Message is:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2459 +#: ../libpurple/protocols/oscar/oscar.c:2453 #, c-format msgid "ICQ user %u has sent you a buddy: %s (%s)" msgstr "ICQ user %u has sent you a buddy: %s (%s)" -#: ../libpurple/protocols/oscar/oscar.c:2465 +#: ../libpurple/protocols/oscar/oscar.c:2459 msgid "Do you want to add this buddy to your buddy list?" msgstr "Do you want to add this buddy to your buddy list?" -#: ../libpurple/protocols/oscar/oscar.c:2470 ../pidgin/gtkroomlist.c:308 +#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308 msgid "_Add" msgstr "_Add" -#: ../libpurple/protocols/oscar/oscar.c:2471 +#: ../libpurple/protocols/oscar/oscar.c:2465 msgid "_Decline" msgstr "_Decline" -#: ../libpurple/protocols/oscar/oscar.c:2555 +#: ../libpurple/protocols/oscar/oscar.c:2589 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:2564 +#: ../libpurple/protocols/oscar/oscar.c:2598 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:2573 +#: ../libpurple/protocols/oscar/oscar.c:2607 #, c-format msgid "" "You missed %hu message from %s because the rate limit has been exceeded." @@ -6915,21 +8537,21 @@ msgstr[1] "" "You missed %hu messages from %s because the rate limit has been exceeded." -#: ../libpurple/protocols/oscar/oscar.c:2582 +#: ../libpurple/protocols/oscar/oscar.c:2616 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:2591 +#: ../libpurple/protocols/oscar/oscar.c:2625 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:2600 +#: ../libpurple/protocols/oscar/oscar.c:2634 #, 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." @@ -6937,61 +8559,47 @@ msgstr[1] "You missed %hu messages from %s for an unknown reason." #. Data is assumed to be the destination sn -#: ../libpurple/protocols/oscar/oscar.c:2755 +#: ../libpurple/protocols/oscar/oscar.c:2789 #, c-format msgid "Unable to send message: %s" msgstr "Unable to send message: %s" -#: ../libpurple/protocols/oscar/oscar.c:2755 -#: ../libpurple/protocols/oscar/oscar.c:2760 -#: ../libpurple/protocols/oscar/oscar.c:2822 -#: ../libpurple/protocols/oscar/oscar.c:2826 +#: ../libpurple/protocols/oscar/oscar.c:2789 +#: ../libpurple/protocols/oscar/oscar.c:2794 +#: ../libpurple/protocols/oscar/oscar.c:2858 msgid "Unknown reason." msgstr "Unknown reason." -#: ../libpurple/protocols/oscar/oscar.c:2758 +#: ../libpurple/protocols/oscar/oscar.c:2792 #: ../libpurple/protocols/sametime/sametime.c:2409 #, c-format msgid "Unable to send message to %s:" msgstr "Unable to send message to %s:" -#: ../libpurple/protocols/oscar/oscar.c:2822 +#: ../libpurple/protocols/oscar/oscar.c:2858 #, c-format msgid "User information not available: %s" msgstr "User information not available: %s" -#: ../libpurple/protocols/oscar/oscar.c:2825 -#, c-format -msgid "User information for %s unavailable:" -msgstr "User information for %s unavailable:" - -#: ../libpurple/protocols/oscar/oscar.c:2854 +#: ../libpurple/protocols/oscar/oscar.c:2889 msgid "Online Since" msgstr "Online Since" -#: ../libpurple/protocols/oscar/oscar.c:2859 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161 +#: ../libpurple/protocols/oscar/oscar.c:2894 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185 msgid "Member Since" msgstr "Member Since" -#: ../libpurple/protocols/oscar/oscar.c:2864 -msgid "Capabilities" -msgstr "Capabilities" - -#: ../libpurple/protocols/oscar/oscar.c:2894 +#: ../libpurple/protocols/oscar/oscar.c:2929 msgid "Available Message" msgstr "Available Message" -#: ../libpurple/protocols/oscar/oscar.c:2920 -msgid "Profile" -msgstr "Profile" - -#: ../libpurple/protocols/oscar/oscar.c:2997 +#: ../libpurple/protocols/oscar/oscar.c:3037 msgid "Your AIM connection may be lost." msgstr "Your AIM connection may be lost." #. The conversion failed! -#: ../libpurple/protocols/oscar/oscar.c:3184 +#: ../libpurple/protocols/oscar/oscar.c:3225 msgid "" "[Unable to display a message from this user because it contained invalid " "characters.]" @@ -6999,7 +8607,7 @@ "[Unable to display a message from this user because it contained invalid " "characters.]" -#: ../libpurple/protocols/oscar/oscar.c:3387 +#: ../libpurple/protocols/oscar/oscar.c:3389 msgid "" "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." @@ -7007,85 +8615,82 @@ "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." -#: ../libpurple/protocols/oscar/oscar.c:3459 -msgid "You have been signed off for an unknown reason." -msgstr "You have been signed off for an unknown reason." - #: ../libpurple/protocols/oscar/oscar.c:3472 #: ../libpurple/protocols/toc/toc.c:977 #, c-format msgid "You have been disconnected from chat room %s." msgstr "You have been disconnected from chat room %s." -#: ../libpurple/protocols/oscar/oscar.c:3719 -#: ../libpurple/protocols/silc/util.c:581 +#: ../libpurple/protocols/oscar/oscar.c:3722 +#: ../libpurple/protocols/silc/util.c:585 +#: ../libpurple/protocols/silc10/util.c:581 msgid "Mobile Phone" msgstr "Mobile Phone" -#: ../libpurple/protocols/oscar/oscar.c:3749 +#: ../libpurple/protocols/oscar/oscar.c:3752 msgid "Personal Web Page" msgstr "Personal Web Page" -#: ../libpurple/protocols/oscar/oscar.c:3773 +#: ../libpurple/protocols/oscar/oscar.c:3776 #: ../libpurple/protocols/qq/buddy_info.c:40 msgid "Additional Information" msgstr "Additional Information" -#: ../libpurple/protocols/oscar/oscar.c:3781 -#: ../libpurple/protocols/oscar/oscar.c:3794 +#: ../libpurple/protocols/oscar/oscar.c:3784 +#: ../libpurple/protocols/oscar/oscar.c:3797 msgid "Zip Code" msgstr "Postcode" -#: ../libpurple/protocols/oscar/oscar.c:3805 +#: ../libpurple/protocols/oscar/oscar.c:3808 msgid "Division" msgstr "Division" -#: ../libpurple/protocols/oscar/oscar.c:3806 +#: ../libpurple/protocols/oscar/oscar.c:3809 msgid "Position" msgstr "Position" -#: ../libpurple/protocols/oscar/oscar.c:3808 +#: ../libpurple/protocols/oscar/oscar.c:3811 msgid "Web Page" msgstr "Web Page" -#: ../libpurple/protocols/oscar/oscar.c:3811 +#: ../libpurple/protocols/oscar/oscar.c:3814 msgid "Work Information" msgstr "Work Information" -#: ../libpurple/protocols/oscar/oscar.c:3867 +#: ../libpurple/protocols/oscar/oscar.c:3870 msgid "Pop-Up Message" msgstr "Pop-Up Message" -#: ../libpurple/protocols/oscar/oscar.c:3907 +#: ../libpurple/protocols/oscar/oscar.c:3910 #, c-format 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" -#: ../libpurple/protocols/oscar/oscar.c:3912 +#: ../libpurple/protocols/oscar/oscar.c:3915 msgid "Screen name" msgstr "Screen name" -#: ../libpurple/protocols/oscar/oscar.c:3938 +#: ../libpurple/protocols/oscar/oscar.c:3941 #, c-format msgid "No results found for e-mail address %s" msgstr "No results found for e-mail address %s" -#: ../libpurple/protocols/oscar/oscar.c:3959 +#: ../libpurple/protocols/oscar/oscar.c:3962 #, c-format msgid "You should receive an e-mail asking to confirm %s." msgstr "You should receive an e-mail asking to confirm %s." -#: ../libpurple/protocols/oscar/oscar.c:3961 +#: ../libpurple/protocols/oscar/oscar.c:3964 msgid "Account Confirmation Requested" msgstr "Account Confirmation Requested" -#: ../libpurple/protocols/oscar/oscar.c:3992 +#: ../libpurple/protocols/oscar/oscar.c:3995 msgid "Error Changing Account Info" msgstr "Error Changing Account Info" -#: ../libpurple/protocols/oscar/oscar.c:3995 +#: ../libpurple/protocols/oscar/oscar.c:3998 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -7094,12 +8699,12 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "differs from the original." -#: ../libpurple/protocols/oscar/oscar.c:3998 +#: ../libpurple/protocols/oscar/oscar.c:4001 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:4001 +#: ../libpurple/protocols/oscar/oscar.c:4004 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -7108,7 +8713,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "is too long." -#: ../libpurple/protocols/oscar/oscar.c:4004 +#: ../libpurple/protocols/oscar/oscar.c:4007 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because there is already a " @@ -7117,7 +8722,7 @@ "Error 0x%04x: Unable to change e-mail address because there is already a " "request pending for this screen name." -#: ../libpurple/protocols/oscar/oscar.c:4007 +#: ../libpurple/protocols/oscar/oscar.c:4010 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address has " @@ -7126,7 +8731,7 @@ "Error 0x%04x: Unable to change e-mail address because the given address has " "too many screen names associated with it." -#: ../libpurple/protocols/oscar/oscar.c:4010 +#: ../libpurple/protocols/oscar/oscar.c:4013 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address is " @@ -7135,31 +8740,31 @@ "Error 0x%04x: Unable to change e-mail address because the given address is " "invalid." -#: ../libpurple/protocols/oscar/oscar.c:4013 +#: ../libpurple/protocols/oscar/oscar.c:4016 #, c-format msgid "Error 0x%04x: Unknown error." msgstr "Error 0x%04x: Unknown error." -#: ../libpurple/protocols/oscar/oscar.c:4023 +#: ../libpurple/protocols/oscar/oscar.c:4026 #, c-format msgid "The e-mail address for %s is %s" msgstr "The e-mail address for %s is %s" -#: ../libpurple/protocols/oscar/oscar.c:4025 +#: ../libpurple/protocols/oscar/oscar.c:4028 msgid "Account Info" msgstr "Account Info" -#: ../libpurple/protocols/oscar/oscar.c:4197 +#: ../libpurple/protocols/oscar/oscar.c:4211 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." -#: ../libpurple/protocols/oscar/oscar.c:4442 +#: ../libpurple/protocols/oscar/oscar.c:4482 msgid "Unable to set AIM profile." msgstr "Unable to set AIM profile." -#: ../libpurple/protocols/oscar/oscar.c:4443 +#: ../libpurple/protocols/oscar/oscar.c:4483 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 " @@ -7169,7 +8774,7 @@ "completed. Your profile remains unset; try setting it again when you are " "fully connected." -#: ../libpurple/protocols/oscar/oscar.c:4457 +#: ../libpurple/protocols/oscar/oscar.c:4497 #, c-format msgid "" "The maximum profile length of %d byte has been exceeded. It has been " @@ -7184,11 +8789,11 @@ "The maximum profile length of %d bytes has been exceeded. It has been " "truncated it for you." -#: ../libpurple/protocols/oscar/oscar.c:4462 +#: ../libpurple/protocols/oscar/oscar.c:4502 msgid "Profile too long." msgstr "Profile too long." -#: ../libpurple/protocols/oscar/oscar.c:4507 +#: ../libpurple/protocols/oscar/oscar.c:4547 #, c-format msgid "" "The maximum away message length of %d byte has been exceeded. It has been " @@ -7203,32 +8808,32 @@ "The maximum away message length of %d bytes has been exceeded. It has been " "truncated for you." -#: ../libpurple/protocols/oscar/oscar.c:4512 +#: ../libpurple/protocols/oscar/oscar.c:4552 msgid "Away message too long." msgstr "Away message too long." -#: ../libpurple/protocols/oscar/oscar.c:4581 +#: ../libpurple/protocols/oscar/oscar.c:4621 #, c-format msgid "" "Could not add the buddy %s because the screen name is invalid. Screen names " -"must either start with a letter and contain only letters, numbers and " -"spaces, or contain only numbers." +"must be a valid email address, or start with a letter and contain only " +"letters, numbers and spaces, or contain only numbers." msgstr "" "Could not add the buddy %s because the screen name is invalid. Screen names " -"must either start with a letter and contain only letters, numbers and " -"spaces, or contain only numbers." - -#: ../libpurple/protocols/oscar/oscar.c:4583 -#: ../libpurple/protocols/oscar/oscar.c:5006 -#: ../libpurple/protocols/oscar/oscar.c:5020 +"must be a valid email address, or start with a letter and contain only " +"letters, numbers and spaces, or contain only numbers." + +#: ../libpurple/protocols/oscar/oscar.c:4623 +#: ../libpurple/protocols/oscar/oscar.c:5056 +#: ../libpurple/protocols/oscar/oscar.c:5071 msgid "Unable To Add" msgstr "Unable To Add" -#: ../libpurple/protocols/oscar/oscar.c:4687 +#: ../libpurple/protocols/oscar/oscar.c:4732 msgid "Unable To Retrieve Buddy List" msgstr "Unable To Retrieve Buddy List" -#: ../libpurple/protocols/oscar/oscar.c:4688 +#: ../libpurple/protocols/oscar/oscar.c:4733 msgid "" "The AIM servers were temporarily unable to send your buddy list. Your buddy " "list is not lost, and will probably become available in a few hours." @@ -7236,16 +8841,15 @@ "The AIM servers were temporarily unable to send your buddy list. Your buddy " "list is not lost, and will probably become available in a few hours." -#: ../libpurple/protocols/oscar/oscar.c:4892 -#: ../libpurple/protocols/oscar/oscar.c:4893 -#: ../libpurple/protocols/oscar/oscar.c:4898 -#: ../libpurple/protocols/oscar/oscar.c:5074 -#: ../libpurple/protocols/oscar/oscar.c:5075 -#: ../libpurple/protocols/oscar/oscar.c:5080 +#: ../libpurple/protocols/oscar/oscar.c:4915 +#: ../libpurple/protocols/oscar/oscar.c:4917 +#: ../libpurple/protocols/oscar/oscar.c:5125 +#: ../libpurple/protocols/oscar/oscar.c:5126 +#: ../libpurple/protocols/oscar/oscar.c:5131 msgid "Orphans" msgstr "Orphans" -#: ../libpurple/protocols/oscar/oscar.c:5004 +#: ../libpurple/protocols/oscar/oscar.c:5054 #, c-format msgid "" "Could not add the buddy %s because you have too many buddies in your buddy " @@ -7254,23 +8858,17 @@ "Could not add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." -#: ../libpurple/protocols/oscar/oscar.c:5004 -#: ../libpurple/protocols/oscar/oscar.c:5018 +#: ../libpurple/protocols/oscar/oscar.c:5054 +#: ../libpurple/protocols/oscar/oscar.c:5069 msgid "(no name)" msgstr "(no name)" -#: ../libpurple/protocols/oscar/oscar.c:5018 -#, c-format -msgid "" -"Could not add the buddy %s for an unknown reason. The most common reason " -"for this is that you have the maximum number of allowed buddies in your " -"buddy list." -msgstr "" -"Could not add the buddy %s for an unknown reason. The most common reason " -"for this is that you have the maximum number of allowed buddies in your " -"buddy list." - -#: ../libpurple/protocols/oscar/oscar.c:5111 +#: ../libpurple/protocols/oscar/oscar.c:5068 +#, c-format +msgid "Could not add the buddy %s for an unknown reason." +msgstr "Could not add the buddy %s for an unknown reason." + +#: ../libpurple/protocols/oscar/oscar.c:5162 #, c-format msgid "" "The user %s has given you permission to add you to their buddy list. Do you " @@ -7279,22 +8877,22 @@ "The user %s has given you permission to add you to their buddy list. Do you " "want to add them?" -#: ../libpurple/protocols/oscar/oscar.c:5119 +#: ../libpurple/protocols/oscar/oscar.c:5170 msgid "Authorization Given" msgstr "Authorisation Given" #. Granted -#: ../libpurple/protocols/oscar/oscar.c:5192 +#: ../libpurple/protocols/oscar/oscar.c:5243 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:5193 +#: ../libpurple/protocols/oscar/oscar.c:5244 msgid "Authorization Granted" msgstr "Authorisation Granted" #. Denied -#: ../libpurple/protocols/oscar/oscar.c:5196 +#: ../libpurple/protocols/oscar/oscar.c:5247 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the " @@ -7305,51 +8903,51 @@ "following reason:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:5197 +#: ../libpurple/protocols/oscar/oscar.c:5248 msgid "Authorization Denied" msgstr "Authorisation Denied" -#: ../libpurple/protocols/oscar/oscar.c:5233 +#: ../libpurple/protocols/oscar/oscar.c:5284 #: ../libpurple/protocols/toc/toc.c:1371 msgid "_Exchange:" msgstr "_Exchange:" -#: ../libpurple/protocols/oscar/oscar.c:5273 +#: ../libpurple/protocols/oscar/oscar.c:5324 msgid "Invalid chat name specified." msgstr "Invalid chat name specified." -#: ../libpurple/protocols/oscar/oscar.c:5343 +#: ../libpurple/protocols/oscar/oscar.c:5393 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." -#: ../libpurple/protocols/oscar/oscar.c:5482 -#: ../libpurple/protocols/oscar/oscar.c:5487 +#: ../libpurple/protocols/oscar/oscar.c:5553 +#: ../libpurple/protocols/oscar/oscar.c:5558 msgid "Away Message" msgstr "Away Message" -#: ../libpurple/protocols/oscar/oscar.c:5487 +#: ../libpurple/protocols/oscar/oscar.c:5558 msgid "<i>(retrieving)</i>" msgstr " <i>(retrieving)</i>" -#: ../libpurple/protocols/oscar/oscar.c:5687 +#: ../libpurple/protocols/oscar/oscar.c:5758 msgid "iTunes Music Store Link" msgstr "iTunes Music Store Link" -#: ../libpurple/protocols/oscar/oscar.c:5795 +#: ../libpurple/protocols/oscar/oscar.c:5866 #, c-format msgid "Buddy Comment for %s" msgstr "Buddy Comment for %s" -#: ../libpurple/protocols/oscar/oscar.c:5796 +#: ../libpurple/protocols/oscar/oscar.c:5867 msgid "Buddy Comment:" msgstr "Buddy Comment:" -#: ../libpurple/protocols/oscar/oscar.c:5843 +#: ../libpurple/protocols/oscar/oscar.c:5914 #, 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." -#: ../libpurple/protocols/oscar/oscar.c:5847 +#: ../libpurple/protocols/oscar/oscar.c:5918 msgid "" "Because this reveals your IP address, it may be considered a security risk. " "Do you wish to continue?" @@ -7357,63 +8955,64 @@ "Because this reveals your IP address, it may be considered a security risk. " "Do you wish to continue?" -#: ../libpurple/protocols/oscar/oscar.c:5853 +#: ../libpurple/protocols/oscar/oscar.c:5924 +#: ../libpurple/protocols/oscar/peer.c:1045 msgid "C_onnect" msgstr "C_onnect" -#: ../libpurple/protocols/oscar/oscar.c:5888 +#: ../libpurple/protocols/oscar/oscar.c:5959 msgid "Get AIM Info" msgstr "Get AIM Info" -#: ../libpurple/protocols/oscar/oscar.c:5894 +#: ../libpurple/protocols/oscar/oscar.c:5965 msgid "Edit Buddy Comment" msgstr "Edit Buddy Comment" -#: ../libpurple/protocols/oscar/oscar.c:5902 +#: ../libpurple/protocols/oscar/oscar.c:5973 msgid "Get Status Msg" msgstr "Get Status Msg" -#: ../libpurple/protocols/oscar/oscar.c:5915 +#: ../libpurple/protocols/oscar/oscar.c:5986 msgid "Direct IM" msgstr "Direct IM" -#: ../libpurple/protocols/oscar/oscar.c:5937 +#: ../libpurple/protocols/oscar/oscar.c:6008 msgid "Re-request Authorization" msgstr "Re-request Authorisation" -#: ../libpurple/protocols/oscar/oscar.c:5996 +#: ../libpurple/protocols/oscar/oscar.c:6067 msgid "Require authorization" msgstr "Require authorisation" -#: ../libpurple/protocols/oscar/oscar.c:5999 +#: ../libpurple/protocols/oscar/oscar.c:6070 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "Web aware (enabling this will cause you to receive spam!)" -#: ../libpurple/protocols/oscar/oscar.c:6004 +#: ../libpurple/protocols/oscar/oscar.c:6075 msgid "ICQ Privacy Options" msgstr "ICQ Privacy Options" -#: ../libpurple/protocols/oscar/oscar.c:6023 +#: ../libpurple/protocols/oscar/oscar.c:6094 msgid "The new formatting is invalid." msgstr "The new formatting is invalid." -#: ../libpurple/protocols/oscar/oscar.c:6024 +#: ../libpurple/protocols/oscar/oscar.c:6095 msgid "Screen name formatting can change only capitalization and whitespace." msgstr "Screen name formatting can change only capitalisation and whitespace." -#: ../libpurple/protocols/oscar/oscar.c:6077 +#: ../libpurple/protocols/oscar/oscar.c:6148 msgid "Change Address To:" msgstr "Change Address To:" -#: ../libpurple/protocols/oscar/oscar.c:6123 +#: ../libpurple/protocols/oscar/oscar.c:6194 msgid "<i>you are not waiting for authorization</i>" msgstr "<i>you are not waiting for authorisation</i>" -#: ../libpurple/protocols/oscar/oscar.c:6126 +#: ../libpurple/protocols/oscar/oscar.c:6197 msgid "You are awaiting authorization from the following buddies" msgstr "You are awaiting authorisation from the following buddies" -#: ../libpurple/protocols/oscar/oscar.c:6127 +#: ../libpurple/protocols/oscar/oscar.c:6198 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -7421,73 +9020,73 @@ "You can re-request authorisation from these buddies by right-clicking on " "them and selecting \"Re-request Authorisation.\"" -#: ../libpurple/protocols/oscar/oscar.c:6144 +#: ../libpurple/protocols/oscar/oscar.c:6215 msgid "Find Buddy by E-Mail" msgstr "Find Buddy by E-Mail" -#: ../libpurple/protocols/oscar/oscar.c:6145 +#: ../libpurple/protocols/oscar/oscar.c:6216 msgid "Search for a buddy by e-mail address" msgstr "Search for a buddy by e-mail address" -#: ../libpurple/protocols/oscar/oscar.c:6146 +#: ../libpurple/protocols/oscar/oscar.c:6217 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." -#: ../libpurple/protocols/oscar/oscar.c:6149 +#: ../libpurple/protocols/oscar/oscar.c:6220 msgid "_Search" msgstr "_Search" -#: ../libpurple/protocols/oscar/oscar.c:6307 +#: ../libpurple/protocols/oscar/oscar.c:6378 msgid "Set User Info (URL)..." msgstr "Set User Info (URL)..." -#: ../libpurple/protocols/oscar/oscar.c:6318 +#: ../libpurple/protocols/oscar/oscar.c:6389 msgid "Change Password (URL)" msgstr "Change Password (URL)" -#: ../libpurple/protocols/oscar/oscar.c:6322 +#: ../libpurple/protocols/oscar/oscar.c:6393 msgid "Configure IM Forwarding (URL)" msgstr "Configure IM Forwarding (URL)" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:6332 +#: ../libpurple/protocols/oscar/oscar.c:6403 msgid "Set Privacy Options..." msgstr "Show Privacy Options..." #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:6339 +#: ../libpurple/protocols/oscar/oscar.c:6410 msgid "Confirm Account" msgstr "Confirm Account" -#: ../libpurple/protocols/oscar/oscar.c:6343 +#: ../libpurple/protocols/oscar/oscar.c:6414 msgid "Display Currently Registered E-Mail Address" msgstr "Display Currently Registered E-mail Address" -#: ../libpurple/protocols/oscar/oscar.c:6347 +#: ../libpurple/protocols/oscar/oscar.c:6418 msgid "Change Currently Registered E-Mail Address..." msgstr "Change Currently Registered E-mail Address" -#: ../libpurple/protocols/oscar/oscar.c:6354 +#: ../libpurple/protocols/oscar/oscar.c:6425 msgid "Show Buddies Awaiting Authorization" msgstr "Show Buddies Awaiting Authorisation" -#: ../libpurple/protocols/oscar/oscar.c:6360 +#: ../libpurple/protocols/oscar/oscar.c:6431 msgid "Search for Buddy by E-Mail Address..." msgstr "Search for Buddy by E-mail Address..." -#: ../libpurple/protocols/oscar/oscar.c:6365 +#: ../libpurple/protocols/oscar/oscar.c:6436 msgid "Search for Buddy by Information" msgstr "Search for Buddy by Information" -#: ../libpurple/protocols/oscar/oscar.c:6433 +#: ../libpurple/protocols/oscar/oscar.c:6504 msgid "Use recent buddies group" msgstr "Use recent buddies group" -#: ../libpurple/protocols/oscar/oscar.c:6436 +#: ../libpurple/protocols/oscar/oscar.c:6507 msgid "Show how long you have been idle" msgstr "Show how long you have been idle" -#: ../libpurple/protocols/oscar/oscar.c:6591 +#: ../libpurple/protocols/oscar/oscar.c:6662 msgid "" "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" @@ -7495,26 +9094,26 @@ "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" -#: ../libpurple/protocols/oscar/peer.c:674 +#: ../libpurple/protocols/oscar/peer.c:697 #, 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." -#: ../libpurple/protocols/oscar/peer.c:759 +#: ../libpurple/protocols/oscar/peer.c:782 #, c-format msgid "Attempting to connect to %s:%hu." msgstr "Attempting to connect to %s:%hu." -#: ../libpurple/protocols/oscar/peer.c:833 +#: ../libpurple/protocols/oscar/peer.c:856 msgid "Attempting to connect via proxy server." msgstr "Attempting to connect via proxy server." -#: ../libpurple/protocols/oscar/peer.c:1010 +#: ../libpurple/protocols/oscar/peer.c:1033 #, c-format msgid "%s has just asked to directly connect to %s" msgstr "%s has just asked to directly connect to %s" -#: ../libpurple/protocols/oscar/peer.c:1014 +#: ../libpurple/protocols/oscar/peer.c:1037 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 " @@ -7524,10 +9123,6 @@ "for IM Images. Because your IP address will be revealed, this may be " "considered a privacy risk." -#: ../libpurple/protocols/oscar/peer.c:1022 -msgid "_Connect" -msgstr "_Connect" - #: ../libpurple/protocols/qq/buddy_info.c:39 msgid "Primary Information" msgstr "Primary Information" @@ -7708,13 +9303,12 @@ msgstr "Invalid QQ Face" #: ../libpurple/protocols/qq/buddy_opt.c:208 -#: ../libpurple/protocols/qq/group_opt.c:135 +#: ../libpurple/protocols/qq/group_opt.c:136 #, c-format msgid "You rejected %d's request" msgstr "You rejected %d's request" #: ../libpurple/protocols/qq/buddy_opt.c:209 -#: ../libpurple/protocols/qq/group_opt.c:136 msgid "Input your reason:" msgstr "Enter your reason:" @@ -7724,65 +9318,59 @@ #. title #: ../libpurple/protocols/qq/buddy_opt.c:213 -#: ../libpurple/protocols/qq/group_opt.c:140 +#: ../libpurple/protocols/qq/group_opt.c:141 msgid "Sorry, you are not my type..." msgstr "Sorry, you are not my type..." -#: ../libpurple/protocols/qq/buddy_opt.c:214 -#: ../libpurple/protocols/qq/group_im.c:142 -#: ../libpurple/protocols/qq/group_opt.c:126 -#: ../libpurple/protocols/qq/sys_msg.c:91 -#: ../libpurple/protocols/qq/sys_msg.c:249 -msgid "Reject" -msgstr "Reject" - #: ../libpurple/protocols/qq/buddy_opt.c:277 -msgid "Add buddy with auth request fails" +msgid "Add buddy with auth request failed" msgstr "Add buddy with auth request failed" -#: ../libpurple/protocols/qq/buddy_opt.c:308 +#. TODO: We don't really need to notify the user about this, do we? +#: ../libpurple/protocols/qq/buddy_opt.c:309 msgid "You have successfully removed a buddy" msgstr "You have successfully removed a buddy" -#: ../libpurple/protocols/qq/buddy_opt.c:336 -msgid "You have successfully removed yourself from a buddy" -msgstr "You have successfully removed yourself from a buddy" - -#: ../libpurple/protocols/qq/buddy_opt.c:402 +#. TODO: Does the user really need to be notified about this? +#: ../libpurple/protocols/qq/buddy_opt.c:338 +msgid "You have successfully removed yourself from your friend's buddy list" +msgstr "You have successfully removed yourself from your friend's buddy list" + +#: ../libpurple/protocols/qq/buddy_opt.c:404 #, c-format msgid "User %d needs authentication" msgstr "User %d needs authentication" -#: ../libpurple/protocols/qq/buddy_opt.c:404 -#: ../libpurple/protocols/qq/group_join.c:134 +#: ../libpurple/protocols/qq/buddy_opt.c:406 +#: ../libpurple/protocols/qq/group_join.c:136 msgid "Input request here" msgstr "Enter request here" #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands -#: ../libpurple/protocols/qq/buddy_opt.c:405 -#: ../libpurple/protocols/qq/group_join.c:135 +#: ../libpurple/protocols/qq/buddy_opt.c:407 +#: ../libpurple/protocols/qq/group_join.c:137 msgid "Would you be my friend?" msgstr "Would you like to be my friend?" #. multiline #. masked #. hint -#: ../libpurple/protocols/qq/buddy_opt.c:406 -#: ../libpurple/protocols/qq/group_join.c:136 -#: ../libpurple/protocols/qq/group_opt.c:142 +#: ../libpurple/protocols/qq/buddy_opt.c:408 +#: ../libpurple/protocols/qq/group_join.c:138 +#: ../libpurple/protocols/qq/group_opt.c:143 msgid "Send" msgstr "Send" -#: ../libpurple/protocols/qq/buddy_opt.c:416 -#, c-format -msgid "You have added %d in buddy list" -msgstr "You have added %d to your buddy list" - -#: ../libpurple/protocols/qq/buddy_opt.c:513 +#: ../libpurple/protocols/qq/buddy_opt.c:418 +#, c-format +msgid "You have added %d to buddy list" +msgstr "You have added %d to buddy list" + +#: ../libpurple/protocols/qq/buddy_opt.c:515 msgid "QQid Error" msgstr "QQid Error" -#: ../libpurple/protocols/qq/buddy_opt.c:514 +#: ../libpurple/protocols/qq/buddy_opt.c:516 msgid "Invalid QQid" msgstr "Invalid QQid" @@ -7811,71 +9399,71 @@ msgstr "QQ Qun" #: ../libpurple/protocols/qq/group.c:120 -msgid "Please input external group ID" -msgstr "Please input external group ID" +msgid "Please enter external group ID" +msgstr "Please enter external group ID" #: ../libpurple/protocols/qq/group.c:121 msgid "You can only search for permanent QQ groups\n" msgstr "You can only search for permanent QQ groups\n" -#: ../libpurple/protocols/qq/group_im.c:124 -#, c-format -msgid "User %d applied to join group %d" -msgstr "User %d applied to join group %d" - -#: ../libpurple/protocols/qq/group_im.c:125 -#: ../libpurple/protocols/qq/group_im.c:179 -#: ../libpurple/protocols/qq/sys_msg.c:195 +#: ../libpurple/protocols/qq/group_im.c:126 +#, c-format +msgid "User %d requested to join group %d" +msgstr "User %d requested to join group %d" + +#: ../libpurple/protocols/qq/group_im.c:127 +#: ../libpurple/protocols/qq/group_im.c:181 +#: ../libpurple/protocols/qq/sys_msg.c:193 #, c-format msgid "Reason: %s" msgstr "Reason: %s" -#: ../libpurple/protocols/qq/group_im.c:134 -#: ../libpurple/protocols/qq/group_im.c:181 -#: ../libpurple/protocols/qq/group_im.c:221 -#: ../libpurple/protocols/qq/group_im.c:256 -#: ../libpurple/protocols/qq/group_im.c:290 -#: ../libpurple/protocols/qq/group_join.c:231 -#: ../libpurple/protocols/qq/group_join.c:357 -#: ../libpurple/protocols/qq/group_opt.c:234 -#: ../libpurple/protocols/qq/group_opt.c:304 -#: ../libpurple/protocols/qq/group_opt.c:390 +#: ../libpurple/protocols/qq/group_im.c:136 +#: ../libpurple/protocols/qq/group_im.c:183 +#: ../libpurple/protocols/qq/group_im.c:223 +#: ../libpurple/protocols/qq/group_im.c:258 +#: ../libpurple/protocols/qq/group_im.c:292 +#: ../libpurple/protocols/qq/group_join.c:233 +#: ../libpurple/protocols/qq/group_join.c:359 +#: ../libpurple/protocols/qq/group_opt.c:235 +#: ../libpurple/protocols/qq/group_opt.c:305 +#: ../libpurple/protocols/qq/group_opt.c:391 msgid "QQ Qun Operation" msgstr "QQ Qun Operation" -#: ../libpurple/protocols/qq/group_im.c:139 -#: ../libpurple/protocols/qq/group_opt.c:127 -#: ../libpurple/protocols/qq/sys_msg.c:92 -#: ../libpurple/protocols/qq/sys_msg.c:251 +#: ../libpurple/protocols/qq/group_im.c:141 +#: ../libpurple/protocols/qq/group_opt.c:128 +#: ../libpurple/protocols/qq/sys_msg.c:91 +#: ../libpurple/protocols/qq/sys_msg.c:248 msgid "Approve" msgstr "Approve" -#: ../libpurple/protocols/qq/group_im.c:178 -#, c-format -msgid "You request to join group %d has been rejected by admin %d" +#: ../libpurple/protocols/qq/group_im.c:180 +#, c-format +msgid "Your request to join group %d has been rejected by admin %d" msgstr "Your request to join group %d has been rejected by admin %d" -#: ../libpurple/protocols/qq/group_im.c:219 -#, c-format -msgid "You request to join group %d has been approved by admin %d" +#: ../libpurple/protocols/qq/group_im.c:221 +#, c-format +msgid "Your request to join group %d has been approved by admin %d" msgstr "Your request to join group %d has been approved by admin %d" -#: ../libpurple/protocols/qq/group_im.c:255 -#, c-format -msgid "You [%d] has exit group \"%d\"" +#: ../libpurple/protocols/qq/group_im.c:257 +#, c-format +msgid "You [%d] have left group \"%d\"" msgstr "You [%d] have left group \"%d\"" -#: ../libpurple/protocols/qq/group_im.c:289 -#, c-format -msgid "You [%d] has been added by group \"%d\"" +#: ../libpurple/protocols/qq/group_im.c:291 +#, c-format +msgid "You [%d] have been added to group \"%d\"" msgstr "You [%d] have been added to group \"%d\"" -#: ../libpurple/protocols/qq/group_im.c:290 +#: ../libpurple/protocols/qq/group_im.c:292 msgid "This group has been added to your buddy list" msgstr "This group has been added to your buddy list" #: ../libpurple/protocols/qq/group_internal.c:41 -msgid "I am not member" +msgid "I am not a member" msgstr "I am not a member" #: ../libpurple/protocols/qq/group_internal.c:44 @@ -7894,31 +9482,31 @@ msgid "Unknown status" msgstr "Unknown status" -#: ../libpurple/protocols/qq/group_join.c:80 +#: ../libpurple/protocols/qq/group_join.c:82 msgid "This group does not allow others to join" msgstr "This group does not allow others to join" -#: ../libpurple/protocols/qq/group_join.c:231 -msgid "You have successfully exited the group" +#: ../libpurple/protocols/qq/group_join.c:233 +msgid "You have successfully left the group" msgstr "You have successfully left the group" -#: ../libpurple/protocols/qq/group_join.c:255 +#: ../libpurple/protocols/qq/group_join.c:257 msgid "QQ Group Auth" msgstr "QQ Group Auth" -#: ../libpurple/protocols/qq/group_join.c:256 -msgid "Your authorization operation has been accepted by the QQ server" +#: ../libpurple/protocols/qq/group_join.c:258 +msgid "Your authorization request has been accepted by the QQ server" msgstr "Your authorisation request has been accepted by the QQ server" -#: ../libpurple/protocols/qq/group_join.c:327 -msgid "You inputted a group id outside the acceptable range" -msgstr "You inputted a group ID outside the permitted range" - -#: ../libpurple/protocols/qq/group_join.c:358 -msgid "Are you sure to exit this Qun?" -msgstr "Are you sure you want to leave this Qun?" +#: ../libpurple/protocols/qq/group_join.c:329 +msgid "You entered a group ID outside the acceptable range" +msgstr "You entered a group ID outside the acceptable range" #: ../libpurple/protocols/qq/group_join.c:360 +msgid "Are you sure you want to leave this Qun?" +msgstr "Are you sure you want to leave this Qun?" + +#: ../libpurple/protocols/qq/group_join.c:362 msgid "" "Note, if you are the creator, \n" "this operation will eventually remove this Qun." @@ -7926,79 +9514,69 @@ "Note: if you are the creator \n" "this operation will eventually remove this Qun." -#: ../libpurple/protocols/qq/group_join.c:365 -msgid "Go ahead" -msgstr "Continue" - -#: ../libpurple/protocols/qq/group_network.c:90 +#: ../libpurple/protocols/qq/group_network.c:92 #, c-format msgid "Code [0x%02X]: %s" msgstr "Code [0x%02X]: %s" -#: ../libpurple/protocols/qq/group_network.c:91 +#: ../libpurple/protocols/qq/group_network.c:93 msgid "Group Operation Error" msgstr "Group Operation Error" -#. we wanna see window -#: ../libpurple/protocols/qq/group_opt.c:123 -#: ../libpurple/protocols/qq/sys_msg.c:88 -msgid "Do you wanna approve the request?" +#. we want to see window +#: ../libpurple/protocols/qq/group_opt.c:124 +#: ../libpurple/protocols/qq/sys_msg.c:87 +msgid "Do you want to approve the request?" msgstr "Do you want to approve the request?" -#: ../libpurple/protocols/qq/group_opt.c:234 -msgid "You have successfully modify Qun member" -msgstr "You have successfully modified the Qun member" - -#: ../libpurple/protocols/qq/group_opt.c:304 -msgid "You have successfully modify Qun information" -msgstr "You have successfully modified the Qun information" - -#: ../libpurple/protocols/qq/group_opt.c:391 +#: ../libpurple/protocols/qq/group_opt.c:137 +msgid "Enter your reason:" +msgstr "Enter your reason:" + +#: ../libpurple/protocols/qq/group_opt.c:235 +msgid "You have successfully modified Qun member" +msgstr "You have successfully modified Qun member" + +#: ../libpurple/protocols/qq/group_opt.c:305 +msgid "You have successfully modified Qun information" +msgstr "You have successfully modified Qun information" + +#: ../libpurple/protocols/qq/group_opt.c:392 msgid "You have successfully created a Qun" msgstr "You have successfully created a Qun" -#: ../libpurple/protocols/qq/group_opt.c:393 +#: ../libpurple/protocols/qq/group_opt.c:394 msgid "Would you like to set up the Qun details now?" msgstr "Would you like to set up the Qun details now?" -#: ../libpurple/protocols/qq/group_opt.c:397 +#: ../libpurple/protocols/qq/group_opt.c:398 msgid "Setup" msgstr "Setup" -#: ../libpurple/protocols/qq/im.c:430 +#: ../libpurple/protocols/qq/im.c:432 msgid "System Message" msgstr "System Message" -#: ../libpurple/protocols/qq/im.c:574 -msgid "Server ACK" -msgstr "Server ACK" - -#: ../libpurple/protocols/qq/im.c:574 -msgid "Send IM fail\n" -msgstr "IM send failed\n" - -#: ../libpurple/protocols/qq/keep_alive.c:85 -msgid "Keep alive error, seems connection lost!" -msgstr "Keep alive error; connection appears to be lost!" +#: ../libpurple/protocols/qq/im.c:576 +msgid "Failed to send IM." +msgstr "Failed to send IM." + +#: ../libpurple/protocols/qq/keep_alive.c:87 +msgid "Keep alive error" +msgstr "Keep alive error" #: ../libpurple/protocols/qq/login_logout.c:408 -msgid "Request login token error!" -msgstr "Request login token error!" +msgid "Error requesting login token" +msgstr "Error requesting login token" #: ../libpurple/protocols/qq/login_logout.c:486 msgid "Unable to login, check debug log" msgstr "Unable to login; check debug log" #. we didn't successfully connect. tdt->toc_fd is valid here -#. TODO: Include error_message in the message below #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173 -#: ../libpurple/protocols/yahoo/yahoo.c:2380 -#: ../libpurple/protocols/yahoo/yahoo.c:2408 -#: ../libpurple/protocols/yahoo/yahoo.c:2515 -#: ../libpurple/protocols/yahoo/yahoo.c:2536 -#: ../libpurple/protocols/yahoo/yahoo.c:2620 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189 #: ../libpurple/protocols/yahoo/ycht.c:549 msgid "Unable to connect." msgstr "Unable to connect." @@ -8008,96 +9586,83 @@ msgid "Unknown-%d" msgstr "Unknown-%d" -#: ../libpurple/protocols/qq/qq.c:209 -#, c-format -msgid "%s Address" -msgstr "%s Address" - -#: ../libpurple/protocols/qq/qq.c:240 +#: ../libpurple/protocols/qq/qq.c:211 +msgid "TCP Address" +msgstr "TCP Address" + +#: ../libpurple/protocols/qq/qq.c:213 +msgid "UDP Address" +msgstr "UDP Address" + +#: ../libpurple/protocols/qq/qq.c:242 msgid "Level" msgstr "Level" -#: ../libpurple/protocols/qq/qq.c:278 -msgid "QQ: Available" -msgstr "QQ: Available" - -#: ../libpurple/protocols/qq/qq.c:282 -msgid "QQ: Away" -msgstr "QQ: Away" - -#: ../libpurple/protocols/qq/qq.c:286 -msgid "QQ: Invisible" -msgstr "QQ: Invisible" - -#: ../libpurple/protocols/qq/qq.c:290 -msgid "QQ: Offline" -msgstr "QQ: Offline" - -#: ../libpurple/protocols/qq/qq.c:371 +#: ../libpurple/protocols/qq/qq.c:373 msgid "Invalid name" msgstr "Invalid name" -#: ../libpurple/protocols/qq/qq.c:437 +#: ../libpurple/protocols/qq/qq.c:439 #, c-format msgid "<b>Current Online</b>: %d<br>\n" msgstr "<b>Currently Online</b>: %d<br>\n" -#: ../libpurple/protocols/qq/qq.c:438 +#: ../libpurple/protocols/qq/qq.c:440 #, c-format msgid "<b>Last Refresh</b>: %s<br>\n" msgstr "<b>Last Refreshed</b>: %s<br>\n" -#: ../libpurple/protocols/qq/qq.c:442 +#: ../libpurple/protocols/qq/qq.c:444 #, c-format msgid "<b>Connection Mode</b>: %s<br>\n" msgstr "<b>Connection Mode</b>: %s<br>\n" -#: ../libpurple/protocols/qq/qq.c:443 +#: ../libpurple/protocols/qq/qq.c:445 #, c-format msgid "<b>Server IP</b>: %s: %d<br>\n" msgstr "<b>Server IP</b>: %s: %d<br>\n" -#: ../libpurple/protocols/qq/qq.c:444 +#: ../libpurple/protocols/qq/qq.c:446 #, c-format msgid "<b>My Public IP</b>: %s<br>\n" msgstr "<b>My Public IP</b>: %s<br>\n" -#: ../libpurple/protocols/qq/qq.c:449 +#: ../libpurple/protocols/qq/qq.c:451 #, c-format msgid "<b>Login Time</b>: %s<br>\n" msgstr "<b>Login Time</b>: %s<br>\n" -#: ../libpurple/protocols/qq/qq.c:450 +#: ../libpurple/protocols/qq/qq.c:452 #, c-format msgid "<b>Last Login IP</b>: %s<br>\n" msgstr "<b>Last Login IP</b>: %s<br>\n" -#: ../libpurple/protocols/qq/qq.c:451 +#: ../libpurple/protocols/qq/qq.c:453 #, c-format msgid "<b>Last Login Time</b>: %s\n" msgstr "<b>Last Login Time</b>: %s\n" -#: ../libpurple/protocols/qq/qq.c:455 +#: ../libpurple/protocols/qq/qq.c:457 msgid "Login Information" msgstr "Login Information" -#: ../libpurple/protocols/qq/qq.c:531 -msgid "Modify My Information" -msgstr "Modify My Information" - -#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680 +#: ../libpurple/protocols/qq/qq.c:533 +msgid "Set My Information" +msgstr "Set My Information" + +#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680 msgid "Change Password" msgstr "Change Password" -#: ../libpurple/protocols/qq/qq.c:537 +#: ../libpurple/protocols/qq/qq.c:539 msgid "Show Login Information" msgstr "Show Login Information" -#: ../libpurple/protocols/qq/qq.c:558 -msgid "Exit this QQ Qun" -msgstr "Exit this QQ Qun" - -#: ../libpurple/protocols/qq/qq.c:582 +#: ../libpurple/protocols/qq/qq.c:560 +msgid "Leave this QQ Qun" +msgstr "Leave this QQ Qun" + +#: ../libpurple/protocols/qq/qq.c:584 msgid "Block this buddy" msgstr "Block this buddy" @@ -8111,25 +9676,13 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725 +#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727 msgid "QQ Protocol\tPlugin" msgstr "QQ Protocol\tPlugin" -#: ../libpurple/protocols/qq/qq.c:750 -msgid "Login in TCP" -msgstr "Login using TCP" - -#: ../libpurple/protocols/qq/qq.c:753 -msgid "Login Hidden" -msgstr "Login Hidden" - -#: ../libpurple/protocols/qq/qq_proxy.c:497 -msgid "Socket send error" -msgstr "Socket send error" - -#: ../libpurple/protocols/qq/qq_proxy.c:500 -msgid "Connection refused" -msgstr "Connection refused" +#: ../libpurple/protocols/qq/qq.c:752 +msgid "Connect using TCP" +msgstr "Connect using TCP" #: ../libpurple/protocols/qq/recv_core.c:309 msgid "Socket error" @@ -8139,80 +9692,76 @@ msgid "Unable to read from socket" msgstr "Unable to read from socket" -#: ../libpurple/protocols/qq/send_file.c:706 +#: ../libpurple/protocols/qq/send_file.c:707 #, c-format msgid "%d has declined the file %s" msgstr "%d has declined the file %s" -#: ../libpurple/protocols/qq/send_file.c:709 -#: ../libpurple/protocols/qq/send_file.c:738 +#: ../libpurple/protocols/qq/send_file.c:710 +#: ../libpurple/protocols/qq/send_file.c:739 msgid "File Send" msgstr "File Send" -#: ../libpurple/protocols/qq/send_file.c:735 +#: ../libpurple/protocols/qq/send_file.c:736 #, c-format msgid "%d canceled the transfer of %s" msgstr "%d cancelled the transfer of %s" -#: ../libpurple/protocols/qq/sendqueue.c:122 +#: ../libpurple/protocols/qq/sendqueue.c:123 msgid "Connection lost" msgstr "Connection lost" #. cancel login progress -#: ../libpurple/protocols/qq/sendqueue.c:130 +#: ../libpurple/protocols/qq/sendqueue.c:131 msgid "Login failed, no reply" msgstr "Login failed; no reply" -#: ../libpurple/protocols/qq/sys_msg.c:112 -msgid "Do you wanna add this buddy?" -msgstr "Do you want to add this buddy to your buddy list?" +#: ../libpurple/protocols/qq/sys_msg.c:110 +msgid "Do you want to add this buddy?" +msgstr "Do you want to add this buddy?" #. only need to get value -#: ../libpurple/protocols/qq/sys_msg.c:168 +#: ../libpurple/protocols/qq/sys_msg.c:166 #, c-format msgid "You have been added by %s" msgstr "You have been added by %s" -#: ../libpurple/protocols/qq/sys_msg.c:171 -msgid "Would like to add him?" +#: ../libpurple/protocols/qq/sys_msg.c:169 +#: ../libpurple/protocols/qq/sys_msg.c:263 +msgid "Would you like to add him?" msgstr "Would you like to add this person?" -#: ../libpurple/protocols/qq/sys_msg.c:178 -#, c-format -msgid "%s has added you [%s]" -msgstr "%s has added you [%s]" - -#: ../libpurple/protocols/qq/sys_msg.c:194 +#: ../libpurple/protocols/qq/sys_msg.c:176 +#, c-format +msgid "%s has added you [%s] to his or her buddy list" +msgstr "%s has added you [%s] to his or her buddy list" + +#: ../libpurple/protocols/qq/sys_msg.c:192 #, c-format msgid "User %s rejected your request" msgstr "User %s rejected your request" -#: ../libpurple/protocols/qq/sys_msg.c:214 -#, c-format -msgid "User %s has approved your request" -msgstr "User %s has approved your request" - -#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze +#: ../libpurple/protocols/qq/sys_msg.c:212 +#, c-format +msgid "User %s approved your request" +msgstr "User %s approved your request" + #. TODO: this should go through purple_account_request_authorization() -#: ../libpurple/protocols/qq/sys_msg.c:241 -#, c-format -msgid "%s wanna add you [%s] as friends" +#: ../libpurple/protocols/qq/sys_msg.c:238 +#, c-format +msgid "%s wants to add you [%s] as a friend" msgstr "%s wants to add you [%s] as a friend" -#: ../libpurple/protocols/qq/sys_msg.c:242 +#: ../libpurple/protocols/qq/sys_msg.c:239 #, c-format msgid "Message: %s" msgstr "Message: %s" -#: ../libpurple/protocols/qq/sys_msg.c:264 +#: ../libpurple/protocols/qq/sys_msg.c:261 #, c-format msgid "%s is not in your buddy list" msgstr "%s is not in your buddy list" -#: ../libpurple/protocols/qq/sys_msg.c:266 -msgid "Would you like to add him?" -msgstr "Would you like to add this person?" - #: ../libpurple/protocols/sametime/sametime.c:417 msgid "Connection closed (writing)" msgstr "Connection closed (writing)" @@ -8276,10 +9825,6 @@ msgid "Starting Services" msgstr "Starting Services" -#: ../libpurple/protocols/sametime/sametime.c:1544 -msgid "Connected" -msgstr "Connected" - #: ../libpurple/protocols/sametime/sametime.c:1645 #, c-format msgid "" @@ -8335,10 +9880,6 @@ msgid "Video Camera" msgstr "Video Camera" -#: ../libpurple/protocols/sametime/sametime.c:3235 -msgid "File Transfer" -msgstr "File Transfer" - #: ../libpurple/protocols/sametime/sametime.c:3269 #: ../libpurple/protocols/sametime/sametime.c:4145 msgid "Supports" @@ -8405,7 +9946,7 @@ msgid "Send TEST Announcement" msgstr "Send TEST Announcement" -#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177 +#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338 msgid "Topic:" msgstr "Topic:" @@ -8430,7 +9971,7 @@ msgid "No Sametime Community Server Specified" msgstr "No Sametime Community Server Specified" -#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3966 +#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038 msgid "Connect" msgstr "Connect" @@ -8608,7 +10149,7 @@ "may add these users to your buddy list or send them messages with the action " "buttons below." -#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716 +#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724 msgid "Search Results" msgstr "Search Results" @@ -8668,60 +10209,85 @@ msgstr "Hide client identity" #: ../libpurple/protocols/silc/buddy.c:52 -#: ../libpurple/protocols/silc/buddy.c:421 -#: ../libpurple/protocols/silc/buddy.c:546 -#: ../libpurple/protocols/silc/buddy.c:712 -#: ../libpurple/protocols/silc/ft.c:338 +#: ../libpurple/protocols/silc/buddy.c:410 +#: ../libpurple/protocols/silc/buddy.c:538 +#: ../libpurple/protocols/silc/buddy.c:700 +#: ../libpurple/protocols/silc/ft.c:423 +#: ../libpurple/protocols/silc10/buddy.c:52 +#: ../libpurple/protocols/silc10/buddy.c:421 +#: ../libpurple/protocols/silc10/buddy.c:546 +#: ../libpurple/protocols/silc10/buddy.c:712 +#: ../libpurple/protocols/silc10/ft.c:338 #, c-format msgid "User %s is not present in the network" msgstr "User %s is not present in the network" #: ../libpurple/protocols/silc/buddy.c:53 +#: ../libpurple/protocols/silc/buddy.c:110 #: ../libpurple/protocols/silc/buddy.c:115 -#: ../libpurple/protocols/silc/buddy.c:120 +#: ../libpurple/protocols/silc/buddy.c:119 #: ../libpurple/protocols/silc/buddy.c:124 #: ../libpurple/protocols/silc/buddy.c:129 #: ../libpurple/protocols/silc/buddy.c:134 -#: ../libpurple/protocols/silc/buddy.c:139 -#: ../libpurple/protocols/silc/buddy.c:257 +#: ../libpurple/protocols/silc/buddy.c:254 +#: ../libpurple/protocols/silc10/buddy.c:53 +#: ../libpurple/protocols/silc10/buddy.c:115 +#: ../libpurple/protocols/silc10/buddy.c:120 +#: ../libpurple/protocols/silc10/buddy.c:124 +#: ../libpurple/protocols/silc10/buddy.c:129 +#: ../libpurple/protocols/silc10/buddy.c:134 +#: ../libpurple/protocols/silc10/buddy.c:139 +#: ../libpurple/protocols/silc10/buddy.c:257 msgid "Key Agreement" msgstr "Key Agreement" #: ../libpurple/protocols/silc/buddy.c:54 +#: ../libpurple/protocols/silc10/buddy.c:54 msgid "Cannot perform the key agreement" msgstr "Cannot perform the key agreement" -#: ../libpurple/protocols/silc/buddy.c:116 +#: ../libpurple/protocols/silc/buddy.c:111 +#: ../libpurple/protocols/silc10/buddy.c:116 msgid "Error occurred during key agreement" msgstr "Error occurred during key agreement" -#: ../libpurple/protocols/silc/buddy.c:120 +#: ../libpurple/protocols/silc/buddy.c:115 +#: ../libpurple/protocols/silc10/buddy.c:120 msgid "Key Agreement failed" msgstr "Key Agreement failed" -#: ../libpurple/protocols/silc/buddy.c:125 +#: ../libpurple/protocols/silc/buddy.c:120 +#: ../libpurple/protocols/silc10/buddy.c:125 msgid "Timeout during key agreement" msgstr "Timeout during key agreement" +#: ../libpurple/protocols/silc/buddy.c:125 +#: ../libpurple/protocols/silc10/buddy.c:130 +msgid "Key agreement was aborted" +msgstr "Key agreement was aborted" + #: ../libpurple/protocols/silc/buddy.c:130 -msgid "Key agreement was aborted" -msgstr "Key agreement was aborted" - -#: ../libpurple/protocols/silc/buddy.c:135 +#: ../libpurple/protocols/silc10/buddy.c:135 msgid "Key agreement is already started" msgstr "Key agreement is already started" -#: ../libpurple/protocols/silc/buddy.c:140 +#: ../libpurple/protocols/silc/buddy.c:135 +#: ../libpurple/protocols/silc10/buddy.c:140 msgid "Key agreement cannot be started with yourself" msgstr "Key agreement cannot be started with yourself" -#: ../libpurple/protocols/silc/buddy.c:258 -#: ../libpurple/protocols/silc/buddy.c:389 -#: ../libpurple/protocols/silc/buddy.c:514 +#: ../libpurple/protocols/silc/buddy.c:255 +#: ../libpurple/protocols/silc/buddy.c:383 +#: ../libpurple/protocols/silc/buddy.c:497 +#: ../libpurple/protocols/silc/buddy.c:508 +#: ../libpurple/protocols/silc10/buddy.c:258 +#: ../libpurple/protocols/silc10/buddy.c:389 +#: ../libpurple/protocols/silc10/buddy.c:514 msgid "The remote user is not present in the network any more" msgstr "The remote user is not present in the network any more" -#: ../libpurple/protocols/silc/buddy.c:295 +#: ../libpurple/protocols/silc/buddy.c:298 +#: ../libpurple/protocols/silc10/buddy.c:295 #, c-format msgid "" "Key agreement request received from %s. Would you like to perform the key " @@ -8730,7 +10296,8 @@ "Key agreement request received from %s. Would you like to perform the key " "agreement?" -#: ../libpurple/protocols/silc/buddy.c:299 +#: ../libpurple/protocols/silc/buddy.c:302 +#: ../libpurple/protocols/silc10/buddy.c:299 #, c-format msgid "" "The remote user is waiting key agreement on:\n" @@ -8741,69 +10308,99 @@ "Remote host: %s\n" "Remote port: %d" -#: ../libpurple/protocols/silc/buddy.c:312 +#: ../libpurple/protocols/silc/buddy.c:315 +#: ../libpurple/protocols/silc10/buddy.c:312 msgid "Key Agreement Request" msgstr "Key Agreement Request" -#: ../libpurple/protocols/silc/buddy.c:388 -#: ../libpurple/protocols/silc/buddy.c:423 -#: ../libpurple/protocols/silc/buddy.c:465 +#: ../libpurple/protocols/silc/buddy.c:382 +#: ../libpurple/protocols/silc/buddy.c:412 +#: ../libpurple/protocols/silc/buddy.c:452 +#: ../libpurple/protocols/silc10/buddy.c:388 +#: ../libpurple/protocols/silc10/buddy.c:423 +#: ../libpurple/protocols/silc10/buddy.c:465 msgid "IM With Password" msgstr "IM With Password" -#: ../libpurple/protocols/silc/buddy.c:424 +#: ../libpurple/protocols/silc/buddy.c:413 +#: ../libpurple/protocols/silc10/buddy.c:424 msgid "Cannot set IM key" msgstr "Cannot set IM key" -#: ../libpurple/protocols/silc/buddy.c:466 +#: ../libpurple/protocols/silc/buddy.c:453 +#: ../libpurple/protocols/silc10/buddy.c:466 msgid "Set IM Password" msgstr "Set IM Password" -#: ../libpurple/protocols/silc/buddy.c:513 -#: ../libpurple/protocols/silc/buddy.c:548 -#: ../libpurple/protocols/silc/ops.c:1494 -#: ../libpurple/protocols/silc/ops.c:1505 +#: ../libpurple/protocols/silc/buddy.c:496 +#: ../libpurple/protocols/silc/buddy.c:507 +#: ../libpurple/protocols/silc/buddy.c:540 +#: ../libpurple/protocols/silc/ops.c:1499 +#: ../libpurple/protocols/silc/ops.c:1510 +#: ../libpurple/protocols/silc10/buddy.c:513 +#: ../libpurple/protocols/silc10/buddy.c:548 +#: ../libpurple/protocols/silc10/ops.c:1494 +#: ../libpurple/protocols/silc10/ops.c:1505 msgid "Get Public Key" msgstr "Get Public Key" -#: ../libpurple/protocols/silc/buddy.c:549 -#: ../libpurple/protocols/silc/ops.c:1495 -#: ../libpurple/protocols/silc/ops.c:1506 +#: ../libpurple/protocols/silc/buddy.c:541 +#: ../libpurple/protocols/silc/ops.c:1500 +#: ../libpurple/protocols/silc/ops.c:1511 +#: ../libpurple/protocols/silc10/buddy.c:549 +#: ../libpurple/protocols/silc10/ops.c:1495 +#: ../libpurple/protocols/silc10/ops.c:1506 msgid "Cannot fetch the public key" msgstr "Cannot fetch the public key" -#: ../libpurple/protocols/silc/buddy.c:635 -#: ../libpurple/protocols/silc/buddy.c:1654 +#: ../libpurple/protocols/silc/buddy.c:622 +#: ../libpurple/protocols/silc/buddy.c:1655 +#: ../libpurple/protocols/silc10/buddy.c:635 +#: ../libpurple/protocols/silc10/buddy.c:1654 msgid "Show Public Key" msgstr "Show Public Key" -#: ../libpurple/protocols/silc/buddy.c:636 -#: ../libpurple/protocols/silc/buddy.c:1033 +#: ../libpurple/protocols/silc/buddy.c:623 +#: ../libpurple/protocols/silc/buddy.c:1027 #: ../libpurple/protocols/silc/chat.c:237 +#: ../libpurple/protocols/silc10/buddy.c:636 +#: ../libpurple/protocols/silc10/buddy.c:1033 +#: ../libpurple/protocols/silc10/chat.c:237 msgid "Could not load public key" msgstr "Could not load public key" -#: ../libpurple/protocols/silc/buddy.c:713 -#: ../libpurple/protocols/silc/ops.c:1087 -#: ../libpurple/protocols/silc/ops.c:1159 -#: ../libpurple/protocols/silc/ops.c:1294 -#: ../libpurple/protocols/silc/ops.c:1295 -#: ../libpurple/protocols/silc/ops.c:1313 +#: ../libpurple/protocols/silc/buddy.c:701 +#: ../libpurple/protocols/silc/ops.c:1053 +#: ../libpurple/protocols/silc/ops.c:1168 +#: ../libpurple/protocols/silc/ops.c:1288 +#: ../libpurple/protocols/silc/ops.c:1289 +#: ../libpurple/protocols/silc/ops.c:1307 +#: ../libpurple/protocols/silc10/buddy.c:713 +#: ../libpurple/protocols/silc10/ops.c:1087 +#: ../libpurple/protocols/silc10/ops.c:1159 +#: ../libpurple/protocols/silc10/ops.c:1294 +#: ../libpurple/protocols/silc10/ops.c:1295 +#: ../libpurple/protocols/silc10/ops.c:1313 msgid "User Information" msgstr "User Information" -#: ../libpurple/protocols/silc/buddy.c:714 -#: ../libpurple/protocols/silc/ops.c:1160 -#: ../libpurple/protocols/silc/ops.c:1314 +#: ../libpurple/protocols/silc/buddy.c:702 +#: ../libpurple/protocols/silc/ops.c:1169 +#: ../libpurple/protocols/silc/ops.c:1308 +#: ../libpurple/protocols/silc10/buddy.c:714 +#: ../libpurple/protocols/silc10/ops.c:1160 +#: ../libpurple/protocols/silc10/ops.c:1314 msgid "Cannot get user information" msgstr "Cannot get user information" -#: ../libpurple/protocols/silc/buddy.c:735 +#: ../libpurple/protocols/silc/buddy.c:723 +#: ../libpurple/protocols/silc10/buddy.c:735 #, c-format msgid "The %s buddy is not trusted" msgstr "The %s buddy is not trusted" -#: ../libpurple/protocols/silc/buddy.c:738 +#: ../libpurple/protocols/silc/buddy.c:726 +#: ../libpurple/protocols/silc10/buddy.c:738 msgid "" "You cannot receive buddy notifications until you import his/her public key. " "You can use the Get Public Key command to get the public key." @@ -8812,16 +10409,19 @@ "You can use the Get Public Key command to get the public key." #. Open file selector to select the public key. -#: ../libpurple/protocols/silc/buddy.c:1067 +#: ../libpurple/protocols/silc/buddy.c:1059 +#: ../libpurple/protocols/silc10/buddy.c:1067 msgid "Open..." msgstr "Open..." -#: ../libpurple/protocols/silc/buddy.c:1078 +#: ../libpurple/protocols/silc/buddy.c:1070 +#: ../libpurple/protocols/silc10/buddy.c:1078 #, c-format msgid "The %s buddy is not present in the network" msgstr "The %s buddy is not present in the network" -#: ../libpurple/protocols/silc/buddy.c:1081 +#: ../libpurple/protocols/silc/buddy.c:1073 +#: ../libpurple/protocols/silc10/buddy.c:1081 msgid "" "To add the buddy you must import his/her public key. Press Import to import " "a public key." @@ -8829,15 +10429,18 @@ "To add the buddy you must import their public key. Press Import to import a " "public key." -#: ../libpurple/protocols/silc/buddy.c:1085 +#: ../libpurple/protocols/silc/buddy.c:1077 +#: ../libpurple/protocols/silc10/buddy.c:1085 msgid "_Import..." msgstr "_Import..." -#: ../libpurple/protocols/silc/buddy.c:1181 +#: ../libpurple/protocols/silc/buddy.c:1183 +#: ../libpurple/protocols/silc10/buddy.c:1181 msgid "Select correct user" msgstr "Select correct user" -#: ../libpurple/protocols/silc/buddy.c:1183 +#: ../libpurple/protocols/silc/buddy.c:1185 +#: ../libpurple/protocols/silc10/buddy.c:1183 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." @@ -8845,7 +10448,8 @@ "More than one user was found with the same public key. Select the correct " "user from the list to add to the buddy list." -#: ../libpurple/protocols/silc/buddy.c:1185 +#: ../libpurple/protocols/silc/buddy.c:1187 +#: ../libpurple/protocols/silc10/buddy.c:1185 msgid "" "More than one user was found with the same name. Select the correct user " "from the list to add to the buddy list." @@ -8854,237 +10458,311 @@ "from the list to add to the buddy list." #: ../libpurple/protocols/silc/buddy.c:1474 +#: ../libpurple/protocols/silc10/buddy.c:1474 msgid "Detached" msgstr "Detached" #: ../libpurple/protocols/silc/buddy.c:1478 -#: ../libpurple/protocols/silc/silc.c:49 +#: ../libpurple/protocols/silc/silc.c:58 +#: ../libpurple/protocols/silc10/buddy.c:1478 +#: ../libpurple/protocols/silc10/silc.c:49 msgid "Indisposed" msgstr "Indisposed" #: ../libpurple/protocols/silc/buddy.c:1482 -#: ../libpurple/protocols/silc/silc.c:51 +#: ../libpurple/protocols/silc/silc.c:60 +#: ../libpurple/protocols/silc10/buddy.c:1482 +#: ../libpurple/protocols/silc10/silc.c:51 msgid "Wake Me Up" msgstr "Wake Me Up" #: ../libpurple/protocols/silc/buddy.c:1484 -#: ../libpurple/protocols/silc/silc.c:43 +#: ../libpurple/protocols/silc/silc.c:52 +#: ../libpurple/protocols/silc10/buddy.c:1484 +#: ../libpurple/protocols/silc10/silc.c:43 msgid "Hyper Active" msgstr "Hyper Active" #: ../libpurple/protocols/silc/buddy.c:1486 +#: ../libpurple/protocols/silc10/buddy.c:1486 msgid "Robot" msgstr "Robot" #: ../libpurple/protocols/silc/buddy.c:1493 -#: ../libpurple/protocols/silc/silc.c:662 -#: ../libpurple/protocols/silc/util.c:512 +#: ../libpurple/protocols/silc/silc.c:743 +#: ../libpurple/protocols/silc/util.c:516 +#: ../libpurple/protocols/silc10/buddy.c:1493 +#: ../libpurple/protocols/silc10/silc.c:654 +#: ../libpurple/protocols/silc10/util.c:512 msgid "Happy" msgstr "Happy" #: ../libpurple/protocols/silc/buddy.c:1495 -#: ../libpurple/protocols/silc/silc.c:664 -#: ../libpurple/protocols/silc/util.c:514 +#: ../libpurple/protocols/silc/silc.c:745 +#: ../libpurple/protocols/silc/util.c:518 +#: ../libpurple/protocols/silc10/buddy.c:1495 +#: ../libpurple/protocols/silc10/silc.c:656 +#: ../libpurple/protocols/silc10/util.c:514 msgid "Sad" msgstr "Sad" #: ../libpurple/protocols/silc/buddy.c:1497 -#: ../libpurple/protocols/silc/silc.c:666 -#: ../libpurple/protocols/silc/util.c:516 +#: ../libpurple/protocols/silc/silc.c:747 +#: ../libpurple/protocols/silc/util.c:520 +#: ../libpurple/protocols/silc10/buddy.c:1497 +#: ../libpurple/protocols/silc10/silc.c:658 +#: ../libpurple/protocols/silc10/util.c:516 msgid "Angry" msgstr "Angry" #: ../libpurple/protocols/silc/buddy.c:1499 -#: ../libpurple/protocols/silc/silc.c:668 -#: ../libpurple/protocols/silc/util.c:518 +#: ../libpurple/protocols/silc/silc.c:749 +#: ../libpurple/protocols/silc/util.c:522 +#: ../libpurple/protocols/silc10/buddy.c:1499 +#: ../libpurple/protocols/silc10/silc.c:660 +#: ../libpurple/protocols/silc10/util.c:518 msgid "Jealous" msgstr "Jealous" #: ../libpurple/protocols/silc/buddy.c:1501 -#: ../libpurple/protocols/silc/silc.c:670 -#: ../libpurple/protocols/silc/util.c:520 +#: ../libpurple/protocols/silc/silc.c:751 +#: ../libpurple/protocols/silc/util.c:524 +#: ../libpurple/protocols/silc10/buddy.c:1501 +#: ../libpurple/protocols/silc10/silc.c:662 +#: ../libpurple/protocols/silc10/util.c:520 msgid "Ashamed" msgstr "Ashamed" #: ../libpurple/protocols/silc/buddy.c:1503 -#: ../libpurple/protocols/silc/silc.c:672 -#: ../libpurple/protocols/silc/util.c:522 +#: ../libpurple/protocols/silc/silc.c:753 +#: ../libpurple/protocols/silc/util.c:526 +#: ../libpurple/protocols/silc10/buddy.c:1503 +#: ../libpurple/protocols/silc10/silc.c:664 +#: ../libpurple/protocols/silc10/util.c:522 msgid "Invincible" msgstr "Invincible" #: ../libpurple/protocols/silc/buddy.c:1505 -#: ../libpurple/protocols/silc/util.c:524 +#: ../libpurple/protocols/silc/util.c:528 +#: ../libpurple/protocols/silc10/buddy.c:1505 +#: ../libpurple/protocols/silc10/util.c:524 msgid "In Love" msgstr "In Love" #: ../libpurple/protocols/silc/buddy.c:1507 -#: ../libpurple/protocols/silc/silc.c:676 -#: ../libpurple/protocols/silc/util.c:526 +#: ../libpurple/protocols/silc/silc.c:757 +#: ../libpurple/protocols/silc/util.c:530 +#: ../libpurple/protocols/silc10/buddy.c:1507 +#: ../libpurple/protocols/silc10/silc.c:668 +#: ../libpurple/protocols/silc10/util.c:526 msgid "Sleepy" msgstr "Sleepy" #: ../libpurple/protocols/silc/buddy.c:1509 -#: ../libpurple/protocols/silc/silc.c:678 -#: ../libpurple/protocols/silc/util.c:528 +#: ../libpurple/protocols/silc/silc.c:759 +#: ../libpurple/protocols/silc/util.c:532 +#: ../libpurple/protocols/silc10/buddy.c:1509 +#: ../libpurple/protocols/silc10/silc.c:670 +#: ../libpurple/protocols/silc10/util.c:528 msgid "Bored" msgstr "Bored" #: ../libpurple/protocols/silc/buddy.c:1511 -#: ../libpurple/protocols/silc/silc.c:680 -#: ../libpurple/protocols/silc/util.c:530 +#: ../libpurple/protocols/silc/silc.c:761 +#: ../libpurple/protocols/silc/util.c:534 +#: ../libpurple/protocols/silc10/buddy.c:1511 +#: ../libpurple/protocols/silc10/silc.c:672 +#: ../libpurple/protocols/silc10/util.c:530 msgid "Excited" msgstr "Excited" #: ../libpurple/protocols/silc/buddy.c:1513 -#: ../libpurple/protocols/silc/silc.c:682 -#: ../libpurple/protocols/silc/util.c:532 +#: ../libpurple/protocols/silc/silc.c:763 +#: ../libpurple/protocols/silc/util.c:536 +#: ../libpurple/protocols/silc10/buddy.c:1513 +#: ../libpurple/protocols/silc10/silc.c:674 +#: ../libpurple/protocols/silc10/util.c:532 msgid "Anxious" msgstr "Anxious" #: ../libpurple/protocols/silc/buddy.c:1545 -#: ../libpurple/protocols/silc/ops.c:1202 +#: ../libpurple/protocols/silc/ops.c:1207 +#: ../libpurple/protocols/silc10/buddy.c:1545 +#: ../libpurple/protocols/silc10/ops.c:1202 msgid "User Modes" msgstr "User Modes" -#: ../libpurple/protocols/silc/buddy.c:1557 -#: ../libpurple/protocols/silc/ops.c:1207 -msgid "Mood" -msgstr "Mood" - #: ../libpurple/protocols/silc/buddy.c:1562 -#: ../libpurple/protocols/silc/ops.c:1219 +#: ../libpurple/protocols/silc/ops.c:1224 +#: ../libpurple/protocols/silc10/buddy.c:1562 +#: ../libpurple/protocols/silc10/ops.c:1219 msgid "Preferred Contact" msgstr "Preferred Contact" #: ../libpurple/protocols/silc/buddy.c:1567 -#: ../libpurple/protocols/silc/ops.c:1224 +#: ../libpurple/protocols/silc/ops.c:1229 +#: ../libpurple/protocols/silc10/buddy.c:1567 +#: ../libpurple/protocols/silc10/ops.c:1224 msgid "Preferred Language" msgstr "Preferred Language" #: ../libpurple/protocols/silc/buddy.c:1572 -#: ../libpurple/protocols/silc/ops.c:1229 +#: ../libpurple/protocols/silc/ops.c:1234 +#: ../libpurple/protocols/silc10/buddy.c:1572 +#: ../libpurple/protocols/silc10/ops.c:1229 msgid "Device" msgstr "Device" #: ../libpurple/protocols/silc/buddy.c:1577 -#: ../libpurple/protocols/silc/ops.c:1234 -#: ../libpurple/protocols/silc/silc.c:730 -#: ../libpurple/protocols/silc/silc.c:732 +#: ../libpurple/protocols/silc/ops.c:1239 +#: ../libpurple/protocols/silc10/buddy.c:1577 +#: ../libpurple/protocols/silc10/ops.c:1234 +#: ../libpurple/protocols/silc10/silc.c:722 +#: ../libpurple/protocols/silc10/silc.c:724 msgid "Timezone" msgstr "Timezone" #: ../libpurple/protocols/silc/buddy.c:1582 -#: ../libpurple/protocols/silc/ops.c:1239 +#: ../libpurple/protocols/silc/ops.c:1244 +#: ../libpurple/protocols/silc10/buddy.c:1582 +#: ../libpurple/protocols/silc10/ops.c:1239 msgid "Geolocation" msgstr "Geolocation" -#: ../libpurple/protocols/silc/buddy.c:1636 +#: ../libpurple/protocols/silc/buddy.c:1638 +#: ../libpurple/protocols/silc10/buddy.c:1636 msgid "Reset IM Key" msgstr "Reset IM Key" -#: ../libpurple/protocols/silc/buddy.c:1642 +#: ../libpurple/protocols/silc/buddy.c:1643 +#: ../libpurple/protocols/silc10/buddy.c:1642 msgid "IM with Key Exchange" msgstr "IM with Key Exchange" -#: ../libpurple/protocols/silc/buddy.c:1647 +#: ../libpurple/protocols/silc/buddy.c:1648 +#: ../libpurple/protocols/silc10/buddy.c:1647 msgid "IM with Password" msgstr "IM with Password" -#: ../libpurple/protocols/silc/buddy.c:1660 +#: ../libpurple/protocols/silc/buddy.c:1661 +#: ../libpurple/protocols/silc10/buddy.c:1660 msgid "Get Public Key..." msgstr "Get Public Key..." -#: ../libpurple/protocols/silc/buddy.c:1667 -#: ../libpurple/protocols/silc/ops.c:1624 +#: ../libpurple/protocols/silc/buddy.c:1668 +#: ../libpurple/protocols/silc/ops.c:1608 +#: ../libpurple/protocols/silc10/buddy.c:1667 +#: ../libpurple/protocols/silc10/ops.c:1624 msgid "Kill User" msgstr "Kill User" -#: ../libpurple/protocols/silc/buddy.c:1677 -#: ../libpurple/protocols/silc/chat.c:977 +#: ../libpurple/protocols/silc/buddy.c:1678 +#: ../libpurple/protocols/silc/chat.c:993 +#: ../libpurple/protocols/silc10/buddy.c:1677 +#: ../libpurple/protocols/silc10/chat.c:977 msgid "Draw On Whiteboard" msgstr "Draw On Whiteboard" #: ../libpurple/protocols/silc/chat.c:39 +#: ../libpurple/protocols/silc10/chat.c:39 msgid "_Passphrase:" msgstr "_Passphrase:" #: ../libpurple/protocols/silc/chat.c:80 +#: ../libpurple/protocols/silc10/chat.c:80 #, c-format msgid "Channel %s does not exist in the network" msgstr "Channel %s does not exist in the network" #: ../libpurple/protocols/silc/chat.c:81 -#: ../libpurple/protocols/silc/chat.c:174 +#: ../libpurple/protocols/silc/chat.c:175 +#: ../libpurple/protocols/silc10/chat.c:81 +#: ../libpurple/protocols/silc10/chat.c:174 msgid "Channel Information" msgstr "Channel Information" #: ../libpurple/protocols/silc/chat.c:82 +#: ../libpurple/protocols/silc10/chat.c:82 msgid "Cannot get channel information" msgstr "Cannot get channel information" #: ../libpurple/protocols/silc/chat.c:119 +#: ../libpurple/protocols/silc10/chat.c:119 #, c-format msgid "<b>Channel Name:</b> %s" msgstr "<b>Channel Name:</b> %s" #: ../libpurple/protocols/silc/chat.c:122 +#: ../libpurple/protocols/silc10/chat.c:122 #, c-format msgid "<br><b>User Count:</b> %d" msgstr "<br><b>User Count:</b> %d" #: ../libpurple/protocols/silc/chat.c:129 +#: ../libpurple/protocols/silc10/chat.c:129 #, c-format msgid "<br><b>Channel Founder:</b> %s" msgstr "<br><b>Channel Founder:</b> %s" #: ../libpurple/protocols/silc/chat.c:138 +#: ../libpurple/protocols/silc10/chat.c:138 #, c-format msgid "<br><b>Channel Cipher:</b> %s" msgstr "<br><b>Channel Cipher:</b> %s" #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC -#: ../libpurple/protocols/silc/chat.c:142 +#: ../libpurple/protocols/silc/chat.c:143 +#: ../libpurple/protocols/silc10/chat.c:142 #, c-format msgid "<br><b>Channel HMAC:</b> %s" msgstr "<br><b>Channel HMAC:</b> %s" -#: ../libpurple/protocols/silc/chat.c:147 +#: ../libpurple/protocols/silc/chat.c:148 +#: ../libpurple/protocols/silc10/chat.c:147 #, c-format msgid "<br><b>Channel Topic:</b><br>%s" msgstr "<br><b>Channel Topic:</b><br>%s" -#: ../libpurple/protocols/silc/chat.c:152 +#: ../libpurple/protocols/silc/chat.c:153 +#: ../libpurple/protocols/silc10/chat.c:152 msgid "<br><b>Channel Modes:</b> " msgstr "<br><b>Channel Modes:</b> " -#: ../libpurple/protocols/silc/chat.c:165 +#: ../libpurple/protocols/silc/chat.c:166 +#: ../libpurple/protocols/silc10/chat.c:165 #, c-format msgid "<br><b>Founder Key Fingerprint:</b><br>%s" msgstr "<br><b>Founder Key Fingerprint:</b><br>%s" -#: ../libpurple/protocols/silc/chat.c:166 +#: ../libpurple/protocols/silc/chat.c:167 +#: ../libpurple/protocols/silc10/chat.c:166 #, c-format msgid "<br><b>Founder Key Babbleprint:</b><br>%s" msgstr "<br><b>Founder Key Babbleprint:</b><br>%s" #: ../libpurple/protocols/silc/chat.c:236 +#: ../libpurple/protocols/silc10/chat.c:236 msgid "Add Channel Public Key" msgstr "Add Channel Public Key" #. Add new public key -#: ../libpurple/protocols/silc/chat.c:291 +#: ../libpurple/protocols/silc/chat.c:304 +#: ../libpurple/protocols/silc10/chat.c:291 msgid "Open Public Key..." msgstr "Open Public Key..." -#: ../libpurple/protocols/silc/chat.c:401 +#: ../libpurple/protocols/silc/chat.c:423 +#: ../libpurple/protocols/silc10/chat.c:401 msgid "Channel Passphrase" msgstr "Channel Passphrase" -#: ../libpurple/protocols/silc/chat.c:408 +#: ../libpurple/protocols/silc/chat.c:430 +#: ../libpurple/protocols/silc10/chat.c:408 msgid "Channel Public Keys List" msgstr "Channel Public Keys List" -#: ../libpurple/protocols/silc/chat.c:413 +#: ../libpurple/protocols/silc/chat.c:435 +#: ../libpurple/protocols/silc10/chat.c:413 msgid "" "Channel authentication is used to secure the channel from unauthorized " "access. The authentication may be based on passphrase and digital " @@ -9098,332 +10776,445 @@ "channel public keys are set then only users whose public keys are listed are " "able to join." -#: ../libpurple/protocols/silc/chat.c:422 -#: ../libpurple/protocols/silc/chat.c:423 -#: ../libpurple/protocols/silc/chat.c:461 -#: ../libpurple/protocols/silc/chat.c:462 -#: ../libpurple/protocols/silc/chat.c:911 +#: ../libpurple/protocols/silc/chat.c:444 +#: ../libpurple/protocols/silc/chat.c:445 +#: ../libpurple/protocols/silc/chat.c:479 +#: ../libpurple/protocols/silc/chat.c:480 +#: ../libpurple/protocols/silc/chat.c:927 +#: ../libpurple/protocols/silc10/chat.c:422 +#: ../libpurple/protocols/silc10/chat.c:423 +#: ../libpurple/protocols/silc10/chat.c:461 +#: ../libpurple/protocols/silc10/chat.c:462 +#: ../libpurple/protocols/silc10/chat.c:911 msgid "Channel Authentication" msgstr "Channel Authentication" -#: ../libpurple/protocols/silc/chat.c:424 -#: ../libpurple/protocols/silc/chat.c:463 +#: ../libpurple/protocols/silc/chat.c:446 +#: ../libpurple/protocols/silc/chat.c:481 +#: ../libpurple/protocols/silc10/chat.c:424 +#: ../libpurple/protocols/silc10/chat.c:463 msgid "Add / Remove" msgstr "Add / Remove" -#: ../libpurple/protocols/silc/chat.c:581 +#: ../libpurple/protocols/silc/chat.c:597 +#: ../libpurple/protocols/silc10/chat.c:581 msgid "Group Name" msgstr "Group name" -#: ../libpurple/protocols/silc/chat.c:585 -#: ../libpurple/protocols/silc/ops.c:1910 -#: ../libpurple/protocols/silc/silc.c:939 +#: ../libpurple/protocols/silc/chat.c:601 +#: ../libpurple/protocols/silc/ops.c:1813 +#: ../libpurple/protocols/silc/silc.c:1020 +#: ../libpurple/protocols/silc10/chat.c:585 +#: ../libpurple/protocols/silc10/ops.c:1901 +#: ../libpurple/protocols/silc10/silc.c:931 msgid "Passphrase" msgstr "Passphrase" -#: ../libpurple/protocols/silc/chat.c:596 +#: ../libpurple/protocols/silc/chat.c:612 +#: ../libpurple/protocols/silc10/chat.c:596 #, c-format msgid "Please enter the %s channel private group name and passphrase." msgstr "Please enter the %s channel private group name and passphrase." -#: ../libpurple/protocols/silc/chat.c:598 +#: ../libpurple/protocols/silc/chat.c:614 +#: ../libpurple/protocols/silc10/chat.c:598 msgid "Add Channel Private Group" msgstr "Add Channel Private Group" -#: ../libpurple/protocols/silc/chat.c:726 +#: ../libpurple/protocols/silc/chat.c:742 +#: ../libpurple/protocols/silc10/chat.c:726 msgid "User Limit" msgstr "User Limit" -#: ../libpurple/protocols/silc/chat.c:727 +#: ../libpurple/protocols/silc/chat.c:743 +#: ../libpurple/protocols/silc10/chat.c:727 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." -#: ../libpurple/protocols/silc/chat.c:891 +#: ../libpurple/protocols/silc/chat.c:907 +#: ../libpurple/protocols/silc10/chat.c:891 msgid "Invite List" msgstr "Invite List" -#: ../libpurple/protocols/silc/chat.c:896 +#: ../libpurple/protocols/silc/chat.c:912 +#: ../libpurple/protocols/silc10/chat.c:896 msgid "Ban List" msgstr "Ban List" -#: ../libpurple/protocols/silc/chat.c:904 +#: ../libpurple/protocols/silc/chat.c:920 +#: ../libpurple/protocols/silc10/chat.c:904 msgid "Add Private Group" msgstr "Add Private Group" -#: ../libpurple/protocols/silc/chat.c:917 +#: ../libpurple/protocols/silc/chat.c:933 +#: ../libpurple/protocols/silc10/chat.c:917 msgid "Reset Permanent" msgstr "Reset Permanent" -#: ../libpurple/protocols/silc/chat.c:922 +#: ../libpurple/protocols/silc/chat.c:938 +#: ../libpurple/protocols/silc10/chat.c:922 msgid "Set Permanent" msgstr "Set Permanent" -#: ../libpurple/protocols/silc/chat.c:930 +#: ../libpurple/protocols/silc/chat.c:946 +#: ../libpurple/protocols/silc10/chat.c:930 msgid "Set User Limit" msgstr "Set User Limit" -#: ../libpurple/protocols/silc/chat.c:936 +#: ../libpurple/protocols/silc/chat.c:952 +#: ../libpurple/protocols/silc10/chat.c:936 msgid "Reset Topic Restriction" msgstr "Reset Topic Restriction" -#: ../libpurple/protocols/silc/chat.c:941 +#: ../libpurple/protocols/silc/chat.c:957 +#: ../libpurple/protocols/silc10/chat.c:941 msgid "Set Topic Restriction" msgstr "Set Topic Restriction" -#: ../libpurple/protocols/silc/chat.c:948 +#: ../libpurple/protocols/silc/chat.c:964 +#: ../libpurple/protocols/silc10/chat.c:948 msgid "Reset Private Channel" msgstr "Reset Private Channel" -#: ../libpurple/protocols/silc/chat.c:953 +#: ../libpurple/protocols/silc/chat.c:969 +#: ../libpurple/protocols/silc10/chat.c:953 msgid "Set Private Channel" msgstr "Set Private Channel" -#: ../libpurple/protocols/silc/chat.c:960 +#: ../libpurple/protocols/silc/chat.c:976 +#: ../libpurple/protocols/silc10/chat.c:960 msgid "Reset Secret Channel" msgstr "Reset Secret Channel" -#: ../libpurple/protocols/silc/chat.c:965 +#: ../libpurple/protocols/silc/chat.c:981 +#: ../libpurple/protocols/silc10/chat.c:965 msgid "Set Secret Channel" msgstr "Set Secret Channel" -#: ../libpurple/protocols/silc/chat.c:1039 -#, c-format -msgid "You are channel founder on <I>%s</I>" -msgstr "You are channel founder on <I>%s</I>" - -#: ../libpurple/protocols/silc/chat.c:1043 -#, c-format -msgid "Channel founder on <I>%s</I> is <I>%s</I>" -msgstr "Channel founder on <I>%s</I> is <I>%s</I>" - -#: ../libpurple/protocols/silc/chat.c:1102 +#: ../libpurple/protocols/silc/chat.c:1045 +#: ../libpurple/protocols/silc10/chat.c:1102 #, 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" -#: ../libpurple/protocols/silc/chat.c:1104 +#: ../libpurple/protocols/silc/chat.c:1047 +#: ../libpurple/protocols/silc10/chat.c:1104 msgid "Join Private Group" msgstr "Join Private Group" -#: ../libpurple/protocols/silc/chat.c:1105 +#: ../libpurple/protocols/silc/chat.c:1048 +#: ../libpurple/protocols/silc10/chat.c:1105 msgid "Cannot join private group" msgstr "Cannot join private group" -#: ../libpurple/protocols/silc/chat.c:1299 -#: ../libpurple/protocols/silc/silc.c:1148 +#: ../libpurple/protocols/silc/chat.c:1260 +#: ../libpurple/protocols/silc/silc.c:1217 +#: ../libpurple/protocols/silc10/chat.c:1299 +#: ../libpurple/protocols/silc10/silc.c:1137 msgid "Call Command" msgstr "Call Command" -#: ../libpurple/protocols/silc/chat.c:1299 -#: ../libpurple/protocols/silc/silc.c:1148 +#: ../libpurple/protocols/silc/chat.c:1260 +#: ../libpurple/protocols/silc/silc.c:1218 +#: ../libpurple/protocols/silc10/chat.c:1299 +#: ../libpurple/protocols/silc10/silc.c:1137 msgid "Cannot call command" msgstr "Cannot call command" -#: ../libpurple/protocols/silc/chat.c:1300 -#: ../libpurple/protocols/silc/silc.c:1149 +#: ../libpurple/protocols/silc/chat.c:1261 +#: ../libpurple/protocols/silc/silc.c:1219 +#: ../libpurple/protocols/silc10/chat.c:1300 +#: ../libpurple/protocols/silc10/silc.c:1138 msgid "Unknown command" msgstr "Unknown command" -#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92 -#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100 -#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205 -#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215 -#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340 +#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101 +#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108 +#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116 +#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272 +#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282 +#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425 +#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92 +#: ../libpurple/protocols/silc10/ft.c:96 +#: ../libpurple/protocols/silc10/ft.c:100 +#: ../libpurple/protocols/silc10/ft.c:104 +#: ../libpurple/protocols/silc10/ft.c:205 +#: ../libpurple/protocols/silc10/ft.c:210 +#: ../libpurple/protocols/silc10/ft.c:215 +#: ../libpurple/protocols/silc10/ft.c:221 +#: ../libpurple/protocols/silc10/ft.c:340 msgid "Secure File Transfer" msgstr "Secure File Transfer" -#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93 -#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101 -#: ../libpurple/protocols/silc/ft.c:105 +#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102 +#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109 +#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117 +#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90 +#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97 +#: ../libpurple/protocols/silc10/ft.c:101 +#: ../libpurple/protocols/silc10/ft.c:105 msgid "Error during file transfer" msgstr "Error during file transfer" -#: ../libpurple/protocols/silc/ft.c:94 +#: ../libpurple/protocols/silc/ft.c:87 +msgid "Remote disconnected" +msgstr "Remote disconnected" + +#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94 msgid "Permission denied" msgstr "Permission denied" -#: ../libpurple/protocols/silc/ft.c:98 +#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98 msgid "Key agreement failed" msgstr "Key agreement failed" -#: ../libpurple/protocols/silc/ft.c:102 +#: ../libpurple/protocols/silc/ft.c:114 +msgid "Connection timed out" +msgstr "Connection timed out" + +#: ../libpurple/protocols/silc/ft.c:118 +msgid "Creating connection failed" +msgstr "Connection creation failed" + +#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102 msgid "File transfer session does not exist" msgstr "File transfer session does not exist" -#: ../libpurple/protocols/silc/ft.c:206 +#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206 msgid "No file transfer session active" msgstr "No file transfer session active" -#: ../libpurple/protocols/silc/ft.c:211 +#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211 msgid "File transfer already started" msgstr "File transfer already started" -#: ../libpurple/protocols/silc/ft.c:216 +#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216 msgid "Could not perform key agreement for file transfer" msgstr "Could not perform key agreement for file transfer" -#: ../libpurple/protocols/silc/ft.c:222 +#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222 msgid "Could not start the file transfer" msgstr "Could not start the file transfer" -#: ../libpurple/protocols/silc/ft.c:341 +#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341 msgid "Cannot send file" msgstr "Cannot send file" -#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563 -#: ../libpurple/protocols/silc/ops.c:572 +#: ../libpurple/protocols/silc/ops.c:57 +msgid "Error occurred" +msgstr "Error occurred" + +#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542 +#: ../libpurple/protocols/silc/ops.c:551 +#: ../libpurple/protocols/silc10/ops.c:554 +#: ../libpurple/protocols/silc10/ops.c:563 +#: ../libpurple/protocols/silc10/ops.c:572 #, 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" -#: ../libpurple/protocols/silc/ops.c:638 +#: ../libpurple/protocols/silc/ops.c:617 +#: ../libpurple/protocols/silc10/ops.c:638 #, 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" -#: ../libpurple/protocols/silc/ops.c:642 +#: ../libpurple/protocols/silc/ops.c:621 +#: ../libpurple/protocols/silc10/ops.c:642 #, c-format msgid "<I>%s</I> removed all channel <I>%s</I> modes" msgstr "<I>%s</I> removed all channel <I>%s</I> modes" -#: ../libpurple/protocols/silc/ops.c:675 +#: ../libpurple/protocols/silc/ops.c:654 +#: ../libpurple/protocols/silc10/ops.c:675 #, 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" -#: ../libpurple/protocols/silc/ops.c:683 +#: ../libpurple/protocols/silc/ops.c:662 +#: ../libpurple/protocols/silc10/ops.c:683 #, c-format msgid "<I>%s</I> removed all <I>%s's</I> modes" msgstr "<I>%s</I> removed all <I>%s's</I> modes" -#: ../libpurple/protocols/silc/ops.c:712 +#: ../libpurple/protocols/silc/ops.c:691 +#: ../libpurple/protocols/silc10/ops.c:712 #, 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)" -#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747 -#: ../libpurple/protocols/silc/ops.c:752 +#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723 +#: ../libpurple/protocols/silc/ops.c:728 +#: ../libpurple/protocols/silc10/ops.c:742 +#: ../libpurple/protocols/silc10/ops.c:747 +#: ../libpurple/protocols/silc10/ops.c:752 #, c-format msgid "You have been killed by %s (%s)" msgstr "You have been killed by %s (%s)" -#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778 -#: ../libpurple/protocols/silc/ops.c:783 +#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754 +#: ../libpurple/protocols/silc/ops.c:759 +#: ../libpurple/protocols/silc10/ops.c:773 +#: ../libpurple/protocols/silc10/ops.c:778 +#: ../libpurple/protocols/silc10/ops.c:783 #, c-format msgid "Killed by %s (%s)" msgstr "Killed by %s (%s)" -#: ../libpurple/protocols/silc/ops.c:829 +#: ../libpurple/protocols/silc/ops.c:796 +#: ../libpurple/protocols/silc10/ops.c:829 msgid "Server signoff" msgstr "Server signoff" -#: ../libpurple/protocols/silc/ops.c:1017 +#: ../libpurple/protocols/silc/ops.c:983 +#: ../libpurple/protocols/silc10/ops.c:1017 msgid "Personal Information" msgstr "Personal Information" -#: ../libpurple/protocols/silc/ops.c:1040 +#: ../libpurple/protocols/silc/ops.c:1006 +#: ../libpurple/protocols/silc10/ops.c:1040 msgid "Birth Day" msgstr "Date of Birth" -#: ../libpurple/protocols/silc/ops.c:1048 +#: ../libpurple/protocols/silc/ops.c:1014 +#: ../libpurple/protocols/silc10/ops.c:1048 msgid "Job Role" msgstr "Job Role" -#: ../libpurple/protocols/silc/ops.c:1052 -#: ../libpurple/protocols/silc/silc.c:932 +#: ../libpurple/protocols/silc/ops.c:1018 +#: ../libpurple/protocols/silc/silc.c:1013 +#: ../libpurple/protocols/silc10/ops.c:1052 +#: ../libpurple/protocols/silc10/silc.c:924 msgid "Organization" msgstr "Organisation" -#: ../libpurple/protocols/silc/ops.c:1056 +#: ../libpurple/protocols/silc/ops.c:1022 +#: ../libpurple/protocols/silc10/ops.c:1056 msgid "Unit" msgstr "Unit" -#: ../libpurple/protocols/silc/ops.c:1080 +#: ../libpurple/protocols/silc/ops.c:1046 +#: ../libpurple/protocols/silc10/ops.c:1080 msgid "Note" msgstr "Note" -#: ../libpurple/protocols/silc/ops.c:1128 +#: ../libpurple/protocols/silc/ops.c:1093 +#: ../libpurple/protocols/silc10/ops.c:1128 msgid "Join Chat" msgstr "Join Chat" -#: ../libpurple/protocols/silc/ops.c:1183 -#: ../libpurple/protocols/silc/ops.c:1332 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047 +#: ../libpurple/protocols/silc/ops.c:1127 +#: ../libpurple/protocols/silc10/chat.c:1039 +#, c-format +msgid "You are channel founder on <I>%s</I>" +msgstr "You are channel founder on <I>%s</I>" + +#: ../libpurple/protocols/silc/ops.c:1131 +#: ../libpurple/protocols/silc10/chat.c:1043 +#, c-format +msgid "Channel founder on <I>%s</I> is <I>%s</I>" +msgstr "Channel founder on <I>%s</I> is <I>%s</I>" + +#: ../libpurple/protocols/silc/ops.c:1190 +#: ../libpurple/protocols/silc/ops.c:1326 +#: ../libpurple/protocols/silc10/ops.c:1183 +#: ../libpurple/protocols/silc10/ops.c:1332 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071 msgid "Real Name" msgstr "Real Name" -#: ../libpurple/protocols/silc/ops.c:1213 +#: ../libpurple/protocols/silc/ops.c:1218 +#: ../libpurple/protocols/silc10/ops.c:1213 msgid "Status Text" msgstr "Status Text" -#: ../libpurple/protocols/silc/ops.c:1285 -#: ../libpurple/protocols/silc/ops.c:1357 +#: ../libpurple/protocols/silc/ops.c:1279 +#: ../libpurple/protocols/silc/ops.c:1351 +#: ../libpurple/protocols/silc10/ops.c:1285 +#: ../libpurple/protocols/silc10/ops.c:1357 msgid "Public Key Fingerprint" msgstr "Public Key Fingerprint" -#: ../libpurple/protocols/silc/ops.c:1286 -#: ../libpurple/protocols/silc/ops.c:1358 +#: ../libpurple/protocols/silc/ops.c:1280 +#: ../libpurple/protocols/silc/ops.c:1352 +#: ../libpurple/protocols/silc10/ops.c:1286 +#: ../libpurple/protocols/silc10/ops.c:1358 msgid "Public Key Babbleprint" msgstr "Public Key Babbleprint" -#: ../libpurple/protocols/silc/ops.c:1298 +#: ../libpurple/protocols/silc/ops.c:1292 +#: ../libpurple/protocols/silc10/ops.c:1298 msgid "_More..." msgstr "_More..." -#: ../libpurple/protocols/silc/ops.c:1371 -#: ../libpurple/protocols/silc/silc.c:999 +#: ../libpurple/protocols/silc/ops.c:1369 +#: ../libpurple/protocols/silc/silc.c:1077 +#: ../libpurple/protocols/silc10/ops.c:1371 +#: ../libpurple/protocols/silc10/silc.c:988 msgid "Detach From Server" msgstr "Detach From Server" -#: ../libpurple/protocols/silc/ops.c:1371 +#: ../libpurple/protocols/silc/ops.c:1369 +#: ../libpurple/protocols/silc10/ops.c:1371 msgid "Cannot detach" msgstr "Cannot detach" -#: ../libpurple/protocols/silc/ops.c:1382 +#: ../libpurple/protocols/silc/ops.c:1389 +#: ../libpurple/protocols/silc10/ops.c:1382 msgid "Cannot set topic" msgstr "Cannot set topic" -#: ../libpurple/protocols/silc/ops.c:1414 +#: ../libpurple/protocols/silc/ops.c:1418 +#: ../libpurple/protocols/silc10/ops.c:1414 msgid "Failed to change nickname" msgstr "Failed to change nickname" -#: ../libpurple/protocols/silc/ops.c:1462 +#: ../libpurple/protocols/silc/ops.c:1467 +#: ../libpurple/protocols/silc10/ops.c:1462 msgid "Roomlist" msgstr "Room List" -#: ../libpurple/protocols/silc/ops.c:1462 +#: ../libpurple/protocols/silc/ops.c:1467 +#: ../libpurple/protocols/silc10/ops.c:1462 msgid "Cannot get room list" msgstr "Cannot get room list" -#: ../libpurple/protocols/silc/ops.c:1507 +#: ../libpurple/protocols/silc/ops.c:1468 +msgid "Network is empty" +msgstr "Network is empty" + +#: ../libpurple/protocols/silc/ops.c:1512 +#: ../libpurple/protocols/silc10/ops.c:1507 msgid "No public key was received" msgstr "No public key was received" -#: ../libpurple/protocols/silc/ops.c:1519 -#: ../libpurple/protocols/silc/ops.c:1532 +#: ../libpurple/protocols/silc/ops.c:1524 +#: ../libpurple/protocols/silc/ops.c:1537 +#: ../libpurple/protocols/silc10/ops.c:1519 +#: ../libpurple/protocols/silc10/ops.c:1532 msgid "Server Information" msgstr "Server Information" -#: ../libpurple/protocols/silc/ops.c:1520 +#: ../libpurple/protocols/silc/ops.c:1525 +#: ../libpurple/protocols/silc10/ops.c:1520 msgid "Cannot get server information" msgstr "Cannot get server information" +#: ../libpurple/protocols/silc/ops.c:1548 +#: ../libpurple/protocols/silc10/ops.c:1549 +#: ../libpurple/protocols/silc10/ops.c:1558 +msgid "Server Statistics" +msgstr "Server Statistics" + #: ../libpurple/protocols/silc/ops.c:1549 -#: ../libpurple/protocols/silc/ops.c:1558 -msgid "Server Statistics" -msgstr "Server Statistics" - -#: ../libpurple/protocols/silc/ops.c:1550 +#: ../libpurple/protocols/silc10/ops.c:1550 msgid "Cannot get server statistics" msgstr "Cannot get server statistics" -#: ../libpurple/protocols/silc/ops.c:1559 -msgid "No server statistics available" -msgstr "No server statistics available" - -#: ../libpurple/protocols/silc/ops.c:1581 +#: ../libpurple/protocols/silc/ops.c:1556 +#: ../libpurple/protocols/silc10/ops.c:1581 #, c-format msgid "" "Local server start time: %s\n" @@ -9458,104 +11249,59 @@ "Total server operators: %d\n" "Total router operators: %d\n" -#: ../libpurple/protocols/silc/ops.c:1604 +#: ../libpurple/protocols/silc/ops.c:1588 +#: ../libpurple/protocols/silc10/ops.c:1604 msgid "Network Statistics" msgstr "Network Statistics" -#: ../libpurple/protocols/silc/ops.c:1612 -#: ../libpurple/protocols/silc/ops.c:1617 -msgid "Ping" -msgstr "Ping" - -#: ../libpurple/protocols/silc/ops.c:1612 +#: ../libpurple/protocols/silc/ops.c:1596 +#: ../libpurple/protocols/silc10/ops.c:1612 msgid "Ping failed" msgstr "Ping failed" -#: ../libpurple/protocols/silc/ops.c:1617 +#: ../libpurple/protocols/silc/ops.c:1601 +#: ../libpurple/protocols/silc10/ops.c:1617 msgid "Ping reply received from server" msgstr "Ping reply received from server" -#: ../libpurple/protocols/silc/ops.c:1625 +#: ../libpurple/protocols/silc/ops.c:1609 +#: ../libpurple/protocols/silc10/ops.c:1625 msgid "Could not kill user" msgstr "Could not kill user" -#: ../libpurple/protocols/silc/ops.c:1709 -msgid "Error during connecting to SILC Server" -msgstr "Error during connecting to SILC Server" - -#: ../libpurple/protocols/silc/ops.c:1714 -msgid "Key Exchange failed" -msgstr "Key Exchange failed" - -#: ../libpurple/protocols/silc/ops.c:1723 -msgid "" -"Resuming detached session failed. Press Reconnect to create new connection." -msgstr "" -"Resuming detached session failed. Press Reconnect to create new connection." - -#: ../libpurple/protocols/silc/ops.c:1758 -msgid "Disconnected by server" -msgstr "Disconnected by server" - -#: ../libpurple/protocols/silc/ops.c:1820 -#: ../libpurple/protocols/silc/ops.c:1867 -#: ../libpurple/protocols/silc/silc.c:182 +#: ../libpurple/protocols/silc/ops.c:1648 +msgid "WATCH" +msgstr "WATCH" + +#: ../libpurple/protocols/silc/ops.c:1648 +msgid "Cannot watch user" +msgstr "Cannot watch user" + +#: ../libpurple/protocols/silc/ops.c:1724 +#: ../libpurple/protocols/silc/ops.c:1775 +#: ../libpurple/protocols/silc/silc.c:277 +#: ../libpurple/protocols/silc10/ops.c:1811 +#: ../libpurple/protocols/silc10/ops.c:1858 +#: ../libpurple/protocols/silc10/silc.c:190 msgid "Resuming session" msgstr "Resuming session" -#: ../libpurple/protocols/silc/ops.c:1822 +#: ../libpurple/protocols/silc/ops.c:1726 +#: ../libpurple/protocols/silc10/ops.c:1813 msgid "Authenticating connection" msgstr "Authenticating connection" -#: ../libpurple/protocols/silc/ops.c:1869 +#: ../libpurple/protocols/silc/ops.c:1777 +#: ../libpurple/protocols/silc10/ops.c:1860 msgid "Verifying server public key" msgstr "Verifying server public key" -#: ../libpurple/protocols/silc/ops.c:1911 +#: ../libpurple/protocols/silc/ops.c:1814 +#: ../libpurple/protocols/silc10/ops.c:1902 msgid "Passphrase required" msgstr "Passphrase required" -#: ../libpurple/protocols/silc/ops.c:1940 -msgid "Failure: Version mismatch, upgrade your client" -msgstr "Failure: Version mismatch, upgrade your client" - -#: ../libpurple/protocols/silc/ops.c:1943 -msgid "Failure: Remote does not trust/support your public key" -msgstr "Failure: Remote does not trust/support your public key" - -#: ../libpurple/protocols/silc/ops.c:1946 -msgid "Failure: Remote does not support proposed KE group" -msgstr "Failure: Remote does not support proposed KE group" - -#: ../libpurple/protocols/silc/ops.c:1949 -msgid "Failure: Remote does not support proposed cipher" -msgstr "Failure: Remote does not support proposed cipher" - -#: ../libpurple/protocols/silc/ops.c:1952 -msgid "Failure: Remote does not support proposed PKCS" -msgstr "Failure: Remote does not support proposed PKCS" - -#: ../libpurple/protocols/silc/ops.c:1955 -msgid "Failure: Remote does not support proposed hash function" -msgstr "Failure: Remote does not support proposed hash function" - -#: ../libpurple/protocols/silc/ops.c:1958 -msgid "Failure: Remote does not support proposed HMAC" -msgstr "Failure: Remote does not support proposed HMAC" - -#: ../libpurple/protocols/silc/ops.c:1960 -msgid "Failure: Incorrect signature" -msgstr "Failure: Incorrect signature" - -#: ../libpurple/protocols/silc/ops.c:1962 -msgid "Failure: Invalid cookie" -msgstr "Failure: Invalid cookie" - -#: ../libpurple/protocols/silc/ops.c:1973 -msgid "Failure: Authentication failed" -msgstr "Failure: Authentication failed" - -#: ../libpurple/protocols/silc/pk.c:104 +#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104 #, c-format msgid "" "Received %s's public key. Your local copy does not match this key. Would you " @@ -9564,12 +11310,12 @@ "Received %s's public key. Your local copy does not match this key. Would you " "still like to accept this public key?" -#: ../libpurple/protocols/silc/pk.c:109 +#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109 #, c-format msgid "Received %s's public key. Would you like to accept this public key?" msgstr "Received %s's public key. Would you like to accept this public key?" -#: ../libpurple/protocols/silc/pk.c:113 +#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113 #, c-format msgid "" "Fingerprint and babbleprint for the %s key are:\n" @@ -9582,73 +11328,99 @@ "%s\n" "%s\n" -#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142 +#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139 +#: ../libpurple/protocols/silc10/pk.c:116 +#: ../libpurple/protocols/silc10/pk.c:142 msgid "Verify Public Key" msgstr "Verify Public Key" -#: ../libpurple/protocols/silc/pk.c:121 +#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121 msgid "_View..." msgstr "_View..." -#: ../libpurple/protocols/silc/pk.c:143 +#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143 msgid "Unsupported public key type" msgstr "Unsupported public key type" -#: ../libpurple/protocols/silc/silc.c:153 +#: ../libpurple/protocols/silc/silc.c:217 +#: ../libpurple/protocols/silc10/ops.c:1749 +msgid "Disconnected by server" +msgstr "Disconnected by server" + +#: ../libpurple/protocols/silc/silc.c:224 +#: ../libpurple/protocols/silc10/ops.c:1700 +msgid "Error during connecting to SILC Server" +msgstr "Error during connecting to SILC Server" + +#: ../libpurple/protocols/silc/silc.c:229 +#: ../libpurple/protocols/silc10/ops.c:1705 +msgid "Key Exchange failed" +msgstr "Key Exchange failed" + +#: ../libpurple/protocols/silc/silc.c:238 +#: ../libpurple/protocols/silc10/ops.c:1714 +msgid "" +"Resuming detached session failed. Press Reconnect to create new connection." +msgstr "" +"Resuming detached session failed. Press Reconnect to create new connection." + +#: ../libpurple/protocols/silc/silc.c:265 +#: ../libpurple/protocols/silc/silc.c:311 +#: ../libpurple/protocols/silc10/silc.c:161 msgid "Connection failed" msgstr "Connection failed" -#: ../libpurple/protocols/silc/silc.c:174 -msgid "Cannot initialize SILC Client connection" -msgstr "Cannot initialise SILC Client connection" - -#: ../libpurple/protocols/silc/silc.c:185 +#: ../libpurple/protocols/silc/silc.c:280 +#: ../libpurple/protocols/silc10/silc.c:193 msgid "Performing key exchange" msgstr "Performing key exchange" -#: ../libpurple/protocols/silc/silc.c:271 +#. Progress +#: ../libpurple/protocols/silc/silc.c:343 +#: ../libpurple/protocols/silc10/silc.c:325 +msgid "Connecting to SILC Server" +msgstr "Connecting to SILC Server" + +#: ../libpurple/protocols/silc/silc.c:352 +msgid "Could not load SILC key pair" +msgstr "Could not load SILC key pair" + +#: ../libpurple/protocols/silc/silc.c:366 +#: ../libpurple/protocols/silc10/silc.c:355 +msgid "Unable to create connection" +msgstr "Unable to create connection" + +#: ../libpurple/protocols/silc/silc.c:395 +#: ../libpurple/protocols/silc10/silc.c:267 msgid "Out of memory" msgstr "Out of memory" -#: ../libpurple/protocols/silc/silc.c:294 -msgid "John Noname" -msgstr "No name" - -#: ../libpurple/protocols/silc/silc.c:317 +#: ../libpurple/protocols/silc/silc.c:438 +#: ../libpurple/protocols/silc10/silc.c:313 msgid "Cannot initialize SILC protocol" msgstr "Cannot initialise SILC protocol" -#: ../libpurple/protocols/silc/silc.c:324 -msgid "Cannot find/access ~/.silc directory" -msgstr "Cannot find/access ~/.silc directory" - -#. Progress -#: ../libpurple/protocols/silc/silc.c:329 -msgid "Connecting to SILC Server" -msgstr "Connecting to SILC Server" - -#: ../libpurple/protocols/silc/silc.c:338 -#, c-format -msgid "Could not load SILC key pair: %s" -msgstr "Could not load SILC key pair: %s" - -#: ../libpurple/protocols/silc/silc.c:359 -msgid "Unable to create connection" -msgstr "Unable to create connection" - -#: ../libpurple/protocols/silc/silc.c:658 +#: ../libpurple/protocols/silc/silc.c:445 +msgid "Error loading SILC key pair" +msgstr "Error loading SILC key pair" + +#: ../libpurple/protocols/silc/silc.c:739 +#: ../libpurple/protocols/silc10/silc.c:650 msgid "Your Current Mood" msgstr "Your Current Mood" -#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529 +#: ../libpurple/protocols/silc/silc.c:741 +#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640 msgid "Normal" msgstr "Normal" -#: ../libpurple/protocols/silc/silc.c:674 +#: ../libpurple/protocols/silc/silc.c:755 +#: ../libpurple/protocols/silc10/silc.c:666 msgid "In love" msgstr "In love" -#: ../libpurple/protocols/silc/silc.c:685 +#: ../libpurple/protocols/silc/silc.c:766 +#: ../libpurple/protocols/silc10/silc.c:677 msgid "" "\n" "Your Preferred Contact Methods" @@ -9656,46 +11428,63 @@ "\n" "Your Preferred Contact Methods" -#: ../libpurple/protocols/silc/silc.c:693 -#: ../libpurple/protocols/silc/util.c:557 +#: ../libpurple/protocols/silc/silc.c:774 +#: ../libpurple/protocols/silc/util.c:561 +#: ../libpurple/protocols/silc10/silc.c:685 +#: ../libpurple/protocols/silc10/util.c:557 msgid "SMS" msgstr "SMS" -#: ../libpurple/protocols/silc/silc.c:695 -#: ../libpurple/protocols/silc/util.c:559 +#: ../libpurple/protocols/silc/silc.c:776 +#: ../libpurple/protocols/silc/util.c:563 +#: ../libpurple/protocols/silc10/silc.c:687 +#: ../libpurple/protocols/silc10/util.c:559 msgid "MMS" msgstr "MMS" -#: ../libpurple/protocols/silc/silc.c:697 +#: ../libpurple/protocols/silc/silc.c:778 +#: ../libpurple/protocols/silc10/silc.c:689 msgid "Video conferencing" msgstr "Video conferencing" -#: ../libpurple/protocols/silc/silc.c:702 +#: ../libpurple/protocols/silc/silc.c:783 +#: ../libpurple/protocols/silc10/silc.c:694 msgid "Your Current Status" msgstr "Your Current Status" -#: ../libpurple/protocols/silc/silc.c:709 +#: ../libpurple/protocols/silc/silc.c:790 +#: ../libpurple/protocols/silc10/silc.c:701 msgid "Online Services" msgstr "Online Services" -#: ../libpurple/protocols/silc/silc.c:712 +#: ../libpurple/protocols/silc/silc.c:793 +#: ../libpurple/protocols/silc10/silc.c:704 msgid "Let others see what services you are using" msgstr "Let others see what services you are using" -#: ../libpurple/protocols/silc/silc.c:718 +#: ../libpurple/protocols/silc/silc.c:799 +#: ../libpurple/protocols/silc10/silc.c:710 msgid "Let others see what computer you are using" msgstr "Let others see what computer you are using" -#: ../libpurple/protocols/silc/silc.c:725 +#: ../libpurple/protocols/silc/silc.c:806 +#: ../libpurple/protocols/silc10/silc.c:717 msgid "Your VCard File" msgstr "Your vCard File" -#: ../libpurple/protocols/silc/silc.c:737 -#: ../libpurple/protocols/silc/silc.c:738 +#: ../libpurple/protocols/silc/silc.c:812 +msgid "Timezone (UTC)" +msgstr "Timezone (UTC)" + +#: ../libpurple/protocols/silc/silc.c:816 +#: ../libpurple/protocols/silc/silc.c:817 +#: ../libpurple/protocols/silc10/silc.c:729 +#: ../libpurple/protocols/silc10/silc.c:730 msgid "User Online Status Attributes" msgstr "User Online Status Attributes" -#: ../libpurple/protocols/silc/silc.c:739 +#: ../libpurple/protocols/silc/silc.c:818 +#: ../libpurple/protocols/silc10/silc.c:731 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 " @@ -9705,169 +11494,213 @@ "information. Please fill the information you would like other users to see " "about yourself." -#: ../libpurple/protocols/silc/silc.c:780 -#: ../libpurple/protocols/silc/silc.c:786 -#: ../libpurple/protocols/silc/silc.c:1426 +#: ../libpurple/protocols/silc/silc.c:859 +#: ../libpurple/protocols/silc/silc.c:865 +#: ../libpurple/protocols/silc/silc.c:1486 +#: ../libpurple/protocols/silc10/silc.c:772 +#: ../libpurple/protocols/silc10/silc.c:778 +#: ../libpurple/protocols/silc10/silc.c:1415 msgid "Message of the Day" msgstr "Message of the Day" -#: ../libpurple/protocols/silc/silc.c:780 +#: ../libpurple/protocols/silc/silc.c:859 +#: ../libpurple/protocols/silc10/silc.c:772 msgid "No Message of the Day available" msgstr "No Message of the Day available" -#: ../libpurple/protocols/silc/silc.c:781 -#: ../libpurple/protocols/silc/silc.c:1421 +#: ../libpurple/protocols/silc/silc.c:860 +#: ../libpurple/protocols/silc/silc.c:1481 +#: ../libpurple/protocols/silc10/silc.c:773 +#: ../libpurple/protocols/silc10/silc.c:1410 msgid "There is no Message of the Day associated with this connection" msgstr "There is no Message of the Day associated with this connection" -#: ../libpurple/protocols/silc/silc.c:832 -#: ../libpurple/protocols/silc/silc.c:876 -#: ../libpurple/protocols/silc/silc.c:947 -#: ../libpurple/protocols/silc/silc.c:948 +#: ../libpurple/protocols/silc/silc.c:911 +#: ../libpurple/protocols/silc/silc.c:957 +#: ../libpurple/protocols/silc/silc.c:1028 +#: ../libpurple/protocols/silc/silc.c:1029 +#: ../libpurple/protocols/silc10/silc.c:824 +#: ../libpurple/protocols/silc10/silc.c:868 +#: ../libpurple/protocols/silc10/silc.c:939 +#: ../libpurple/protocols/silc10/silc.c:940 msgid "Create New SILC Key Pair" msgstr "Create New SILC Key Pair" -#: ../libpurple/protocols/silc/silc.c:832 +#: ../libpurple/protocols/silc/silc.c:911 +#: ../libpurple/protocols/silc10/silc.c:824 msgid "Passphrases do not match" msgstr "Passphrases do not match" -#: ../libpurple/protocols/silc/silc.c:876 +#: ../libpurple/protocols/silc/silc.c:957 +#: ../libpurple/protocols/silc10/silc.c:868 msgid "Key Pair Generation failed" msgstr "Key Pair Generation failed" -#: ../libpurple/protocols/silc/silc.c:915 +#: ../libpurple/protocols/silc/silc.c:996 +#: ../libpurple/protocols/silc10/silc.c:907 msgid "Key length" msgstr "Key length" -#: ../libpurple/protocols/silc/silc.c:917 +#: ../libpurple/protocols/silc/silc.c:998 +#: ../libpurple/protocols/silc10/silc.c:909 msgid "Public key file" msgstr "Public key file" -#: ../libpurple/protocols/silc/silc.c:919 +#: ../libpurple/protocols/silc/silc.c:1000 +#: ../libpurple/protocols/silc10/silc.c:911 msgid "Private key file" msgstr "Private key file" -#: ../libpurple/protocols/silc/silc.c:942 +#: ../libpurple/protocols/silc/silc.c:1023 +#: ../libpurple/protocols/silc10/silc.c:934 msgid "Passphrase (retype)" msgstr "Passphrase (retype)" -#: ../libpurple/protocols/silc/silc.c:949 +#: ../libpurple/protocols/silc/silc.c:1030 +#: ../libpurple/protocols/silc10/silc.c:941 msgid "Generate Key Pair" msgstr "Generate Key Pair" -#: ../libpurple/protocols/silc/silc.c:994 +#: ../libpurple/protocols/silc/silc.c:1073 +#: ../libpurple/protocols/silc10/silc.c:984 msgid "Online Status" msgstr "Online Status" -#: ../libpurple/protocols/silc/silc.c:1003 +#: ../libpurple/protocols/silc/silc.c:1081 +#: ../libpurple/protocols/silc10/silc.c:992 msgid "View Message of the Day" msgstr "View Message of the Day" -#: ../libpurple/protocols/silc/silc.c:1007 +#: ../libpurple/protocols/silc/silc.c:1085 +#: ../libpurple/protocols/silc10/silc.c:996 msgid "Create SILC Key Pair..." msgstr "Create SILC key pair..." -#: ../libpurple/protocols/silc/silc.c:1106 +#: ../libpurple/protocols/silc/silc.c:1177 +#: ../libpurple/protocols/silc10/silc.c:1095 #, c-format msgid "User <I>%s</I> is not present in the network" msgstr "User <I>%s</I> is not present in the network" -#: ../libpurple/protocols/silc/silc.c:1297 +#: ../libpurple/protocols/silc/silc.c:1357 +#: ../libpurple/protocols/silc10/silc.c:1286 msgid "Topic too long" msgstr "Topic too long." -#: ../libpurple/protocols/silc/silc.c:1378 +#: ../libpurple/protocols/silc/silc.c:1438 +#: ../libpurple/protocols/silc10/silc.c:1367 msgid "You must specify a nick" msgstr "You must specify a nick" -#: ../libpurple/protocols/silc/silc.c:1480 +#: ../libpurple/protocols/silc/silc.c:1540 +#: ../libpurple/protocols/silc10/silc.c:1469 #, c-format msgid "channel %s not found" msgstr "channel %s not found" -#: ../libpurple/protocols/silc/silc.c:1485 +#: ../libpurple/protocols/silc/silc.c:1545 +#: ../libpurple/protocols/silc10/silc.c:1474 #, c-format msgid "channel modes for %s: %s" msgstr "channel modes for %s: %s" -#: ../libpurple/protocols/silc/silc.c:1487 +#: ../libpurple/protocols/silc/silc.c:1547 +#: ../libpurple/protocols/silc10/silc.c:1476 #, c-format msgid "no channel modes are set on %s" msgstr "no channel modes are set on %s" -#: ../libpurple/protocols/silc/silc.c:1500 +#: ../libpurple/protocols/silc/silc.c:1560 +#: ../libpurple/protocols/silc10/silc.c:1489 #, c-format msgid "Failed to set cmodes for %s" msgstr "Failed to set cmodes for %s" -#: ../libpurple/protocols/silc/silc.c:1530 +#: ../libpurple/protocols/silc/silc.c:1590 +#: ../libpurple/protocols/silc10/silc.c:1519 #, c-format msgid "Unknown command: %s, (may be a client bug)" msgstr "Unknown command: %s, (may be a client bug)" -#: ../libpurple/protocols/silc/silc.c:1593 +#: ../libpurple/protocols/silc/silc.c:1653 +#: ../libpurple/protocols/silc10/silc.c:1582 msgid "part [channel]: Leave the chat" msgstr "part [channel]: Leave the chat" -#: ../libpurple/protocols/silc/silc.c:1597 +#: ../libpurple/protocols/silc/silc.c:1657 +#: ../libpurple/protocols/silc10/silc.c:1586 msgid "leave [channel]: Leave the chat" msgstr "leave [channel]: Leave the chat" -#: ../libpurple/protocols/silc/silc.c:1601 +#: ../libpurple/protocols/silc/silc.c:1661 +#: ../libpurple/protocols/silc10/silc.c:1590 msgid "topic [<new topic>]: View or change the topic" msgstr "topic [<new topic>]: View or change the topic" -#: ../libpurple/protocols/silc/silc.c:1606 +#: ../libpurple/protocols/silc/silc.c:1666 +#: ../libpurple/protocols/silc10/silc.c:1595 msgid "join <channel> [<password>]: Join a chat on this network" msgstr "join <channel> [<password>]: Join a chat on this network" -#: ../libpurple/protocols/silc/silc.c:1610 +#: ../libpurple/protocols/silc/silc.c:1670 +#: ../libpurple/protocols/silc10/silc.c:1599 msgid "list: List channels on this network" msgstr "list: List channels on this network" -#: ../libpurple/protocols/silc/silc.c:1614 +#: ../libpurple/protocols/silc/silc.c:1674 +#: ../libpurple/protocols/silc10/silc.c:1603 msgid "whois <nick>: View nick's information" msgstr "whois <nick>: View nick's information" -#: ../libpurple/protocols/silc/silc.c:1618 +#: ../libpurple/protocols/silc/silc.c:1678 +#: ../libpurple/protocols/silc10/silc.c:1607 #: ../libpurple/protocols/zephyr/zephyr.c:2685 msgid "msg <nick> <message>: Send a private message to a user" msgstr "msg <nick> <message>: Send a private message to a user" -#: ../libpurple/protocols/silc/silc.c:1622 +#: ../libpurple/protocols/silc/silc.c:1682 +#: ../libpurple/protocols/silc10/silc.c:1611 msgid "query <nick> [<message>]: Send a private message to a user" msgstr "" "query <nick> [<message>]: Send a private message to a user" -#: ../libpurple/protocols/silc/silc.c:1626 +#: ../libpurple/protocols/silc/silc.c:1686 +#: ../libpurple/protocols/silc10/silc.c:1615 msgid "motd: View the server's Message Of The Day" msgstr "motd: View the server's Message Of The Day" -#: ../libpurple/protocols/silc/silc.c:1630 +#: ../libpurple/protocols/silc/silc.c:1690 +#: ../libpurple/protocols/silc10/silc.c:1619 msgid "detach: Detach this session" msgstr "detach: Detach this session" -#: ../libpurple/protocols/silc/silc.c:1634 +#: ../libpurple/protocols/silc/silc.c:1694 +#: ../libpurple/protocols/silc10/silc.c:1623 msgid "quit [message]: Disconnect from the server, with an optional message" msgstr "quit [message]: Disconnect from the server, with an optional message" -#: ../libpurple/protocols/silc/silc.c:1638 +#: ../libpurple/protocols/silc/silc.c:1698 +#: ../libpurple/protocols/silc10/silc.c:1627 msgid "call <command>: Call any silc client command" msgstr "call <command>: Call any silc client command" -#: ../libpurple/protocols/silc/silc.c:1644 +#: ../libpurple/protocols/silc/silc.c:1704 +#: ../libpurple/protocols/silc10/silc.c:1633 msgid "kill <nick> [-pubkey|<reason>]: Kill nick" msgstr "kill <nick> [-pubkey|<reason>]: Kill nick" -#: ../libpurple/protocols/silc/silc.c:1648 +#: ../libpurple/protocols/silc/silc.c:1708 +#: ../libpurple/protocols/silc10/silc.c:1637 msgid "nick <newnick>: Change your nickname" msgstr "nick <newnick>: Change your nickname" -#: ../libpurple/protocols/silc/silc.c:1652 +#: ../libpurple/protocols/silc/silc.c:1712 +#: ../libpurple/protocols/silc10/silc.c:1641 msgid "whowas <nick>: View nick's information" msgstr "whowas <nick>: View nick's information" -#: ../libpurple/protocols/silc/silc.c:1656 +#: ../libpurple/protocols/silc/silc.c:1716 +#: ../libpurple/protocols/silc10/silc.c:1645 msgid "" "cmode <channel> [+|-<modes>] [arguments]: Change or display " "channel modes" @@ -9875,7 +11708,8 @@ "cmode <channel> [+|-<modes>] [arguments]: Change or display " "channel modes" -#: ../libpurple/protocols/silc/silc.c:1660 +#: ../libpurple/protocols/silc/silc.c:1720 +#: ../libpurple/protocols/silc10/silc.c:1649 msgid "" "cumode <channel> +|-<modes> <nick>: Change nick's modes " "on channel" @@ -9883,15 +11717,18 @@ "cumode <channel> +|-<modes> <nick>: Change nick's modes " "on channel" -#: ../libpurple/protocols/silc/silc.c:1664 +#: ../libpurple/protocols/silc/silc.c:1724 +#: ../libpurple/protocols/silc10/silc.c:1653 msgid "umode <usermodes>: Set your modes in the network" msgstr "umode <usermodes>: Set your modes in the network" -#: ../libpurple/protocols/silc/silc.c:1668 +#: ../libpurple/protocols/silc/silc.c:1728 +#: ../libpurple/protocols/silc10/silc.c:1657 msgid "oper <nick> [-pubkey]: Get server operator privileges" msgstr "oper <nick> [-pubkey]: Get server operator privileges" -#: ../libpurple/protocols/silc/silc.c:1672 +#: ../libpurple/protocols/silc/silc.c:1732 +#: ../libpurple/protocols/silc10/silc.c:1661 msgid "" "invite <channel> [-|+]<nick>: invite nick or add/remove from " "channel invite list" @@ -9899,35 +11736,43 @@ "invite <channel> [-|+]<nick>: invite nick or add/remove from " "channel invite list" -#: ../libpurple/protocols/silc/silc.c:1676 +#: ../libpurple/protocols/silc/silc.c:1736 +#: ../libpurple/protocols/silc10/silc.c:1665 msgid "kick <channel> <nick> [comment]: Kick client from channel" msgstr "kick <channel> <nick> [comment]: Kick client from channel" -#: ../libpurple/protocols/silc/silc.c:1680 +#: ../libpurple/protocols/silc/silc.c:1740 +#: ../libpurple/protocols/silc10/silc.c:1669 msgid "info [server]: View server administrative details" msgstr "info [server]: View server administrative details" -#: ../libpurple/protocols/silc/silc.c:1684 +#: ../libpurple/protocols/silc/silc.c:1744 +#: ../libpurple/protocols/silc10/silc.c:1673 msgid "ban [<channel> +|-<nick>]: Ban client from channel" msgstr "ban [<channel> +|-<nick>]: Ban client from channel" -#: ../libpurple/protocols/silc/silc.c:1688 +#: ../libpurple/protocols/silc/silc.c:1748 +#: ../libpurple/protocols/silc10/silc.c:1677 msgid "getkey <nick|server>: Retrieve client's or server's public key" msgstr "getkey <nick|server>: Retrieve client's or server's public key" -#: ../libpurple/protocols/silc/silc.c:1692 +#: ../libpurple/protocols/silc/silc.c:1752 +#: ../libpurple/protocols/silc10/silc.c:1681 msgid "stats: View server and network statistics" msgstr "stats: View server and network statistics" -#: ../libpurple/protocols/silc/silc.c:1696 +#: ../libpurple/protocols/silc/silc.c:1756 +#: ../libpurple/protocols/silc10/silc.c:1685 msgid "ping: Send PING to the connected server" msgstr "ping: Send PING to the connected server" -#: ../libpurple/protocols/silc/silc.c:1701 +#: ../libpurple/protocols/silc/silc.c:1761 +#: ../libpurple/protocols/silc10/silc.c:1690 msgid "users <channel>: List users in channel" msgstr "users <channel>: List users in channel" -#: ../libpurple/protocols/silc/silc.c:1705 +#: ../libpurple/protocols/silc/silc.c:1765 +#: ../libpurple/protocols/silc10/silc.c:1694 msgid "" "names [-count|-ops|-halfops|-voices|-normal] <channel(s)>: List " "specific users in channel(s)" @@ -9944,116 +11789,141 @@ #. *< name #. *< version #. * summary -#: ../libpurple/protocols/silc/silc.c:1828 +#: ../libpurple/protocols/silc/silc.c:1876 +#: ../libpurple/protocols/silc10/silc.c:1819 msgid "SILC Protocol Plugin" msgstr "SILC Protocol Plug-in" #. * description -#: ../libpurple/protocols/silc/silc.c:1830 +#: ../libpurple/protocols/silc/silc.c:1878 +#: ../libpurple/protocols/silc10/silc.c:1821 msgid "Secure Internet Live Conferencing (SILC) Protocol" msgstr "Secure Internet Live Conferencing (SILC) Protocol" -#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1921 +#: ../libpurple/protocols/silc/silc.c:1910 +#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035 msgid "Network" msgstr "Network" -#: ../libpurple/protocols/silc/silc.c:1873 +#: ../libpurple/protocols/silc/silc.c:1921 +#: ../libpurple/protocols/silc10/silc.c:1864 msgid "Public Key file" msgstr "Public Key file" -#: ../libpurple/protocols/silc/silc.c:1877 +#: ../libpurple/protocols/silc/silc.c:1925 +#: ../libpurple/protocols/silc10/silc.c:1868 msgid "Private Key file" msgstr "Private Key file" -#: ../libpurple/protocols/silc/silc.c:1887 +#: ../libpurple/protocols/silc/silc.c:1935 +#: ../libpurple/protocols/silc10/silc.c:1878 msgid "Cipher" msgstr "Cipher" -#: ../libpurple/protocols/silc/silc.c:1897 +#: ../libpurple/protocols/silc/silc.c:1945 +#: ../libpurple/protocols/silc10/silc.c:1888 msgid "HMAC" msgstr "HMAC" -#: ../libpurple/protocols/silc/silc.c:1900 +#: ../libpurple/protocols/silc/silc.c:1948 +msgid "Use Perfect Forward Secrecy" +msgstr "Use Perfect Forward Secrecy" + +#: ../libpurple/protocols/silc/silc.c:1952 +#: ../libpurple/protocols/silc10/silc.c:1891 msgid "Public key authentication" msgstr "Public key authentication" -#: ../libpurple/protocols/silc/silc.c:1903 -msgid "Reject watching by other users" -msgstr "Reject watching by other users" - -#: ../libpurple/protocols/silc/silc.c:1906 -msgid "Block invites" -msgstr "Block invites" - -#: ../libpurple/protocols/silc/silc.c:1909 +#: ../libpurple/protocols/silc/silc.c:1955 +#: ../libpurple/protocols/silc10/silc.c:1894 msgid "Block IMs without Key Exchange" msgstr "Block IMs without Key Exchange" -#: ../libpurple/protocols/silc/silc.c:1912 -msgid "Reject online status attribute requests" -msgstr "Reject online status attribute requests" - -#: ../libpurple/protocols/silc/silc.c:1915 +#: ../libpurple/protocols/silc/silc.c:1958 +#: ../libpurple/protocols/silc10/silc.c:1897 msgid "Block messages to whiteboard" msgstr "Block messages to whiteboard" -#: ../libpurple/protocols/silc/silc.c:1918 +#: ../libpurple/protocols/silc/silc.c:1961 +#: ../libpurple/protocols/silc10/silc.c:1900 msgid "Automatically open whiteboard" msgstr "Automatically open whiteboard" -#: ../libpurple/protocols/silc/silc.c:1921 +#: ../libpurple/protocols/silc/silc.c:1964 +#: ../libpurple/protocols/silc10/silc.c:1903 msgid "Digitally sign and verify all messages" msgstr "Digitally sign and verify all messages" #: ../libpurple/protocols/silc/util.c:207 -#: ../libpurple/protocols/silc/util.c:247 +#: ../libpurple/protocols/silc/util.c:249 +#: ../libpurple/protocols/silc10/util.c:207 +#: ../libpurple/protocols/silc10/util.c:247 msgid "Creating SILC key pair..." msgstr "Creating SILC key pair..." +#: ../libpurple/protocols/silc/util.c:215 +#: ../libpurple/protocols/silc/util.c:257 +msgid "Cannot create SILC key pair\n" +msgstr "Cannot create SILC key pair\n" + #. 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) -#: ../libpurple/protocols/silc/util.c:355 +#: ../libpurple/protocols/silc/util.c:358 +#: ../libpurple/protocols/silc10/util.c:355 #, c-format msgid "Real Name: \t%s\n" msgstr "Real Name: \t%s\n" -#: ../libpurple/protocols/silc/util.c:357 +#: ../libpurple/protocols/silc/util.c:360 +#: ../libpurple/protocols/silc10/util.c:357 #, c-format msgid "User Name: \t%s\n" msgstr "User Name: \t%s\n" -#: ../libpurple/protocols/silc/util.c:359 +#: ../libpurple/protocols/silc/util.c:362 +#: ../libpurple/protocols/silc10/util.c:359 #, c-format msgid "E-Mail: \t\t%s\n" msgstr "E-mail: \t\t%s\n" -#: ../libpurple/protocols/silc/util.c:361 +#: ../libpurple/protocols/silc/util.c:364 +#: ../libpurple/protocols/silc10/util.c:361 #, c-format msgid "Host Name: \t%s\n" msgstr "Host Name: \t%s\n" -#: ../libpurple/protocols/silc/util.c:363 +#: ../libpurple/protocols/silc/util.c:366 +#: ../libpurple/protocols/silc10/util.c:363 #, c-format msgid "Organization: \t%s\n" msgstr "Organisation: \t%s\n" -#: ../libpurple/protocols/silc/util.c:365 +#: ../libpurple/protocols/silc/util.c:368 +#: ../libpurple/protocols/silc10/util.c:365 #, c-format msgid "Country: \t%s\n" msgstr "Country: \t%s\n" -#: ../libpurple/protocols/silc/util.c:366 +#: ../libpurple/protocols/silc/util.c:369 +#: ../libpurple/protocols/silc10/util.c:366 #, c-format msgid "Algorithm: \t%s\n" msgstr "Algorithm: \t%s\n" -#: ../libpurple/protocols/silc/util.c:367 +#: ../libpurple/protocols/silc/util.c:370 +#: ../libpurple/protocols/silc10/util.c:367 #, c-format msgid "Key Length: \t%d bits\n" msgstr "Key Length: \t%d bits\n" -#: ../libpurple/protocols/silc/util.c:369 +#: ../libpurple/protocols/silc/util.c:372 +#, c-format +msgid "Version: \t%s\n" +msgstr "Version: \t%s\n" + +#: ../libpurple/protocols/silc/util.c:374 +#: ../libpurple/protocols/silc10/util.c:369 #, c-format msgid "" "Public Key Fingerprint:\n" @@ -10064,7 +11934,8 @@ "%s\n" "\n" -#: ../libpurple/protocols/silc/util.c:370 +#: ../libpurple/protocols/silc/util.c:375 +#: ../libpurple/protocols/silc10/util.c:370 #, c-format msgid "" "Public Key Babbleprint:\n" @@ -10073,37 +11944,44 @@ "Public Key Babbleprint:\n" "%s" -#: ../libpurple/protocols/silc/util.c:374 -#: ../libpurple/protocols/silc/util.c:375 +#: ../libpurple/protocols/silc/util.c:379 +#: ../libpurple/protocols/silc/util.c:380 +#: ../libpurple/protocols/silc10/util.c:374 +#: ../libpurple/protocols/silc10/util.c:375 msgid "Public Key Information" msgstr "Public Key Information" -#: ../libpurple/protocols/silc/util.c:555 +#: ../libpurple/protocols/silc/util.c:559 +#: ../libpurple/protocols/silc10/util.c:555 msgid "Paging" msgstr "Paging" -#: ../libpurple/protocols/silc/util.c:561 +#: ../libpurple/protocols/silc/util.c:565 +#: ../libpurple/protocols/silc10/util.c:561 msgid "Video Conferencing" msgstr "Video Conferencing" -#: ../libpurple/protocols/silc/util.c:579 +#: ../libpurple/protocols/silc/util.c:583 +#: ../libpurple/protocols/silc10/util.c:579 msgid "Computer" msgstr "Computer" -#: ../libpurple/protocols/silc/util.c:583 +#: ../libpurple/protocols/silc/util.c:587 +#: ../libpurple/protocols/silc10/util.c:583 msgid "PDA" msgstr "PDA" -#: ../libpurple/protocols/silc/util.c:585 +#: ../libpurple/protocols/silc/util.c:589 +#: ../libpurple/protocols/silc10/util.c:585 msgid "Terminal" msgstr "Terminal" -#: ../libpurple/protocols/silc/wb.c:284 +#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/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?" -#: ../libpurple/protocols/silc/wb.c:288 +#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288 #, c-format msgid "" "%s sent message to whiteboard on %s channel. Would you like to open the " @@ -10112,36 +11990,97 @@ "%s sent message to whiteboard on %s channel. Would you like to open the " "whiteboard?" -#: ../libpurple/protocols/silc/wb.c:302 +#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302 msgid "Whiteboard" msgstr "Whiteboard" +#: ../libpurple/protocols/silc10/ops.c:1559 +msgid "No server statistics available" +msgstr "No server statistics available" + +#: ../libpurple/protocols/silc10/ops.c:1931 +msgid "Failure: Version mismatch, upgrade your client" +msgstr "Failure: Version mismatch, upgrade your client" + +#: ../libpurple/protocols/silc10/ops.c:1934 +msgid "Failure: Remote does not trust/support your public key" +msgstr "Failure: Remote does not trust/support your public key" + +#: ../libpurple/protocols/silc10/ops.c:1937 +msgid "Failure: Remote does not support proposed KE group" +msgstr "Failure: Remote does not support proposed KE group" + +#: ../libpurple/protocols/silc10/ops.c:1940 +msgid "Failure: Remote does not support proposed cipher" +msgstr "Failure: Remote does not support proposed cipher" + +#: ../libpurple/protocols/silc10/ops.c:1943 +msgid "Failure: Remote does not support proposed PKCS" +msgstr "Failure: Remote does not support proposed PKCS" + +#: ../libpurple/protocols/silc10/ops.c:1946 +msgid "Failure: Remote does not support proposed hash function" +msgstr "Failure: Remote does not support proposed hash function" + +#: ../libpurple/protocols/silc10/ops.c:1949 +msgid "Failure: Remote does not support proposed HMAC" +msgstr "Failure: Remote does not support proposed HMAC" + +#: ../libpurple/protocols/silc10/ops.c:1951 +msgid "Failure: Incorrect signature" +msgstr "Failure: Incorrect signature" + +#: ../libpurple/protocols/silc10/ops.c:1953 +msgid "Failure: Invalid cookie" +msgstr "Failure: Invalid cookie" + +#: ../libpurple/protocols/silc10/ops.c:1964 +msgid "Failure: Authentication failed" +msgstr "Failure: Authentication failed" + +#: ../libpurple/protocols/silc10/silc.c:182 +msgid "Cannot initialize SILC Client connection" +msgstr "Cannot initialise SILC Client connection" + +#: ../libpurple/protocols/silc10/silc.c:290 +msgid "John Noname" +msgstr "No name" + +#: ../libpurple/protocols/silc10/silc.c:320 +msgid "Cannot find/access ~/.silc directory" +msgstr "Cannot find/access ~/.silc directory" + +#: ../libpurple/protocols/silc10/silc.c:334 +#, c-format +msgid "Could not load SILC key pair: %s" +msgstr "Could not load SILC key pair: %s" + #. TODO: do we really want to disconnect on a failure to write? #: ../libpurple/protocols/simple/simple.c:416 msgid "Could not write" msgstr "Could not write" #: ../libpurple/protocols/simple/simple.c:438 -#: ../libpurple/protocols/simple/simple.c:1484 +#: ../libpurple/protocols/simple/simple.c:1490 msgid "Could not connect" msgstr "Could not connect" -#: ../libpurple/protocols/simple/simple.c:1518 -#: ../libpurple/protocols/simple/simple.c:1560 -#: ../libpurple/protocols/simple/simple.c:1573 -#: ../libpurple/protocols/simple/simple.c:1624 +#: ../libpurple/protocols/simple/simple.c:1524 +#: ../libpurple/protocols/simple/simple.c:1566 +#: ../libpurple/protocols/simple/simple.c:1579 +#: ../libpurple/protocols/simple/simple.c:1630 msgid "Could not create listen socket" msgstr "Could not create listen socket" -#: ../libpurple/protocols/simple/simple.c:1541 +#: ../libpurple/protocols/simple/simple.c:1547 msgid "Couldn't resolve host" msgstr "Couldn't resolve host" -#: ../libpurple/protocols/simple/simple.c:1632 +#: ../libpurple/protocols/simple/simple.c:1638 msgid "Could not resolve hostname" msgstr "Could not resolve hostname" -#: ../libpurple/protocols/simple/simple.c:1649 +#: ../libpurple/protocols/simple/simple.c:1655 msgid "SIP screen names may not contain whitespaces or @ symbols" msgstr "SIP screen names may not contain whitespaces or @ symbols" @@ -10153,36 +12092,36 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/simple/simple.c:1824 +#: ../libpurple/protocols/simple/simple.c:1830 msgid "SIP/SIMPLE Protocol Plugin" msgstr "SIP/SIMPLE Protocol Plug-in" #. * summary -#: ../libpurple/protocols/simple/simple.c:1825 +#: ../libpurple/protocols/simple/simple.c:1831 msgid "The SIP/SIMPLE Protocol Plugin" msgstr "The SIP/SIMPLE Protocol Plug-in" -#: ../libpurple/protocols/simple/simple.c:1853 +#: ../libpurple/protocols/simple/simple.c:1859 msgid "Publish status (note: everyone may watch you)" msgstr "Publish status (note: anyone can watch you)" -#: ../libpurple/protocols/simple/simple.c:1859 +#: ../libpurple/protocols/simple/simple.c:1865 msgid "Use UDP" msgstr "Use UDP" -#: ../libpurple/protocols/simple/simple.c:1861 +#: ../libpurple/protocols/simple/simple.c:1867 msgid "Use proxy" msgstr "Use proxy" -#: ../libpurple/protocols/simple/simple.c:1863 +#: ../libpurple/protocols/simple/simple.c:1869 msgid "Proxy" msgstr "Proxy" -#: ../libpurple/protocols/simple/simple.c:1865 +#: ../libpurple/protocols/simple/simple.c:1871 msgid "Auth User" msgstr "Auth User" -#: ../libpurple/protocols/simple/simple.c:1867 +#: ../libpurple/protocols/simple/simple.c:1873 msgid "Auth Domain" msgstr "Auth Domain" @@ -10341,7 +12280,8 @@ msgid "Password Change Successful" msgstr "Password Change Successful" -#: ../libpurple/protocols/toc/toc.c:1366 +#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576 +#: ../pidgin/gtkblist.c:5929 msgid "_Group:" msgstr "_Group:" @@ -10401,30 +12341,25 @@ msgid "TOC Protocol Plugin" msgstr "TOC Protocol Plug-in" -#: ../libpurple/protocols/yahoo/yahoo.c:810 +#: ../libpurple/protocols/yahoo/yahoo.c:782 +#, c-format +msgid "%s has sent you a webcam invite, which is not yet supported." +msgstr "%s has sent you a webcam invitation, which is not yet supported." + +#: ../libpurple/protocols/yahoo/yahoo.c:838 msgid "Your Yahoo! message did not get sent." msgstr "Your Yahoo! message did not get sent." -#: ../libpurple/protocols/yahoo/yahoo.c:880 -#, c-format -msgid "%s just sent you a Buzz!" -msgstr "%s just sent you a Buzz!" - -#: ../libpurple/protocols/yahoo/yahoo.c:927 +#: ../libpurple/protocols/yahoo/yahoo.c:957 #, c-format msgid "Yahoo! system message for %s:" msgstr "Yahoo! system message for %s:" -#: ../libpurple/protocols/yahoo/yahoo.c:986 +#: ../libpurple/protocols/yahoo/yahoo.c:1026 msgid "Authorization denied message:" msgstr "Authorisation denied message:" -#: ../libpurple/protocols/yahoo/yahoo.c:1067 -#, 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." - -#: ../libpurple/protocols/yahoo/yahoo.c:1070 +#: ../libpurple/protocols/yahoo/yahoo.c:1044 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -10433,11 +12368,16 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." -#: ../libpurple/protocols/yahoo/yahoo.c:1073 +#: ../libpurple/protocols/yahoo/yahoo.c:1047 +#, 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." + +#: ../libpurple/protocols/yahoo/yahoo.c:1049 msgid "Add buddy rejected" msgstr "Add buddy rejected" -#: ../libpurple/protocols/yahoo/yahoo.c:1824 +#: ../libpurple/protocols/yahoo/yahoo.c:1991 #, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -10448,11 +12388,11 @@ "method. You will probably not be able to successfully sign on to Yahoo. " "Check %s for updates." -#: ../libpurple/protocols/yahoo/yahoo.c:1827 +#: ../libpurple/protocols/yahoo/yahoo.c:1994 msgid "Failed Yahoo! Authentication" msgstr "Failed Yahoo! Authentication" -#: ../libpurple/protocols/yahoo/yahoo.c:1893 +#: ../libpurple/protocols/yahoo/yahoo.c:2060 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -10461,149 +12401,171 @@ "You have tried to ignore %s, but the user is on your buddy list. Clicking " "\"Yes\" will remove and ignore the buddy." -#: ../libpurple/protocols/yahoo/yahoo.c:1896 +#: ../libpurple/protocols/yahoo/yahoo.c:2063 msgid "Ignore buddy?" msgstr "Ignore buddy?" -#: ../libpurple/protocols/yahoo/yahoo.c:1955 +#: ../libpurple/protocols/yahoo/yahoo.c:2126 msgid "Your account is locked, please log in to the Yahoo! website." msgstr "Your account is locked, please log in to the Yahoo! website." -#: ../libpurple/protocols/yahoo/yahoo.c:1958 +#: ../libpurple/protocols/yahoo/yahoo.c:2129 #, 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." -#: ../libpurple/protocols/yahoo/yahoo.c:2012 +#: ../libpurple/protocols/yahoo/yahoo.c:2183 #, 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." -#: ../libpurple/protocols/yahoo/yahoo.c:2015 +#: ../libpurple/protocols/yahoo/yahoo.c:2186 msgid "Could not add buddy to server list" msgstr "Could not add buddy to server list" -#: ../libpurple/protocols/yahoo/yahoo.c:2134 +#: ../libpurple/protocols/yahoo/yahoo.c:2305 #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Audible %s/%s/%s.swf ] %s" -#: ../libpurple/protocols/yahoo/yahoo.c:2466 +#: ../libpurple/protocols/yahoo/yahoo.c:2648 msgid "Received unexpected HTTP response from server." msgstr "Received unexpected HTTP response from server." -#: ../libpurple/protocols/yahoo/yahoo.c:2490 -#: ../libpurple/protocols/yahoo/yahoo.c:2669 -#: ../libpurple/protocols/yahoo/yahoo.c:2772 -#: ../libpurple/protocols/yahoo/yahoo.c:2782 -#: ../libpurple/protocols/yahoo/yahoochat.c:1455 -#: ../libpurple/protocols/yahoo/yahoochat.c:1525 +#: ../libpurple/protocols/yahoo/yahoo.c:2672 +#: ../libpurple/protocols/yahoo/yahoo.c:2858 +#: ../libpurple/protocols/yahoo/yahoo.c:2961 +#: ../libpurple/protocols/yahoo/yahoo.c:2971 +#: ../libpurple/protocols/yahoo/yahoochat.c:1514 +#: ../libpurple/protocols/yahoo/yahoochat.c:1584 #: ../libpurple/protocols/yahoo/ycht.c:585 msgid "Connection problem" msgstr "Connection problem" -#: ../libpurple/protocols/yahoo/yahoo.c:2884 -#: ../libpurple/protocols/yahoo/yahoo.c:3495 +#: ../libpurple/protocols/yahoo/yahoo.c:2698 +#, c-format +msgid "" +"Lost connection with %s:\n" +"%s" +msgstr "" +"Lost connection with %s:\n" +"%s" + +#: ../libpurple/protocols/yahoo/yahoo.c:2723 +#, c-format +msgid "" +"Could not establish a connection with %s:\n" +"%s" +msgstr "" +"Could not establish a connection with %s:\n" +"%s" + +#: ../libpurple/protocols/yahoo/yahoo.c:3078 +#: ../libpurple/protocols/yahoo/yahoo.c:3764 msgid "Not at Home" msgstr "Not at Home" -#: ../libpurple/protocols/yahoo/yahoo.c:2886 -#: ../libpurple/protocols/yahoo/yahoo.c:3498 +#: ../libpurple/protocols/yahoo/yahoo.c:3080 +#: ../libpurple/protocols/yahoo/yahoo.c:3767 msgid "Not at Desk" msgstr "Not at Desk" -#: ../libpurple/protocols/yahoo/yahoo.c:2888 -#: ../libpurple/protocols/yahoo/yahoo.c:3501 +#: ../libpurple/protocols/yahoo/yahoo.c:3082 +#: ../libpurple/protocols/yahoo/yahoo.c:3770 msgid "Not in Office" msgstr "Not in Office" -#: ../libpurple/protocols/yahoo/yahoo.c:2892 -#: ../libpurple/protocols/yahoo/yahoo.c:3507 +#: ../libpurple/protocols/yahoo/yahoo.c:3086 +#: ../libpurple/protocols/yahoo/yahoo.c:3776 msgid "On Vacation" msgstr "On Vacation" -#: ../libpurple/protocols/yahoo/yahoo.c:2896 -#: ../libpurple/protocols/yahoo/yahoo.c:3513 +#: ../libpurple/protocols/yahoo/yahoo.c:3090 +#: ../libpurple/protocols/yahoo/yahoo.c:3782 msgid "Stepped Out" msgstr "Stepped Out" -#: ../libpurple/protocols/yahoo/yahoo.c:2989 -#: ../libpurple/protocols/yahoo/yahoo.c:3019 +#: ../libpurple/protocols/yahoo/yahoo.c:3183 +#: ../libpurple/protocols/yahoo/yahoo.c:3213 msgid "Not on server list" msgstr "Not on server list" -#: ../libpurple/protocols/yahoo/yahoo.c:3036 -#: ../libpurple/protocols/yahoo/yahoo.c:3094 +#: ../libpurple/protocols/yahoo/yahoo.c:3230 +#: ../libpurple/protocols/yahoo/yahoo.c:3288 msgid "Appear Online" msgstr "Appear Online" -#: ../libpurple/protocols/yahoo/yahoo.c:3039 -#: ../libpurple/protocols/yahoo/yahoo.c:3115 +#: ../libpurple/protocols/yahoo/yahoo.c:3233 +#: ../libpurple/protocols/yahoo/yahoo.c:3309 msgid "Appear Permanently Offline" msgstr "Appear Permanently Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3057 +#: ../libpurple/protocols/yahoo/yahoo.c:3251 msgid "Presence" msgstr "Presence" -#: ../libpurple/protocols/yahoo/yahoo.c:3100 +#: ../libpurple/protocols/yahoo/yahoo.c:3294 msgid "Appear Offline" msgstr "Appear Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3109 +#: ../libpurple/protocols/yahoo/yahoo.c:3303 msgid "Don't Appear Permanently Offline" msgstr "Don't Appear Permanently Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3157 +#: ../libpurple/protocols/yahoo/yahoo.c:3351 msgid "Join in Chat" msgstr "Join in Chat" -#: ../libpurple/protocols/yahoo/yahoo.c:3163 +#: ../libpurple/protocols/yahoo/yahoo.c:3357 msgid "Initiate Conference" msgstr "Initiate Conference" -#: ../libpurple/protocols/yahoo/yahoo.c:3191 +#: ../libpurple/protocols/yahoo/yahoo.c:3385 msgid "Presence Settings" msgstr "Presence Settings" -#: ../libpurple/protocols/yahoo/yahoo.c:3197 +#: ../libpurple/protocols/yahoo/yahoo.c:3391 msgid "Start Doodling" msgstr "Start Doodling" -#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over -#: ../libpurple/protocols/yahoo/yahoo.c:3230 -msgid "Active which ID?" -msgstr "Active which ID?" - -#: ../libpurple/protocols/yahoo/yahoo.c:3241 +#: ../libpurple/protocols/yahoo/yahoo.c:3492 +msgid "Activate which ID?" +msgstr "Activate which ID?" + +#: ../libpurple/protocols/yahoo/yahoo.c:3503 msgid "Join whom in chat?" msgstr "Join whom in chat?" -#: ../libpurple/protocols/yahoo/yahoo.c:3253 +#: ../libpurple/protocols/yahoo/yahoo.c:3515 msgid "Activate ID..." msgstr "Activate ID..." -#: ../libpurple/protocols/yahoo/yahoo.c:3257 +#: ../libpurple/protocols/yahoo/yahoo.c:3519 msgid "Join User in Chat..." msgstr "Join User in Chat..." -#: ../libpurple/protocols/yahoo/yahoo.c:3764 -msgid "You have just sent a Buzz!" -msgstr "You have just sent a Buzz!" - -#: ../libpurple/protocols/yahoo/yahoo.c:3823 +#: ../libpurple/protocols/yahoo/yahoo.c:3524 +msgid "Open Inbox" +msgstr "Open Inbox" + +#: ../libpurple/protocols/yahoo/yahoo.c:4116 +msgid "Buzz" +msgstr "Buzz" + +#: ../libpurple/protocols/yahoo/yahoo.c:4118 +#, c-format +msgid "Buzzing %s..." +msgstr "Buzzing %s..." + +#: ../libpurple/protocols/yahoo/yahoo.c:4133 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "join <room>: Join a chat room on the Yahoo network" -#: ../libpurple/protocols/yahoo/yahoo.c:3828 +#: ../libpurple/protocols/yahoo/yahoo.c:4138 msgid "list: List rooms on the Yahoo network" msgstr "list: List rooms on the Yahoo network" -#: ../libpurple/protocols/yahoo/yahoo.c:3832 -msgid "buzz: Buzz a user to get their attention" -msgstr "buzz: Buzz a user to get their attention" - -#: ../libpurple/protocols/yahoo/yahoo.c:3836 +#: ../libpurple/protocols/yahoo/yahoo.c:4146 msgid "doodle: Request user to start a Doodle session" msgstr "doodle: Request user to start a Doodle session" @@ -10617,130 +12579,59 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/yahoo/yahoo.c:4044 -#: ../libpurple/protocols/yahoo/yahoo.c:4046 +#: ../libpurple/protocols/yahoo/yahoo.c:4355 +#: ../libpurple/protocols/yahoo/yahoo.c:4357 msgid "Yahoo Protocol Plugin" msgstr "Yahoo Protocol Plug-in" -#: ../libpurple/protocols/yahoo/yahoo.c:4069 +#: ../libpurple/protocols/yahoo/yahoo.c:4380 msgid "Yahoo Japan" msgstr "Yahoo Japan" -#: ../libpurple/protocols/yahoo/yahoo.c:4072 +#: ../libpurple/protocols/yahoo/yahoo.c:4383 msgid "Pager server" msgstr "Pager server" -#: ../libpurple/protocols/yahoo/yahoo.c:4075 +#: ../libpurple/protocols/yahoo/yahoo.c:4386 msgid "Japan Pager server" msgstr "Japan Pager server" -#: ../libpurple/protocols/yahoo/yahoo.c:4078 +#: ../libpurple/protocols/yahoo/yahoo.c:4389 msgid "Pager port" msgstr "Pager port" -#: ../libpurple/protocols/yahoo/yahoo.c:4081 +#: ../libpurple/protocols/yahoo/yahoo.c:4392 msgid "File transfer server" msgstr "File transfer server" -#: ../libpurple/protocols/yahoo/yahoo.c:4084 +#: ../libpurple/protocols/yahoo/yahoo.c:4395 msgid "Japan file transfer server" msgstr "Japan file transfer server" -#: ../libpurple/protocols/yahoo/yahoo.c:4087 +#: ../libpurple/protocols/yahoo/yahoo.c:4398 msgid "File transfer port" msgstr "File transfer port" -#: ../libpurple/protocols/yahoo/yahoo.c:4090 +#: ../libpurple/protocols/yahoo/yahoo.c:4401 msgid "Chat room locale" msgstr "Chat room locale" -#: ../libpurple/protocols/yahoo/yahoo.c:4093 +#: ../libpurple/protocols/yahoo/yahoo.c:4404 msgid "Ignore conference and chatroom invitations" msgstr "Ignore conference and chatroom invitations" -#: ../libpurple/protocols/yahoo/yahoo.c:4101 +#: ../libpurple/protocols/yahoo/yahoo.c:4412 msgid "Chat room list URL" msgstr "Chat room list URL" -#: ../libpurple/protocols/yahoo/yahoo.c:4104 +#: ../libpurple/protocols/yahoo/yahoo.c:4415 msgid "Yahoo Chat server" msgstr "Yahoo Chat server" -#: ../libpurple/protocols/yahoo/yahoo.c:4107 +#: ../libpurple/protocols/yahoo/yahoo.c:4418 msgid "Yahoo Chat port" msgstr "Yahoo Chat port" -#: ../libpurple/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\"." - -#: ../libpurple/protocols/yahoo/yahoochat.c:205 -msgid "Invitation Rejected" -msgstr "Invitation Rejected" - -#: ../libpurple/protocols/yahoo/yahoochat.c:361 -msgid "Failed to join chat" -msgstr "Failed to join chat" - -#. -6 -#: ../libpurple/protocols/yahoo/yahoochat.c:364 -msgid "Unknown room" -msgstr "Unknown room" - -#. -15 -#: ../libpurple/protocols/yahoo/yahoochat.c:367 -msgid "Maybe the room is full" -msgstr "Perhaps the room is full" - -#. -35 -#: ../libpurple/protocols/yahoo/yahoochat.c:370 -msgid "Not available" -msgstr "Not available" - -#: ../libpurple/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" - -#: ../libpurple/protocols/yahoo/yahoochat.c:452 -#, c-format -msgid "You are now chatting in %s." -msgstr "You are now chatting in %s." - -#: ../libpurple/protocols/yahoo/yahoochat.c:627 -msgid "Failed to join buddy in chat" -msgstr "Failed to join buddy in chat" - -#: ../libpurple/protocols/yahoo/yahoochat.c:628 -msgid "Maybe they're not in a chat?" -msgstr "Perhaps they're not in a chat?" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1357 -#: ../libpurple/protocols/yahoo/yahoochat.c:1383 -msgid "Fetching the room list failed." -msgstr "Fetching the room list failed." - -#: ../libpurple/protocols/yahoo/yahoochat.c:1441 -msgid "Voices" -msgstr "Voices" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1444 -msgid "Webcams" -msgstr "Webcams" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1455 -#: ../libpurple/protocols/yahoo/yahoochat.c:1525 -msgid "Unable to fetch room list." -msgstr "Unable to fetch room list." - -#: ../libpurple/protocols/yahoo/yahoochat.c:1518 -msgid "User Rooms" -msgstr "User Rooms" - #. Write a local message to this conversation showing that a request for a #. * Doodle session has been made #. @@ -10748,26 +12639,26 @@ msgid "Sent Doodle request." msgstr "Sent Doodle request." -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278 -#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279 +#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292 msgid "Unable to establish file descriptor." msgstr "Unable to establish file descriptor." #. TODO: what to do here - do we really have to disconnect? -#: ../libpurple/protocols/yahoo/yahoo_packet.c:289 +#: ../libpurple/protocols/yahoo/yahoo_packet.c:307 msgid "Write Error" msgstr "Write Error" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:773 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 msgid "Yahoo! Japan Profile" msgstr "Yahoo! Japan Profile" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:774 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "Yahoo! Profile" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:814 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:838 msgid "" "Sorry, profiles marked as containing adult content are not supported at this " "time." @@ -10775,7 +12666,7 @@ "Sorry, profiles marked as containing adult content are not supported at this " "time." -#: ../libpurple/protocols/yahoo/yahoo_profile.c:816 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:840 msgid "" "If you wish to view this profile, you will need to visit this link in your " "web browser:" @@ -10783,47 +12674,47 @@ "If you wish to view this profile, you will need to visit this link in your " "web browser:" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034 msgid "Yahoo! ID" msgstr "Yahoo! ID" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117 msgid "Hobbies" msgstr "Hobbies" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131 msgid "Latest News" msgstr "Latest News" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152 msgid "Home Page" msgstr "Home Page" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167 msgid "Cool Link 1" msgstr "Cool Link 1" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172 msgid "Cool Link 2" msgstr "Cool Link 2" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176 msgid "Cool Link 3" msgstr "Cool Link 3" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190 msgid "Last Update" msgstr "Last Update" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199 #, c-format msgid "User information for %s unavailable" msgstr "User information for %s unavailable" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205 msgid "" "Sorry, this profile seems to be in a language or format that is not " "supported at this time." @@ -10831,7 +12722,7 @@ "Sorry, this profile seems to be in a language or format that is not " "supported at this time." -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221 msgid "" "Could not retrieve the user's profile. This most likely is a temporary " "server-side problem. Please try again later." @@ -10839,7 +12730,7 @@ "Could not retrieve the user's profile. This most likely is a temporary " "server-side problem. Please try again later." -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224 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 " @@ -10849,10 +12740,81 @@ "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." -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231 msgid "The user's profile is empty." msgstr "The user's profile is empty." +#: ../libpurple/protocols/yahoo/yahoochat.c:217 +#, c-format +msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." +msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"." + +#: ../libpurple/protocols/yahoo/yahoochat.c:219 +msgid "Invitation Rejected" +msgstr "Invitation Rejected" + +#: ../libpurple/protocols/yahoo/yahoochat.c:438 +msgid "Failed to join chat" +msgstr "Failed to join chat" + +#. -6 +#: ../libpurple/protocols/yahoo/yahoochat.c:441 +msgid "Unknown room" +msgstr "Unknown room" + +#. -15 +#: ../libpurple/protocols/yahoo/yahoochat.c:444 +msgid "Maybe the room is full" +msgstr "Perhaps the room is full" + +#. -35 +#: ../libpurple/protocols/yahoo/yahoochat.c:447 +msgid "Not available" +msgstr "Not available" + +#: ../libpurple/protocols/yahoo/yahoochat.c:451 +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" + +#: ../libpurple/protocols/yahoo/yahoochat.c:534 +#, c-format +msgid "You are now chatting in %s." +msgstr "You are now chatting in %s." + +#: ../libpurple/protocols/yahoo/yahoochat.c:719 +msgid "Failed to join buddy in chat" +msgstr "Failed to join buddy in chat" + +#: ../libpurple/protocols/yahoo/yahoochat.c:720 +msgid "Maybe they're not in a chat?" +msgstr "Perhaps they're not in a chat?" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 +msgid "Fetching the room list failed." +msgstr "Fetching the room list failed." + +#: ../libpurple/protocols/yahoo/yahoochat.c:1500 +msgid "Voices" +msgstr "Voices" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1503 +msgid "Webcams" +msgstr "Webcams" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1514 +#: ../libpurple/protocols/yahoo/yahoochat.c:1584 +msgid "Unable to fetch room list." +msgstr "Unable to fetch room list." + +#: ../libpurple/protocols/yahoo/yahoochat.c:1577 +msgid "User Rooms" +msgstr "User Rooms" + #: ../libpurple/protocols/yahoo/ycht.c:456 msgid "Connection problem with the YCHT server." msgstr "Connection problem with the YCHT server." @@ -10879,11 +12841,6 @@ msgid "Unable to send to chat %s,%s,%s" msgstr "Unable to send to chat %s,%s,%s" -#: ../libpurple/protocols/zephyr/zephyr.c:786 -#: ../libpurple/protocols/zephyr/zephyr.c:1204 -msgid "User" -msgstr "User" - #: ../libpurple/protocols/zephyr/zephyr.c:791 #: ../libpurple/protocols/zephyr/zephyr.c:1210 msgid "Hidden or not logged-in" @@ -11031,7 +12988,7 @@ msgstr "Exposure" #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032 -#: ../libpurple/proxy.c:1588 +#: ../libpurple/proxy.c:1600 #, c-format msgid "" "Unable to create socket:\n" @@ -11061,7 +13018,7 @@ msgid "Error resolving %s" msgstr "Error resolving %s" -#: ../libpurple/proxy.c:1685 +#: ../libpurple/proxy.c:1697 msgid "Could not resolve host name" msgstr "Could not resolve host name" @@ -11086,11 +13043,11 @@ #. * #. * The default message to use when the user becomes auto-away. #. -#: ../libpurple/savedstatuses.c:46 +#: ../libpurple/savedstatuses.c:47 msgid "I'm not here right now" msgstr "I'm not here right now" -#: ../libpurple/savedstatuses.c:532 +#: ../libpurple/savedstatuses.c:534 msgid "saved statuses" msgstr "saved statuses" @@ -11099,7 +13056,17 @@ msgid "%s is now known as %s.\n" msgstr "%s is now known as %s.\n" -#: ../libpurple/server.c:679 +#: ../libpurple/server.c:301 +#, c-format +msgid "Requesting %s's attention..." +msgstr "Requesting %s's attention..." + +#: ../libpurple/server.c:346 +#, c-format +msgid "%s has requested your attention!" +msgstr "%s has requested your attention!" + +#: ../libpurple/server.c:795 #, c-format msgid "" "%s has invited %s to the chat room %s:\n" @@ -11108,22 +13075,42 @@ "%s has invited %s to the chat room %s:\n" "%s" -#: ../libpurple/server.c:684 +#: ../libpurple/server.c:800 #, c-format msgid "%s has invited %s to the chat room %s\n" msgstr "%s has invited %s to the chat room %s\n" -#: ../libpurple/server.c:688 +#: ../libpurple/server.c:804 msgid "Accept chat invitation?" msgstr "Accept chat invitation?" +#: ../libpurple/sslconn.c:163 +msgid "SSL Connection Failed" +msgstr "SSL Connection Failed" + +#: ../libpurple/sslconn.c:165 +msgid "SSL Handshake Failed" +msgstr "SSL Handshake Failed" + +#: ../libpurple/sslconn.c:167 +msgid "SSL peer presented an invalid certificate" +msgstr "SSL peer presented an invalid certificate" + +#: ../libpurple/sslconn.c:170 +msgid "Unknown SSL error" +msgstr "Unknown SSL error" + #: ../libpurple/status.c:152 msgid "Unset" msgstr "Unset" -#: ../libpurple/status.c:155 -msgid "Unavailable" -msgstr "Unavailable" +#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058 +msgid "Do not disturb" +msgstr "Do not disturb" + +#: ../libpurple/status.c:158 +msgid "Extended away" +msgstr "Extended away" #: ../libpurple/status.c:159 msgid "Mobile" @@ -11154,27 +13141,27 @@ msgid "%s became unidle" msgstr "%s is no longer idle" -#: ../libpurple/status.c:1312 +#: ../libpurple/status.c:1313 #, c-format msgid "+++ %s became idle" msgstr "+++ %s became idle" -#: ../libpurple/status.c:1314 +#: ../libpurple/status.c:1315 #, c-format msgid "+++ %s became unidle" msgstr "+++ %s is no longer idle" -#: ../libpurple/util.c:681 +#: ../libpurple/util.c:717 #, c-format msgid "%x %X" msgstr "%x %X" -#: ../libpurple/util.c:2553 +#: ../libpurple/util.c:2720 #, c-format msgid "Error Reading %s" msgstr "Error reading %s" -#: ../libpurple/util.c:2554 +#: ../libpurple/util.c:2721 #, c-format msgid "" "An error was encountered reading your %s. They have not been loaded, and " @@ -11183,62 +13170,67 @@ "An error was encountered reading your %s. They have not been loaded, and " "the old file has been renamed to %s~." -#: ../libpurple/util.c:3024 +#: ../libpurple/util.c:3221 msgid "Calculating..." msgstr "Calculating..." -#: ../libpurple/util.c:3027 +#: ../libpurple/util.c:3224 msgid "Unknown." msgstr "Unknown." -#: ../libpurple/util.c:3053 +#: ../libpurple/util.c:3250 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d second" msgstr[1] "%d seconds" -#: ../libpurple/util.c:3065 +#: ../libpurple/util.c:3262 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d day" msgstr[1] "%d days" -#: ../libpurple/util.c:3073 +#: ../libpurple/util.c:3270 #, c-format msgid "%s, %d hour" msgid_plural "%s, %d hours" msgstr[0] "%s, %d hour" msgstr[1] "%s, %d hours" -#: ../libpurple/util.c:3079 +#: ../libpurple/util.c:3276 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hour" msgstr[1] "%d hours" -#: ../libpurple/util.c:3087 +#: ../libpurple/util.c:3284 #, c-format msgid "%s, %d minute" msgid_plural "%s, %d minutes" msgstr[0] "%s, %d minute" msgstr[1] "%s, %d minutes" -#: ../libpurple/util.c:3093 +#: ../libpurple/util.c:3290 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: ../libpurple/util.c:3365 ../libpurple/util.c:3663 +#: ../libpurple/util.c:3550 +#, c-format +msgid "Could not open %s: Redirected too many times" +msgstr "Could not open %s: Redirected too many times" + +#: ../libpurple/util.c:3587 ../libpurple/util.c:3882 #, c-format msgid "Unable to connect to %s" msgstr "Unable to connect to %s" -#: ../libpurple/util.c:3491 +#: ../libpurple/util.c:3710 #, c-format msgid "" "Unable to allocate enough memory to hold the contents from %s. The web " @@ -11247,17 +13239,17 @@ "Unable to allocate enough memory to hold the contents from %s. The web " "server may be trying something malicious." -#: ../libpurple/util.c:3526 +#: ../libpurple/util.c:3745 #, c-format msgid "Error reading from %s: %s" msgstr "Error reading from %s: %s" -#: ../libpurple/util.c:3557 +#: ../libpurple/util.c:3776 #, c-format msgid "Error writing to %s: %s" msgstr "Error writing to %s: %s" -#: ../libpurple/util.c:3582 +#: ../libpurple/util.c:3801 #, c-format msgid "Unable to connect to %s: %s" msgstr "Unable to connect to %s: %s" @@ -11283,55 +13275,71 @@ msgstr "The orientation of the tray." #. Build the login options frame. -#: ../pidgin/gtkaccount.c:408 +#: ../pidgin/gtkaccount.c:407 msgid "Login Options" msgstr "Login Options" -#: ../pidgin/gtkaccount.c:524 -msgid "Local alias:" -msgstr "Local alias:" +#: ../pidgin/gtkaccount.c:428 +msgid "Pro_tocol:" +msgstr "Pro_tocol:" + +#: ../pidgin/gtkaccount.c:439 +msgid "Screen _name:" +msgstr "Screen _name:" + +#: ../pidgin/gtkaccount.c:529 +msgid "_Local alias:" +msgstr "_Local alias:" + +#: ../pidgin/gtkaccount.c:533 +msgid "Remember pass_word" +msgstr "Remember pass_word" #. Build the user options frame. -#: ../pidgin/gtkaccount.c:586 +#: ../pidgin/gtkaccount.c:591 msgid "User Options" msgstr "User Options" +#: ../pidgin/gtkaccount.c:604 +msgid "New _mail notifications" +msgstr "New _mail notifications" + #. Buddy icon -#: ../pidgin/gtkaccount.c:604 -msgid "Use this buddy icon for this account:" -msgstr "Use this buddy icon for this account:" +#: ../pidgin/gtkaccount.c:609 +msgid "Use this buddy _icon for this account:" +msgstr "Use this buddy _icon for this account:" #. Build the protocol options frame. -#: ../pidgin/gtkaccount.c:724 +#: ../pidgin/gtkaccount.c:731 #, c-format msgid "%s Options" msgstr "%s Options" -#: ../pidgin/gtkaccount.c:929 +#: ../pidgin/gtkaccount.c:936 msgid "Use GNOME Proxy Settings" msgstr "Use GNOME Proxy Settings" -#: ../pidgin/gtkaccount.c:930 +#: ../pidgin/gtkaccount.c:937 msgid "Use Global Proxy Settings" msgstr "Use Global Proxy Settings" -#: ../pidgin/gtkaccount.c:936 +#: ../pidgin/gtkaccount.c:943 msgid "No Proxy" msgstr "No Proxy" -#: ../pidgin/gtkaccount.c:942 +#: ../pidgin/gtkaccount.c:949 msgid "HTTP" msgstr "HTTP" -#: ../pidgin/gtkaccount.c:948 +#: ../pidgin/gtkaccount.c:955 msgid "SOCKS 4" msgstr "SOCKS 4" -#: ../pidgin/gtkaccount.c:954 +#: ../pidgin/gtkaccount.c:961 msgid "SOCKS 5" msgstr "SOCKS 5" -#: ../pidgin/gtkaccount.c:960 ../pidgin/gtkprefs.c:1100 +#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210 msgid "Use Environmental Settings" msgstr "Use Environmental Settings" @@ -11340,60 +13348,72 @@ #. A) your network is really slow and you have nothing better to do than #. look at butterflies. #. B)You are looking really closely at something that shouldn't matter. -#: ../pidgin/gtkaccount.c:999 +#: ../pidgin/gtkaccount.c:1006 msgid "If you look real closely" msgstr "If you look real closely" #. This is an easter egg. See the comment on the previous line in the source. -#: ../pidgin/gtkaccount.c:1002 +#: ../pidgin/gtkaccount.c:1009 msgid "you can see the butterflies mating" msgstr "you can see the butterflies mating" -#: ../pidgin/gtkaccount.c:1023 +#: ../pidgin/gtkaccount.c:1030 msgid "Proxy Options" msgstr "Proxy Options" -#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:1094 +#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204 msgid "Proxy _type:" msgstr "Proxy _type:" -#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1115 +#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225 msgid "_Host:" msgstr "_Host:" -#: ../pidgin/gtkaccount.c:1050 ../pidgin/gtkprefs.c:1133 +#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243 msgid "_Port:" msgstr "_Port:" -#: ../pidgin/gtkaccount.c:1058 +#: ../pidgin/gtkaccount.c:1065 msgid "_Username:" msgstr "_Username:" -#: ../pidgin/gtkaccount.c:1065 ../pidgin/gtkprefs.c:1170 +#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280 msgid "Pa_ssword:" msgstr "Pa_ssword:" -#: ../pidgin/gtkaccount.c:1471 +#: ../pidgin/gtkaccount.c:1195 +msgid "Unable to save new account" +msgstr "Unable to save new account" + +#: ../pidgin/gtkaccount.c:1196 +msgid "An account already exists with the specified criteria." +msgstr "An account already exists with the specified criteria." + +#: ../pidgin/gtkaccount.c:1473 msgid "Add Account" msgstr "Add Account" -#: ../pidgin/gtkaccount.c:1495 +#: ../pidgin/gtkaccount.c:1492 msgid "_Basic" msgstr "_Basic" -#: ../pidgin/gtkaccount.c:1506 +#: ../pidgin/gtkaccount.c:1499 +msgid "Create this new account on the server" +msgstr "Create this new account on the server" + +#: ../pidgin/gtkaccount.c:1515 msgid "_Advanced" msgstr "_Advanced" -#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:568 +#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568 msgid "Enabled" msgstr "Enabled" -#: ../pidgin/gtkaccount.c:2006 +#: ../pidgin/gtkaccount.c:2001 msgid "Protocol" msgstr "Protocol" -#: ../pidgin/gtkaccount.c:2200 +#: ../pidgin/gtkaccount.c:2201 #, c-format msgid "" "<span size='larger' weight='bold'>Welcome to %s!</span>\n" @@ -11416,11 +13436,11 @@ "You can come back to this window to add, edit, or remove accounts from " "<b>Accounts->Add/Edit</b> in the Buddy List window" -#: ../pidgin/gtkblist.c:724 +#: ../pidgin/gtkblist.c:765 msgid "Join a Chat" msgstr "Join a Chat" -#: ../pidgin/gtkblist.c:745 +#: ../pidgin/gtkblist.c:786 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -11428,222 +13448,232 @@ "Please enter the appropriate information about the chat you would like to " "join.\n" -#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531 -#: ../pidgin/gtkroomlist.c:399 +#. Set up stuff for the account box +#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524 +#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538 +#: ../pidgin/gtkroomlist.c:395 msgid "_Account:" msgstr "_Account:" -#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606 -#: ../pidgin/gtkprivacy.c:620 +#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602 +#: ../pidgin/gtkprivacy.c:616 msgid "_Block" msgstr "_Block" -#: ../pidgin/gtkblist.c:1045 +#: ../pidgin/gtkblist.c:1086 msgid "Un_block" msgstr "Un_block" -#: ../pidgin/gtkblist.c:1096 +#: ../pidgin/gtkblist.c:1137 msgid "Get _Info" msgstr "Get _Info" -#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84 +#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89 msgid "I_M" msgstr "I_M" -#: ../pidgin/gtkblist.c:1105 +#: ../pidgin/gtkblist.c:1146 msgid "_Send File" msgstr "_Send File" -#: ../pidgin/gtkblist.c:1112 +#: ../pidgin/gtkblist.c:1153 msgid "Add Buddy _Pounce" msgstr "Add Buddy _Pounce" -#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120 -#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245 +#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162 +#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290 msgid "View _Log" msgstr "View _Log" -#: ../pidgin/gtkblist.c:1132 -msgid "Alias..." -msgstr "Alias..." - -#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230 -#: ../pidgin/gtkblist.c:1251 +#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184 +#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296 msgid "_Alias..." msgstr "_Alias..." -#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232 -#: ../pidgin/gtkblist.c:1253 +#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186 +#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298 msgid "_Remove" msgstr "_Remove" -#: ../pidgin/gtkblist.c:1192 +#: ../pidgin/gtkblist.c:1236 msgid "Add a _Buddy" msgstr "Add a _Buddy" -#: ../pidgin/gtkblist.c:1195 +#: ../pidgin/gtkblist.c:1239 msgid "Add a C_hat" msgstr "Add a C_hat" -#: ../pidgin/gtkblist.c:1198 +#: ../pidgin/gtkblist.c:1242 msgid "_Delete Group" msgstr "_Delete Group" -#: ../pidgin/gtkblist.c:1200 +#: ../pidgin/gtkblist.c:1244 msgid "_Rename" msgstr "_Rename" #. join button -#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306 -#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82 +#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306 +#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87 msgid "_Join" msgstr "_Join" -#: ../pidgin/gtkblist.c:1220 +#: ../pidgin/gtkblist.c:1265 msgid "Auto-Join" msgstr "Auto-Join" -#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281 +#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327 msgid "_Collapse" msgstr "_Collapse" -#: ../pidgin/gtkblist.c:1286 +#: ../pidgin/gtkblist.c:1332 msgid "_Expand" msgstr "_Expand" -#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543 -#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521 +#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595 +#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613 msgid "/Tools/Mute Sounds" msgstr "/Tools/Mute Sounds" -#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535 -#: ../pidgin/gtkpounce.c:423 +#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826 +#: ../pidgin/gtkpounce.c:429 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 -#: ../pidgin/gtkblist.c:2832 +#: ../pidgin/gtkblist.c:2866 msgid "/_Buddies" msgstr "/_Buddies" -#: ../pidgin/gtkblist.c:2833 +#: ../pidgin/gtkblist.c:2867 msgid "/Buddies/New Instant _Message..." msgstr "/Buddies/New Instant _Message..." -#: ../pidgin/gtkblist.c:2834 +#: ../pidgin/gtkblist.c:2868 msgid "/Buddies/Join a _Chat..." msgstr "/Buddies/Join a _Chat..." -#: ../pidgin/gtkblist.c:2835 +#: ../pidgin/gtkblist.c:2869 msgid "/Buddies/Get User _Info..." msgstr "/Buddies/Get User _Info..." -#: ../pidgin/gtkblist.c:2836 +#: ../pidgin/gtkblist.c:2870 msgid "/Buddies/View User _Log..." msgstr "/Buddies/View User _Log..." -#: ../pidgin/gtkblist.c:2838 -msgid "/Buddies/Show _Offline Buddies" -msgstr "/Buddies/Show _Offline Buddies" - -#: ../pidgin/gtkblist.c:2839 -msgid "/Buddies/Show _Empty Groups" -msgstr "/Buddies/Show _Empty Groups" - -#: ../pidgin/gtkblist.c:2840 -msgid "/Buddies/Show Buddy _Details" -msgstr "/Buddies/Show Buddy _Details" - -#: ../pidgin/gtkblist.c:2841 -msgid "/Buddies/Show Idle _Times" -msgstr "/Buddies/Show Idle _Times" - -#: ../pidgin/gtkblist.c:2842 +#: ../pidgin/gtkblist.c:2872 +msgid "/Buddies/Show" +msgstr "/Buddies/Show" + +#: ../pidgin/gtkblist.c:2873 +msgid "/Buddies/Show/_Offline Buddies" +msgstr "/Buddies/Show/_Offline Buddies" + +#: ../pidgin/gtkblist.c:2874 +msgid "/Buddies/Show/_Empty Groups" +msgstr "/Buddies/Show/_Empty Groups" + +#: ../pidgin/gtkblist.c:2875 +msgid "/Buddies/Show/Buddy _Details" +msgstr "/Buddies/Show/Buddy _Details" + +#: ../pidgin/gtkblist.c:2876 +msgid "/Buddies/Show/Idle _Times" +msgstr "/Buddies/Show/Idle _Times" + +#: ../pidgin/gtkblist.c:2877 +msgid "/Buddies/Show/_Protocol Icons" +msgstr "/Buddies/Show/_Protocol Icons" + +#: ../pidgin/gtkblist.c:2878 msgid "/Buddies/_Sort Buddies" msgstr "/Buddies/_Sort Buddies" -#: ../pidgin/gtkblist.c:2844 +#: ../pidgin/gtkblist.c:2880 msgid "/Buddies/_Add Buddy..." msgstr "/Buddies/_Add Buddy..." -#: ../pidgin/gtkblist.c:2845 +#: ../pidgin/gtkblist.c:2881 msgid "/Buddies/Add C_hat..." msgstr "/Buddies/Add C_hat..." -#: ../pidgin/gtkblist.c:2846 +#: ../pidgin/gtkblist.c:2882 msgid "/Buddies/Add _Group..." msgstr "/Buddies/Add _Group..." -#: ../pidgin/gtkblist.c:2848 +#: ../pidgin/gtkblist.c:2884 msgid "/Buddies/_Quit" msgstr "/Buddies/_Quit" #. Accounts menu -#: ../pidgin/gtkblist.c:2851 +#: ../pidgin/gtkblist.c:2887 msgid "/_Accounts" msgstr "/_Accounts" -#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6448 +#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589 msgid "/Accounts/Add\\/Edit" msgstr "/Accounts/Add\\/Edit" #. Tools -#: ../pidgin/gtkblist.c:2855 +#: ../pidgin/gtkblist.c:2891 msgid "/_Tools" msgstr "/_Tools" -#: ../pidgin/gtkblist.c:2856 +#: ../pidgin/gtkblist.c:2892 msgid "/Tools/Buddy _Pounces" msgstr "/Tools/Buddy _Pounces" -#: ../pidgin/gtkblist.c:2857 +#: ../pidgin/gtkblist.c:2893 +msgid "/Tools/_Certificates" +msgstr "/Tools/_Certificates" + +#: ../pidgin/gtkblist.c:2894 msgid "/Tools/Plu_gins" msgstr "/Tools/Plu_g-ins" -#: ../pidgin/gtkblist.c:2858 +#: ../pidgin/gtkblist.c:2895 msgid "/Tools/Pr_eferences" msgstr "/Tools/Pr_eferences" -#: ../pidgin/gtkblist.c:2859 +#: ../pidgin/gtkblist.c:2896 msgid "/Tools/Pr_ivacy" msgstr "/Tools/Pr_ivacy" -#: ../pidgin/gtkblist.c:2861 +#: ../pidgin/gtkblist.c:2898 msgid "/Tools/_File Transfers" msgstr "/Tools/_File Transfers" -#: ../pidgin/gtkblist.c:2862 +#: ../pidgin/gtkblist.c:2899 msgid "/Tools/R_oom List" msgstr "/Tools/R_oom List" -#: ../pidgin/gtkblist.c:2863 +#: ../pidgin/gtkblist.c:2900 msgid "/Tools/System _Log" msgstr "/Tools/System _Log" -#: ../pidgin/gtkblist.c:2865 +#: ../pidgin/gtkblist.c:2902 msgid "/Tools/Mute _Sounds" msgstr "/Tools/Mute _Sounds" #. Help -#: ../pidgin/gtkblist.c:2868 +#: ../pidgin/gtkblist.c:2904 msgid "/_Help" msgstr "/_Help" -#: ../pidgin/gtkblist.c:2869 +#: ../pidgin/gtkblist.c:2905 msgid "/Help/Online _Help" msgstr "/Help/Online _Help" -#: ../pidgin/gtkblist.c:2870 +#: ../pidgin/gtkblist.c:2906 msgid "/Help/_Debug Window" msgstr "/Help/_Debug Window" -#: ../pidgin/gtkblist.c:2871 +#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910 msgid "/Help/_About" msgstr "/Help/_About" -#: ../pidgin/gtkblist.c:2899 +#: ../pidgin/gtkblist.c:2939 #, c-format msgid "" "\n" @@ -11652,127 +13682,132 @@ "\n" "<b>Account:</b> %s" -#: ../pidgin/gtkblist.c:2977 +#: ../pidgin/gtkblist.c:3017 msgid "Buddy Alias" msgstr "Buddy Alias" -#: ../pidgin/gtkblist.c:2998 +#: ../pidgin/gtkblist.c:3046 msgid "Logged In" msgstr "Logged In" -#: ../pidgin/gtkblist.c:3044 +#: ../pidgin/gtkblist.c:3092 msgid "Last Seen" msgstr "Last Seen" -#: ../pidgin/gtkblist.c:3064 +#: ../pidgin/gtkblist.c:3113 msgid "Spooky" msgstr "Spooky" -#: ../pidgin/gtkblist.c:3066 +#: ../pidgin/gtkblist.c:3115 msgid "Awesome" msgstr "Awesome" -#: ../pidgin/gtkblist.c:3068 +#: ../pidgin/gtkblist.c:3117 msgid "Rockin'" msgstr "Rockin'" -#: ../pidgin/gtkblist.c:3394 +#: ../pidgin/gtkblist.c:3450 +#, c-format +msgid "Idle %dd %dh %02dm" +msgstr "Idle %dd %dh %02dm" + +#: ../pidgin/gtkblist.c:3452 #, c-format msgid "Idle %dh %02dm" msgstr "Idle %dh %02dm" -#: ../pidgin/gtkblist.c:3396 +#: ../pidgin/gtkblist.c:3454 #, c-format msgid "Idle %dm" msgstr "Idle %dm" -#: ../pidgin/gtkblist.c:3533 +#: ../pidgin/gtkblist.c:3599 msgid "/Buddies/New Instant Message..." msgstr "/Buddies/New Instant Message..." -#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567 +#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633 msgid "/Buddies/Join a Chat..." msgstr "/Buddies/Join a Chat..." -#: ../pidgin/gtkblist.c:3535 +#: ../pidgin/gtkblist.c:3601 msgid "/Buddies/Get User Info..." msgstr "/Buddies/Get User Info..." -#: ../pidgin/gtkblist.c:3536 +#: ../pidgin/gtkblist.c:3602 msgid "/Buddies/Add Buddy..." msgstr "/Buddies/Add Buddy..." -#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570 +#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636 msgid "/Buddies/Add Chat..." msgstr "/Buddies/Add Chat..." -#: ../pidgin/gtkblist.c:3538 +#: ../pidgin/gtkblist.c:3604 msgid "/Buddies/Add Group..." msgstr "/Buddies/Add Group..." -#: ../pidgin/gtkblist.c:3573 +#: ../pidgin/gtkblist.c:3639 msgid "/Tools/Privacy" msgstr "/Tools/Privacy" -#: ../pidgin/gtkblist.c:3576 +#: ../pidgin/gtkblist.c:3642 msgid "/Tools/Room List" msgstr "/Tools/Room List" -#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153 +#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153 #, 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" -#: ../pidgin/gtkblist.c:3750 +#: ../pidgin/gtkblist.c:3819 msgid "Manually" msgstr "Manually" -#: ../pidgin/gtkblist.c:3752 +#: ../pidgin/gtkblist.c:3821 msgid "Alphabetically" msgstr "Alphabetically" -#: ../pidgin/gtkblist.c:3753 +#: ../pidgin/gtkblist.c:3822 msgid "By status" msgstr "By status" -#: ../pidgin/gtkblist.c:3754 +#: ../pidgin/gtkblist.c:3823 msgid "By log size" msgstr "By log size" -#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178 +#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178 #, c-format msgid "%s disconnected" msgstr "%s disconnected" -#: ../pidgin/gtkblist.c:3966 +#: ../pidgin/gtkblist.c:4038 msgid "Re-enable Account" msgstr "Re-enable Account" -#: ../pidgin/gtkblist.c:3990 +#: ../pidgin/gtkblist.c:4064 #, c-format msgid "<span color=\"red\">%s disconnected: %s</span>" msgstr "<span color=\"red\">%s disconnected: %s</span>" -#: ../pidgin/gtkblist.c:4142 +#: ../pidgin/gtkblist.c:4216 msgid "<b>Username:</b>" msgstr "<b>Username:</b>" -#: ../pidgin/gtkblist.c:4149 +#: ../pidgin/gtkblist.c:4223 msgid "<b>Password:</b>" msgstr "<b>Password:</b>" -#: ../pidgin/gtkblist.c:4160 +#: ../pidgin/gtkblist.c:4234 msgid "_Login" msgstr "_Login" -#: ../pidgin/gtkblist.c:4245 +#: ../pidgin/gtkblist.c:4317 msgid "/Accounts" msgstr "/Accounts" #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy -#: ../pidgin/gtkblist.c:4259 +#: ../pidgin/gtkblist.c:4331 #, c-format msgid "" "<span weight='bold' size='larger'>Welcome to %s!</span>\n" @@ -11790,23 +13825,27 @@ #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. -#: ../pidgin/gtkblist.c:4505 -msgid "/Buddies/Show Offline Buddies" -msgstr "/Buddies/Show Offline Buddies" - -#: ../pidgin/gtkblist.c:4508 -msgid "/Buddies/Show Empty Groups" -msgstr "/Buddies/Show Empty Groups" - -#: ../pidgin/gtkblist.c:4514 -msgid "/Buddies/Show Buddy Details" -msgstr "/Buddies/Show Buddy Details" - -#: ../pidgin/gtkblist.c:4517 -msgid "/Buddies/Show Idle Times" -msgstr "/Buddies/Show Idle Times" - -#: ../pidgin/gtkblist.c:5367 +#: ../pidgin/gtkblist.c:4594 +msgid "/Buddies/Show/Offline Buddies" +msgstr "/Buddies/Show/Offline Buddies" + +#: ../pidgin/gtkblist.c:4597 +msgid "/Buddies/Show/Empty Groups" +msgstr "/Buddies/Show/ Empty Groups" + +#: ../pidgin/gtkblist.c:4603 +msgid "/Buddies/Show/Buddy Details" +msgstr "/Buddies/Show/Buddy Details" + +#: ../pidgin/gtkblist.c:4606 +msgid "/Buddies/Show/Idle Times" +msgstr "/Buddies/Show/Idle Times" + +#: ../pidgin/gtkblist.c:4609 +msgid "/Buddies/Show/Protocol Icons" +msgstr "/Buddies/Show/Protocol Icons" + +#: ../pidgin/gtkblist.c:5501 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. " @@ -11816,17 +13855,20 @@ "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" -#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5790 -#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554 -#: ../pidgin/plugins/gevolution/new_person_dialog.c:307 -msgid "Group:" -msgstr "Group:" - -#: ../pidgin/gtkblist.c:5686 +#. End of account box +#: ../pidgin/gtkblist.c:5536 +msgid "_Screen name:" +msgstr "_Screen name:" + +#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911 +msgid "A_lias:" +msgstr "A_lias:" + +#: ../pidgin/gtkblist.c:5823 msgid "This protocol does not support chat rooms." msgstr "This protocol does not support chat rooms." -#: ../pidgin/gtkblist.c:5702 +#: ../pidgin/gtkblist.c:5839 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." @@ -11834,7 +13876,7 @@ "You are not currently signed on with any protocols that have the ability to " "chat." -#: ../pidgin/gtkblist.c:5743 +#: ../pidgin/gtkblist.c:5880 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" @@ -11842,42 +13884,47 @@ "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" -#: ../pidgin/gtkblist.c:5828 +#: ../pidgin/gtkblist.c:5968 msgid "Please enter the name of the group to be added." msgstr "Please enter the name of the group to be added." -#: ../pidgin/gtkblist.c:6468 +#: ../pidgin/gtkblist.c:6609 msgid "<PurpleMain>/Accounts/" msgstr "<PurpleMain>/Accounts/" -#: ../pidgin/gtkblist.c:6492 +#: ../pidgin/gtkblist.c:6633 msgid "_Edit Account" msgstr "_Edit Account" -#: ../pidgin/gtkblist.c:6505 ../pidgin/gtkconv.c:2923 +#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056 msgid "No actions available" msgstr "No actions available" -#: ../pidgin/gtkblist.c:6513 +#: ../pidgin/gtkblist.c:6654 msgid "_Disable" msgstr "_Disable" -#: ../pidgin/gtkblist.c:6525 +#: ../pidgin/gtkblist.c:6666 msgid "Enable Account" msgstr "Enable Account" -#: ../pidgin/gtkblist.c:6531 +#: ../pidgin/gtkblist.c:6672 msgid "<PurpleMain>/Accounts/Enable Account" msgstr "<PurpleMain>/Accounts/Enable Account" -#: ../pidgin/gtkblist.c:6580 +#: ../pidgin/gtkblist.c:6721 msgid "/Tools" msgstr "/Tools" -#: ../pidgin/gtkblist.c:6650 +#: ../pidgin/gtkblist.c:6791 msgid "/Buddies/Sort Buddies" msgstr "/Buddies/Sort Buddies" +#. Widget creation function +#: ../pidgin/gtkcertmgr.c:549 +msgid "SSL Servers" +msgstr "SSL Servers" + #: ../pidgin/gtkconn.c:179 #, c-format msgid "" @@ -11891,22 +13938,26 @@ "%s will not attempt to reconnect the account until you correct the error and " "re-enable the account." -#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814 +#: ../pidgin/gtkconv.c:462 +msgid "Unknown command." +msgstr "Unknown command." + +#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760 msgid "That buddy is not on the same protocol as this chat." msgstr "That buddy is not on the same protocol as this chat." -#: ../pidgin/gtkconv.c:808 +#: ../pidgin/gtkconv.c:754 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." -#: ../pidgin/gtkconv.c:861 +#: ../pidgin/gtkconv.c:807 msgid "Invite Buddy Into Chat Room" msgstr "Invite Buddy Into Chat Room" #. Put our happy label in it. -#: ../pidgin/gtkconv.c:891 +#: ../pidgin/gtkconv.c:837 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." @@ -11914,352 +13965,362 @@ "Please enter the name of the user you wish to invite, along with an optional " "invite message." -#: ../pidgin/gtkconv.c:912 +#: ../pidgin/gtkconv.c:858 msgid "_Buddy:" msgstr "_Buddy:" -#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142 -#: ../pidgin/gtksavedstatuses.c:1478 +#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193 +#: ../pidgin/gtksavedstatuses.c:1527 msgid "_Message:" msgstr "_Message:" -#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:218 +#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218 #: ../pidgin/gtkft.c:542 msgid "Unable to open file." msgstr "Unable to open file." -#: ../pidgin/gtkconv.c:995 +#: ../pidgin/gtkconv.c:942 #, c-format msgid "<h1>Conversation with %s</h1>\n" msgstr "<h1>Conversation with %s</h1>\n" -#: ../pidgin/gtkconv.c:1031 +#: ../pidgin/gtkconv.c:980 msgid "Save Conversation" msgstr "Save Conversation" -#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742 +#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742 msgid "Find" msgstr "Find" -#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:194 +#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194 msgid "_Search for:" msgstr "_Search for:" -#: ../pidgin/gtkconv.c:1358 -msgid "Logging started. Future messages in this conversation will be logged." -msgstr "Logging started. Future messages in this conversation will be logged." - -#: ../pidgin/gtkconv.c:1366 -msgid "" -"Logging stopped. Future messages in this conversation will not be logged." -msgstr "" -"Logging stopped. Future messages in this conversation will not be logged." - -#: ../pidgin/gtkconv.c:1614 +#: ../pidgin/gtkconv.c:1607 msgid "Un-Ignore" msgstr "Un-Ignore" -#: ../pidgin/gtkconv.c:1617 +#: ../pidgin/gtkconv.c:1610 msgid "Ignore" msgstr "Ignore" -#: ../pidgin/gtkconv.c:1637 +#: ../pidgin/gtkconv.c:1630 msgid "Get Away Message" msgstr "Get Away Message" -#: ../pidgin/gtkconv.c:1660 +#: ../pidgin/gtkconv.c:1653 msgid "Last said" msgstr "Last said" -#: ../pidgin/gtkconv.c:2507 +#: ../pidgin/gtkconv.c:2589 msgid "Unable to save icon file to disk." msgstr "Unable to save icon file to disk." -#: ../pidgin/gtkconv.c:2558 +#: ../pidgin/gtkconv.c:2640 msgid "Save Icon" msgstr "Save Icon" -#: ../pidgin/gtkconv.c:2610 +#: ../pidgin/gtkconv.c:2692 msgid "Animate" msgstr "Animate" -#: ../pidgin/gtkconv.c:2615 +#: ../pidgin/gtkconv.c:2697 msgid "Hide Icon" msgstr "Hide Icon" -#: ../pidgin/gtkconv.c:2618 +#: ../pidgin/gtkconv.c:2700 msgid "Save Icon As..." msgstr "Save Icon As..." -#: ../pidgin/gtkconv.c:2622 +#: ../pidgin/gtkconv.c:2704 msgid "Set Custom Icon..." msgstr "Set Custom Icon..." -#: ../pidgin/gtkconv.c:2635 +#: ../pidgin/gtkconv.c:2717 msgid "Remove Custom Icon" msgstr "Remove Custom Icon" +#: ../pidgin/gtkconv.c:2844 +msgid "Show All" +msgstr "Show All" + #. Conversation menu -#: ../pidgin/gtkconv.c:2777 +#: ../pidgin/gtkconv.c:2863 msgid "/_Conversation" msgstr "/_Conversation" -#: ../pidgin/gtkconv.c:2779 +#: ../pidgin/gtkconv.c:2865 msgid "/Conversation/New Instant _Message..." msgstr "/Conversation/New Instant _Message..." -#: ../pidgin/gtkconv.c:2784 +#: ../pidgin/gtkconv.c:2870 msgid "/Conversation/_Find..." msgstr "/Conversation/_Find..." -#: ../pidgin/gtkconv.c:2786 +#: ../pidgin/gtkconv.c:2872 msgid "/Conversation/View _Log" msgstr "/Conversation/View _Log" -#: ../pidgin/gtkconv.c:2787 +#: ../pidgin/gtkconv.c:2873 msgid "/Conversation/_Save As..." msgstr "/Conversation/_Save As..." -#: ../pidgin/gtkconv.c:2789 +#: ../pidgin/gtkconv.c:2875 msgid "/Conversation/Clea_r Scrollback" msgstr "/Conversation/Clea_r Scrollback" -#: ../pidgin/gtkconv.c:2793 +#: ../pidgin/gtkconv.c:2879 msgid "/Conversation/Se_nd File..." msgstr "/Conversation/Se_nd File..." -#: ../pidgin/gtkconv.c:2794 +#: ../pidgin/gtkconv.c:2880 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/Conversation/Add Buddy _Pounce..." -#: ../pidgin/gtkconv.c:2796 +#: ../pidgin/gtkconv.c:2882 msgid "/Conversation/_Get Info" msgstr "/Conversation/_Get Info" -#: ../pidgin/gtkconv.c:2798 +#: ../pidgin/gtkconv.c:2884 msgid "/Conversation/In_vite..." msgstr "/Conversation/In_vite..." -#: ../pidgin/gtkconv.c:2800 +#: ../pidgin/gtkconv.c:2886 msgid "/Conversation/M_ore" msgstr "/Conversation/M_ore" -#: ../pidgin/gtkconv.c:2804 +#: ../pidgin/gtkconv.c:2890 msgid "/Conversation/Al_ias..." msgstr "/Conversation/Al_ias..." -#: ../pidgin/gtkconv.c:2806 +#: ../pidgin/gtkconv.c:2892 msgid "/Conversation/_Block..." msgstr "/Conversation/_Block..." -#: ../pidgin/gtkconv.c:2808 +#: ../pidgin/gtkconv.c:2894 msgid "/Conversation/_Unblock..." msgstr "/Conversation/_Unblock..." -#: ../pidgin/gtkconv.c:2810 +#: ../pidgin/gtkconv.c:2896 msgid "/Conversation/_Add..." msgstr "/Conversation/_Add..." -#: ../pidgin/gtkconv.c:2812 +#: ../pidgin/gtkconv.c:2898 msgid "/Conversation/_Remove..." msgstr "/Conversation/_Remove..." -#: ../pidgin/gtkconv.c:2817 +#: ../pidgin/gtkconv.c:2903 +msgid "/Conversation/Insert Lin_k..." +msgstr "/Conversation/Insert Lin_k..." + +#: ../pidgin/gtkconv.c:2905 +msgid "/Conversation/Insert Imag_e..." +msgstr "/Conversation/Insert Imag_e..." + +#: ../pidgin/gtkconv.c:2911 msgid "/Conversation/_Close" msgstr "/Conversation/_Close" #. Options -#: ../pidgin/gtkconv.c:2821 +#: ../pidgin/gtkconv.c:2915 msgid "/_Options" msgstr "/_Options" -#: ../pidgin/gtkconv.c:2822 +#: ../pidgin/gtkconv.c:2916 msgid "/Options/Enable _Logging" msgstr "/Options/Enable _Logging" -#: ../pidgin/gtkconv.c:2823 +#: ../pidgin/gtkconv.c:2917 msgid "/Options/Enable _Sounds" msgstr "/Options/Enable _Sounds" -#: ../pidgin/gtkconv.c:2824 -msgid "/Options/Show Buddy _Icon" -msgstr "/Options/Show Buddy _Icons" - -#: ../pidgin/gtkconv.c:2826 +#: ../pidgin/gtkconv.c:2919 msgid "/Options/Show Formatting _Toolbars" msgstr "/Options/Show Formatting _Toolbars" -#: ../pidgin/gtkconv.c:2827 +#: ../pidgin/gtkconv.c:2920 msgid "/Options/Show Ti_mestamps" msgstr "/Options/Show Ti_mestamps" -#: ../pidgin/gtkconv.c:2902 +#: ../pidgin/gtkconv.c:3044 msgid "/Conversation/More" msgstr "/Conversation/More" +#: ../pidgin/gtkconv.c:3100 +msgid "/Options" +msgstr "/Options" + #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time #. * the 'Conversation' menu pops up. #. Make sure the 'Conversation -> More' menuitems are regenerated whenever #. * the 'Conversation' menu pops up because the entries can change after the #. * conversation is created. -#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979 +#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167 msgid "/Conversation" msgstr "/Conversation" -#: ../pidgin/gtkconv.c:2987 +#: ../pidgin/gtkconv.c:3175 msgid "/Conversation/View Log" msgstr "/Conversation/View Log" -#: ../pidgin/gtkconv.c:2993 +#: ../pidgin/gtkconv.c:3181 msgid "/Conversation/Send File..." msgstr "/Conversation/Send File..." -#: ../pidgin/gtkconv.c:2997 +#: ../pidgin/gtkconv.c:3185 msgid "/Conversation/Add Buddy Pounce..." msgstr "/Conversation/Add Buddy Pounce..." -#: ../pidgin/gtkconv.c:3003 +#: ../pidgin/gtkconv.c:3191 msgid "/Conversation/Get Info" msgstr "/Conversation/Get Info" -#: ../pidgin/gtkconv.c:3007 +#: ../pidgin/gtkconv.c:3195 msgid "/Conversation/Invite..." msgstr "/Conversation/Invite..." -#: ../pidgin/gtkconv.c:3013 +#: ../pidgin/gtkconv.c:3201 msgid "/Conversation/Alias..." msgstr "/Conversation/Alias..." -#: ../pidgin/gtkconv.c:3017 +#: ../pidgin/gtkconv.c:3205 msgid "/Conversation/Block..." msgstr "/Conversation/Block..." -#: ../pidgin/gtkconv.c:3021 +#: ../pidgin/gtkconv.c:3209 msgid "/Conversation/Unblock..." msgstr "/Conversation/Unblock..." -#: ../pidgin/gtkconv.c:3025 +#: ../pidgin/gtkconv.c:3213 msgid "/Conversation/Add..." msgstr "/Conversation/Add..." -#: ../pidgin/gtkconv.c:3029 +#: ../pidgin/gtkconv.c:3217 msgid "/Conversation/Remove..." msgstr "/Conversation/Remove..." -#: ../pidgin/gtkconv.c:3033 +#: ../pidgin/gtkconv.c:3223 +msgid "/Conversation/Insert Link..." +msgstr "/Conversation/Insert Link..." + +#: ../pidgin/gtkconv.c:3227 +msgid "/Conversation/Insert Image..." +msgstr "/Conversation/Insert Image..." + +#: ../pidgin/gtkconv.c:3233 msgid "/Options/Enable Logging" msgstr "/Options/Enable Logging" -#: ../pidgin/gtkconv.c:3036 +#: ../pidgin/gtkconv.c:3236 msgid "/Options/Enable Sounds" msgstr "/Options/Enable Sounds" -#: ../pidgin/gtkconv.c:3049 +#: ../pidgin/gtkconv.c:3249 msgid "/Options/Show Formatting Toolbars" msgstr "/Options/Show Formatting Toolbars" -#: ../pidgin/gtkconv.c:3052 +#: ../pidgin/gtkconv.c:3252 msgid "/Options/Show Timestamps" msgstr "/Options/Show Timestamps" -#: ../pidgin/gtkconv.c:3055 -msgid "/Options/Show Buddy Icon" -msgstr "/Options/Show Buddy Icons" - -#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181 +#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371 msgid "User is typing..." msgstr "User is typing..." -#: ../pidgin/gtkconv.c:3184 +#: ../pidgin/gtkconv.c:3374 msgid "User has typed something and stopped" msgstr "User has typed something and stopped" #. Build the Send To menu -#: ../pidgin/gtkconv.c:3366 +#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000 msgid "_Send To" msgstr "_Send To" -#: ../pidgin/gtkconv.c:4080 +#: ../pidgin/gtkconv.c:4270 msgid "_Send" msgstr "_Send" #. Setup the label telling how many people are in the room. -#: ../pidgin/gtkconv.c:4229 +#: ../pidgin/gtkconv.c:4374 msgid "0 people in room" msgstr "0 people in room" -#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542 +#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863 #, 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" -#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657 +#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659 msgid "Typing" msgstr "Typing" -#: ../pidgin/gtkconv.c:6114 +#: ../pidgin/gtkconv.c:6468 msgid "Stopped Typing" msgstr "Stopped Typing" -#: ../pidgin/gtkconv.c:6119 +#: ../pidgin/gtkconv.c:6471 msgid "Nick Said" msgstr "Nick Said" -#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492 +#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492 msgid "Unread Messages" msgstr "Unread Messages" -#: ../pidgin/gtkconv.c:6129 +#: ../pidgin/gtkconv.c:6477 msgid "New Event" msgstr "New Event" -#: ../pidgin/gtkconv.c:7258 +#: ../pidgin/gtkconv.c:7550 +msgid "clear: Clears all conversation scrollbacks." +msgstr "clear: Clears all conversation scrollbacks." + +#: ../pidgin/gtkconv.c:7714 msgid "Confirm close" msgstr "Confirm close" -#: ../pidgin/gtkconv.c:7290 +#: ../pidgin/gtkconv.c:7746 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?" -#: ../pidgin/gtkconv.c:7812 +#: ../pidgin/gtkconv.c:8333 msgid "Close other tabs" msgstr "Close other tabs" -#: ../pidgin/gtkconv.c:7818 +#: ../pidgin/gtkconv.c:8339 msgid "Close all tabs" msgstr "Close all tabs" -#: ../pidgin/gtkconv.c:7826 +#: ../pidgin/gtkconv.c:8347 msgid "Detach this tab" msgstr "Detach this tab" -#: ../pidgin/gtkconv.c:7832 +#: ../pidgin/gtkconv.c:8353 msgid "Close this tab" msgstr "Close this tab" -#: ../pidgin/gtkconv.c:8216 +#: ../pidgin/gtkconv.c:8853 msgid "Close conversation" msgstr "Close conversation" -#: ../pidgin/gtkconv.c:8737 +#: ../pidgin/gtkconv.c:9455 msgid "Last created window" msgstr "Last created window" -#: ../pidgin/gtkconv.c:8739 +#: ../pidgin/gtkconv.c:9457 msgid "Separate IM and Chat windows" msgstr "Separate IM and Chat windows" -#: ../pidgin/gtkconv.c:8741 ../pidgin/gtkprefs.c:1303 +#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414 msgid "New window" msgstr "New window" -#: ../pidgin/gtkconv.c:8743 +#: ../pidgin/gtkconv.c:9461 msgid "By group" msgstr "By group" -#: ../pidgin/gtkconv.c:8745 +#: ../pidgin/gtkconv.c:9463 msgid "By account" msgstr "By account" @@ -12323,25 +14384,22 @@ msgid "Fatal Error" msgstr "Fatal Error" -#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117 +#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116 msgid "lead developer" msgstr "lead developer" #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75 -#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78 -#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80 -#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82 -#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84 -#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88 -#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90 +#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77 +#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79 +#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81 +#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83 +#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85 +#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90 +#: ../pidgin/gtkdialogs.c:91 msgid "developer" msgstr "developer" -#: ../pidgin/gtkdialogs.c:77 -msgid "developer & webmaster" -msgstr "developer & webmaster" - #: ../pidgin/gtkdialogs.c:86 msgid "support" msgstr "support" @@ -12350,367 +14408,388 @@ msgid "support/QA" msgstr "support/QA" -#: ../pidgin/gtkdialogs.c:109 +#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111 +msgid "developer & webmaster" +msgstr "developer & webmaster" + +#: ../pidgin/gtkdialogs.c:98 +msgid "Senior Contributor/QA" +msgstr "Senior Contributor/QA" + +#: ../pidgin/gtkdialogs.c:107 msgid "win32 port" msgstr "win32 port" -#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111 +#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109 msgid "maintainer" msgstr "maintainer" -#: ../pidgin/gtkdialogs.c:112 +#: ../pidgin/gtkdialogs.c:110 msgid "libfaim maintainer" msgstr "libfaim maintainer" #. If "lazy bum" translates literally into a serious insult, use something else or omit it. -#: ../pidgin/gtkdialogs.c:114 +#: ../pidgin/gtkdialogs.c:113 msgid "hacker and designated driver [lazy bum]" msgstr "hacker and designated driver [lazy bum]" -#: ../pidgin/gtkdialogs.c:115 +#: ../pidgin/gtkdialogs.c:114 msgid "XMPP developer" msgstr "XMPP developer" -#: ../pidgin/gtkdialogs.c:116 +#: ../pidgin/gtkdialogs.c:115 msgid "original author" msgstr "original author" -#: ../pidgin/gtkdialogs.c:123 +#: ../pidgin/gtkdialogs.c:132 msgid "Afrikaans" msgstr "Afrikaans" -#: ../pidgin/gtkdialogs.c:124 +#: ../pidgin/gtkdialogs.c:133 msgid "Arabic" msgstr "Arabic" -#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126 -#: ../pidgin/gtkdialogs.c:211 +#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135 +#: ../pidgin/gtkdialogs.c:222 msgid "Bulgarian" msgstr "Bulgarian" -#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128 -#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130 +#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137 +#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139 msgid "Bengali" msgstr "Bengali" -#: ../pidgin/gtkdialogs.c:131 +#: ../pidgin/gtkdialogs.c:140 msgid "Bosnian" msgstr "Bosnian" -#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212 -#: ../pidgin/gtkdialogs.c:213 +#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223 +#: ../pidgin/gtkdialogs.c:224 msgid "Catalan" msgstr "Catalan" -#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134 +#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143 msgid "Valencian-Catalan" msgstr "Valencian Catalan" -#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214 +#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225 msgid "Czech" msgstr "Czech" -#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137 +#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146 msgid "Danish" msgstr "Danish" -#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139 -#: ../pidgin/gtkdialogs.c:215 +#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148 +#: ../pidgin/gtkdialogs.c:226 msgid "German" msgstr "German" -#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141 -#: ../pidgin/gtkdialogs.c:142 +#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150 +#: ../pidgin/gtkdialogs.c:151 msgid "Dzongkha" msgstr "Dzongkha" -#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144 +#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153 msgid "Greek" msgstr "Greek" -#: ../pidgin/gtkdialogs.c:145 +#: ../pidgin/gtkdialogs.c:154 msgid "Australian English" msgstr "Australian English" -#: ../pidgin/gtkdialogs.c:146 +#: ../pidgin/gtkdialogs.c:155 msgid "Canadian English" msgstr "Canadian English" -#: ../pidgin/gtkdialogs.c:147 +#: ../pidgin/gtkdialogs.c:156 msgid "British English" msgstr "British English" -#: ../pidgin/gtkdialogs.c:148 +#: ../pidgin/gtkdialogs.c:157 msgid "Esperanto" msgstr "Esperanto" -#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216 -#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218 -#: ../pidgin/gtkdialogs.c:219 +#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227 +#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229 +#: ../pidgin/gtkdialogs.c:230 msgid "Spanish" msgstr "Spanish" -#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151 +#: ../pidgin/gtkdialogs.c:159 +msgid "Estonian" +msgstr "Estonian" + +#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161 msgid "Euskera(Basque)" msgstr "Euskera (Basque)" -#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153 -#: ../pidgin/gtkdialogs.c:154 +#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163 +#: ../pidgin/gtkdialogs.c:164 msgid "Persian" msgstr "Persian" -#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220 -#: ../pidgin/gtkdialogs.c:221 +#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231 +#: ../pidgin/gtkdialogs.c:232 msgid "Finnish" msgstr "Finnish" -#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222 -#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224 -#: ../pidgin/gtkdialogs.c:225 +#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233 +#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235 +#: ../pidgin/gtkdialogs.c:236 msgid "French" msgstr "French" -#: ../pidgin/gtkdialogs.c:157 +#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168 +#: ../pidgin/gtkdialogs.c:237 msgid "Galician" msgstr "Galician" -#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159 +#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170 msgid "Gujarati" msgstr "Gujarati" -#: ../pidgin/gtkdialogs.c:159 +#: ../pidgin/gtkdialogs.c:170 msgid "Gujarati Language Team" msgstr "Gujarati Language Team" -#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226 +#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238 msgid "Hebrew" msgstr "Hebrew" -#: ../pidgin/gtkdialogs.c:161 +#: ../pidgin/gtkdialogs.c:172 msgid "Hindi" msgstr "Hindi" -#: ../pidgin/gtkdialogs.c:162 +#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239 msgid "Hungarian" msgstr "Hungarian" -#: ../pidgin/gtkdialogs.c:163 +#: ../pidgin/gtkdialogs.c:174 msgid "Indonesian" msgstr "Indonesian" -#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227 +#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240 msgid "Italian" msgstr "Italian" -#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228 -#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230 +#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:241 +#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243 msgid "Japanese" msgstr "Japanese" -#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231 +#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:244 msgid "Georgian" msgstr "Georgian" -#: ../pidgin/gtkdialogs.c:166 +#: ../pidgin/gtkdialogs.c:177 msgid "Ubuntu Georgian Translators" msgstr "Ubuntu Georgian Translators" -#: ../pidgin/gtkdialogs.c:167 +#: ../pidgin/gtkdialogs.c:178 msgid "Kannada" msgstr "Kannada" -#: ../pidgin/gtkdialogs.c:167 +#: ../pidgin/gtkdialogs.c:178 msgid "Kannada Translation team" msgstr "Kannada Translation team" -#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232 +#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:245 +#: ../pidgin/gtkdialogs.c:246 msgid "Korean" msgstr "Korean" -#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170 -#: ../pidgin/gtkdialogs.c:171 +#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181 +#: ../pidgin/gtkdialogs.c:182 msgid "Kurdish" msgstr "Kurdish" -#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233 -#: ../pidgin/gtkdialogs.c:234 +#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:247 +#: ../pidgin/gtkdialogs.c:248 msgid "Lithuanian" msgstr "Lithuanian" -#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174 -#: ../pidgin/gtkdialogs.c:235 +#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185 +#: ../pidgin/gtkdialogs.c:249 msgid "Macedonian" msgstr "Macedonian" -#: ../pidgin/gtkdialogs.c:175 +#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:250 msgid "Bokmål Norwegian" msgstr "Bokmål Norwegian" -#: ../pidgin/gtkdialogs.c:176 +#: ../pidgin/gtkdialogs.c:187 msgid "Nepali" msgstr "Nepali" -#: ../pidgin/gtkdialogs.c:177 +#: ../pidgin/gtkdialogs.c:188 msgid "Dutch, Flemish" msgstr "Dutch, Flemish" -#: ../pidgin/gtkdialogs.c:178 -msgid "Norwegian" -msgstr "Norwegian" - -#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180 -#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236 +#: ../pidgin/gtkdialogs.c:189 +msgid "Norwegian Nynorsk" +msgstr "Norwegian Nynorsk" + +#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191 +#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:251 msgid "Polish" msgstr "Polish" -#: ../pidgin/gtkdialogs.c:182 +#: ../pidgin/gtkdialogs.c:193 msgid "Portuguese" msgstr "Portuguese" -#: ../pidgin/gtkdialogs.c:183 +#: ../pidgin/gtkdialogs.c:194 msgid "Portuguese-Brazil" msgstr "Portuguese-Brazil" -#: ../pidgin/gtkdialogs.c:184 +#: ../pidgin/gtkdialogs.c:195 msgid "Pashto" msgstr "Pashto" -#: ../pidgin/gtkdialogs.c:185 +#: ../pidgin/gtkdialogs.c:196 msgid "Romanian" msgstr "Romanian" -#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237 -#: ../pidgin/gtkdialogs.c:238 +#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:252 +#: ../pidgin/gtkdialogs.c:253 msgid "Russian" msgstr "Russian" -#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188 -#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240 -#: ../pidgin/gtkdialogs.c:241 +#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199 +#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255 +#: ../pidgin/gtkdialogs.c:256 msgid "Slovak" msgstr "Slovak" -#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242 +#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:257 msgid "Slovenian" msgstr "Slovenian" -#: ../pidgin/gtkdialogs.c:190 +#: ../pidgin/gtkdialogs.c:201 msgid "Albanian" msgstr "Albanian" -#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192 +#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203 msgid "Serbian" msgstr "Serbian" -#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243 +#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:258 +#: ../pidgin/gtkdialogs.c:259 msgid "Swedish" msgstr "Swedish" -#: ../pidgin/gtkdialogs.c:194 +#: ../pidgin/gtkdialogs.c:205 msgid "Tamil" msgstr "Tamil" -#: ../pidgin/gtkdialogs.c:195 +#: ../pidgin/gtkdialogs.c:206 msgid "Telugu" msgstr "Telugu" -#: ../pidgin/gtkdialogs.c:196 +#: ../pidgin/gtkdialogs.c:207 msgid "Thai" msgstr "Thai" -#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244 +#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:260 msgid "Turkish" msgstr "Turkish" -#: ../pidgin/gtkdialogs.c:198 +#: ../pidgin/gtkdialogs.c:209 msgid "Vietnamese" msgstr "Vietnamese" -#: ../pidgin/gtkdialogs.c:198 +#: ../pidgin/gtkdialogs.c:209 msgid "T.M.Thanh and the Gnome-Vi Team" msgstr "T.M.Thanh and the Gnome-Vi Team" -#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245 +#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:261 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201 -#: ../pidgin/gtkdialogs.c:202 +#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212 +#: ../pidgin/gtkdialogs.c:213 msgid "Hong Kong Chinese" msgstr "Hong Kong Chinese" -#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204 -#: ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215 +#: ../pidgin/gtkdialogs.c:262 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: ../pidgin/gtkdialogs.c:210 +#: ../pidgin/gtkdialogs.c:221 msgid "Amharic" msgstr "Amharic" -#: ../pidgin/gtkdialogs.c:331 +#: ../pidgin/gtkdialogs.c:347 #, c-format msgid "About %s" msgstr "About %s" -#: ../pidgin/gtkdialogs.c:369 +#: ../pidgin/gtkdialogs.c:385 #, c-format msgid "" "%s is a graphical modular messaging client based on libpurple which is " "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " -"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ 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 %s. %s is copyrighted " -"by its contributors. See the 'COPYRIGHT' file for the complete list of " -"contributors. We provide no warranty for this program.<BR><BR>" +"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and " +"QQ 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 %s. %s " +"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 "" "%s is a graphical modular messaging client based on libpurple which is " "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " -"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ 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 %s. %s is copyrighted " -"by its contributors. See the 'COPYRIGHT' file for the complete list of " -"contributors. We provide no warranty for this program.<BR><BR>" - -#: ../pidgin/gtkdialogs.c:384 +"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and " +"QQ 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 %s. %s " +"is copyrighted by its contributors. See the 'COPYRIGHT' file for the " +"complete list of contributors. We provide no warranty for this program." +"<BR><BR>" + +#: ../pidgin/gtkdialogs.c:403 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>" msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>" -#: ../pidgin/gtkdialogs.c:389 +#: ../pidgin/gtkdialogs.c:408 msgid "Current Developers" msgstr "Current Developers" -#: ../pidgin/gtkdialogs.c:404 +#: ../pidgin/gtkdialogs.c:423 msgid "Crazy Patch Writers" msgstr "Crazy Patch Writers" -#: ../pidgin/gtkdialogs.c:419 +#: ../pidgin/gtkdialogs.c:438 msgid "Retired Developers" msgstr "Retired Developers" -#: ../pidgin/gtkdialogs.c:434 +#: ../pidgin/gtkdialogs.c:453 +msgid "Retired Crazy Patch Writers" +msgstr "Retired Crazy Patch Writers" + +#: ../pidgin/gtkdialogs.c:468 msgid "Artists" msgstr "Artists" -#: ../pidgin/gtkdialogs.c:449 +#: ../pidgin/gtkdialogs.c:483 msgid "Current Translators" msgstr "Current Translators" -#: ../pidgin/gtkdialogs.c:469 +#: ../pidgin/gtkdialogs.c:503 msgid "Past Translators" msgstr "Past Translators" -#: ../pidgin/gtkdialogs.c:487 +#: ../pidgin/gtkdialogs.c:521 msgid "Debugging Information" msgstr "Debugging Information" -#: ../pidgin/gtkdialogs.c:856 +#: ../pidgin/gtkdialogs.c:891 msgid "Get User Info" msgstr "Get User Info" -#: ../pidgin/gtkdialogs.c:858 +#: ../pidgin/gtkdialogs.c:893 msgid "" "Please enter the screen name or alias of the person whose info you would " "like to view." @@ -12718,11 +14797,11 @@ "Please enter the screen name or alias of the person whose info you would " "like to view." -#: ../pidgin/gtkdialogs.c:948 +#: ../pidgin/gtkdialogs.c:983 msgid "View User Log" msgstr "View User Log" -#: ../pidgin/gtkdialogs.c:950 +#: ../pidgin/gtkdialogs.c:985 msgid "" "Please enter the screen name or alias of the person whose log you would like " "to view." @@ -12730,32 +14809,32 @@ "Please enter the screen name or alias of the person whose log you would like " "to view." -#: ../pidgin/gtkdialogs.c:970 +#: ../pidgin/gtkdialogs.c:1005 msgid "Alias Contact" msgstr "Alias Contact" -#: ../pidgin/gtkdialogs.c:971 +#: ../pidgin/gtkdialogs.c:1006 msgid "Enter an alias for this contact." msgstr "Enter an alias for this contact." -#: ../pidgin/gtkdialogs.c:993 +#: ../pidgin/gtkdialogs.c:1028 #, c-format msgid "Enter an alias for %s." msgstr "Enter an alias for %s." -#: ../pidgin/gtkdialogs.c:995 +#: ../pidgin/gtkdialogs.c:1030 msgid "Alias Buddy" msgstr "Alias Buddy" -#: ../pidgin/gtkdialogs.c:1016 +#: ../pidgin/gtkdialogs.c:1051 msgid "Alias Chat" msgstr "Alias Chat" -#: ../pidgin/gtkdialogs.c:1017 +#: ../pidgin/gtkdialogs.c:1052 msgid "Enter an alias for this chat." msgstr "Enter an alias for this chat." -#: ../pidgin/gtkdialogs.c:1056 +#: ../pidgin/gtkdialogs.c:1091 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -12770,15 +14849,15 @@ "You are about to remove the contact containing %s and %d other buddies from " "your buddy list. Do you want to continue?" -#: ../pidgin/gtkdialogs.c:1064 +#: ../pidgin/gtkdialogs.c:1099 msgid "Remove Contact" msgstr "Remove Contact" -#: ../pidgin/gtkdialogs.c:1067 +#: ../pidgin/gtkdialogs.c:1102 msgid "_Remove Contact" msgstr "_Remove Contact" -#: ../pidgin/gtkdialogs.c:1098 +#: ../pidgin/gtkdialogs.c:1133 #, c-format msgid "" "You are about to merge the group called %s into the group called %s. Do you " @@ -12787,15 +14866,15 @@ "You are about to merge the group called %s into the group called %s. Do you " "want to continue?" -#: ../pidgin/gtkdialogs.c:1105 +#: ../pidgin/gtkdialogs.c:1140 msgid "Merge Groups" msgstr "Merge Groups" -#: ../pidgin/gtkdialogs.c:1108 +#: ../pidgin/gtkdialogs.c:1143 msgid "_Merge Groups" msgstr "_Merge Groups" -#: ../pidgin/gtkdialogs.c:1158 +#: ../pidgin/gtkdialogs.c:1193 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " @@ -12804,30 +14883,30 @@ "You are about to remove the group %s and all its members from your buddy " "list. Do you want to continue?" -#: ../pidgin/gtkdialogs.c:1161 +#: ../pidgin/gtkdialogs.c:1196 msgid "Remove Group" msgstr "Remove Group" -#: ../pidgin/gtkdialogs.c:1164 +#: ../pidgin/gtkdialogs.c:1199 msgid "_Remove Group" msgstr "_Remove Group" -#: ../pidgin/gtkdialogs.c:1197 +#: ../pidgin/gtkdialogs.c:1232 #, 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?" -#: ../pidgin/gtkdialogs.c:1200 +#: ../pidgin/gtkdialogs.c:1235 msgid "Remove Buddy" msgstr "Remove Buddy" -#: ../pidgin/gtkdialogs.c:1203 +#: ../pidgin/gtkdialogs.c:1238 msgid "_Remove Buddy" msgstr "_Remove Buddy" -#: ../pidgin/gtkdialogs.c:1224 +#: ../pidgin/gtkdialogs.c:1259 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " @@ -12836,11 +14915,11 @@ "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" -#: ../pidgin/gtkdialogs.c:1227 +#: ../pidgin/gtkdialogs.c:1262 msgid "Remove Chat" msgstr "Remove Chat" -#: ../pidgin/gtkdialogs.c:1230 +#: ../pidgin/gtkdialogs.c:1265 msgid "_Remove Chat" msgstr "_Remove Chat" @@ -12935,66 +15014,66 @@ msgid "Time Remaining:" msgstr "Time Remaining:" -#: ../pidgin/gtkft.c:786 +#: ../pidgin/gtkft.c:783 msgid "Close this window when all transfers _finish" msgstr "Close this window when all transfers _finish" -#: ../pidgin/gtkft.c:796 +#: ../pidgin/gtkft.c:793 msgid "C_lear finished transfers" msgstr "C_lear finished transfers" #. "Download Details" arrow -#: ../pidgin/gtkft.c:805 +#: ../pidgin/gtkft.c:802 msgid "File transfer _details" msgstr "File transfer _details" #. Pause button -#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89 +#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94 msgid "_Pause" msgstr "_Pause" #. Resume button -#: ../pidgin/gtkft.c:845 +#: ../pidgin/gtkft.c:842 msgid "_Resume" msgstr "_Resume" -#: ../pidgin/gtkimhtml.c:792 +#: ../pidgin/gtkimhtml.c:815 msgid "Paste as Plain _Text" msgstr "Paste as Plain _Text" -#: ../pidgin/gtkimhtml.c:809 +#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190 msgid "_Reset formatting" msgstr "_Reset formatting" -#: ../pidgin/gtkimhtml.c:1284 +#: ../pidgin/gtkimhtml.c:1372 msgid "Hyperlink color" msgstr "Hyperlink colour" -#: ../pidgin/gtkimhtml.c:1285 +#: ../pidgin/gtkimhtml.c:1373 msgid "Color to draw hyperlinks." msgstr "Colour to draw hyperlinks." -#: ../pidgin/gtkimhtml.c:1288 +#: ../pidgin/gtkimhtml.c:1376 msgid "Hyperlink prelight color" msgstr "Hyperlink prelight colour" -#: ../pidgin/gtkimhtml.c:1289 +#: ../pidgin/gtkimhtml.c:1377 msgid "Color to draw hyperlinks when mouse is over them." msgstr "Colour to draw hyperlinks when mouse is over them." -#: ../pidgin/gtkimhtml.c:1505 +#: ../pidgin/gtkimhtml.c:1597 msgid "_Copy E-Mail Address" msgstr "_Copy E-Mail Address" -#: ../pidgin/gtkimhtml.c:1517 +#: ../pidgin/gtkimhtml.c:1609 msgid "_Open Link in Browser" msgstr "_Open Link in Browser" -#: ../pidgin/gtkimhtml.c:1527 +#: ../pidgin/gtkimhtml.c:1619 msgid "_Copy Link Location" msgstr "_Copy Link Location" -#: ../pidgin/gtkimhtml.c:3200 +#: ../pidgin/gtkimhtml.c:3365 msgid "" "<span size='larger' weight='bold'>Unrecognized file type</span>\n" "\n" @@ -13004,7 +15083,7 @@ "\n" "Defaulting to PNG." -#: ../pidgin/gtkimhtml.c:3203 +#: ../pidgin/gtkimhtml.c:3368 msgid "" "Unrecognized file type\n" "\n" @@ -13014,7 +15093,7 @@ "\n" "Defaulting to PNG." -#: ../pidgin/gtkimhtml.c:3216 +#: ../pidgin/gtkimhtml.c:3397 #, c-format msgid "" "<span size='larger' weight='bold'>Error saving image</span>\n" @@ -13025,7 +15104,7 @@ "\n" "%s" -#: ../pidgin/gtkimhtml.c:3219 +#: ../pidgin/gtkimhtml.c:3400 #, c-format msgid "" "Error saving image\n" @@ -13036,35 +15115,35 @@ "\n" "%s" -#: ../pidgin/gtkimhtml.c:3299 ../pidgin/gtkimhtml.c:3311 +#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490 msgid "Save Image" msgstr "Save Image" -#: ../pidgin/gtkimhtml.c:3339 +#: ../pidgin/gtkimhtml.c:3518 msgid "_Save Image..." msgstr "_Save Image..." -#: ../pidgin/gtkimhtmltoolbar.c:151 +#: ../pidgin/gtkimhtmltoolbar.c:162 msgid "Select Font" msgstr "Select Font" -#: ../pidgin/gtkimhtmltoolbar.c:230 +#: ../pidgin/gtkimhtmltoolbar.c:241 msgid "Select Text Color" msgstr "Select Text Colour" -#: ../pidgin/gtkimhtmltoolbar.c:309 +#: ../pidgin/gtkimhtmltoolbar.c:320 msgid "Select Background Color" msgstr "Select Background Colour" -#: ../pidgin/gtkimhtmltoolbar.c:398 +#: ../pidgin/gtkimhtmltoolbar.c:409 msgid "_URL" msgstr "_URL" -#: ../pidgin/gtkimhtmltoolbar.c:406 +#: ../pidgin/gtkimhtmltoolbar.c:417 msgid "_Description" msgstr "_Description" -#: ../pidgin/gtkimhtmltoolbar.c:409 +#: ../pidgin/gtkimhtmltoolbar.c:420 msgid "" "Please enter the URL and description of the link that you want to insert. " "The description is optional." @@ -13072,85 +15151,156 @@ "Please enter the URL and description of the link that you want to insert. " "The description is optional." -#: ../pidgin/gtkimhtmltoolbar.c:413 +#: ../pidgin/gtkimhtmltoolbar.c:424 msgid "Please enter the URL of the link that you want to insert." msgstr "Please enter the URL of the link that you want to insert." -#: ../pidgin/gtkimhtmltoolbar.c:418 +#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098 msgid "Insert Link" msgstr "Insert Link" -#: ../pidgin/gtkimhtmltoolbar.c:422 +#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258 msgid "_Insert" msgstr "_Insert" -#: ../pidgin/gtkimhtmltoolbar.c:491 +#: ../pidgin/gtkimhtmltoolbar.c:513 #, c-format msgid "Failed to store image: %s\n" msgstr "Failed to store image: %s\n" -#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527 +#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549 msgid "Insert Image" msgstr "Insert Image" -#: ../pidgin/gtkimhtmltoolbar.c:725 +#: ../pidgin/gtkimhtmltoolbar.c:760 msgid "This theme has no available smileys." msgstr "This theme has no available smileys." #. show everything -#: ../pidgin/gtkimhtmltoolbar.c:739 +#: ../pidgin/gtkimhtmltoolbar.c:777 msgid "Smile!" msgstr "Smile!" -#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287 +#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215 +msgid "_Font" +msgstr "_Font" + +#: ../pidgin/gtkimhtmltoolbar.c:1050 +msgid "Group Items" +msgstr "Group Items" + +#: ../pidgin/gtkimhtmltoolbar.c:1050 +msgid "Ungroup Items" +msgstr "Ungroup Items" + +#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287 msgid "Bold" msgstr "Bold" -#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294 +#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294 msgid "Italic" msgstr "Italic" -#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301 +#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301 msgid "Underline" msgstr "Underline" -#: ../pidgin/gtkimhtmltoolbar.c:964 -msgid "Larger font size" -msgstr "Larger font size" - -#: ../pidgin/gtkimhtmltoolbar.c:976 -msgid "Smaller font size" -msgstr "Smaller font size" - -#: ../pidgin/gtkimhtmltoolbar.c:993 -msgid "Font face" -msgstr "Font face" - -#: ../pidgin/gtkimhtmltoolbar.c:1005 -msgid "Foreground font color" -msgstr "Foreground font colour" - -#: ../pidgin/gtkimhtmltoolbar.c:1017 -msgid "Background color" -msgstr "Background colour" - -#: ../pidgin/gtkimhtmltoolbar.c:1033 -msgid "Reset formatting" -msgstr "Reset formatting" - -#: ../pidgin/gtkimhtmltoolbar.c:1048 -msgid "Insert link" -msgstr "Insert link" - -#: ../pidgin/gtkimhtmltoolbar.c:1058 -msgid "Insert image" -msgstr "Insert image" - -#: ../pidgin/gtkimhtmltoolbar.c:1069 -msgid "Insert smiley" -msgstr "Insert smiley" - -#: ../pidgin/gtklog.c:267 +#: ../pidgin/gtkimhtmltoolbar.c:1087 +msgid "Strikethrough" +msgstr "Strikethrough" + +#: ../pidgin/gtkimhtmltoolbar.c:1089 +msgid "Increase Font Size" +msgstr "Increase Font Size" + +#: ../pidgin/gtkimhtmltoolbar.c:1090 +msgid "Decrease Font Size" +msgstr "Decrease Font Size" + +#: ../pidgin/gtkimhtmltoolbar.c:1092 +msgid "Font Face" +msgstr "Font Face" + +#: ../pidgin/gtkimhtmltoolbar.c:1093 +msgid "Background Color" +msgstr "Background Colour" + +#: ../pidgin/gtkimhtmltoolbar.c:1094 +msgid "Foreground Color" +msgstr "Foreground Colour" + +#: ../pidgin/gtkimhtmltoolbar.c:1096 +msgid "Reset Formatting" +msgstr "Reset Formatting" + +#: ../pidgin/gtkimhtmltoolbar.c:1099 +msgid "Insert IM Image" +msgstr "Insert IM Image" + +#: ../pidgin/gtkimhtmltoolbar.c:1100 +msgid "Insert Smiley" +msgstr "Insert Smiley" + +#: ../pidgin/gtkimhtmltoolbar.c:1175 +msgid "<b>_Bold</b>" +msgstr "<b>_Bold</b>" + +#: ../pidgin/gtkimhtmltoolbar.c:1176 +msgid "<i>_Italic</i>" +msgstr "<i>_Italic</i>" + +#: ../pidgin/gtkimhtmltoolbar.c:1177 +msgid "<u>_Underline</u>" +msgstr "<u>_Underline</u>" + +#: ../pidgin/gtkimhtmltoolbar.c:1178 +msgid "<span strikethrough='true'>Strikethrough</span>" +msgstr "<span strikethrough='true'>Strikethrough</span>" + +#: ../pidgin/gtkimhtmltoolbar.c:1179 +msgid "<span size='larger'>_Larger</span>" +msgstr "<span size='larger'>_Larger</span>" + +#: ../pidgin/gtkimhtmltoolbar.c:1181 +msgid "_Normal" +msgstr "_Normal" + +#: ../pidgin/gtkimhtmltoolbar.c:1183 +msgid "<span size='smaller'>_Smaller</span>" +msgstr "<span size='smaller'>_Smaller</span>" + +#. If we want to show the formatting for the following items, we would +#. * need to update them when formatting changes. The above items don't need +#. * no updating nor nothin' +#: ../pidgin/gtkimhtmltoolbar.c:1187 +msgid "_Font face" +msgstr "_Font face" + +#: ../pidgin/gtkimhtmltoolbar.c:1188 +msgid "Foreground _color" +msgstr "Foreground _colour" + +#: ../pidgin/gtkimhtmltoolbar.c:1189 +msgid "Bac_kground color" +msgstr "Bac_kground colour" + +#: ../pidgin/gtkimhtmltoolbar.c:1266 +msgid "_Smiley" +msgstr "_Smiley" + +#: ../pidgin/gtkimhtmltoolbar.c:1272 +msgid "_Image" +msgstr "_Image" + +#: ../pidgin/gtkimhtmltoolbar.c:1278 +msgid "_Link" +msgstr "_Link" + +#: ../pidgin/gtkimhtmltoolbar.c:1284 +msgid "_Horizontal rule" +msgstr "_Horizontal rule" + +#: ../pidgin/gtklog.c:292 #, c-format msgid "" "Are you sure you want to permanently delete the log of the conversation with " @@ -13159,7 +15309,7 @@ "Are you sure you want to permanently delete the log of the conversation with " "%s which started at %s?" -#: ../pidgin/gtklog.c:278 +#: ../pidgin/gtklog.c:303 #, c-format msgid "" "Are you sure you want to permanently delete the log of the conversation in %" @@ -13168,7 +15318,7 @@ "Are you sure you want to permanently delete the log of the conversation in %" "s which started at %s?" -#: ../pidgin/gtklog.c:283 +#: ../pidgin/gtklog.c:308 #, c-format msgid "" "Are you sure you want to permanently delete the system log which started at %" @@ -13177,21 +15327,21 @@ "Are you sure you want to permanently delete the system log which started at %" "s?" -#: ../pidgin/gtklog.c:427 +#: ../pidgin/gtklog.c:452 #, c-format msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>" msgstr "<span size='larger' weight='bold'>Conversation in %s on %s</span>" -#: ../pidgin/gtklog.c:430 +#: ../pidgin/gtklog.c:455 #, c-format msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>" msgstr "<span size='larger' weight='bold'>Conversation with %s on %s</span>" -#: ../pidgin/gtklog.c:477 +#: ../pidgin/gtklog.c:502 msgid "%B %Y" msgstr "%B %Y" -#: ../pidgin/gtklog.c:524 +#: ../pidgin/gtklog.c:549 msgid "" "System events will only be logged if the \"Log all status changes to system " "log\" preference is enabled." @@ -13199,7 +15349,7 @@ "System events will only be logged if the \"Log all status changes to system " "log\" preference is enabled." -#: ../pidgin/gtklog.c:528 +#: ../pidgin/gtklog.c:553 msgid "" "Instant messages will only be logged if the \"Log all instant messages\" " "preference is enabled." @@ -13207,45 +15357,45 @@ "Instant messages will only be logged if the \"Log all instant messages\" " "preference is enabled." -#: ../pidgin/gtklog.c:531 +#: ../pidgin/gtklog.c:556 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." -#: ../pidgin/gtklog.c:535 +#: ../pidgin/gtklog.c:560 msgid "No logs were found" msgstr "No logs were found" #. Steal the "HELP" response and use it to trigger browsing to the logs folder -#: ../pidgin/gtklog.c:550 +#: ../pidgin/gtklog.c:575 msgid "_Browse logs folder" msgstr "_Browse logs folder" -#: ../pidgin/gtklog.c:614 +#: ../pidgin/gtklog.c:639 msgid "Total log size:" msgstr "Total log size:" -#: ../pidgin/gtklog.c:683 +#: ../pidgin/gtklog.c:708 #, c-format msgid "Conversations in %s" msgstr "Conversations in %s" -#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753 +#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778 #, c-format msgid "Conversations with %s" msgstr "Conversations with %s" -#: ../pidgin/gtklog.c:778 +#: ../pidgin/gtklog.c:803 msgid "System Log" msgstr "System Log" -#: ../pidgin/gtkmain.c:373 +#: ../pidgin/gtkmain.c:386 #, c-format msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. Try `%s -h' for more information.\n" -#: ../pidgin/gtkmain.c:375 +#: ../pidgin/gtkmain.c:388 #, c-format msgid "" "%s %s\n" @@ -13254,6 +15404,7 @@ " -c, --config=DIR use DIR for config files\n" " -d, --debug print debugging messages to stdout\n" " -h, --help display this help and exit\n" +" -m, --multiple do not ensure single instance\n" " -n, --nologin don't automatically login\n" " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" " account(s) to use, separated by commas)\n" @@ -13265,12 +15416,13 @@ " -c, --config=DIR use DIR for config files\n" " -d, --debug print debugging messages to stdout\n" " -h, --help display this help and exit\n" +" -m, --multiple do not ensure single instance\n" " -n, --nologin don't automatically login\n" " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" " account(s) to use, separated by commas)\n" " -v, --version display the current version and exit\n" -#: ../pidgin/gtkmain.c:493 +#: ../pidgin/gtkmain.c:512 #, c-format msgid "" "%s has segfaulted and attempted to dump a core file.\n" @@ -13279,7 +15431,7 @@ "\n" "If you can reproduce the crash, please notify the developers\n" "by reporting a bug at:\n" -"%snewticket/\n" +"%ssimpleticket/\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" @@ -13297,7 +15449,7 @@ "\n" "If you can reproduce the crash, please notify the developers\n" "by reporting a bug at:\n" -"%snewticket/\n" +"%ssimpleticket/\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" @@ -13309,48 +15461,50 @@ "on other protocols is at\n" "%swiki/DeveloperPages\n" -#: ../pidgin/gtknotify.c:337 +#. Translators may want to transliterate the name. +#. It is not to be translated. +#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../pidgin/gtknotify.c:348 msgid "Open All Messages" msgstr "Open All Messages" -#: ../pidgin/gtknotify.c:389 +#: ../pidgin/gtknotify.c:401 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>" msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>" -#: ../pidgin/gtknotify.c:483 -msgid "Sender" -msgstr "Sender" - -#: ../pidgin/gtknotify.c:509 +#: ../pidgin/gtknotify.c:521 #, 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." -#: ../pidgin/gtknotify.c:520 +#: ../pidgin/gtknotify.c:532 #, c-format msgid "<b>You have %d new e-mail.</b>" msgid_plural "<b>You have %d new e-mails.</b>" msgstr[0] "<b>You have %d new e-mail.</b>" msgstr[1] "<b>You have %d new e-mails.</b>" -#: ../pidgin/gtknotify.c:951 +#: ../pidgin/gtknotify.c:957 #, c-format msgid "The browser command \"%s\" is invalid." msgstr "The browser command \"%s\" is invalid." -#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965 -#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106 +#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971 +#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112 msgid "Unable to open URL" msgstr "Unable to open URL" -#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976 +#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982 #, c-format msgid "Error launching \"%s\": %s" msgstr "Error launching \"%s\": %s" -#: ../pidgin/gtknotify.c:1107 +#: ../pidgin/gtknotify.c:1113 msgid "" "The 'Manual' browser command has been chosen, but no command has been set." msgstr "" @@ -13398,108 +15552,117 @@ msgid "<b>Plugin Details</b>" msgstr "<b>Plug-in Details</b>" -#: ../pidgin/gtkpounce.c:155 +#: ../pidgin/gtkpounce.c:156 msgid "Select a file" msgstr "Select a file" #. Create the "Pounce on Whom" frame. -#: ../pidgin/gtkpounce.c:524 +#: ../pidgin/gtkpounce.c:531 msgid "Pounce on Whom" msgstr "Pounce on Whom" -#: ../pidgin/gtkpounce.c:551 +#: ../pidgin/gtkpounce.c:558 msgid "_Buddy name:" msgstr "_Buddy name:" -#: ../pidgin/gtkpounce.c:585 +#: ../pidgin/gtkpounce.c:592 msgid "Si_gns on" msgstr "Si_gns on" -#: ../pidgin/gtkpounce.c:587 +#: ../pidgin/gtkpounce.c:594 msgid "Signs o_ff" msgstr "Signs o_ff" -#: ../pidgin/gtkpounce.c:589 +#: ../pidgin/gtkpounce.c:596 msgid "Goes a_way" msgstr "Goes a_way" -#: ../pidgin/gtkpounce.c:591 +#: ../pidgin/gtkpounce.c:598 msgid "Ret_urns from away" msgstr "Ret_urn from away" -#: ../pidgin/gtkpounce.c:593 +#: ../pidgin/gtkpounce.c:600 msgid "Becomes _idle" msgstr "Becomes _idle" -#: ../pidgin/gtkpounce.c:595 +#: ../pidgin/gtkpounce.c:602 msgid "Is no longer i_dle" msgstr "Is no longer i_dle" -#: ../pidgin/gtkpounce.c:597 +#: ../pidgin/gtkpounce.c:604 msgid "Starts _typing" msgstr "Starts _typing" -#: ../pidgin/gtkpounce.c:599 +#: ../pidgin/gtkpounce.c:606 msgid "P_auses while typing" msgstr "P_auses while typing" -#: ../pidgin/gtkpounce.c:601 +#: ../pidgin/gtkpounce.c:608 msgid "Stops t_yping" msgstr "Stops t_yping" -#: ../pidgin/gtkpounce.c:603 +#: ../pidgin/gtkpounce.c:610 msgid "Sends a _message" msgstr "Sends a _message" -#: ../pidgin/gtkpounce.c:646 +#: ../pidgin/gtkpounce.c:653 msgid "Ope_n an IM window" msgstr "Ope_n a message window" -#: ../pidgin/gtkpounce.c:648 +#: ../pidgin/gtkpounce.c:655 msgid "_Pop up a notification" msgstr "_Pop up a notification" -#: ../pidgin/gtkpounce.c:650 +#: ../pidgin/gtkpounce.c:657 msgid "Send a _message" msgstr "Send a _message" -#: ../pidgin/gtkpounce.c:652 +#: ../pidgin/gtkpounce.c:659 msgid "E_xecute a command" msgstr "E_xecute a command" -#: ../pidgin/gtkpounce.c:654 -msgid "P_lay a sound" -msgstr "P_lay a sound" - -#: ../pidgin/gtkpounce.c:659 -msgid "Brows_e..." -msgstr "Brows_e..." - #: ../pidgin/gtkpounce.c:661 +msgid "P_lay a sound" +msgstr "P_lay a sound" + +#: ../pidgin/gtkpounce.c:667 +msgid "Brows_e..." +msgstr "Brows_e..." + +#: ../pidgin/gtkpounce.c:669 msgid "Br_owse..." msgstr "Br_owse..." -#: ../pidgin/gtkpounce.c:662 +#: ../pidgin/gtkpounce.c:670 msgid "Pre_view" msgstr "Pre_view" -#: ../pidgin/gtkpounce.c:786 -msgid "P_ounce only when my status is not available" -msgstr "P_ounce only when my status is \"not available\"" - -#: ../pidgin/gtkpounce.c:791 +#: ../pidgin/gtkpounce.c:797 +msgid "P_ounce only when my status is not Available" +msgstr "P_ounce only when my status is not Available" + +#: ../pidgin/gtkpounce.c:802 msgid "_Recurring" msgstr "_Recurring" -#: ../pidgin/gtkpounce.c:1247 +#: ../pidgin/gtkpounce.c:1245 msgid "Pounce Target" msgstr "Pounce Target" -#: ../pidgin/gtkprefs.c:509 +#: ../pidgin/gtkprefs.c:385 +#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1 +msgid "Default" +msgstr "Default" + +#: ../pidgin/gtkprefs.c:516 msgid "Smiley theme failed to unpack." msgstr "Smiley theme failed to unpack." -#: ../pidgin/gtkprefs.c:638 +#: ../pidgin/gtkprefs.c:643 +msgid "Install Theme" +msgstr "Install Theme" + +#: ../pidgin/gtkprefs.c:696 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." @@ -13507,239 +15670,252 @@ "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." -#: ../pidgin/gtkprefs.c:673 +#: ../pidgin/gtkprefs.c:731 msgid "Icon" msgstr "Icon" -#: ../pidgin/gtkprefs.c:816 +#: ../pidgin/gtkprefs.c:893 msgid "System Tray Icon" msgstr "System Tray Icon" -#: ../pidgin/gtkprefs.c:817 +#: ../pidgin/gtkprefs.c:894 msgid "_Show system tray icon:" msgstr "_Show system tray icon:" -#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1649 -#: ../pidgin/plugins/timestamp_format.c:42 -#: ../pidgin/plugins/timestamp_format.c:51 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:338 -msgid "Always" -msgstr "Always" - -#: ../pidgin/gtkprefs.c:821 +#: ../pidgin/gtkprefs.c:898 msgid "On unread messages" msgstr "On unread messages" -#: ../pidgin/gtkprefs.c:826 +#: ../pidgin/gtkprefs.c:903 msgid "Conversation Window Hiding" msgstr "Conversation Window Hiding" -#: ../pidgin/gtkprefs.c:827 +#: ../pidgin/gtkprefs.c:904 msgid "_Hide new IM conversations:" msgstr "_Hide new IM conversations:" -#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1829 +#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943 msgid "When away" msgstr "When away" #. All the tab options! -#: ../pidgin/gtkprefs.c:838 +#: ../pidgin/gtkprefs.c:915 msgid "Tabs" msgstr "Tabs" -#: ../pidgin/gtkprefs.c:840 +#: ../pidgin/gtkprefs.c:917 msgid "Show IMs and chats in _tabbed windows" msgstr "Show IMs and chats in _tabbed windows" -#: ../pidgin/gtkprefs.c:854 +#: ../pidgin/gtkprefs.c:931 msgid "Show close b_utton on tabs" msgstr "Show close b_utton on tabs" -#: ../pidgin/gtkprefs.c:857 +#: ../pidgin/gtkprefs.c:934 msgid "_Placement:" msgstr "_Placement" -#: ../pidgin/gtkprefs.c:859 +#: ../pidgin/gtkprefs.c:936 msgid "Top" msgstr "Top" -#: ../pidgin/gtkprefs.c:860 +#: ../pidgin/gtkprefs.c:937 msgid "Bottom" msgstr "Bottom" -#: ../pidgin/gtkprefs.c:861 +#: ../pidgin/gtkprefs.c:938 msgid "Left" msgstr "Left" -#: ../pidgin/gtkprefs.c:862 +#: ../pidgin/gtkprefs.c:939 msgid "Right" msgstr "Right" -#: ../pidgin/gtkprefs.c:864 +#: ../pidgin/gtkprefs.c:941 msgid "Left Vertical" msgstr "Left Vertical" -#: ../pidgin/gtkprefs.c:865 +#: ../pidgin/gtkprefs.c:942 msgid "Right Vertical" msgstr "Right Vertical" -#: ../pidgin/gtkprefs.c:872 +#: ../pidgin/gtkprefs.c:949 msgid "N_ew conversations:" msgstr "N_ew conversations:" -#: ../pidgin/gtkprefs.c:900 +#: ../pidgin/gtkprefs.c:994 msgid "Show _formatting on incoming messages" msgstr "Show _formatting on incoming messages" -#: ../pidgin/gtkprefs.c:903 -msgid "Show buddy _icons" -msgstr "Show buddy _icons" - -#: ../pidgin/gtkprefs.c:905 +#: ../pidgin/gtkprefs.c:997 +msgid "Show _detailed information" +msgstr "Show _detailed information" + +#: ../pidgin/gtkprefs.c:999 msgid "Enable buddy ic_on animation" msgstr "Enable buddy ic_on animation" -#: ../pidgin/gtkprefs.c:912 +#: ../pidgin/gtkprefs.c:1006 msgid "_Notify buddies that you are typing to them" msgstr "_Notify buddies that you are typing to them" -#: ../pidgin/gtkprefs.c:915 +#: ../pidgin/gtkprefs.c:1009 msgid "Highlight _misspelled words" msgstr "Highlight _misspelled words" -#: ../pidgin/gtkprefs.c:919 +#: ../pidgin/gtkprefs.c:1013 msgid "Use smooth-scrolling" msgstr "Use smooth-scrolling" -#: ../pidgin/gtkprefs.c:922 +#: ../pidgin/gtkprefs.c:1016 msgid "F_lash window when IMs are received" msgstr "F_lash window when IMs are received" -#: ../pidgin/gtkprefs.c:925 +#: ../pidgin/gtkprefs.c:1018 +msgid "Minimi_ze new conversation windows" +msgstr "Minimi_ze new conversation windows" + +#: ../pidgin/gtkprefs.c:1022 +msgid "Font" +msgstr "Font" + +#: ../pidgin/gtkprefs.c:1024 +msgid "Use document font from _theme" +msgstr "Use document font from _theme" + +#: ../pidgin/gtkprefs.c:1026 +msgid "Use font from _theme" +msgstr "Use font from _theme" + +#: ../pidgin/gtkprefs.c:1028 +msgid "Conversation _font:" +msgstr "Conversation _font:" + +#: ../pidgin/gtkprefs.c:1042 msgid "Default Formatting" msgstr "Default Formatting" -#: ../pidgin/gtkprefs.c:941 +#: ../pidgin/gtkprefs.c:1061 msgid "" "This is how your outgoing message text will appear when you use protocols " -"that support formatting. :)" +"that support formatting." msgstr "" "This is how your outgoing message text will appear when you use protocols " -"that support formatting. :)" - -#: ../pidgin/gtkprefs.c:1017 +"that support formatting." + +#: ../pidgin/gtkprefs.c:1127 msgid "ST_UN server:" msgstr "ST_UN Server:" -#: ../pidgin/gtkprefs.c:1029 +#: ../pidgin/gtkprefs.c:1139 msgid "<span style=\"italic\">Example: stunserver.org</span>" msgstr "<span style=\"italic\">Example: stunserver.org</span>" -#: ../pidgin/gtkprefs.c:1033 +#: ../pidgin/gtkprefs.c:1143 msgid "_Autodetect IP address" msgstr "_Autodetect IP address" -#: ../pidgin/gtkprefs.c:1042 +#: ../pidgin/gtkprefs.c:1152 msgid "Public _IP:" msgstr "Public _IP:" -#: ../pidgin/gtkprefs.c:1071 +#: ../pidgin/gtkprefs.c:1181 msgid "Ports" msgstr "Ports" -#: ../pidgin/gtkprefs.c:1074 +#: ../pidgin/gtkprefs.c:1184 msgid "_Manually specify range of ports to listen on" msgstr "_Manually specify range of ports to listen on" -#: ../pidgin/gtkprefs.c:1077 +#: ../pidgin/gtkprefs.c:1187 msgid "_Start port:" msgstr "_Start port:" -#: ../pidgin/gtkprefs.c:1084 +#: ../pidgin/gtkprefs.c:1194 msgid "_End port:" msgstr "_End port:" -#: ../pidgin/gtkprefs.c:1092 +#: ../pidgin/gtkprefs.c:1202 msgid "Proxy Server" msgstr "Proxy Server" -#: ../pidgin/gtkprefs.c:1096 +#: ../pidgin/gtkprefs.c:1206 msgid "No proxy" msgstr "No proxy" -#: ../pidgin/gtkprefs.c:1152 +#: ../pidgin/gtkprefs.c:1262 msgid "_User:" msgstr "_User:" -#: ../pidgin/gtkprefs.c:1216 +#: ../pidgin/gtkprefs.c:1327 msgid "Seamonkey" msgstr "Seamonkey" -#: ../pidgin/gtkprefs.c:1217 +#: ../pidgin/gtkprefs.c:1328 msgid "Opera" msgstr "Opera" -#: ../pidgin/gtkprefs.c:1218 +#: ../pidgin/gtkprefs.c:1329 msgid "Netscape" msgstr "Netscape" -#: ../pidgin/gtkprefs.c:1219 +#: ../pidgin/gtkprefs.c:1330 msgid "Mozilla" msgstr "Mozilla" -#: ../pidgin/gtkprefs.c:1220 +#: ../pidgin/gtkprefs.c:1331 msgid "Konqueror" msgstr "Konqueror" -#: ../pidgin/gtkprefs.c:1221 +#: ../pidgin/gtkprefs.c:1332 msgid "GNOME Default" msgstr "GNOME Default" -#: ../pidgin/gtkprefs.c:1222 +#: ../pidgin/gtkprefs.c:1333 msgid "Galeon" msgstr "Galeon" -#: ../pidgin/gtkprefs.c:1223 +#: ../pidgin/gtkprefs.c:1334 msgid "Firefox" msgstr "Firefox" -#: ../pidgin/gtkprefs.c:1224 +#: ../pidgin/gtkprefs.c:1335 msgid "Firebird" msgstr "Firebird" -#: ../pidgin/gtkprefs.c:1225 +#: ../pidgin/gtkprefs.c:1336 msgid "Epiphany" msgstr "Epiphany" -#: ../pidgin/gtkprefs.c:1234 +#: ../pidgin/gtkprefs.c:1345 msgid "Manual" msgstr "Manual" -#: ../pidgin/gtkprefs.c:1287 +#: ../pidgin/gtkprefs.c:1398 msgid "Browser Selection" msgstr "Browser Selection" -#: ../pidgin/gtkprefs.c:1291 +#: ../pidgin/gtkprefs.c:1402 msgid "_Browser:" msgstr "_Browser:" -#: ../pidgin/gtkprefs.c:1299 +#: ../pidgin/gtkprefs.c:1410 msgid "_Open link in:" msgstr "_Open Link in:" -#: ../pidgin/gtkprefs.c:1301 +#: ../pidgin/gtkprefs.c:1412 msgid "Browser default" msgstr "Browser default" -#: ../pidgin/gtkprefs.c:1302 +#: ../pidgin/gtkprefs.c:1413 msgid "Existing window" msgstr "Existing window" -#: ../pidgin/gtkprefs.c:1304 +#: ../pidgin/gtkprefs.c:1415 msgid "New tab" msgstr "New tab" -#: ../pidgin/gtkprefs.c:1318 +#: ../pidgin/gtkprefs.c:1429 #, c-format msgid "" "_Manual:\n" @@ -13748,80 +15924,63 @@ "_Manual:\n" "(%s for URL)" -#: ../pidgin/gtkprefs.c:1358 +#: ../pidgin/gtkprefs.c:1469 msgid "Log _format:" msgstr "Log _format:" -#: ../pidgin/gtkprefs.c:1363 +#: ../pidgin/gtkprefs.c:1474 msgid "Log all _instant messages" msgstr "Log all _instant messages" -#: ../pidgin/gtkprefs.c:1365 +#: ../pidgin/gtkprefs.c:1476 msgid "Log all c_hats" msgstr "Log all c_hats" -#: ../pidgin/gtkprefs.c:1367 +#: ../pidgin/gtkprefs.c:1478 msgid "Log all _status changes to system log" msgstr "Log all _status changes to system log" -#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564 -#: ../pidgin/gtkprefs.c:1757 -msgid "(default)" -msgstr "(default)" - -#: ../pidgin/gtkprefs.c:1513 +#: ../pidgin/gtkprefs.c:1624 msgid "Sound Selection" msgstr "Sound Selection" -#: ../pidgin/gtkprefs.c:1523 +#: ../pidgin/gtkprefs.c:1634 msgid "Quietest" msgstr "Quietest" -#: ../pidgin/gtkprefs.c:1525 +#: ../pidgin/gtkprefs.c:1636 msgid "Quieter" msgstr "Quieter" -#: ../pidgin/gtkprefs.c:1527 +#: ../pidgin/gtkprefs.c:1638 msgid "Quiet" msgstr "Quiet" -#: ../pidgin/gtkprefs.c:1531 +#: ../pidgin/gtkprefs.c:1642 msgid "Loud" msgstr "Loud" -#: ../pidgin/gtkprefs.c:1533 +#: ../pidgin/gtkprefs.c:1644 msgid "Louder" msgstr "Louder" -#: ../pidgin/gtkprefs.c:1535 +#: ../pidgin/gtkprefs.c:1646 msgid "Loudest" msgstr "Loudest" -#: ../pidgin/gtkprefs.c:1598 -msgid "Sound Method" -msgstr "Sound Method" - -#: ../pidgin/gtkprefs.c:1599 +#: ../pidgin/gtkprefs.c:1712 msgid "_Method:" msgstr "_Method:" -#: ../pidgin/gtkprefs.c:1601 +#: ../pidgin/gtkprefs.c:1714 msgid "Console beep" msgstr "Console beep" -#: ../pidgin/gtkprefs.c:1603 -msgid "Automatic" -msgstr "Automatic" - -#: ../pidgin/gtkprefs.c:1607 -msgid "Command" -msgstr "Command" - -#: ../pidgin/gtkprefs.c:1608 +#: ../pidgin/gtkprefs.c:1721 msgid "No sounds" msgstr "No sounds" -#: ../pidgin/gtkprefs.c:1616 +#: ../pidgin/gtkprefs.c:1729 #, c-format msgid "" "Sound c_ommand:\n" @@ -13830,117 +15989,81 @@ "Sound c_ommand:\n" "(%s for filename)" -#: ../pidgin/gtkprefs.c:1642 -msgid "Sound Options" -msgstr "Sound Options" - -#: ../pidgin/gtkprefs.c:1643 +#: ../pidgin/gtkprefs.c:1756 msgid "Sounds when conversation has _focus" msgstr "Sounds when conversation has _focus" -#: ../pidgin/gtkprefs.c:1645 +#: ../pidgin/gtkprefs.c:1758 msgid "Enable sounds:" msgstr "Enable sounds:" -#: ../pidgin/gtkprefs.c:1647 -msgid "Only when available" -msgstr "Only when available" - -#: ../pidgin/gtkprefs.c:1648 -msgid "Only when not available" -msgstr "Only when not available" - -#: ../pidgin/gtkprefs.c:1656 +#: ../pidgin/gtkprefs.c:1769 msgid "Volume:" msgstr "Volume:" -#: ../pidgin/gtkprefs.c:1684 -msgid "Sound Events" -msgstr "Sound Events" - -#: ../pidgin/gtkprefs.c:1735 +#: ../pidgin/gtkprefs.c:1849 msgid "Play" msgstr "Play" -#: ../pidgin/gtkprefs.c:1742 -msgid "Event" -msgstr "Event" - -#: ../pidgin/gtkprefs.c:1761 -msgid "Test" -msgstr "Test" - -#: ../pidgin/gtkprefs.c:1765 -msgid "Reset" -msgstr "Reset" - -#: ../pidgin/gtkprefs.c:1769 -msgid "Choose..." -msgstr "Choose..." - -#: ../pidgin/gtkprefs.c:1812 +#: ../pidgin/gtkprefs.c:1926 msgid "_Report idle time:" msgstr "_Report idle time:" -#: ../pidgin/gtkprefs.c:1817 +#: ../pidgin/gtkprefs.c:1931 msgid "Based on keyboard or mouse use" msgstr "Based on keyboard or mouse use" -#: ../pidgin/gtkprefs.c:1826 +#: ../pidgin/gtkprefs.c:1940 msgid "_Auto-reply:" msgstr "_Auto-reply:" -#: ../pidgin/gtkprefs.c:1830 +#: ../pidgin/gtkprefs.c:1944 msgid "When both away and idle" msgstr "When both away and idle" #. Auto-away stuff -#: ../pidgin/gtkprefs.c:1836 +#: ../pidgin/gtkprefs.c:1950 msgid "Auto-away" msgstr "Auto-away" -#: ../pidgin/gtkprefs.c:1838 +#: ../pidgin/gtkprefs.c:1952 msgid "Change status when _idle" msgstr "Change status when _idle" -#: ../pidgin/gtkprefs.c:1842 -msgid "_Minutes before changing status:" -msgstr "_Minutes before changing status:" - -#: ../pidgin/gtkprefs.c:1850 +#: ../pidgin/gtkprefs.c:1956 +msgid "_Minutes before becoming idle:" +msgstr "_Minutes before becoming idle:" + +#: ../pidgin/gtkprefs.c:1964 msgid "Change _status to:" msgstr "Change _status to:" #. Signon status stuff -#: ../pidgin/gtkprefs.c:1871 +#: ../pidgin/gtkprefs.c:1985 msgid "Status at Startup" msgstr "Status at Startup" -#: ../pidgin/gtkprefs.c:1873 +#: ../pidgin/gtkprefs.c:1987 msgid "Use status from last _exit at startup" msgstr "Use status from last _exit at startup" -#: ../pidgin/gtkprefs.c:1879 +#: ../pidgin/gtkprefs.c:1993 msgid "Status to a_pply at startup:" msgstr "Status to a_pply at startup:" -#: ../pidgin/gtkprefs.c:1917 +#: ../pidgin/gtkprefs.c:2031 msgid "Interface" msgstr "Interface" -#: ../pidgin/gtkprefs.c:1919 +#: ../pidgin/gtkprefs.c:2033 msgid "Smiley Themes" msgstr "Smiley Themes" -#: ../pidgin/gtkprefs.c:1920 -msgid "Sounds" -msgstr "Sounds" - -#: ../pidgin/gtkprefs.c:1926 +#: ../pidgin/gtkprefs.c:2040 msgid "Browser" msgstr "Browser" -#: ../pidgin/gtkprefs.c:1930 +#: ../pidgin/gtkprefs.c:2044 msgid "Status / Idle" msgstr "Status / Idle" @@ -13964,63 +16087,63 @@ msgid "Block only the users below" msgstr "Block only the users below" -#: ../pidgin/gtkprivacy.c:372 +#: ../pidgin/gtkprivacy.c:369 msgid "Privacy" msgstr "Privacy" -#: ../pidgin/gtkprivacy.c:385 +#: ../pidgin/gtkprivacy.c:381 msgid "Changes to privacy settings take effect immediately." msgstr "Changes to privacy settings take effect immediately." #. "Set privacy for:" label -#: ../pidgin/gtkprivacy.c:397 +#: ../pidgin/gtkprivacy.c:393 msgid "Set privacy for:" msgstr "Set privacy for:" -#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577 +#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573 msgid "Permit User" msgstr "Permit User" -#: ../pidgin/gtkprivacy.c:561 +#: ../pidgin/gtkprivacy.c:557 msgid "Type a user you permit to contact you." msgstr "Type a user you permit to contact you." -#: ../pidgin/gtkprivacy.c:562 +#: ../pidgin/gtkprivacy.c:558 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." -#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581 +#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577 msgid "_Permit" msgstr "_Permit" -#: ../pidgin/gtkprivacy.c:571 +#: ../pidgin/gtkprivacy.c:567 #, c-format msgid "Allow %s to contact you?" msgstr "Allow %s to contact you?" -#: ../pidgin/gtkprivacy.c:573 +#: ../pidgin/gtkprivacy.c:569 #, 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?" -#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616 +#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612 msgid "Block User" msgstr "Block User" -#: ../pidgin/gtkprivacy.c:603 +#: ../pidgin/gtkprivacy.c:599 msgid "Type a user to block." msgstr "Type a user to block." -#: ../pidgin/gtkprivacy.c:604 +#: ../pidgin/gtkprivacy.c:600 msgid "Please enter the name of the user you wish to block." msgstr "Please enter the name of the user you wish to block." -#: ../pidgin/gtkprivacy.c:612 +#: ../pidgin/gtkprivacy.c:608 #, c-format msgid "Block %s?" msgstr "Block %s?" -#: ../pidgin/gtkprivacy.c:614 +#: ../pidgin/gtkprivacy.c:610 #, c-format msgid "Are you sure you want to block %s?" msgstr "Are you sure you want to block %s?" @@ -14029,151 +16152,104 @@ msgid "Apply" msgstr "Apply" -#: ../pidgin/gtkrequest.c:1481 +#: ../pidgin/gtkrequest.c:1507 msgid "That file already exists" msgstr "That file already exists" -#: ../pidgin/gtkrequest.c:1482 +#: ../pidgin/gtkrequest.c:1508 msgid "Would you like to overwrite it?" msgstr "Would you like to overwrite it?" -#: ../pidgin/gtkrequest.c:1485 +#: ../pidgin/gtkrequest.c:1511 msgid "Overwrite" msgstr "Overwrite" -#: ../pidgin/gtkrequest.c:1486 +#: ../pidgin/gtkrequest.c:1512 msgid "Choose New Name" msgstr "Choose New Name" -#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638 +#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664 msgid "Select Folder..." msgstr "Select Folder..." -#: ../pidgin/gtkroomlist.c:376 +#. Create the window. +#: ../pidgin/gtkroomlist.c:374 msgid "Room List" msgstr "Room List" #. list button -#: ../pidgin/gtkroomlist.c:446 +#: ../pidgin/gtkroomlist.c:442 msgid "_Get List" msgstr "_Get List" #. add button -#: ../pidgin/gtkroomlist.c:454 +#: ../pidgin/gtkroomlist.c:450 msgid "_Add Chat" msgstr "_Add Chat" -#: ../pidgin/gtksavedstatuses.c:331 +#: ../pidgin/gtksavedstatuses.c:336 msgid "Are you sure you want to delete the selected saved statuses?" msgstr "Are you sure you want to delete the selected saved statuses?" #. Use button -#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214 +#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265 msgid "_Use" msgstr "_Use" -#: ../pidgin/gtksavedstatuses.c:726 +#: ../pidgin/gtksavedstatuses.c:779 msgid "Title already in use. You must choose a unique title." msgstr "Title already in use. You must choose a unique title." -#: ../pidgin/gtksavedstatuses.c:914 +#: ../pidgin/gtksavedstatuses.c:969 msgid "Different" msgstr "Different" -#: ../pidgin/gtksavedstatuses.c:1107 +#: ../pidgin/gtksavedstatuses.c:1158 msgid "_Title:" msgstr "_Title:" -#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447 +#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496 msgid "_Status:" msgstr "_Status:" #. Different status message expander -#: ../pidgin/gtksavedstatuses.c:1158 +#: ../pidgin/gtksavedstatuses.c:1209 msgid "Use a _different status for some accounts" msgstr "Use a _different status for some accounts" #. Save & Use button -#: ../pidgin/gtksavedstatuses.c:1222 +#: ../pidgin/gtksavedstatuses.c:1273 msgid "Sa_ve & Use" msgstr "Sa_ve & Use" -#: ../pidgin/gtksavedstatuses.c:1428 +#: ../pidgin/gtksavedstatuses.c:1479 #, c-format msgid "Status for %s" msgstr "Status for %s" -#: ../pidgin/gtksound.c:63 -msgid "Buddy logs in" -msgstr "Buddy logs in" - -#: ../pidgin/gtksound.c:64 -msgid "Buddy logs out" -msgstr "Buddy logs out" - -#: ../pidgin/gtksound.c:65 -msgid "Message received" -msgstr "Message received" - -#: ../pidgin/gtksound.c:66 -msgid "Message received begins conversation" -msgstr "Message received begins conversation" - -#: ../pidgin/gtksound.c:67 -msgid "Message sent" -msgstr "Message sent" - -#: ../pidgin/gtksound.c:68 -msgid "Person enters chat" -msgstr "Person enters chat" - -#: ../pidgin/gtksound.c:69 -msgid "Person leaves chat" -msgstr "Person leaves chat" - -#: ../pidgin/gtksound.c:70 -msgid "You talk in chat" -msgstr "You talk in chat" - -#: ../pidgin/gtksound.c:71 -msgid "Others talk in chat" -msgstr "Others talk in chat" - -#: ../pidgin/gtksound.c:74 -msgid "Someone says your screen name in chat" -msgstr "Someone says your screen name in chat" - -#: ../pidgin/gtksound.c:310 -msgid "GStreamer Failure" -msgstr "GStreamer Failure" - -#: ../pidgin/gtksound.c:311 -msgid "GStreamer failed to initialize." -msgstr "GStreamer failed to initialize." - -#: ../pidgin/gtkstatusbox.c:661 +#: ../pidgin/gtkstatusbox.c:663 msgid "Waiting for network connection" msgstr "Waiting for network connection" -#: ../pidgin/gtkutils.c:590 +#: ../pidgin/gtkutils.c:631 msgid "Google Talk" msgstr "Google Talk" -#: ../pidgin/gtkutils.c:1305 ../pidgin/gtkutils.c:1328 +#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421 #, c-format msgid "The following error has occurred loading %s: %s" msgstr "The following error has occurred loading %s: %s" -#: ../pidgin/gtkutils.c:1308 ../pidgin/gtkutils.c:1330 +#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423 msgid "Failed to load image" msgstr "Failed to load image" -#: ../pidgin/gtkutils.c:1404 +#: ../pidgin/gtkutils.c:1497 #, c-format msgid "Cannot send folder %s." msgstr "Cannot send folder %s." -#: ../pidgin/gtkutils.c:1405 +#: ../pidgin/gtkutils.c:1498 #, c-format msgid "" "%s cannot transfer a folder. You will need to send the files within " @@ -14182,12 +16258,12 @@ "%s cannot transfer a folder. You will need to send the files within " "individually." -#: ../pidgin/gtkutils.c:1437 ../pidgin/gtkutils.c:1449 -#: ../pidgin/gtkutils.c:1456 +#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542 +#: ../pidgin/gtkutils.c:1549 msgid "You have dragged an image" msgstr "You have dragged an image" -#: ../pidgin/gtkutils.c:1438 +#: ../pidgin/gtkutils.c:1531 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." @@ -14195,31 +16271,31 @@ "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." -#: ../pidgin/gtkutils.c:1444 ../pidgin/gtkutils.c:1465 +#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557 msgid "Set as buddy icon" msgstr "Set as buddy icon" -#: ../pidgin/gtkutils.c:1445 ../pidgin/gtkutils.c:1466 +#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558 msgid "Send image file" msgstr "Send image file" -#: ../pidgin/gtkutils.c:1446 ../pidgin/gtkutils.c:1466 +#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558 msgid "Insert in message" msgstr "Insert in message" -#: ../pidgin/gtkutils.c:1450 +#: ../pidgin/gtkutils.c:1543 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?" -#: ../pidgin/gtkutils.c:1457 -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." -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." - -#: ../pidgin/gtkutils.c:1459 +#: ../pidgin/gtkutils.c:1550 +msgid "" +"You can send this image as a file transfer, or use it as the buddy icon for " +"this user." +msgstr "" +"You can send this image as a file transfer, or use it as the buddy icon for " +"this user." + +#: ../pidgin/gtkutils.c:1551 msgid "" "You can insert this image into this message, or use it as the buddy icon for " "this user" @@ -14232,11 +16308,11 @@ #. * send. The only logical one is "Application," but do we really want to send a binary and nothing else? #. * Probably not. I'll just give an error and return. #. The original patch sent the icon used by the launcher. That's probably wrong -#: ../pidgin/gtkutils.c:1517 +#: ../pidgin/gtkutils.c:1609 msgid "Cannot send launcher" msgstr "Cannot send launcher" -#: ../pidgin/gtkutils.c:1517 +#: ../pidgin/gtkutils.c:1609 msgid "" "You dragged a desktop launcher. Most likely you wanted to send whatever this " "launcher points to instead of this launcher itself." @@ -14244,7 +16320,7 @@ "You dragged a desktop launcher. Most likely you wanted to send whatever this " "launcher points to instead of this launcher itself." -#: ../pidgin/gtkutils.c:2264 +#: ../pidgin/gtkutils.c:2344 #, c-format msgid "" "<b>File:</b> %s\n" @@ -14255,98 +16331,108 @@ "<b>File size:</b> %s\n" "<b>Image size:</b> %dx%d" -#: ../pidgin/gtkutils.c:2560 +#: ../pidgin/gtkutils.c:2640 #, c-format msgid "The file '%s' is too large for %s. Please try a smaller image.\n" msgstr "The file '%s' is too large for %s. Please try a smaller image.\n" -#: ../pidgin/gtkutils.c:2562 +#: ../pidgin/gtkutils.c:2642 msgid "Icon Error" msgstr "Icon Error" -#: ../pidgin/gtkutils.c:2563 +#: ../pidgin/gtkutils.c:2643 msgid "Could not set icon" msgstr "Could not set icon" -#: ../pidgin/gtkutils.c:2663 +#: ../pidgin/gtkutils.c:2743 #, c-format msgid "Failed to open file '%s': %s" msgstr "Failed to open file \"%s\": %s" -#: ../pidgin/gtkutils.c:2712 +#: ../pidgin/gtkutils.c:2792 #, c-format msgid "" "Failed to load image '%s': reason not known, probably a corrupt image file" msgstr "" "Failed to load image \"%s\": reason not known; probably a corrupt image file" -#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779 +#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773 msgid "Save File" msgstr "Save File" -#: ../pidgin/gtkwhiteboard.c:867 +#: ../pidgin/gtkwhiteboard.c:861 msgid "Select color" msgstr "Select colour" -#. Translators may want to transliterate the name. -#. It is not to be translated. -#: ../pidgin/pidgin.h:50 -msgid "Pidgin" -msgstr "Pidgin" - -#: ../pidgin/pidginstock.c:81 +#: ../pidgin/pidginstock.c:86 msgid "_Alias" msgstr "_Alias" -#: ../pidgin/pidginstock.c:83 +#: ../pidgin/pidginstock.c:88 msgid "Close _tabs" msgstr "Close _tabs" -#: ../pidgin/pidginstock.c:85 +#: ../pidgin/pidginstock.c:90 msgid "_Get Info" msgstr "_Get Info" -#: ../pidgin/pidginstock.c:86 +#: ../pidgin/pidginstock.c:91 msgid "_Invite" msgstr "_Invite" -#: ../pidgin/pidginstock.c:87 +#: ../pidgin/pidginstock.c:92 msgid "_Modify" msgstr "_Modify" -#: ../pidgin/pidginstock.c:88 +#: ../pidgin/pidginstock.c:93 msgid "_Open Mail" msgstr "_Open Mail" -#: ../pidgin/plugins/cap/cap.c:449 +#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2 +msgid "Pidgin smileys" +msgstr "Pidgin smileys" + +#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1 +msgid "Penguin Pimps" +msgstr "Penguin Pimps" + +#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2 +msgid "Selecting this disables graphical emoticons." +msgstr "Selecting this disables graphical emoticons." + +#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3 +msgid "none" +msgstr "none" + +#: ../pidgin/plugins/cap/cap.c:450 msgid "Display Statistics" msgstr "Display Statistics" -#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464 +#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465 msgid "Response Probability:" msgstr "Responses Probability:" -#: ../pidgin/plugins/cap/cap.c:810 +#: ../pidgin/plugins/cap/cap.c:811 msgid "Statistics Configuration" msgstr "Statistics Configuration" #. msg_difference spinner -#: ../pidgin/plugins/cap/cap.c:813 +#: ../pidgin/plugins/cap/cap.c:814 msgid "Maximum response timeout:" msgstr "Maximum response timeout:" -#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823 -#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150 +#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824 +#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150 msgid "minutes" msgstr "minutes" #. last_seen spinner -#: ../pidgin/plugins/cap/cap.c:820 +#: ../pidgin/plugins/cap/cap.c:821 msgid "Maximum last-seen difference:" msgstr "Maximum last-seen difference:" #. threshold spinner -#: ../pidgin/plugins/cap/cap.c:827 +#: ../pidgin/plugins/cap/cap.c:828 msgid "Threshold:" msgstr "Threshold:" @@ -14356,18 +16442,18 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/cap/cap.c:934 +#: ../pidgin/plugins/cap/cap.c:936 msgid "Contact Availability Prediction" msgstr "Contact Availability Prediction" #. *< name #. *< version -#: ../pidgin/plugins/cap/cap.c:936 +#: ../pidgin/plugins/cap/cap.c:938 msgid "Contact Availability Prediction plugin." msgstr "Contact Availability Prediction plugin." #. * summary -#: ../pidgin/plugins/cap/cap.c:937 +#: ../pidgin/plugins/cap/cap.c:939 msgid "" "The contact availability plugin (cap) is used to display statistical " "information about buddies in a users contact list." @@ -14472,7 +16558,7 @@ msgid "Received Messages" msgstr "Received Messages" -#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320 +#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251 #, c-format msgid "Select Color for %s" msgstr "Select Colour for %s" @@ -14597,24 +16683,29 @@ msgstr "Instant Messaging" #. Add the label. -#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460 +#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457 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." +#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:303 +msgid "Group:" +msgstr "Group:" + #. "New Person" button -#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580 -#: ../pidgin/plugins/gevolution/assoc-buddy.c:469 -#: ../pidgin/plugins/gevolution/new_person_dialog.c:251 +#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577 +#: ../pidgin/plugins/gevolution/assoc-buddy.c:467 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:249 msgid "New Person" msgstr "New Person" #. "Select Buddy" button -#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597 +#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594 msgid "Select Buddy" msgstr "Select Buddy" #. Add the label. -#: ../pidgin/plugins/gevolution/assoc-buddy.c:345 +#: ../pidgin/plugins/gevolution/assoc-buddy.c:343 msgid "" "Select a person from your address book to add this buddy to, or create a new " "person." @@ -14623,43 +16714,43 @@ "person." #. Add the expander -#: ../pidgin/plugins/gevolution/assoc-buddy.c:433 +#: ../pidgin/plugins/gevolution/assoc-buddy.c:431 msgid "User _details" msgstr "User _details" #. "Associate Buddy" button -#: ../pidgin/plugins/gevolution/assoc-buddy.c:486 +#: ../pidgin/plugins/gevolution/assoc-buddy.c:484 msgid "_Associate Buddy" msgstr "_Associate Buddy" -#: ../pidgin/plugins/gevolution/gevolution.c:239 -#: ../pidgin/plugins/gevolution/gevolution.c:245 -msgid "Unable to send e-mail" -msgstr "Unable to send e-mail" - #: ../pidgin/plugins/gevolution/gevolution.c:240 +#: ../pidgin/plugins/gevolution/gevolution.c:246 +msgid "Unable to send e-mail" +msgstr "Unable to send e-mail" + +#: ../pidgin/plugins/gevolution/gevolution.c:241 msgid "The evolution executable was not found in the PATH." msgstr "The evolution executable was not found in the PATH." -#: ../pidgin/plugins/gevolution/gevolution.c:246 +#: ../pidgin/plugins/gevolution/gevolution.c:247 msgid "An e-mail address was not found for this buddy." msgstr "An e-mail address was not found for this buddy." -#: ../pidgin/plugins/gevolution/gevolution.c:272 +#: ../pidgin/plugins/gevolution/gevolution.c:273 msgid "Add to Address Book" msgstr "Add to Address Book" -#: ../pidgin/plugins/gevolution/gevolution.c:284 +#: ../pidgin/plugins/gevolution/gevolution.c:285 msgid "Send E-Mail" msgstr "Send E-Mail" #. Configuration frame -#: ../pidgin/plugins/gevolution/gevolution.c:411 +#: ../pidgin/plugins/gevolution/gevolution.c:412 msgid "Evolution Integration Configuration" msgstr "Evolution Integration Configuration" #. Label -#: ../pidgin/plugins/gevolution/gevolution.c:414 +#: ../pidgin/plugins/gevolution/gevolution.c:415 msgid "Select all accounts that buddies should be auto-added to." msgstr "Select all accounts that buddies should be auto-added to." @@ -14669,7 +16760,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/gevolution/gevolution.c:526 +#: ../pidgin/plugins/gevolution/gevolution.c:527 msgid "Evolution Integration" msgstr "Evolution Integration" @@ -14677,37 +16768,37 @@ #. *< version #. * summary #. * description -#: ../pidgin/plugins/gevolution/gevolution.c:529 -#: ../pidgin/plugins/gevolution/gevolution.c:531 +#: ../pidgin/plugins/gevolution/gevolution.c:530 +#: ../pidgin/plugins/gevolution/gevolution.c:532 msgid "Provides integration with Evolution." msgstr "Provides integration with Evolution." +#: ../pidgin/plugins/gevolution/new_person_dialog.c:263 +msgid "Please enter the person's information below." +msgstr "Please enter the person's information below." + #: ../pidgin/plugins/gevolution/new_person_dialog.c:267 -msgid "Please enter the person's information below." -msgstr "Please enter the person's information below." - -#: ../pidgin/plugins/gevolution/new_person_dialog.c:271 msgid "Please enter the buddy's screen name and account type below." msgstr "Please enter the buddy's screen name and account type below." -#: ../pidgin/plugins/gevolution/new_person_dialog.c:291 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:287 msgid "Account type:" msgstr "Account type:" #. Optional Information section -#: ../pidgin/plugins/gevolution/new_person_dialog.c:315 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:311 msgid "Optional information:" msgstr "Optional information:" -#: ../pidgin/plugins/gevolution/new_person_dialog.c:350 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:346 msgid "First name:" msgstr "Forename" -#: ../pidgin/plugins/gevolution/new_person_dialog.c:362 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:358 msgid "Last name:" msgstr "Surname" -#: ../pidgin/plugins/gevolution/new_person_dialog.c:382 +#: ../pidgin/plugins/gevolution/new_person_dialog.c:378 msgid "E-mail:" msgstr "E-mail:" @@ -14730,6 +16821,15 @@ msgid "Test to see that all ui signals are working properly." msgstr "Test to see that all UI signals are working properly." +#: ../pidgin/plugins/gtkbuddynote.c:34 +#, c-format +msgid "" +"\n" +"<b>Buddy Note</b>: %s" +msgstr "" +"\n" +"<b>Buddy Note</b>: %s" + #: ../pidgin/plugins/history.c:188 msgid "History" msgstr "History" @@ -14776,11 +16876,11 @@ msgid "Draw Markerline in " msgstr "Draw Markerline in " -#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676 +#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682 msgid "_IM windows" msgstr "_IM windows" -#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683 +#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689 msgid "C_hat windows" msgstr "C_hat windows" @@ -14796,32 +16896,32 @@ msgid "Music messaging session confirmed." msgstr "Music messaging session confirmed." -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428 msgid "Music Messaging" msgstr "Music Messaging" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429 msgid "There was a conflict in running the command:" msgstr "There was a conflict in running the command:" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537 msgid "Error Running Editor" msgstr "Error Running Editor" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538 msgid "The following error has occurred:" msgstr "The following error has occurred:" #. Configuration frame -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637 msgid "Music Messaging Configuration" msgstr "Music Messaging Configuration" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641 msgid "Score Editor Path" msgstr "Score Editor Path" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642 msgid "_Apply" msgstr "_Apply" @@ -14833,12 +16933,12 @@ #. *< id #. *< name #. *< version -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683 msgid "Music Messaging Plugin for collaborative composition." msgstr "Music Messaging Plugin for collaborative composition." #. * summary -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685 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." @@ -14847,74 +16947,74 @@ "on a piece of music by editting a common score in real-time." #. ---------- "Notify For" ---------- -#: ../pidgin/plugins/notify.c:672 +#: ../pidgin/plugins/notify.c:678 msgid "Notify For" msgstr "Notify For" -#: ../pidgin/plugins/notify.c:691 +#: ../pidgin/plugins/notify.c:697 msgid "\t_Only when someone says your screen name" msgstr "\t_Only when someone says your screen name" -#: ../pidgin/plugins/notify.c:701 +#: ../pidgin/plugins/notify.c:707 msgid "_Focused windows" msgstr "_Focused windows" #. ---------- "Notification Methods" ---------- -#: ../pidgin/plugins/notify.c:709 +#: ../pidgin/plugins/notify.c:715 msgid "Notification Methods" msgstr "Notification Methods" -#: ../pidgin/plugins/notify.c:716 +#: ../pidgin/plugins/notify.c:722 msgid "Prepend _string into window title:" msgstr "Prepend _string into window title:" #. Count method button -#: ../pidgin/plugins/notify.c:735 +#: ../pidgin/plugins/notify.c:741 msgid "Insert c_ount of new messages into window title" msgstr "Insert c_ount of new messages into window title" #. Count xprop method button -#: ../pidgin/plugins/notify.c:744 +#: ../pidgin/plugins/notify.c:750 msgid "Insert count of new message into _X property" msgstr "Insert count of new messages into _X property" #. Urgent method button -#: ../pidgin/plugins/notify.c:752 +#: ../pidgin/plugins/notify.c:758 msgid "Set window manager \"_URGENT\" hint" msgstr "Set window manager \"_URGENT\" hint" #. Raise window method button -#: ../pidgin/plugins/notify.c:761 +#: ../pidgin/plugins/notify.c:767 msgid "R_aise conversation window" msgstr "R_aise conversation window" #. ---------- "Notification Removals" ---------- -#: ../pidgin/plugins/notify.c:769 +#: ../pidgin/plugins/notify.c:775 msgid "Notification Removal" msgstr "Notification Removal" #. Remove on focus button -#: ../pidgin/plugins/notify.c:774 +#: ../pidgin/plugins/notify.c:780 msgid "Remove when conversation window _gains focus" msgstr "Remove when conversation window _gains focus" #. Remove on click button -#: ../pidgin/plugins/notify.c:781 +#: ../pidgin/plugins/notify.c:787 msgid "Remove when conversation window _receives click" msgstr "Remove when conversation window _receives click" #. Remove on type button -#: ../pidgin/plugins/notify.c:789 +#: ../pidgin/plugins/notify.c:795 msgid "Remove when _typing in conversation window" msgstr "Remove when _typing in conversation window" #. Remove on message send button -#: ../pidgin/plugins/notify.c:797 +#: ../pidgin/plugins/notify.c:803 msgid "Remove when a _message gets sent" msgstr "Remove when a _message gets sent" #. Remove on conversation switch button -#: ../pidgin/plugins/notify.c:806 +#: ../pidgin/plugins/notify.c:812 msgid "Remove on switch to conversation ta_b" msgstr "Remove on switch to conversation ta_b" @@ -14924,7 +17024,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/notify.c:901 +#: ../pidgin/plugins/notify.c:907 msgid "Message Notification" msgstr "Message Notification" @@ -14932,7 +17032,7 @@ #. *< version #. * summary #. * description -#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906 +#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912 msgid "Provides a variety of ways of notifying you of unread messages." msgstr "Provides a variety of ways of notifying you of unread messages." @@ -15002,24 +17102,24 @@ msgid "Notify Dialog" msgstr "Notify Dialog" -#: ../pidgin/plugins/pidginrc.c:322 +#: ../pidgin/plugins/pidginrc.c:253 msgid "Select Color" msgstr "Select Colour" -#: ../pidgin/plugins/pidginrc.c:361 +#: ../pidgin/plugins/pidginrc.c:300 +msgid "Select Interface Font" +msgstr "Select Interface Font" + +#: ../pidgin/plugins/pidginrc.c:303 #, c-format msgid "Select Font for %s" msgstr "Select Font for %s" -#: ../pidgin/plugins/pidginrc.c:398 -msgid "Select Interface Font" -msgstr "Select Interface Font" - -#: ../pidgin/plugins/pidginrc.c:453 +#: ../pidgin/plugins/pidginrc.c:371 msgid "GTK+ Interface Font" msgstr "GTK+ Interface Font" -#: ../pidgin/plugins/pidginrc.c:473 +#: ../pidgin/plugins/pidginrc.c:391 msgid "GTK+ Text Shortcut Theme" msgstr "GTK+ Text Shortcut Theme" @@ -15043,36 +17143,36 @@ #. widget_bool_widgets[i]); #. } #. -#: ../pidgin/plugins/pidginrc.c:510 +#: ../pidgin/plugins/pidginrc.c:428 msgid "Interface colors" msgstr "Interface colours" -#: ../pidgin/plugins/pidginrc.c:534 +#: ../pidgin/plugins/pidginrc.c:452 msgid "Widget Sizes" msgstr "Widget Sizes" -#: ../pidgin/plugins/pidginrc.c:555 +#: ../pidgin/plugins/pidginrc.c:473 msgid "Fonts" msgstr "Fonts" -#: ../pidgin/plugins/pidginrc.c:578 -msgid "Tools" -msgstr "Tools" - -#: ../pidgin/plugins/pidginrc.c:583 +#: ../pidgin/plugins/pidginrc.c:497 +msgid "Gtkrc File Tools" +msgstr "Gtkrc File Tools" + +#: ../pidgin/plugins/pidginrc.c:502 #, c-format msgid "Write settings to %s%sgtkrc-2.0" msgstr "Write settings to %s%sgtkrc-2.0" -#: ../pidgin/plugins/pidginrc.c:591 +#: ../pidgin/plugins/pidginrc.c:511 msgid "Re-read gtkrc files" msgstr "Re-read gtkrc files" -#: ../pidgin/plugins/pidginrc.c:624 +#: ../pidgin/plugins/pidginrc.c:544 msgid "Pidgin GTK+ Theme Control" msgstr "Pidgin GTK+ Theme Control" -#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627 +#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547 msgid "Provides access to commonly used gtkrc settings." msgstr "Provides access to commonly used gtkrc settings." @@ -15094,28 +17194,19 @@ #: ../pidgin/plugins/relnot.c:71 #, c-format -msgid "You are using %s version %s. The current version is %s.<hr>" -msgstr "You are using %s version %s. The current version is %s.<hr>" - -#: ../pidgin/plugins/relnot.c:77 -#, c-format -msgid "" -"<b>ChangeLog:</b>\n" -"%s<br><br>" -msgstr "" -"<b>ChangeLog:</b>\n" -"%s<br><br>" - -#: ../pidgin/plugins/relnot.c:82 -#, c-format -msgid "" -"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin." -"im</a>." -msgstr "" -"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin." -"im</a>." - -#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87 +msgid "" +"You are using %s version %s. The current version is %s. You can get it " +"from <a href=\"%s\">%s</a><hr>" +msgstr "" +"You are using %s version %s. The current version is %s. You can get it " +"from <a href=\"%s\">%s</a><hr>" + +#: ../pidgin/plugins/relnot.c:79 +#, c-format +msgid "<b>ChangeLog:</b><br>%s" +msgstr "<b>ChangeLog:</b><br>%s" + +#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85 msgid "New Version Available" msgstr "New Version Available" @@ -15125,19 +17216,19 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/relnot.c:145 +#: ../pidgin/plugins/relnot.c:143 msgid "Release Notification" msgstr "Release Notification" #. *< name #. *< version #. * summary -#: ../pidgin/plugins/relnot.c:148 +#: ../pidgin/plugins/relnot.c:146 msgid "Checks periodically for new releases." msgstr "Checks periodically for new releases." #. * description -#: ../pidgin/plugins/relnot.c:150 +#: ../pidgin/plugins/relnot.c:148 msgid "" "Checks periodically for new releases and notifies the user with the " "ChangeLog." @@ -15145,68 +17236,68 @@ "Checks periodically for new releases and notifies the user with the " "ChangeLog." -#: ../pidgin/plugins/spellchk.c:1965 +#: ../pidgin/plugins/spellchk.c:1962 msgid "Duplicate Correction" msgstr "Duplicate Correction" -#: ../pidgin/plugins/spellchk.c:1966 +#: ../pidgin/plugins/spellchk.c:1963 msgid "The specified word already exists in the correction list." msgstr "The specified word already exists in the correction list." -#: ../pidgin/plugins/spellchk.c:2180 +#: ../pidgin/plugins/spellchk.c:2177 msgid "Text Replacements" msgstr "Text Replacements" -#: ../pidgin/plugins/spellchk.c:2203 +#: ../pidgin/plugins/spellchk.c:2200 msgid "You type" msgstr "You type" -#: ../pidgin/plugins/spellchk.c:2217 +#: ../pidgin/plugins/spellchk.c:2214 msgid "You send" msgstr "You send" -#: ../pidgin/plugins/spellchk.c:2231 +#: ../pidgin/plugins/spellchk.c:2228 msgid "Whole words only" msgstr "Whole words only" -#: ../pidgin/plugins/spellchk.c:2243 +#: ../pidgin/plugins/spellchk.c:2240 msgid "Case sensitive" msgstr "Case sensitive" -#: ../pidgin/plugins/spellchk.c:2269 +#: ../pidgin/plugins/spellchk.c:2266 msgid "Add a new text replacement" msgstr "Add a new text replacement" -#: ../pidgin/plugins/spellchk.c:2285 +#: ../pidgin/plugins/spellchk.c:2282 msgid "You _type:" msgstr "You _type:" -#: ../pidgin/plugins/spellchk.c:2302 +#: ../pidgin/plugins/spellchk.c:2299 msgid "You _send:" msgstr "You _send:" #. Created here so it can be passed to whole_words_button_toggled. -#: ../pidgin/plugins/spellchk.c:2314 +#: ../pidgin/plugins/spellchk.c:2311 msgid "_Exact case match (uncheck for automatic case handling)" msgstr "_Exact case match (uncheck for automatic case handling)" -#: ../pidgin/plugins/spellchk.c:2316 +#: ../pidgin/plugins/spellchk.c:2313 msgid "Only replace _whole words" msgstr "Only replace _whole words" -#: ../pidgin/plugins/spellchk.c:2341 +#: ../pidgin/plugins/spellchk.c:2338 msgid "General Text Replacement Options" msgstr "General Text Replacement Options" -#: ../pidgin/plugins/spellchk.c:2342 +#: ../pidgin/plugins/spellchk.c:2339 msgid "Enable replacement of last word on send" msgstr "Enable replacement of last word on send" -#: ../pidgin/plugins/spellchk.c:2373 +#: ../pidgin/plugins/spellchk.c:2370 msgid "Text replacement" msgstr "Text replacement" -#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376 +#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373 msgid "Replaces text in outgoing messages according to user-defined rules." msgstr "Replaces text in outgoing messages according to user-defined rules." @@ -15216,7 +17307,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355 +#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354 msgid "Buddy Ticker" msgstr "Buddy Ticker" @@ -15224,7 +17315,7 @@ #. *< version #. * summary #. * description -#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360 +#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359 msgid "A horizontal scrolling version of the buddy list." msgstr "A horizontal scrolling version of the buddy list." @@ -15310,44 +17401,44 @@ "This plug-in allows the user to customize conversation and logging message " "timestamp formats." -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645 msgid "Opacity:" msgstr "Opacity:" #. IM Convo trans options -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562 msgid "IM Conversation Windows" msgstr "IM Conversation Windows" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563 msgid "_IM window transparency" msgstr "_IM window transparency" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577 msgid "_Show slider bar in IM window" msgstr "_Show slider bar in IM window" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584 msgid "Remove IM window transparency on focus" msgstr "Remove IM window transparency on focus" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635 msgid "Always on top" msgstr "Always on top" #. Buddy List trans options -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619 msgid "Buddy List Window" msgstr "Buddy List Window" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620 msgid "_Buddy List window transparency" msgstr "_Buddy List window transparency" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633 msgid "Remove Buddy List window transparency on focus" msgstr "Remove Buddy List window transparency on focus" @@ -15357,19 +17448,19 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693 msgid "Transparency" msgstr "Transparency" #. *< name #. *< version #. * summary -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696 msgid "Variable Transparency for the buddy list and conversations." msgstr "Variable Transparency for the buddy list and conversations." #. * description -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698 msgid "" "This plugin enables variable alpha transparency on conversation windows and " "the buddy list.\n" @@ -15381,53 +17472,53 @@ "\n" "* Note: This plug-in requires Win2000 or greater." -#: ../pidgin/plugins/win32/winprefs/winprefs.c:307 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:303 msgid "GTK+ Runtime Version" msgstr "GTK+ Runtime Version" #. Autostart -#: ../pidgin/plugins/win32/winprefs/winprefs.c:315 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:311 msgid "Startup" msgstr "Startup" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:316 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:312 #, c-format msgid "_Start %s on Windows startup" msgstr "_Start %s on Windows startup" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:331 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:327 msgid "_Dockable Buddy List" msgstr "_Dockable Buddy List" #. Blist On Top -#: ../pidgin/plugins/win32/winprefs/winprefs.c:335 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:331 msgid "_Keep Buddy List window on top:" msgstr "_Keep Buddy List window on top:" #. XXX: Did this ever work? -#: ../pidgin/plugins/win32/winprefs/winprefs.c:340 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:336 msgid "Only when docked" msgstr "Only when docked" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:345 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:341 msgid "_Flash window when chat messages are received" msgstr "_Flash window when chat messages are received" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:375 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:371 msgid "Windows Pidgin Options" msgstr "Windows Pidgin Options" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:377 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:373 msgid "Options specific to Pidgin for Windows." msgstr "Options specific to Pidgin for Windows." -#: ../pidgin/plugins/win32/winprefs/winprefs.c:378 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:374 msgid "" "Provides options specific to Pidgin for Windows , such as buddy list docking." msgstr "" "Provides options specific to Pidgin for Windows, such as buddy list docking." -#: ../pidgin/plugins/xmppconsole.c:665 +#: ../pidgin/plugins/xmppconsole.c:667 msgid "<font color='#777777'>Logged out.</font>" msgstr "<font color='#777777'>Logged out.</font>" @@ -15437,7 +17528,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841 +#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841 #: ../pidgin/plugins/xmppconsole.c:860 msgid "XMPP Console" msgstr "XMPP Console"