Mercurial > pidgin
diff po/en_CA.po @ 20712:f62eb68c9dda
merge of '2cfece889d5b58dc78c6375f4662ba44f167286d'
and '4738dbce827a83740e87c9d66f79d4fa5de8abaf'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2007 07:19:00 +0000 |
| parents | 1f27c4471ccf |
| children | e0bcb8cfda74 |
line wrap: on
line diff
--- a/po/en_CA.po Fri Sep 28 04:45:57 2007 +0000 +++ b/po/en_CA.po Sat Sep 29 07:19:00 2007 +0000 @@ -4,12 +4,11 @@ # Adam Weinberger <adamw@gnome.org>, 2004, 2005. # # -#: ../libpurple/certificate.c:543 msgid "" msgstr "" "Project-Id-Version: gaim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-25 01:15-0700\n" +"POT-Creation-Date: 2007-09-28 15:32-0500\n" "PO-Revision-Date: 2005-03-17 19:45-0400\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\n" @@ -42,7 +41,7 @@ " -v, --version display the current version and exit\n" msgstr "" -#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718 +#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711 #, c-format msgid "" "%s encountered errors migrating your settings from %s to %s. Please " @@ -55,7 +54,7 @@ #: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 #: ../finch/plugins/gntclipboard.c:128 -#: ../libpurple/protocols/jabber/buddy.c:2032 +#: ../libpurple/protocols/jabber/buddy.c:2029 #: ../libpurple/protocols/jabber/chat.c:677 #: ../libpurple/protocols/jabber/chat.c:688 #: ../libpurple/protocols/jabber/jabber.c:1515 @@ -91,8 +90,8 @@ msgid "(You probably forgot to 'make install'.)" msgstr "" -#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137 -#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322 +#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136 +#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040 msgid "Modify Account" msgstr "Modify Account" @@ -124,7 +123,7 @@ #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005 -#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91 +#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91 #: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667 #: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145 #: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610 @@ -134,8 +133,8 @@ #: ../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:2416 -#: ../libpurple/protocols/jabber/buddy.c:2452 +#: ../libpurple/protocols/jabber/buddy.c:2413 +#: ../libpurple/protocols/jabber/buddy.c:2449 #: ../libpurple/protocols/jabber/chat.c:786 #: ../libpurple/protocols/jabber/jabber.c:1008 #: ../libpurple/protocols/jabber/jabber.c:1017 @@ -144,10 +143,10 @@ #: ../libpurple/protocols/jabber/usermood.c:184 #: ../libpurple/protocols/jabber/usernick.c:78 #: ../libpurple/protocols/jabber/xdata.c:400 -#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307 -#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341 -#: ../libpurple/protocols/msn/msn.c:362 -#: ../libpurple/protocols/oscar/oscar.c:6092 +#: ../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:6094 #: ../libpurple/protocols/oscar/peer.c:1046 #: ../libpurple/protocols/qq/buddy_info.c:484 #: ../libpurple/protocols/qq/buddy_opt.c:214 @@ -182,16 +181,16 @@ #: ../libpurple/protocols/silc10/ops.c:1904 #: ../libpurple/protocols/silc10/silc.c:736 #: ../libpurple/protocols/silc10/silc.c:942 -#: ../libpurple/protocols/yahoo/yahoo.c:1031 -#: ../libpurple/protocols/yahoo/yahoo.c:3497 -#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908 -#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267 -#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767 -#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998 -#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042 -#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112 -#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209 -#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275 +#: ../libpurple/protocols/yahoo/yahoo.c:1032 +#: ../libpurple/protocols/yahoo/yahoo.c:3498 +#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908 +#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967 +#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773 +#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004 +#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048 +#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118 +#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215 +#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579 @@ -233,7 +232,7 @@ msgid "Delete" msgstr "Delete" -#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82 +#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522 msgid "Accounts" msgstr "Accounts" @@ -245,16 +244,15 @@ #. Add button #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343 -#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305 -#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713 -#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883 -#: ../libpurple/protocols/qq/sys_msg.c:114 +#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306 +#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199 +#: ../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:615 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494 -#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712 +#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659 #: ../pidgin/gtkrequest.c:275 msgid "Add" msgstr "Add" @@ -320,19 +318,19 @@ "Error reading %s: \n" "%s.\n" -#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884 +#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980 msgid "Screen Name" msgstr "Screen Name" #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250 -#: ../libpurple/protocols/msn/msn.c:1507 +#: ../libpurple/protocols/msn/msn.c:1395 #: ../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:1017 -#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063 +#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023 +#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069 #: ../pidgin/gtkrequest.c:278 msgid "Alias" msgstr "Alias" @@ -345,7 +343,7 @@ #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305 #: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190 -#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503 +#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445 msgid "Account" msgstr "Account" @@ -359,7 +357,7 @@ #: ../libpurple/protocols/silc10/buddy.c:1033 #: ../libpurple/protocols/silc10/buddy.c:1080 #: ../libpurple/protocols/silc10/buddy.c:1180 -#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772 +#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445 msgid "Add Buddy" msgstr "Add Buddy" @@ -369,15 +367,15 @@ msgid "Please enter buddy information." msgstr "Please enter a buddy to pounce." -#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210 +#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209 msgid "Chats" msgstr "Chats" #. Extract their Name and put it in #: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924 #: ../libpurple/protocols/jabber/jabber.c:927 -#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759 -#: ../libpurple/protocols/msn/msn.c:1786 +#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649 +#: ../libpurple/protocols/msn/msn.c:1676 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582 #: ../pidgin/gtkroomlist.c:618 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132 @@ -390,7 +388,7 @@ msgid "Auto-join" msgstr "Auto-Join" -#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154 +#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859 msgid "Add Chat" msgstr "Add Chat" @@ -417,7 +415,7 @@ #: ../finch/gntblist.c:454 ../finch/gntblist.c:856 #: ../libpurple/protocols/sametime/sametime.c:5396 -#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263 +#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963 msgid "Add Group" msgstr "Add Group" @@ -454,7 +452,7 @@ msgid "Retrieving..." msgstr "Connecting..." -#: ../finch/gntblist.c:904 ../finch/gntconv.c:534 +#: ../finch/gntblist.c:904 ../finch/gntconv.c:507 #: ../libpurple/protocols/silc/chat.c:899 #: ../libpurple/protocols/silc10/chat.c:883 msgid "Get Info" @@ -466,10 +464,10 @@ msgstr "Add Buddy _Pounce" #. if (q_bud && is_online(q_bud->status)) { -#: ../finch/gntblist.c:915 ../finch/gntconv.c:546 +#: ../finch/gntblist.c:915 ../finch/gntconv.c:519 #: ../libpurple/protocols/jabber/si.c:874 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587 -#: ../pidgin/gtkconv.c:1660 +#: ../pidgin/gtkconv.c:1607 msgid "Send File" msgstr "Send File" @@ -517,14 +515,14 @@ msgstr "Confirm Account" #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227 -#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276 +#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276 #: ../pidgin/gtkstatusbox.c:264 msgid "Remove" msgstr "Remove" #. Buddy List -#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258 -#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566 +#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258 +#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326 msgid "Buddy List" msgstr "Buddy List" @@ -543,15 +541,15 @@ #: ../libpurple/protocols/gg/gg.c:2207 #: ../libpurple/protocols/jabber/buddy.c:286 #: ../libpurple/protocols/jabber/buddy.c:1247 -#: ../libpurple/protocols/jabber/buddy.c:2217 -#: ../libpurple/protocols/jabber/buddy.c:2399 +#: ../libpurple/protocols/jabber/buddy.c:2214 +#: ../libpurple/protocols/jabber/buddy.c:2396 #: ../libpurple/protocols/jabber/jabber.c:937 #: ../libpurple/protocols/jabber/jabber.c:1544 #: ../libpurple/protocols/jabber/jabber.c:1567 #: ../libpurple/protocols/jabber/jabber.c:1590 #: ../libpurple/protocols/jabber/jabber.c:1613 #: ../libpurple/protocols/jabber/jabber.c:1636 -#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697 +#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587 #: ../libpurple/protocols/qq/buddy_info.c:43 #: ../libpurple/protocols/silc/buddy.c:1535 #: ../libpurple/protocols/silc/ops.c:1002 @@ -561,7 +559,7 @@ #: ../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:3230 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032 msgid "Nickname" msgstr "Nickname" @@ -570,12 +568,12 @@ #: ../libpurple/protocols/bonjour/bonjour.c:340 #: ../libpurple/protocols/jabber/buddy.c:787 #: ../libpurple/protocols/jabber/buddy.c:951 -#: ../libpurple/protocols/msn/state.c:32 -#: ../libpurple/protocols/novell/novell.c:2830 -#: ../libpurple/protocols/oscar/oscar.c:2908 -#: ../libpurple/protocols/yahoo/yahoo.c:3096 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258 -#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927 +#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32 +#: ../libpurple/protocols/novell/novell.c:2825 +#: ../libpurple/protocols/oscar/oscar.c:2912 +#: ../libpurple/protocols/yahoo/yahoo.c:3097 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060 +#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925 msgid "Idle" msgstr "Idle" @@ -605,38 +603,38 @@ "\n" "<b>%s:</b> %s" -#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470 +#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470 #: ../pidgin/gtkstatusbox.c:1072 msgid "New..." msgstr "New..." -#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471 +#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471 #: ../pidgin/gtkstatusbox.c:1073 #, fuzzy msgid "Saved..." msgstr "Save File..." -#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88 +#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531 msgid "Plugins" msgstr "Plugins" -#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748 -#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968 +#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754 +#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974 #, fuzzy msgid "_Name" msgstr "Name" -#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753 -#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973 +#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759 +#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979 msgid "_Account" msgstr "_Account" -#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761 +#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767 msgid "New Instant Message" msgstr "New Instant Message" -#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763 +#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769 #, fuzzy msgid "" "Please enter the screen name or alias of the person you would like to IM." @@ -645,15 +643,15 @@ #. Not multiline #. Not masked? #. No hints? -#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136 +#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802 #: ../libpurple/protocols/jabber/jabber.c:1736 #: ../libpurple/protocols/jabber/xdata.c:399 -#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306 -#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340 -#: ../libpurple/protocols/oscar/oscar.c:6091 +#: ../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:6093 #: ../libpurple/protocols/silc/buddy.c:454 #: ../libpurple/protocols/silc/buddy.c:1190 #: ../libpurple/protocols/silc/chat.c:447 @@ -670,58 +668,49 @@ #: ../libpurple/protocols/silc10/ops.c:1297 #: ../libpurple/protocols/silc10/ops.c:1903 #: ../libpurple/protocols/silc10/silc.c:735 -#: ../libpurple/protocols/yahoo/yahoo.c:1030 -#: ../libpurple/protocols/yahoo/yahoo.c:3496 -#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321 -#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766 -#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997 +#: ../libpurple/protocols/yahoo/yahoo.c:1031 +#: ../libpurple/protocols/yahoo/yahoo.c:3497 +#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039 +#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772 +#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003 #: ../pidgin/gtkrequest.c:270 msgid "OK" msgstr "OK" #. Create the "Options" frame. -#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790 +#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790 #, fuzzy msgid "Options" msgstr "/_Options" -#: ../finch/gntblist.c:2267 +#: ../finch/gntblist.c:2247 #, fuzzy msgid "Send IM..." msgstr "Save File..." -#: ../finch/gntblist.c:2271 -msgid "Show" -msgstr "" - -#: ../finch/gntblist.c:2276 -#, fuzzy -msgid "Empty groups" +#: ../finch/gntblist.c:2251 +#, fuzzy +msgid "Show empty groups" msgstr "By group" -#: ../finch/gntblist.c:2282 -#, fuzzy -msgid "Offline buddies" -msgstr "Dim i_dle buddies" - -#: ../finch/gntblist.c:2288 -#, fuzzy -msgid "Sort" -msgstr "Port" - -#: ../finch/gntblist.c:2293 -#, fuzzy -msgid "By Status" -msgstr "By status" - -#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106 -#, fuzzy -msgid "Alphabetically" +#: ../finch/gntblist.c:2257 +#, fuzzy +msgid "Show offline buddies" +msgstr "/Buddies/Show Offline Buddies" + +#: ../finch/gntblist.c:2263 +#, fuzzy +msgid "Sort by status" +msgstr "Status" + +#: ../finch/gntblist.c:2267 +#, fuzzy +msgid "Sort alphabetically" msgstr "Alphabetical" -#: ../finch/gntblist.c:2301 -#, fuzzy -msgid "By Log Size" +#: ../finch/gntblist.c:2271 +#, fuzzy +msgid "Sort by log size" msgstr "By log size" #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188 @@ -815,7 +804,7 @@ msgid "Hostname" msgstr "Last name:" -#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688 +#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635 #: ../pidgin/gtkdebug.c:835 msgid "Info" msgstr "Info" @@ -823,24 +812,24 @@ #. Close button #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182 #: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738 -#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406 +#: ../finch/gntstatus.c:216 ../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:273 msgid "Close" msgstr "Close" -#: ../finch/gntconn.c:125 +#: ../finch/gntconn.c:124 #, fuzzy, c-format msgid "%s (%s)" msgstr "%s on %s (%s)" -#: ../finch/gntconn.c:128 +#: ../finch/gntconn.c:127 #, fuzzy, c-format msgid "%s disconnected." msgstr "Disconnected." -#: ../finch/gntconn.c:129 +#: ../finch/gntconn.c:128 #, c-format msgid "" "%s\n" @@ -849,7 +838,7 @@ "and re-enable the account." msgstr "" -#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323 +#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041 msgid "Re-enable Account" msgstr "" @@ -857,26 +846,26 @@ msgid "No such command." msgstr "No such command." -#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530 +#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489 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:148 ../pidgin/gtkconv.c:536 +#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495 msgid "Your command failed for an unknown reason." msgstr "Your command failed for an unknown reason." -#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543 +#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502 #, fuzzy msgid "That command only works in chats, not IMs." msgstr "That command only works in Chats, not IMs." -#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546 +#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505 #, fuzzy msgid "That command only works in IMs, not chats." msgstr "That command only works in IMs, not Chats." -#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551 +#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510 msgid "That command doesn't work on this protocol." msgstr "That command doesn't work on this protocol." @@ -895,7 +884,7 @@ msgid "%s [%s]" msgstr "" -#: ../finch/gntconv.c:279 ../finch/gntconv.c:801 +#: ../finch/gntconv.c:279 ../finch/gntconv.c:773 #, fuzzy, c-format msgid "" "\n" @@ -907,68 +896,68 @@ msgid "You have left this chat." msgstr "You talk in chat" -#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415 +#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362 msgid "Logging started. Future messages in this conversation will be logged." msgstr "" -#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423 +#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370 msgid "" "Logging stopped. Future messages in this conversation will not be logged." msgstr "" -#: ../finch/gntconv.c:469 +#: ../finch/gntconv.c:442 #, fuzzy msgid "Send To" msgstr "_Send As" -#: ../finch/gntconv.c:513 +#: ../finch/gntconv.c:486 #, fuzzy msgid "Conversation" msgstr "Conversations" -#: ../finch/gntconv.c:519 +#: ../finch/gntconv.c:492 msgid "Clear Scrollback" msgstr "" -#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191 +#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191 #, fuzzy msgid "Show Timestamps" msgstr "Timestamps" -#: ../finch/gntconv.c:539 +#: ../finch/gntconv.c:512 #, fuzzy msgid "Add Buddy Pounce..." msgstr "Add Buddy _Pounce" -#: ../finch/gntconv.c:554 +#: ../finch/gntconv.c:527 #, fuzzy msgid "Enable Logging" msgstr "/Options/Enable Logging" -#: ../finch/gntconv.c:560 +#: ../finch/gntconv.c:533 #, fuzzy msgid "Enable Sounds" msgstr "/Options/Enable Sounds" -#: ../finch/gntconv.c:766 +#: ../finch/gntconv.c:739 #, fuzzy msgid "<AUTO-REPLY> " msgstr "(%s) %s <AUTO-REPLY>: %s\n" #. Print the list of users in the room -#: ../finch/gntconv.c:889 +#: ../finch/gntconv.c:861 msgid "List of users:\n" msgstr "" -#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370 +#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331 msgid "Supported debug options are: version" msgstr "Supported debug options are: version" -#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422 +#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381 msgid "No such command (in this context)." msgstr "No such command (in this context)." -#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425 +#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384 msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" @@ -976,7 +965,7 @@ "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" -#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642 +#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." @@ -984,11 +973,11 @@ "say <message>: Send a message normally as if you weren't using a " "command." -#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645 +#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563 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:1154 ../pidgin/gtkconv.c:7648 +#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566 msgid "" "debug <option>: Send various debug information to the current " "conversation." @@ -996,40 +985,40 @@ "debug <option>: Send various debug information to the current " "conversation." -#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651 +#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569 #, fuzzy msgid "clear: Clears the conversation scrollback." msgstr "%s has closed the conversation window." -#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657 +#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575 msgid "help <command>: Help on a specific command." msgstr "help <command>: Help on a specific command." -#: ../finch/gntconv.c:1163 +#: ../finch/gntconv.c:1135 msgid "users: Show the list of users in the chat." msgstr "" -#: ../finch/gntconv.c:1168 +#: ../finch/gntconv.c:1140 msgid "plugins: Show the plugins window." msgstr "" -#: ../finch/gntconv.c:1171 +#: ../finch/gntconv.c:1143 msgid "buddylist: Show the buddylist." msgstr "" -#: ../finch/gntconv.c:1174 +#: ../finch/gntconv.c:1146 msgid "accounts: Show the accounts window." msgstr "" -#: ../finch/gntconv.c:1177 +#: ../finch/gntconv.c:1149 msgid "debugwin: Show the debug window." msgstr "" -#: ../finch/gntconv.c:1180 +#: ../finch/gntconv.c:1152 msgid "prefs: Show the preference window." msgstr "" -#: ../finch/gntconv.c:1183 +#: ../finch/gntconv.c:1155 msgid "statuses: Show the savedstatuses window." msgstr "" @@ -1096,17 +1085,17 @@ #: ../libpurple/protocols/jabber/buddy.c:782 #: ../libpurple/protocols/jabber/buddy.c:941 #: ../libpurple/protocols/jabber/jabber.c:1500 -#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603 -#: ../libpurple/protocols/novell/novell.c:2840 +#: ../libpurple/protocols/msn/msn.c:543 +#: ../libpurple/protocols/novell/novell.c:2835 #: ../libpurple/protocols/oscar/oscar.c:821 #: ../libpurple/protocols/oscar/oscar.c:826 #: ../libpurple/protocols/oscar/oscar.c:828 -#: ../libpurple/protocols/oscar/oscar.c:2696 -#: ../libpurple/protocols/oscar/oscar.c:3776 +#: ../libpurple/protocols/oscar/oscar.c:2700 +#: ../libpurple/protocols/oscar/oscar.c:3780 #: ../libpurple/protocols/sametime/sametime.c:3263 #: ../libpurple/protocols/sametime/sametime.c:4150 -#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302 -#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318 +#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104 +#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144 msgid "Status" msgstr "Status" @@ -1152,7 +1141,7 @@ msgid "Finished" msgstr "Finished" -#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386 +#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347 msgid "Transferring" msgstr "Transferring" @@ -1165,12 +1154,12 @@ msgid "You have mail!" msgstr "" -#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510 +#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513 #, fuzzy msgid "Sender" msgstr "Gender" -#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517 +#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520 msgid "Subject" msgstr "" @@ -1196,25 +1185,25 @@ msgid "Buddy Information" msgstr "Buddy Information" -#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367 +#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367 #, fuzzy msgid "Continue" msgstr "Connecting" -#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649 +#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596 msgid "IM" msgstr "IM" -#: ../finch/gntnotify.c:392 +#: ../finch/gntnotify.c:389 #, fuzzy msgid "Join" msgstr "_Join" -#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473 +#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473 msgid "Invite" msgstr "Invite" -#: ../finch/gntnotify.c:398 +#: ../finch/gntnotify.c:395 #, fuzzy msgid "(none)" msgstr "(no name)" @@ -1267,7 +1256,7 @@ #. Back to instant-apply! I win! BU-HAHAHA! #. Create the window #: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264 -#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069 +#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067 msgid "Preferences" msgstr "Preferences" @@ -1466,6 +1455,7 @@ msgstr "%s wants to send you %s (%s)" #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471 +#, c-format msgid "Unknown pounce event. Please report this!" msgstr "Unknown pounce event. Please report this!" @@ -1473,13 +1463,13 @@ msgid "Based on keyboard use" msgstr "" -#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932 +#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930 #, fuzzy msgid "From last sent message" msgstr "C_ontrol-Enter sends message" #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907 -#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945 +#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333 msgid "Never" msgstr "Never" @@ -1538,12 +1528,12 @@ msgstr "Change Address To:" #. Conversations -#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035 +#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340 msgid "Conversations" msgstr "Conversations" -#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046 +#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044 msgid "Logging" msgstr "Logging" @@ -1611,8 +1601,8 @@ msgid "GStreamer failed to initialize." msgstr "" -#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589 -#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874 +#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587 +#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872 #, fuzzy msgid "(default)" msgstr "Gnome Default" @@ -1632,7 +1622,7 @@ msgid "Profiles" msgstr "Profile" -#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719 +#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717 msgid "Automatic" msgstr "Automatic" @@ -1641,7 +1631,7 @@ msgid "Console Beep" msgstr "Console beep" -#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723 +#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721 msgid "Command" msgstr "Command" @@ -1650,7 +1640,7 @@ msgid "No Sound" msgstr "Sounds" -#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714 +#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712 msgid "Sound Method" msgstr "Sound Method" @@ -1669,7 +1659,7 @@ "(%s for filename)" #. Sound options -#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758 +#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756 msgid "Sound Options" msgstr "Sound Options" @@ -1679,19 +1669,19 @@ msgstr "Sounds when conversation has _focus" #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909 -#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42 +#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42 #: ../pidgin/plugins/timestamp_format.c:51 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334 #, fuzzy msgid "Always" msgstr "Away" -#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763 +#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761 #, fuzzy msgid "Only when available" msgstr "Unavailable" -#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764 +#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762 #, fuzzy msgid "Only when not available" msgstr "Chat in %s is not available." @@ -1701,11 +1691,11 @@ msgstr "" #. Sound events -#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800 +#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798 msgid "Sound Events" msgstr "Sound Events" -#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859 +#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857 msgid "Event" msgstr "Event" @@ -1714,15 +1704,15 @@ msgid "File" msgstr "Failed" -#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878 +#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876 msgid "Test" msgstr "Test" -#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882 +#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880 msgid "Reset" msgstr "Reset" -#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886 +#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884 msgid "Choose..." msgstr "Choose..." @@ -1744,7 +1734,7 @@ #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539 #: ../libpurple/protocols/jabber/buddy.c:298 #: ../libpurple/protocols/jabber/buddy.c:1359 -#: ../libpurple/protocols/novell/novell.c:1486 +#: ../libpurple/protocols/novell/novell.c:1484 #: ../pidgin/gtksavedstatuses.c:500 msgid "Title" msgstr "Title" @@ -1775,20 +1765,17 @@ #: ../libpurple/protocols/jabber/jabber.c:1601 #: ../libpurple/protocols/jabber/jabber.c:1624 #: ../libpurple/protocols/jabber/jabber.c:1649 -#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641 -#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655 -#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667 #: ../libpurple/protocols/myspace/myspace.c:148 -#: ../libpurple/protocols/novell/novell.c:2843 -#: ../libpurple/protocols/novell/novell.c:2946 -#: ../libpurple/protocols/novell/novell.c:2952 -#: ../libpurple/protocols/novell/novell.c:2958 -#: ../libpurple/protocols/oscar/oscar.c:5552 -#: ../libpurple/protocols/oscar/oscar.c:5770 -#: ../libpurple/protocols/oscar/oscar.c:5784 -#: ../libpurple/protocols/oscar/oscar.c:5800 -#: ../libpurple/protocols/oscar/oscar.c:5807 -#: ../libpurple/protocols/oscar/oscar.c:5814 +#: ../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:5554 +#: ../libpurple/protocols/oscar/oscar.c:5772 +#: ../libpurple/protocols/oscar/oscar.c:5786 +#: ../libpurple/protocols/oscar/oscar.c:5802 +#: ../libpurple/protocols/oscar/oscar.c:5809 +#: ../libpurple/protocols/oscar/oscar.c:5816 #: ../libpurple/protocols/sametime/sametime.c:3286 #: ../libpurple/protocols/sametime/sametime.c:3292 #: ../libpurple/protocols/sametime/sametime.c:3298 @@ -1796,8 +1783,8 @@ #: ../libpurple/protocols/silc/buddy.c:1551 #: ../libpurple/protocols/silc10/buddy.c:1551 #: ../libpurple/protocols/simple/simple.c:246 -#: ../libpurple/protocols/yahoo/yahoo.c:3750 -#: ../libpurple/protocols/yahoo/yahoo.c:3756 +#: ../libpurple/protocols/yahoo/yahoo.c:3751 +#: ../libpurple/protocols/yahoo/yahoo.c:3757 #: ../libpurple/protocols/zephyr/zephyr.c:2337 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010 msgid "Message" @@ -1862,7 +1849,7 @@ msgid "Certificates" msgstr "" -#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037 +#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035 msgid "Sounds" msgstr "Sounds" @@ -1969,16 +1956,16 @@ msgid "Toaster plugin" msgstr "" -#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123 +#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120 #, fuzzy, c-format msgid "<b>Conversation with %s on %s:</b><br>" msgstr "Conversations with %s" -#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150 +#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147 msgid "History Plugin Requires Logging" msgstr "" -#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151 +#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148 msgid "" "Logging can be enabled from Tools -> Preferences -> Logging.\n" "\n" @@ -1991,11 +1978,11 @@ msgid "GntHistory" msgstr "History" -#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194 +#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190 msgid "Shows recently logged conversations in new conversations." msgstr "Shows recently logged conversations in new conversations." -#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195 +#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191 msgid "" "When a new conversation is opened this plugin will insert the last " "conversation into the current conversation." @@ -2007,15 +1994,16 @@ msgid "Lastlog" msgstr "" -#: ../finch/plugins/lastlog.c:99 +#. Translator Note: The "backlog" is the conversation buffer/history. +#: ../finch/plugins/lastlog.c:100 msgid "lastlog: Searches for a substring in the backlog." msgstr "" -#: ../finch/plugins/lastlog.c:121 +#: ../finch/plugins/lastlog.c:122 msgid "GntLastlog" msgstr "" -#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124 +#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125 msgid "Lastlog plugin." msgstr "" @@ -2051,7 +2039,7 @@ msgstr "Missing protocol plugin for %s" #: ../libpurple/account.c:1041 ../libpurple/connection.c:108 -#: ../pidgin/gtkblist.c:4318 +#: ../pidgin/gtkblist.c:4036 msgid "Connection Error" msgstr "Connection Error" @@ -2096,16 +2084,16 @@ #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017 #: ../libpurple/protocols/jabber/buddy.c:782 -#: ../libpurple/protocols/jabber/buddy.c:2030 -#: ../libpurple/protocols/jabber/buddy.c:2047 -#: ../libpurple/protocols/novell/novell.c:2836 +#: ../libpurple/protocols/jabber/buddy.c:2027 +#: ../libpurple/protocols/jabber/buddy.c:2044 +#: ../libpurple/protocols/novell/novell.c:2831 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160 msgid "Unknown" msgstr "Unknown" -#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321 -#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69 -#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662 +#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320 +#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69 +#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373 #: ../pidgin/plugins/gevolution/gevo-util.c:67 #: ../pidgin/plugins/gevolution/gevolution.c:96 msgid "Buddies" @@ -2244,7 +2232,7 @@ msgstr "" #. Make messages -#: ../libpurple/certificate.c:1882 +#: ../libpurple/certificate.c:1881 #, c-format msgid "" "Common name: %s\n" @@ -2256,7 +2244,7 @@ msgstr "" #. TODO: Find what the handle ought to be -#: ../libpurple/certificate.c:1891 +#: ../libpurple/certificate.c:1890 #, fuzzy msgid "Certificate Information" msgstr "Profile Information" @@ -2281,9 +2269,9 @@ msgstr "%s signed off" #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282 -#: ../libpurple/protocols/jabber/buddy.c:2340 +#: ../libpurple/protocols/jabber/buddy.c:2337 #: ../libpurple/protocols/msn/servconn.c:141 -#: ../libpurple/protocols/msn/session.c:361 +#: ../libpurple/protocols/msn/session.c:322 msgid "Unknown error" msgstr "Unknown error" @@ -2404,7 +2392,7 @@ msgstr "Error while reading from socket." #: ../libpurple/dnsquery.c:578 -#, fuzzy +#, fuzzy, c-format msgid "EOF while reading from resolver process" msgstr "Error while reading from socket." @@ -2514,6 +2502,7 @@ msgstr "Transfer of file %s complete" #: ../libpurple/ft.c:685 +#, c-format msgid "File transfer complete" msgstr "File transfer complete" @@ -2523,6 +2512,7 @@ msgstr "You cancelled the transfer of %s" #: ../libpurple/ft.c:1108 +#, c-format msgid "File transfer cancelled" msgstr "File transfer cancelled" @@ -2762,6 +2752,7 @@ msgstr "" #: ../libpurple/plugin.c:380 +#, c-format msgid "This plugin has not defined an ID." msgstr "" @@ -2848,13 +2839,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:1453 -#: ../libpurple/protocols/oscar/oscar.c:2229 -#: ../libpurple/protocols/oscar/oscar.c:2278 -#: ../libpurple/protocols/oscar/oscar.c:5884 -#: ../libpurple/protocols/oscar/oscar.c:5939 -#: ../libpurple/protocols/oscar/oscar.c:6165 -#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388 -#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527 +#: ../libpurple/protocols/oscar/oscar.c:2233 +#: ../libpurple/protocols/oscar/oscar.c:2282 +#: ../libpurple/protocols/oscar/oscar.c:5886 +#: ../libpurple/protocols/oscar/oscar.c:5941 +#: ../libpurple/protocols/oscar/oscar.c:6167 +#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388 +#: ../libpurple/request.h:1398 msgid "_Cancel" msgstr "_Cancel" @@ -2895,8 +2886,8 @@ "(only when there's no conversation with the sender)" msgstr "" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770 -#: ../libpurple/protocols/msn/msn.c:1800 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660 +#: ../libpurple/protocols/msn/msn.c:1690 #, fuzzy msgid "Notes" msgstr "Note" @@ -3339,9 +3330,9 @@ msgstr "" #: ../libpurple/plugins/offlinemsg.c:165 -#: ../libpurple/protocols/msn/dialog.c:141 -#: ../libpurple/protocols/msn/msn.c:622 -#: ../libpurple/protocols/novell/novell.c:1919 +#: ../libpurple/protocols/msn/dialog.c:133 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 +#: ../libpurple/protocols/novell/novell.c:1917 #: ../libpurple/protocols/silc/buddy.c:317 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304 #: ../libpurple/protocols/silc10/buddy.c:314 @@ -3351,9 +3342,9 @@ msgstr "Yes" #: ../libpurple/plugins/offlinemsg.c:166 -#: ../libpurple/protocols/msn/dialog.c:142 -#: ../libpurple/protocols/msn/msn.c:622 -#: ../libpurple/protocols/novell/novell.c:1920 +#: ../libpurple/protocols/msn/dialog.c:134 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 +#: ../libpurple/protocols/novell/novell.c:1918 #: ../libpurple/protocols/silc/buddy.c:318 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305 #: ../libpurple/protocols/silc10/buddy.c:315 @@ -3462,7 +3453,7 @@ msgstr "Tests to see that most things are working." #. Scheme name -#: ../libpurple/plugins/ssl/ssl-gnutls.c:903 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:902 #: ../libpurple/plugins/ssl/ssl-nss.c:725 msgid "X.509 Certificates" msgstr "" @@ -3473,7 +3464,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/ssl/ssl-gnutls.c:987 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:986 msgid "GNUTLS" msgstr "GNUTLS" @@ -3481,8 +3472,8 @@ #. *< version #. * summary #. * description -#: ../libpurple/plugins/ssl/ssl-gnutls.c:990 -#: ../libpurple/plugins/ssl/ssl-gnutls.c:992 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:989 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:991 msgid "Provides SSL support through GNUTLS." msgstr "Provides SSL support through GNUTLS." @@ -3588,15 +3579,15 @@ "Notifies in a conversation window when a buddy goes or returns from away or " "idle." -#: ../libpurple/plugins/tcl/tcl.c:423 +#: ../libpurple/plugins/tcl/tcl.c:421 msgid "Tcl Plugin Loader" msgstr "Tcl Plugin Loader" -#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426 +#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424 msgid "Provides support for loading Tcl plugins" msgstr "Provides support for loading Tcl plugins" -#: ../libpurple/plugins/tcl/tcl.c:509 +#: ../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" @@ -3634,7 +3625,7 @@ #: ../libpurple/protocols/jabber/buddy.c:295 #: ../libpurple/protocols/jabber/buddy.c:1325 #: ../libpurple/protocols/jabber/buddy.c:1335 -#: ../libpurple/protocols/jabber/buddy.c:2219 +#: ../libpurple/protocols/jabber/buddy.c:2216 #: ../libpurple/protocols/silc/ops.c:1041 #: ../libpurple/protocols/silc/util.c:555 #: ../libpurple/protocols/silc10/ops.c:1075 @@ -3843,8 +3834,8 @@ #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054 #: ../libpurple/protocols/gg/gg.c:1126 #: ../libpurple/protocols/jabber/jabber.c:957 -#: ../libpurple/protocols/oscar/oscar.c:3785 -#: ../libpurple/protocols/oscar/oscar.c:3798 +#: ../libpurple/protocols/oscar/oscar.c:3789 +#: ../libpurple/protocols/oscar/oscar.c:3802 #: ../libpurple/protocols/qq/buddy_info.c:49 msgid "City" msgstr "City" @@ -3853,9 +3844,9 @@ msgid "Year of birth" msgstr "" -#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699 +#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589 #: ../libpurple/protocols/myspace/user.c:115 -#: ../libpurple/protocols/oscar/oscar.c:3728 +#: ../libpurple/protocols/oscar/oscar.c:3732 #: ../libpurple/protocols/qq/buddy_info.c:46 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236 @@ -3868,14 +3859,14 @@ msgstr "" #: ../libpurple/protocols/gg/gg.c:652 -#: ../libpurple/protocols/oscar/oscar.c:3728 +#: ../libpurple/protocols/oscar/oscar.c:3732 #: ../libpurple/protocols/qq/buddy_info.c:83 #: ../libpurple/protocols/qq/qq.c:226 msgid "Male" msgstr "Male" #: ../libpurple/protocols/gg/gg.c:653 -#: ../libpurple/protocols/oscar/oscar.c:3728 +#: ../libpurple/protocols/oscar/oscar.c:3732 #: ../libpurple/protocols/qq/buddy_info.c:84 #: ../libpurple/protocols/qq/qq.c:229 msgid "Female" @@ -3945,25 +3936,25 @@ msgstr "Add a C_hat" #: ../libpurple/protocols/gg/gg.c:1008 -#: ../libpurple/protocols/jabber/buddy.c:2034 -#: ../libpurple/protocols/novell/novell.c:2833 +#: ../libpurple/protocols/jabber/buddy.c:2031 +#: ../libpurple/protocols/novell/novell.c:2828 #: ../libpurple/protocols/oscar/oscar.c:828 -#: ../libpurple/protocols/oscar/oscar.c:5602 +#: ../libpurple/protocols/oscar/oscar.c:5604 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177 #: ../libpurple/protocols/qq/qq.c:292 -#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154 -#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640 +#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154 +#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061 msgid "Offline" msgstr "Offline" #: ../libpurple/protocols/gg/gg.c:1011 -#: ../libpurple/protocols/jabber/buddy.c:2036 +#: ../libpurple/protocols/jabber/buddy.c:2033 #: ../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:2821 +#: ../libpurple/protocols/novell/novell.c:2816 #: ../libpurple/protocols/qq/qq.c:280 -#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155 +#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057 msgid "Available" msgstr "Available" @@ -3973,31 +3964,32 @@ #. 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:2040 -#: ../libpurple/protocols/novell/novell.c:2824 +#: ../libpurple/protocols/jabber/buddy.c:2037 +#: ../libpurple/protocols/novell/novell.c:2819 #: ../libpurple/protocols/oscar/oscar.c:733 -#: ../libpurple/protocols/oscar/oscar.c:4543 -#: ../libpurple/protocols/oscar/oscar.c:5630 +#: ../libpurple/protocols/oscar/oscar.c:4547 +#: ../libpurple/protocols/oscar/oscar.c:5632 #: ../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:3652 -#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158 -#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941 +#: ../libpurple/protocols/yahoo/yahoo.c:3653 +#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158 +#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939 #: ../pidgin/gtkstatusbox.c:1058 +#, c-format msgid "Away" msgstr "Away" #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117 -#: ../libpurple/protocols/oscar/oscar.c:2695 -#: ../libpurple/protocols/oscar/oscar.c:3695 +#: ../libpurple/protocols/oscar/oscar.c:2699 +#: ../libpurple/protocols/oscar/oscar.c:3699 msgid "UIN" msgstr "UIN" #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120 -#: ../libpurple/protocols/jabber/buddy.c:2213 -#: ../libpurple/protocols/jabber/buddy.c:2389 -#: ../libpurple/protocols/oscar/oscar.c:3706 +#: ../libpurple/protocols/jabber/buddy.c:2210 +#: ../libpurple/protocols/jabber/buddy.c:2386 +#: ../libpurple/protocols/oscar/oscar.c:3710 #: ../libpurple/protocols/silc/ops.c:990 #: ../libpurple/protocols/silc10/ops.c:1024 msgid "First Name" @@ -4008,7 +4000,7 @@ msgstr "Birth Year" #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180 -#: ../libpurple/protocols/oscar/oscar.c:3907 +#: ../libpurple/protocols/oscar/oscar.c:3911 #, fuzzy msgid "Unable to display the search results." msgstr "Unable to invite user (%s)." @@ -4061,7 +4053,7 @@ msgid "Connection failed." msgstr "Connection failed" -#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621 +#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559 msgid "Blocked" msgstr "Blocked" @@ -4215,7 +4207,7 @@ #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637 -#: ../libpurple/protocols/myspace/myspace.c:2354 +#: ../libpurple/protocols/myspace/myspace.c:2356 msgid "Server has disconnected" msgstr "Server has disconnected" @@ -4241,14 +4233,14 @@ #. connect to the server #: ../libpurple/protocols/irc/irc.c:319 #: ../libpurple/protocols/jabber/jabber.c:1280 -#: ../libpurple/protocols/msn/session.c:384 -#: ../libpurple/protocols/myspace/myspace.c:302 -#: ../libpurple/protocols/novell/novell.c:2187 +#: ../libpurple/protocols/msn/session.c:345 +#: ../libpurple/protocols/myspace/myspace.c:301 +#: ../libpurple/protocols/novell/novell.c:2182 #: ../libpurple/protocols/oscar/oscar.c:1287 #: ../libpurple/protocols/qq/qq.c:136 #: ../libpurple/protocols/sametime/sametime.c:3723 -#: ../libpurple/protocols/simple/simple.c:1718 -#: ../libpurple/protocols/yahoo/yahoo.c:2938 +#: ../libpurple/protocols/simple/simple.c:1716 +#: ../libpurple/protocols/yahoo/yahoo.c:2939 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662 msgid "Connecting" msgstr "Connecting" @@ -4262,20 +4254,20 @@ #. 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:318 +#: ../libpurple/protocols/myspace/myspace.c:317 #: ../libpurple/protocols/simple/simple.c:464 -#: ../libpurple/protocols/simple/simple.c:1633 +#: ../libpurple/protocols/simple/simple.c:1631 msgid "Couldn't create socket" msgstr "Couldn't create socket" #: ../libpurple/protocols/irc/irc.c:421 -#: ../libpurple/protocols/myspace/myspace.c:2467 +#: ../libpurple/protocols/myspace/myspace.c:2469 #: ../libpurple/protocols/oscar/oscar.c:1283 msgid "Couldn't connect to host" msgstr "Couldn't connect to host" #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634 -#: ../libpurple/protocols/myspace/myspace.c:2350 +#: ../libpurple/protocols/myspace/myspace.c:2352 msgid "Read error" msgstr "Read error" @@ -4315,22 +4307,22 @@ #. host to connect to #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323 -#: ../libpurple/protocols/msn/msn.c:2297 -#: ../libpurple/protocols/oscar/oscar.c:6669 +#: ../libpurple/protocols/msn/msn.c:2185 +#: ../libpurple/protocols/oscar/oscar.c:6671 #: ../libpurple/protocols/qq/qq.c:755 #: ../libpurple/protocols/sametime/sametime.c:5727 #: ../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:1898 +#: ../libpurple/protocols/simple/simple.c:1896 #: ../libpurple/protocols/toc/toc.c:2327 msgid "Server" msgstr "Server" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302 -#: ../libpurple/protocols/oscar/oscar.c:6672 +#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190 +#: ../libpurple/protocols/oscar/oscar.c:6674 #: ../libpurple/protocols/qq/qq.c:758 #: ../libpurple/protocols/sametime/sametime.c:5732 #: ../libpurple/protocols/silc/silc.c:1918 @@ -4403,7 +4395,7 @@ msgstr " <i>(identified)</i>" #: ../libpurple/protocols/irc/msgs.c:303 -#: ../libpurple/protocols/oscar/oscar.c:3696 +#: ../libpurple/protocols/oscar/oscar.c:3700 #: ../libpurple/protocols/silc/ops.c:1418 #: ../libpurple/protocols/silc10/ops.c:1414 msgid "Nick" @@ -4692,7 +4684,7 @@ msgstr "names [channel]: List the users currently in a channel." #: ../libpurple/protocols/irc/parse.c:137 -#: ../libpurple/protocols/jabber/jabber.c:2299 +#: ../libpurple/protocols/jabber/jabber.c:2261 msgid "nick <new nickname>: Change your nickname." msgstr "nick <new nickname>: Change your nickname." @@ -4836,7 +4828,7 @@ msgid "Ad-Hoc Command Failed" msgstr "Command disabled" -#: ../libpurple/protocols/jabber/adhoccommands.c:176 +#: ../libpurple/protocols/jabber/adhoccommands.c:173 #, fuzzy msgid "execute" msgstr "Not expected" @@ -4983,15 +4975,15 @@ #: ../libpurple/protocols/jabber/buddy.c:300 #: ../libpurple/protocols/jabber/buddy.c:1250 -#: ../libpurple/protocols/msn/msn.c:1768 -#: ../libpurple/protocols/oscar/oscar.c:3745 +#: ../libpurple/protocols/msn/msn.c:1658 +#: ../libpurple/protocols/oscar/oscar.c:3749 msgid "Birthday" msgstr "Birthday" #: ../libpurple/protocols/jabber/buddy.c:301 #: ../libpurple/protocols/jabber/buddy.c:1365 #: ../libpurple/protocols/jabber/chat.c:775 -#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314 +#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116 #: ../pidgin/gtkprefs.c:739 msgid "Description" msgstr "Description" @@ -5307,7 +5299,7 @@ #: ../libpurple/protocols/jabber/buddy.c:921 #: ../libpurple/protocols/jabber/buddy.c:1081 -#: ../libpurple/protocols/oscar/oscar.c:2902 +#: ../libpurple/protocols/oscar/oscar.c:2906 msgid "Capabilities" msgstr "Capabilities" @@ -5335,8 +5327,8 @@ #: ../libpurple/protocols/jabber/buddy.c:1270 #: ../libpurple/protocols/jabber/jabber.c:952 -#: ../libpurple/protocols/oscar/oscar.c:3784 -#: ../libpurple/protocols/oscar/oscar.c:3797 +#: ../libpurple/protocols/oscar/oscar.c:3788 +#: ../libpurple/protocols/oscar/oscar.c:3801 #: ../libpurple/protocols/qq/buddy_info.c:56 #: ../libpurple/protocols/silc/ops.c:1030 #: ../libpurple/protocols/silc10/ops.c:1064 @@ -5355,114 +5347,115 @@ msgid "Logo" msgstr "Logo" -#: ../libpurple/protocols/jabber/buddy.c:1945 +#: ../libpurple/protocols/jabber/buddy.c:1942 msgid "Un-hide From" msgstr "Un-hide From" -#: ../libpurple/protocols/jabber/buddy.c:1949 +#: ../libpurple/protocols/jabber/buddy.c:1946 msgid "Temporarily Hide From" msgstr "Temporarily Hide From" #. && NOT ME -#: ../libpurple/protocols/jabber/buddy.c:1957 +#: ../libpurple/protocols/jabber/buddy.c:1954 msgid "Cancel Presence Notification" msgstr "Cancel Presence Notification" -#: ../libpurple/protocols/jabber/buddy.c:1964 +#: ../libpurple/protocols/jabber/buddy.c:1961 msgid "(Re-)Request authorization" msgstr "(Re-)Request authorization" #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? -#: ../libpurple/protocols/jabber/buddy.c:1973 +#: ../libpurple/protocols/jabber/buddy.c:1970 msgid "Unsubscribe" msgstr "Unsubscribe" -#: ../libpurple/protocols/jabber/buddy.c:1988 +#: ../libpurple/protocols/jabber/buddy.c:1985 #, fuzzy msgid "Log In" msgstr "Login" -#: ../libpurple/protocols/jabber/buddy.c:1992 +#: ../libpurple/protocols/jabber/buddy.c:1989 #, fuzzy msgid "Log Out" msgstr "Logged out" -#: ../libpurple/protocols/jabber/buddy.c:2038 +#: ../libpurple/protocols/jabber/buddy.c:2035 #: ../libpurple/protocols/jabber/jabber.c:1553 msgid "Chatty" msgstr "Chatty" -#: ../libpurple/protocols/jabber/buddy.c:2042 +#: ../libpurple/protocols/jabber/buddy.c:2039 msgid "Extended Away" msgstr "Extended Away" -#: ../libpurple/protocols/jabber/buddy.c:2044 +#: ../libpurple/protocols/jabber/buddy.c:2041 #: ../libpurple/protocols/jabber/jabber.c:1622 #: ../libpurple/protocols/oscar/oscar.c:727 -#: ../libpurple/protocols/oscar/oscar.c:5806 +#: ../libpurple/protocols/oscar/oscar.c:5808 #: ../libpurple/protocols/sametime/sametime.c:3297 +#, c-format msgid "Do Not Disturb" msgstr "Do Not Disturb" -#: ../libpurple/protocols/jabber/buddy.c:2211 +#: ../libpurple/protocols/jabber/buddy.c:2208 msgid "JID" msgstr "" -#: ../libpurple/protocols/jabber/buddy.c:2215 -#: ../libpurple/protocols/jabber/buddy.c:2394 -#: ../libpurple/protocols/oscar/oscar.c:3707 +#: ../libpurple/protocols/jabber/buddy.c:2212 +#: ../libpurple/protocols/jabber/buddy.c:2391 +#: ../libpurple/protocols/oscar/oscar.c:3711 msgid "Last Name" msgstr "Last Name" -#: ../libpurple/protocols/jabber/buddy.c:2247 +#: ../libpurple/protocols/jabber/buddy.c:2244 msgid "The following are the results of your search" msgstr "" #. current comment from Jabber User Directory users.jabber.org -#: ../libpurple/protocols/jabber/buddy.c:2322 +#: ../libpurple/protocols/jabber/buddy.c:2319 msgid "" "Find a contact by entering the search criteria in the given fields. Note: " "Each field supports wild card searches (%)" msgstr "" -#: ../libpurple/protocols/jabber/buddy.c:2342 +#: ../libpurple/protocols/jabber/buddy.c:2339 #, fuzzy msgid "Directory Query Failed" msgstr "Direct Connect failed" -#: ../libpurple/protocols/jabber/buddy.c:2343 +#: ../libpurple/protocols/jabber/buddy.c:2340 #, fuzzy msgid "Could not query the directory server." msgstr "Could not start the file transfer" #. Try to translate the message (see static message #. list in jabber_user_dir_comments[]) -#: ../libpurple/protocols/jabber/buddy.c:2377 +#: ../libpurple/protocols/jabber/buddy.c:2374 #, fuzzy, c-format msgid "Server Instructions: %s" msgstr "Server Information" -#: ../libpurple/protocols/jabber/buddy.c:2384 +#: ../libpurple/protocols/jabber/buddy.c:2381 msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "" -#: ../libpurple/protocols/jabber/buddy.c:2404 -#: ../libpurple/protocols/novell/novell.c:1490 -#: ../libpurple/protocols/oscar/oscar.c:3710 -#: ../libpurple/protocols/oscar/oscar.c:3719 +#: ../libpurple/protocols/jabber/buddy.c:2401 +#: ../libpurple/protocols/novell/novell.c:1488 +#: ../libpurple/protocols/oscar/oscar.c:3714 +#: ../libpurple/protocols/oscar/oscar.c:3723 msgid "E-Mail Address" msgstr "E-Mail Address" -#: ../libpurple/protocols/jabber/buddy.c:2413 -#: ../libpurple/protocols/jabber/buddy.c:2414 +#: ../libpurple/protocols/jabber/buddy.c:2410 +#: ../libpurple/protocols/jabber/buddy.c:2411 #, fuzzy msgid "Search for XMPP users" msgstr "Search for a buddy by e-mail address" #. "Search" -#: ../libpurple/protocols/jabber/buddy.c:2415 +#: ../libpurple/protocols/jabber/buddy.c:2412 #: ../libpurple/protocols/qq/group.c:123 #: ../libpurple/protocols/qq/group_im.c:147 #: ../libpurple/protocols/qq/sys_msg.c:174 @@ -5474,28 +5467,28 @@ msgid "Search" msgstr "Search" -#: ../libpurple/protocols/jabber/buddy.c:2430 +#: ../libpurple/protocols/jabber/buddy.c:2427 #, fuzzy msgid "Invalid Directory" msgstr "Invalid error" -#: ../libpurple/protocols/jabber/buddy.c:2447 +#: ../libpurple/protocols/jabber/buddy.c:2444 #, fuzzy msgid "Enter a User Directory" msgstr "Cannot send a directory." -#: ../libpurple/protocols/jabber/buddy.c:2448 +#: ../libpurple/protocols/jabber/buddy.c:2445 #, fuzzy msgid "Select a user directory to search" msgstr "Select a conference server to query" -#: ../libpurple/protocols/jabber/buddy.c:2451 +#: ../libpurple/protocols/jabber/buddy.c:2448 #, fuzzy msgid "Search Directory" msgstr "_Search for:" #: ../libpurple/protocols/jabber/chat.c:41 -#: ../libpurple/protocols/oscar/oscar.c:5290 +#: ../libpurple/protocols/oscar/oscar.c:5294 #: ../libpurple/protocols/yahoo/yahoochat.c:1048 msgid "_Room:" msgstr "_Room:" @@ -5607,9 +5600,9 @@ msgstr "Read Error" #: ../libpurple/protocols/jabber/jabber.c:482 -#: ../libpurple/protocols/oscar/flap_connection.c:396 -#: ../libpurple/protocols/yahoo/yahoo.c:2557 -#: ../libpurple/protocols/yahoo/yahoo.c:2589 +#: ../libpurple/protocols/oscar/flap_connection.c:394 +#: ../libpurple/protocols/yahoo/yahoo.c:2558 +#: ../libpurple/protocols/yahoo/yahoo.c:2590 #, c-format msgid "" "Could not establish a connection with the server:\n" @@ -5672,8 +5665,8 @@ msgstr "Already Registered" #: ../libpurple/protocols/jabber/jabber.c:962 -#: ../libpurple/protocols/oscar/oscar.c:3786 -#: ../libpurple/protocols/oscar/oscar.c:3799 +#: ../libpurple/protocols/oscar/oscar.c:3790 +#: ../libpurple/protocols/oscar/oscar.c:3803 msgid "State" msgstr "Province/Territory" @@ -5757,7 +5750,7 @@ msgstr "Initializing Stream" #: ../libpurple/protocols/jabber/jabber.c:1293 -#: ../libpurple/protocols/msn/session.c:390 +#: ../libpurple/protocols/msn/session.c:351 msgid "Authenticating" msgstr "Authenticating" @@ -5770,7 +5763,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1909 #: ../libpurple/protocols/jabber/jabber.c:1945 #: ../libpurple/protocols/oscar/oscar.c:826 -#: ../libpurple/protocols/oscar/oscar.c:5600 +#: ../libpurple/protocols/oscar/oscar.c:5602 msgid "Not Authorized" msgstr "Not Authorized" @@ -5939,7 +5932,7 @@ msgstr "Please enter your new password" #: ../libpurple/protocols/jabber/jabber.c:1749 -#: ../libpurple/protocols/oscar/oscar.c:6386 +#: ../libpurple/protocols/oscar/oscar.c:6388 #: ../libpurple/protocols/silc/silc.c:1093 #: ../libpurple/protocols/silc10/silc.c:1004 msgid "Set User Info..." @@ -5947,7 +5940,7 @@ #. if (js->protocol_options & CHANGE_PASSWORD) { #: ../libpurple/protocols/jabber/jabber.c:1754 -#: ../libpurple/protocols/oscar/oscar.c:6397 +#: ../libpurple/protocols/oscar/oscar.c:6399 #: ../libpurple/protocols/silc/silc.c:1089 #: ../libpurple/protocols/silc10/silc.c:1000 msgid "Change Password..." @@ -6209,86 +6202,67 @@ msgid "Unable to buzz, because the user %s does not support it." msgstr "Unable to play sound because the chosen file (%s) does not exist." -#: ../libpurple/protocols/jabber/jabber.c:2250 -#: ../libpurple/protocols/yahoo/yahoo.c:4118 -#, fuzzy -msgid "Buzz" -msgstr "Buzz!!" - -#: ../libpurple/protocols/jabber/jabber.c:2251 -#: ../libpurple/protocols/jabber/message.c:307 -#: ../libpurple/protocols/yahoo/yahoo.c:4119 -#, fuzzy, c-format -msgid "%s has buzzed you!" -msgstr "The user has blocked you" - -#: ../libpurple/protocols/jabber/jabber.c:2252 -#: ../libpurple/protocols/yahoo/yahoo.c:4120 -#, c-format -msgid "Buzzing %s..." -msgstr "" - -#: ../libpurple/protocols/jabber/jabber.c:2291 +#: ../libpurple/protocols/jabber/jabber.c:2253 msgid "config: Configure a chat room." msgstr "config: Configure a chat room." -#: ../libpurple/protocols/jabber/jabber.c:2295 +#: ../libpurple/protocols/jabber/jabber.c:2257 msgid "configure: Configure a chat room." msgstr "configure: Configure a chat room." -#: ../libpurple/protocols/jabber/jabber.c:2304 +#: ../libpurple/protocols/jabber/jabber.c:2266 msgid "part [room]: Leave the room." msgstr "part [room]: Leave the room." -#: ../libpurple/protocols/jabber/jabber.c:2309 +#: ../libpurple/protocols/jabber/jabber.c:2271 msgid "register: Register with a chat room." msgstr "register: Register with a chat room." -#: ../libpurple/protocols/jabber/jabber.c:2315 +#: ../libpurple/protocols/jabber/jabber.c:2277 msgid "topic [new topic]: View or change the topic." msgstr "topic [new topic]: View or change the topic." -#: ../libpurple/protocols/jabber/jabber.c:2321 +#: ../libpurple/protocols/jabber/jabber.c:2283 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:2327 +#: ../libpurple/protocols/jabber/jabber.c:2289 msgid "" "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." msgstr "" -#: ../libpurple/protocols/jabber/jabber.c:2333 +#: ../libpurple/protocols/jabber/jabber.c:2295 msgid "" "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." msgstr "" -#: ../libpurple/protocols/jabber/jabber.c:2339 +#: ../libpurple/protocols/jabber/jabber.c:2301 #, fuzzy msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <user> [room]: Invite a user to the room." -#: ../libpurple/protocols/jabber/jabber.c:2345 +#: ../libpurple/protocols/jabber/jabber.c:2307 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:2351 +#: ../libpurple/protocols/jabber/jabber.c:2313 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:2356 +#: ../libpurple/protocols/jabber/jabber.c:2318 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:2362 +#: ../libpurple/protocols/jabber/jabber.c:2324 msgid "ping <jid>:\tPing a user/component/server." msgstr "" -#: ../libpurple/protocols/jabber/jabber.c:2367 -#: ../libpurple/protocols/yahoo/yahoo.c:4144 +#: ../libpurple/protocols/jabber/jabber.c:2329 +#: ../libpurple/protocols/yahoo/yahoo.c:4145 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -6327,8 +6301,8 @@ msgstr "Allow plaintext auth over unencrypted streams" #: ../libpurple/protocols/jabber/libxmpp.c:224 -#: ../libpurple/protocols/myspace/myspace.c:3275 -#: ../libpurple/protocols/simple/simple.c:1904 +#: ../libpurple/protocols/myspace/myspace.c:3277 +#: ../libpurple/protocols/simple/simple.c:1902 #, fuzzy msgid "Connect port" msgstr "Connect" @@ -6337,7 +6311,7 @@ #. * able to set the first port to try (like LastConnectedPort in Windows client). #. Account options #: ../libpurple/protocols/jabber/libxmpp.c:228 -#: ../libpurple/protocols/myspace/myspace.c:3272 +#: ../libpurple/protocols/myspace/myspace.c:3274 #: ../libpurple/protocols/silc/silc.c:1914 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837 msgid "Connect server" @@ -6372,6 +6346,12 @@ msgid "XMPP Message Error" msgstr "XMPP Message Error" +#: ../libpurple/protocols/jabber/message.c:307 +#: ../libpurple/protocols/yahoo/yahoo.c:4120 +#, fuzzy, c-format +msgid "%s has buzzed you!" +msgstr "The user has blocked you" + #: ../libpurple/protocols/jabber/message.c:407 #, c-format msgid " (Code %s)" @@ -6381,16 +6361,16 @@ msgid "XML Parse error" msgstr "XML Parse error" -#: ../libpurple/protocols/jabber/presence.c:422 +#: ../libpurple/protocols/jabber/presence.c:427 msgid "Unknown Error in presence" msgstr "Unknown Error in presence" -#: ../libpurple/protocols/jabber/presence.c:503 -#: ../libpurple/protocols/jabber/presence.c:504 +#: ../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:505 +#: ../libpurple/protocols/jabber/presence.c:510 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" @@ -6398,22 +6378,22 @@ "You are creating a new room. Would you like to configure it, or accept the " "default settings?" -#: ../libpurple/protocols/jabber/presence.c:511 +#: ../libpurple/protocols/jabber/presence.c:516 #, fuzzy msgid "_Configure Room" msgstr "Configure Room" -#: ../libpurple/protocols/jabber/presence.c:512 +#: ../libpurple/protocols/jabber/presence.c:517 #, fuzzy msgid "_Accept Defaults" msgstr "Accept Defaults" -#: ../libpurple/protocols/jabber/presence.c:554 +#: ../libpurple/protocols/jabber/presence.c:559 #, c-format msgid "Error in chat %s" msgstr "Error in chat %s" -#: ../libpurple/protocols/jabber/presence.c:558 +#: ../libpurple/protocols/jabber/presence.c:563 #, c-format msgid "Error joining chat %s" msgstr "Error joining chat %s" @@ -6491,7 +6471,7 @@ "something appropriate." msgstr "" -#: ../libpurple/protocols/jabber/usernick.c:100 +#: ../libpurple/protocols/jabber/usernick.c:99 #, fuzzy msgid "Set Nickname..." msgstr "Nickname" @@ -6506,22 +6486,12 @@ msgid "Select an action" msgstr "Select a file" -#: ../libpurple/protocols/msn/contact.c:207 -#, fuzzy -msgid "Unable to connect to contact server" -msgstr "Unable to connect to server." - -#: ../libpurple/protocols/msn/contact.c:954 -#, fuzzy -msgid "Unable to retrieve MSN Address Book" -msgstr "Unable To Retrieve Buddy List" - -#: ../libpurple/protocols/msn/dialog.c:118 +#: ../libpurple/protocols/msn/dialog.c:110 #, c-format msgid "Buddy list synchronization issue in %s (%s)" msgstr "Buddy list synchronization issue in %s (%s)" -#: ../libpurple/protocols/msn/dialog.c:124 +#: ../libpurple/protocols/msn/dialog.c:116 #, c-format msgid "" "%s on the local list is inside the group \"%s\" but not on the server list. " @@ -6530,7 +6500,7 @@ "%s on the local list is inside the group \"%s\" but not on the server list. " "Do you want this buddy to be added?" -#: ../libpurple/protocols/msn/dialog.c:132 +#: ../libpurple/protocols/msn/dialog.c:124 #, c-format msgid "" "%s is on the local list but not on the server list. Do you want this buddy " @@ -6540,204 +6510,241 @@ "to be added?" #: ../libpurple/protocols/msn/error.c:36 +#, c-format msgid "Unable to parse message" msgstr "Unable to parse message" #: ../libpurple/protocols/msn/error.c:41 -#, fuzzy +#, fuzzy, c-format msgid "Syntax Error (probably a client bug)" msgstr "Syntax Error (probably a Gaim bug)" #: ../libpurple/protocols/msn/error.c:46 +#, c-format msgid "Invalid e-mail address" msgstr "Invalid e-mail address" #: ../libpurple/protocols/msn/error.c:49 +#, c-format msgid "User does not exist" msgstr "User does not exist" #: ../libpurple/protocols/msn/error.c:53 -#, fuzzy +#, fuzzy, c-format msgid "Fully qualified domain name missing" msgstr "Fully Qualified Domain Name missing" #: ../libpurple/protocols/msn/error.c:56 -#, fuzzy +#, fuzzy, c-format msgid "Already logged in" msgstr "Already Logged In" #: ../libpurple/protocols/msn/error.c:59 -#, fuzzy +#, fuzzy, c-format msgid "Invalid screen name" msgstr "Invalid Username" #: ../libpurple/protocols/msn/error.c:62 -#, fuzzy +#, fuzzy, c-format msgid "Invalid friendly name" msgstr "Invalid Friendly Name" #: ../libpurple/protocols/msn/error.c:65 -#, fuzzy +#, fuzzy, c-format msgid "List full" msgstr "List Full" #: ../libpurple/protocols/msn/error.c:68 +#, c-format msgid "Already there" msgstr "Already there" #: ../libpurple/protocols/msn/error.c:72 +#, c-format msgid "Not on list" msgstr "Not on list" #: ../libpurple/protocols/msn/error.c:75 #: ../libpurple/protocols/zephyr/zephyr.c:756 +#, c-format msgid "User is offline" msgstr "User is offline" #: ../libpurple/protocols/msn/error.c:78 +#, c-format msgid "Already in the mode" msgstr "Already in the mode" #: ../libpurple/protocols/msn/error.c:82 +#, c-format msgid "Already in opposite list" msgstr "Already in opposite list" #: ../libpurple/protocols/msn/error.c:86 +#, c-format msgid "Too many groups" msgstr "Too many groups" #: ../libpurple/protocols/msn/error.c:89 +#, c-format msgid "Invalid group" msgstr "Invalid group" #: ../libpurple/protocols/msn/error.c:92 +#, c-format msgid "User not in group" msgstr "User not in group" #: ../libpurple/protocols/msn/error.c:95 +#, c-format msgid "Group name too long" msgstr "Group name too long" #: ../libpurple/protocols/msn/error.c:98 +#, c-format msgid "Cannot remove group zero" msgstr "Cannot remove group zero" #: ../libpurple/protocols/msn/error.c:103 -#, fuzzy +#, fuzzy, c-format msgid "Tried to add a user to a group that doesn't exist" msgstr "Tried to add a contact to a group that doesn't exist" #: ../libpurple/protocols/msn/error.c:107 +#, c-format msgid "Switchboard failed" msgstr "Switchboard failed" #: ../libpurple/protocols/msn/error.c:111 -#, fuzzy +#, fuzzy, c-format msgid "Notify transfer failed" msgstr "Notify Transfer failed" #: ../libpurple/protocols/msn/error.c:116 +#, c-format msgid "Required fields missing" msgstr "Required fields missing" #: ../libpurple/protocols/msn/error.c:120 +#, c-format msgid "Too many hits to a FND" msgstr "Too many hits to a FND" #: ../libpurple/protocols/msn/error.c:124 #: ../libpurple/protocols/oscar/oscar.c:120 +#, c-format msgid "Not logged in" msgstr "Not logged in" #: ../libpurple/protocols/msn/error.c:128 -#, fuzzy +#, fuzzy, c-format msgid "Service temporarily unavailable" msgstr "Service Temporarily Unavailable" #: ../libpurple/protocols/msn/error.c:131 +#, c-format msgid "Database server error" msgstr "Database server error" #: ../libpurple/protocols/msn/error.c:135 +#, c-format msgid "Command disabled" msgstr "Command disabled" #: ../libpurple/protocols/msn/error.c:139 +#, c-format msgid "File operation error" msgstr "File operation error" #: ../libpurple/protocols/msn/error.c:143 +#, c-format msgid "Memory allocation error" msgstr "Memory allocation error" #: ../libpurple/protocols/msn/error.c:147 +#, c-format msgid "Wrong CHL value sent to server" msgstr "Wrong CHL value sent to server" #: ../libpurple/protocols/msn/error.c:152 +#, c-format msgid "Server busy" msgstr "Server busy" #: ../libpurple/protocols/msn/error.c:155 #: ../libpurple/protocols/msn/error.c:170 #: ../libpurple/protocols/msn/error.c:230 +#, c-format msgid "Server unavailable" msgstr "Server unavailable" #: ../libpurple/protocols/msn/error.c:158 -#, fuzzy +#, fuzzy, c-format msgid "Peer notification server down" msgstr "Peer Notification server down" #: ../libpurple/protocols/msn/error.c:162 +#, c-format msgid "Database connect error" msgstr "Database connect error" #: ../libpurple/protocols/msn/error.c:167 +#, c-format msgid "Server is going down (abandon ship)" msgstr "Server is going down (abandon ship)" #: ../libpurple/protocols/msn/error.c:174 +#, c-format msgid "Error creating connection" msgstr "Error creating connection" #: ../libpurple/protocols/msn/error.c:179 +#, c-format msgid "CVR parameters are either unknown or not allowed" msgstr "CVR parameters are either unknown or not allowed" #: ../libpurple/protocols/msn/error.c:183 +#, c-format msgid "Unable to write" msgstr "Unable to write" #: ../libpurple/protocols/msn/error.c:186 +#, c-format msgid "Session overload" msgstr "Session overload" #: ../libpurple/protocols/msn/error.c:190 +#, c-format msgid "User is too active" msgstr "User is too active" #: ../libpurple/protocols/msn/error.c:193 +#, c-format msgid "Too many sessions" msgstr "Too many sessions" #: ../libpurple/protocols/msn/error.c:196 +#, c-format msgid "Passport not verified" msgstr "Passport not verified" #: ../libpurple/protocols/msn/error.c:199 +#, c-format msgid "Bad friend file" msgstr "Bad friend file" #: ../libpurple/protocols/msn/error.c:203 +#, c-format msgid "Not expected" msgstr "Not expected" #: ../libpurple/protocols/msn/error.c:209 +#, c-format msgid "Friendly name changes too rapidly" msgstr "Friendly name changes too rapidly" #: ../libpurple/protocols/msn/error.c:218 +#, c-format msgid "Server too busy" msgstr "Server too busy" @@ -6746,26 +6753,32 @@ #: ../libpurple/protocols/silc/silc.c:233 #: ../libpurple/protocols/silc10/ops.c:1709 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380 +#, c-format msgid "Authentication failed" msgstr "Authentication failed" #: ../libpurple/protocols/msn/error.c:225 +#, c-format msgid "Not allowed when offline" msgstr "Not allowed when offline" #: ../libpurple/protocols/msn/error.c:233 +#, c-format msgid "Not accepting new users" msgstr "Not accepting new users" #: ../libpurple/protocols/msn/error.c:237 +#, c-format msgid "Kids Passport without parental consent" msgstr "Kids Passport without parental consent" #: ../libpurple/protocols/msn/error.c:241 +#, c-format msgid "Passport account not yet verified" msgstr "Passport account not yet verified" #: ../libpurple/protocols/msn/error.c:244 +#, c-format msgid "Bad ticket" msgstr "Bad ticket" @@ -6797,31 +6810,31 @@ msgid "Your new MSN friendly name is too long." msgstr "Your new MSN friendly name is too long." -#: ../libpurple/protocols/msn/msn.c:285 +#: ../libpurple/protocols/msn/msn.c:282 msgid "Set your friendly name." msgstr "Set your friendly name." -#: ../libpurple/protocols/msn/msn.c:286 +#: ../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:304 +#: ../libpurple/protocols/msn/msn.c:301 msgid "Set your home phone number." msgstr "Set your home phone number." -#: ../libpurple/protocols/msn/msn.c:321 +#: ../libpurple/protocols/msn/msn.c:318 msgid "Set your work phone number." msgstr "Set your work phone number." -#: ../libpurple/protocols/msn/msn.c:338 +#: ../libpurple/protocols/msn/msn.c:335 msgid "Set your mobile phone number." msgstr "Set your mobile phone number." -#: ../libpurple/protocols/msn/msn.c:353 +#: ../libpurple/protocols/msn/msn.c:350 msgid "Allow MSN Mobile pages?" msgstr "Allow MSN Mobile pages?" -#: ../libpurple/protocols/msn/msn.c:354 +#: ../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?" @@ -6829,355 +6842,351 @@ "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?" -#: ../libpurple/protocols/msn/msn.c:360 +#: ../libpurple/protocols/msn/msn.c:357 msgid "Allow" msgstr "Allow" -#: ../libpurple/protocols/msn/msn.c:361 +#: ../libpurple/protocols/msn/msn.c:358 msgid "Disallow" msgstr "Disallow" -#: ../libpurple/protocols/msn/msn.c:377 +#: ../libpurple/protocols/msn/msn.c:374 msgid "This Hotmail account may not be active." msgstr "" -#: ../libpurple/protocols/msn/msn.c:403 +#: ../libpurple/protocols/msn/msn.c:400 msgid "Send a mobile message." msgstr "Send a mobile message." -#: ../libpurple/protocols/msn/msn.c:405 +#: ../libpurple/protocols/msn/msn.c:402 msgid "Page" msgstr "Page" -#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635 -#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649 -#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662 -#: ../libpurple/protocols/msn/msn.c:668 -#, fuzzy -msgid "Current media" -msgstr "Currently on" - -#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33 -#: ../libpurple/protocols/yahoo/yahoo.c:3076 -#: ../libpurple/protocols/yahoo/yahoo.c:3760 +#: ../libpurple/protocols/msn/msn.c:549 +msgid "Has you" +msgstr "Has you" + +#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33 +#: ../libpurple/protocols/yahoo/yahoo.c:3077 +#: ../libpurple/protocols/yahoo/yahoo.c:3761 msgid "Be Right Back" msgstr "Be Right Back" -#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31 -#: ../libpurple/protocols/novell/novell.c:2827 -#: ../libpurple/protocols/novell/novell.c:2957 +#: ../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:56 #: ../libpurple/protocols/silc10/buddy.c:1480 #: ../libpurple/protocols/silc10/silc.c:47 -#: ../libpurple/protocols/yahoo/yahoo.c:3078 -#: ../libpurple/protocols/yahoo/yahoo.c:3763 +#: ../libpurple/protocols/yahoo/yahoo.c:3079 +#: ../libpurple/protocols/yahoo/yahoo.c:3764 msgid "Busy" msgstr "Busy" -#: ../libpurple/protocols/msn/msn.c:660 -#: ../libpurple/protocols/yahoo/yahoo.c:3086 -#: ../libpurple/protocols/yahoo/yahoo.c:3775 +#: ../libpurple/protocols/msn/msn.c:587 +#: ../libpurple/protocols/yahoo/yahoo.c:3087 +#: ../libpurple/protocols/yahoo/yahoo.c:3776 #, fuzzy msgid "On the Phone" msgstr "On The Phone" -#: ../libpurple/protocols/msn/msn.c:666 -#: ../libpurple/protocols/yahoo/yahoo.c:3090 -#: ../libpurple/protocols/yahoo/yahoo.c:3781 +#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/yahoo/yahoo.c:3091 +#: ../libpurple/protocols/yahoo/yahoo.c:3782 #, fuzzy msgid "Out to Lunch" msgstr "Out To Lunch" -#: ../libpurple/protocols/msn/msn.c:697 +#: ../libpurple/protocols/msn/msn.c:619 #, fuzzy msgid "Set Friendly Name..." msgstr "Set Friendly Name" -#: ../libpurple/protocols/msn/msn.c:702 +#: ../libpurple/protocols/msn/msn.c:624 #, fuzzy msgid "Set Home Phone Number..." msgstr "Set Home Phone Number" -#: ../libpurple/protocols/msn/msn.c:706 +#: ../libpurple/protocols/msn/msn.c:628 #, fuzzy msgid "Set Work Phone Number..." msgstr "Set Work Phone Number" -#: ../libpurple/protocols/msn/msn.c:710 +#: ../libpurple/protocols/msn/msn.c:632 #, fuzzy msgid "Set Mobile Phone Number..." msgstr "Set Mobile Phone Number" -#: ../libpurple/protocols/msn/msn.c:716 +#: ../libpurple/protocols/msn/msn.c:638 #, fuzzy msgid "Enable/Disable Mobile Devices..." msgstr "Enable/Disable Mobile Devices" -#: ../libpurple/protocols/msn/msn.c:721 +#: ../libpurple/protocols/msn/msn.c:643 #, fuzzy msgid "Allow/Disallow Mobile Pages..." msgstr "Allow/Disallow Mobile Pages" -#: ../libpurple/protocols/msn/msn.c:732 +#: ../libpurple/protocols/msn/msn.c:654 msgid "Open Hotmail Inbox" msgstr "" -#: ../libpurple/protocols/msn/msn.c:756 +#: ../libpurple/protocols/msn/msn.c:678 msgid "Send to Mobile" msgstr "Send to Mobile" -#: ../libpurple/protocols/msn/msn.c:766 -#: ../libpurple/protocols/novell/novell.c:3413 +#: ../libpurple/protocols/msn/msn.c:688 +#: ../libpurple/protocols/novell/novell.c:3408 msgid "Initiate _Chat" msgstr "Initiate _Chat" -#: ../libpurple/protocols/msn/msn.c:804 +#: ../libpurple/protocols/msn/msn.c:726 #, fuzzy 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. See " "http://gaim.sf.net/faq-ssl.php for more information." -#: ../libpurple/protocols/msn/msn.c:832 +#: ../libpurple/protocols/msn/msn.c:754 msgid "Failed to connect to server." msgstr "Failed to connect to server." -#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968 +#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808 msgid "Error retrieving profile" msgstr "Error retrieving profile" -#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309 -#: ../pidgin/plugins/pidginrc.c:360 +#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309 +#: ../pidgin/plugins/pidginrc.c:366 #, fuzzy msgid "General" msgstr "Gender" -#: ../libpurple/protocols/msn/msn.c:1698 +#: ../libpurple/protocols/msn/msn.c:1588 #: ../libpurple/protocols/myspace/user.c:110 -#: ../libpurple/protocols/oscar/oscar.c:3751 +#: ../libpurple/protocols/oscar/oscar.c:3755 #: ../libpurple/protocols/qq/buddy_info.c:45 #: ../libpurple/protocols/qq/qq.c:221 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081 msgid "Age" msgstr "Age" -#: ../libpurple/protocols/msn/msn.c:1700 +#: ../libpurple/protocols/msn/msn.c:1590 #: ../libpurple/protocols/qq/buddy_info.c:51 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096 msgid "Occupation" msgstr "Occupation" -#: ../libpurple/protocols/msn/msn.c:1701 +#: ../libpurple/protocols/msn/msn.c:1591 #: ../libpurple/protocols/myspace/user.c:119 -#: ../libpurple/protocols/novell/novell.c:1480 +#: ../libpurple/protocols/novell/novell.c:1478 #: ../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:1706 ../libpurple/protocols/msn/msn.c:1898 -#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911 +#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788 +#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801 msgid "Hobbies and Interests" msgstr "Hobbies and Interests" -#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832 -#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845 -#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860 +#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722 +#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735 +#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750 msgid "A Little About Me" msgstr "A Little About Me" -#: ../libpurple/protocols/msn/msn.c:1729 +#: ../libpurple/protocols/msn/msn.c:1619 msgid "Social" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1731 +#: ../libpurple/protocols/msn/msn.c:1621 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086 msgid "Marital Status" msgstr "Marital Status" -#: ../libpurple/protocols/msn/msn.c:1732 +#: ../libpurple/protocols/msn/msn.c:1622 #, fuzzy msgid "Interests" msgstr "_Insert" -#: ../libpurple/protocols/msn/msn.c:1733 +#: ../libpurple/protocols/msn/msn.c:1623 #, fuzzy msgid "Pets" msgstr "Ports" -#: ../libpurple/protocols/msn/msn.c:1734 +#: ../libpurple/protocols/msn/msn.c:1624 #, fuzzy msgid "Hometown" msgstr "Host Unknown" -#: ../libpurple/protocols/msn/msn.c:1735 +#: ../libpurple/protocols/msn/msn.c:1625 msgid "Places Lived" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1736 +#: ../libpurple/protocols/msn/msn.c:1626 msgid "Fashion" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1737 +#: ../libpurple/protocols/msn/msn.c:1627 msgid "Humor" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1738 +#: ../libpurple/protocols/msn/msn.c:1628 msgid "Music" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920 -#: ../libpurple/protocols/msn/msn.c:1926 +#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810 +#: ../libpurple/protocols/msn/msn.c:1816 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138 msgid "Favorite Quote" msgstr "Favuorite Quote" -#: ../libpurple/protocols/msn/msn.c:1756 +#: ../libpurple/protocols/msn/msn.c:1646 #, fuzzy msgid "Contact Info" msgstr "Account Info" -#: ../libpurple/protocols/msn/msn.c:1757 +#: ../libpurple/protocols/msn/msn.c:1647 #, fuzzy msgid "Personal" msgstr "Personal Title" -#: ../libpurple/protocols/msn/msn.c:1760 +#: ../libpurple/protocols/msn/msn.c:1650 msgid "Significant Other" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1761 +#: ../libpurple/protocols/msn/msn.c:1651 #, fuzzy msgid "Home Phone" msgstr "Home Page" -#: ../libpurple/protocols/msn/msn.c:1762 +#: ../libpurple/protocols/msn/msn.c:1652 #, fuzzy msgid "Home Phone 2" msgstr "Set Home Phone Number" -#: ../libpurple/protocols/msn/msn.c:1763 -#: ../libpurple/protocols/oscar/oscar.c:3789 +#: ../libpurple/protocols/msn/msn.c:1653 +#: ../libpurple/protocols/oscar/oscar.c:3793 msgid "Home Address" msgstr "Home Address" -#: ../libpurple/protocols/msn/msn.c:1764 +#: ../libpurple/protocols/msn/msn.c:1654 #, fuzzy msgid "Personal Mobile" msgstr "Personal Title" -#: ../libpurple/protocols/msn/msn.c:1765 +#: ../libpurple/protocols/msn/msn.c:1655 #, fuzzy msgid "Home Fax" msgstr "Home Page" -#: ../libpurple/protocols/msn/msn.c:1766 +#: ../libpurple/protocols/msn/msn.c:1656 #, fuzzy msgid "Personal E-Mail" msgstr "Personal Title" -#: ../libpurple/protocols/msn/msn.c:1767 +#: ../libpurple/protocols/msn/msn.c:1657 #, fuzzy msgid "Personal IM" msgstr "Personal Title" -#: ../libpurple/protocols/msn/msn.c:1769 +#: ../libpurple/protocols/msn/msn.c:1659 msgid "Anniversary" msgstr "" #. Business -#: ../libpurple/protocols/msn/msn.c:1785 +#: ../libpurple/protocols/msn/msn.c:1675 msgid "Work" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1787 +#: ../libpurple/protocols/msn/msn.c:1677 #: ../libpurple/protocols/silc/ops.c:1010 #: ../libpurple/protocols/silc10/ops.c:1044 msgid "Job Title" msgstr "Job Title" -#: ../libpurple/protocols/msn/msn.c:1788 -#: ../libpurple/protocols/oscar/oscar.c:3810 +#: ../libpurple/protocols/msn/msn.c:1678 +#: ../libpurple/protocols/oscar/oscar.c:3814 msgid "Company" msgstr "Company" -#: ../libpurple/protocols/msn/msn.c:1789 -#: ../libpurple/protocols/novell/novell.c:1482 +#: ../libpurple/protocols/msn/msn.c:1679 +#: ../libpurple/protocols/novell/novell.c:1480 msgid "Department" msgstr "Department" -#: ../libpurple/protocols/msn/msn.c:1790 +#: ../libpurple/protocols/msn/msn.c:1680 #, fuzzy msgid "Profession" msgstr "Progress" -#: ../libpurple/protocols/msn/msn.c:1791 +#: ../libpurple/protocols/msn/msn.c:1681 #, fuzzy msgid "Work Phone" msgstr "Phone" -#: ../libpurple/protocols/msn/msn.c:1792 +#: ../libpurple/protocols/msn/msn.c:1682 #, fuzzy msgid "Work Phone 2" msgstr "Set Work Phone Number" -#: ../libpurple/protocols/msn/msn.c:1793 -#: ../libpurple/protocols/oscar/oscar.c:3802 +#: ../libpurple/protocols/msn/msn.c:1683 +#: ../libpurple/protocols/oscar/oscar.c:3806 msgid "Work Address" msgstr "Work Address" -#: ../libpurple/protocols/msn/msn.c:1794 +#: ../libpurple/protocols/msn/msn.c:1684 #, fuzzy msgid "Work Mobile" msgstr "Send to Mobile" -#: ../libpurple/protocols/msn/msn.c:1795 +#: ../libpurple/protocols/msn/msn.c:1685 #, fuzzy msgid "Work Pager" msgstr "Web Page" -#: ../libpurple/protocols/msn/msn.c:1796 +#: ../libpurple/protocols/msn/msn.c:1686 msgid "Work Fax" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1797 +#: ../libpurple/protocols/msn/msn.c:1687 #, fuzzy msgid "Work E-Mail" msgstr "E-Mail" -#: ../libpurple/protocols/msn/msn.c:1798 +#: ../libpurple/protocols/msn/msn.c:1688 msgid "Work IM" msgstr "" -#: ../libpurple/protocols/msn/msn.c:1799 +#: ../libpurple/protocols/msn/msn.c:1689 #, fuzzy msgid "Start Date" msgstr "Province/Territory" -#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875 -#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889 +#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765 +#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779 msgid "Favorite Things" msgstr "Favourite Things" -#: ../libpurple/protocols/msn/msn.c:1934 +#: ../libpurple/protocols/msn/msn.c:1824 msgid "Last Updated" msgstr "Last Updated" -#: ../libpurple/protocols/msn/msn.c:1945 +#: ../libpurple/protocols/msn/msn.c:1835 #: ../libpurple/protocols/qq/buddy_info.c:60 #: ../libpurple/protocols/silc/ops.c:1026 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "Homepage" -#: ../libpurple/protocols/msn/msn.c:1969 +#: ../libpurple/protocols/msn/msn.c:1859 msgid "The user has not created a public profile." msgstr "The user has not created a public profile." -#: ../libpurple/protocols/msn/msn.c:1970 +#: ../libpurple/protocols/msn/msn.c:1860 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 " @@ -7187,7 +7196,7 @@ "that the user does not exist, or that the user exists but has not created a " "public profile." -#: ../libpurple/protocols/msn/msn.c:1974 +#: ../libpurple/protocols/msn/msn.c:1864 #, fuzzy msgid "" "Could not find any information in the user's profile. The user most likely " @@ -7196,7 +7205,7 @@ "Gaim could not find any information in the user's profile. The user most " "likely does not exist." -#: ../libpurple/protocols/msn/msn.c:1982 +#: ../libpurple/protocols/msn/msn.c:1872 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240 msgid "Profile URL" msgstr "Profile URL" @@ -7211,108 +7220,102 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271 -#, fuzzy -msgid "Windows Live Messenger Protocol Plugin" -msgstr "Novell GroupWise Messenger Protocol Plugin" - -#: ../libpurple/protocols/msn/msn.c:2306 +#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160 +msgid "MSN Protocol Plugin" +msgstr "MSN Protocol Plugin" + +#: ../libpurple/protocols/msn/msn.c:2194 msgid "Use HTTP Method" msgstr "Use HTTP Method" -#: ../libpurple/protocols/msn/msn.c:2311 +#: ../libpurple/protocols/msn/msn.c:2199 #, fuzzy msgid "HTTP Method Server" msgstr "IPC Test Server" -#: ../libpurple/protocols/msn/msn.c:2316 +#: ../libpurple/protocols/msn/msn.c:2204 msgid "Show custom smileys" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2324 +#: ../libpurple/protocols/msn/msn.c:2212 msgid "nudge: nudge a user to get their attention" msgstr "" -#: ../libpurple/protocols/msn/nexus.c:137 -msgid "Windows Live ID authentication:Unable to connect" -msgstr "" - -#: ../libpurple/protocols/msn/nexus.c:275 -#, fuzzy -msgid "Windows Live ID authentication Failed" -msgstr "Normal authentication failed!" - -#: ../libpurple/protocols/msn/notification.c:191 +#: ../libpurple/protocols/msn/nexus.c:146 +#: ../libpurple/protocols/msn/servconn.c:135 +#: ../libpurple/protocols/qq/qq_proxy.c:242 +#: ../libpurple/protocols/qq/qq_proxy.c:321 +#: ../libpurple/protocols/qq/qq_proxy.c:366 +#: ../libpurple/protocols/qq/qq_proxy.c:399 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:63 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:163 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:187 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:200 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:229 +#: ../libpurple/protocols/qq/udp_proxy_s5.c:243 +#: ../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:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 +msgid "Unable to connect" +msgstr "Unable to connect" + +#: ../libpurple/protocols/msn/notification.c:178 #, c-format msgid "%s is not a valid group." msgstr "%s is not a valid group." -#: ../libpurple/protocols/msn/notification.c:197 -#: ../libpurple/protocols/msn/notification.c:938 -#: ../libpurple/protocols/msn/session.c:369 +#: ../libpurple/protocols/msn/notification.c:184 +#: ../libpurple/protocols/msn/notification.c:532 +#: ../libpurple/protocols/msn/session.c:330 msgid "Unknown error." msgstr "Unknown error." -#: ../libpurple/protocols/msn/notification.c:200 +#: ../libpurple/protocols/msn/notification.c:187 #, c-format msgid "%s on %s (%s)" msgstr "%s on %s (%s)" -#: ../libpurple/protocols/msn/notification.c:518 -#, fuzzy, c-format -msgid "%s just sent you a Nudge!" -msgstr "%s wants to send you a file" - -#: ../libpurple/protocols/msn/notification.c:843 -#, fuzzy, c-format -msgid "Unknown error (%d)" -msgstr "Unknown error" - -#: ../libpurple/protocols/msn/notification.c:844 -#: ../libpurple/protocols/sametime/sametime.c:4425 -#, fuzzy -msgid "Unable to add user" -msgstr "Unable to ban user %s" - -#: ../libpurple/protocols/msn/notification.c:904 +#: ../libpurple/protocols/msn/notification.c:498 #, c-format msgid "Unable to add user on %s (%s)" msgstr "Unable to add user on %s (%s)" -#: ../libpurple/protocols/msn/notification.c:908 +#: ../libpurple/protocols/msn/notification.c:502 #, c-format msgid "Unable to block user on %s (%s)" msgstr "Unable to block user on %s (%s)" -#: ../libpurple/protocols/msn/notification.c:912 +#: ../libpurple/protocols/msn/notification.c:506 #, c-format msgid "Unable to permit user on %s (%s)" msgstr "Unable to permit user on %s (%s)" -#: ../libpurple/protocols/msn/notification.c:920 +#: ../libpurple/protocols/msn/notification.c:514 #, c-format msgid "%s could not be added because your buddy list is full." msgstr "%s could not be added because your buddy list is full." -#: ../libpurple/protocols/msn/notification.c:929 +#: ../libpurple/protocols/msn/notification.c:523 #, c-format msgid "%s is not a valid passport account." msgstr "%s is not a valid passport account." -#: ../libpurple/protocols/msn/notification.c:934 +#: ../libpurple/protocols/msn/notification.c:528 #, fuzzy msgid "Service Temporarily Unavailable." msgstr "Service Temporarily Unavailable" -#: ../libpurple/protocols/msn/notification.c:1272 +#: ../libpurple/protocols/msn/notification.c:851 msgid "Unable to rename group" msgstr "Unable to rename group" -#: ../libpurple/protocols/msn/notification.c:1327 +#: ../libpurple/protocols/msn/notification.c:906 msgid "Unable to delete group" msgstr "Unable to delete group" -#: ../libpurple/protocols/msn/notification.c:1943 +#: ../libpurple/protocols/msn/notification.c:1325 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -7343,30 +7346,6 @@ "After the maintenance has been completed, you will be able to successfully " "sign in." -#: ../libpurple/protocols/msn/oim.c:141 -#, fuzzy -msgid "Unable to connect to OIM server" -msgstr "Unable to connect to server." - -#: ../libpurple/protocols/msn/servconn.c:135 -#: ../libpurple/protocols/qq/qq_proxy.c:242 -#: ../libpurple/protocols/qq/qq_proxy.c:321 -#: ../libpurple/protocols/qq/qq_proxy.c:366 -#: ../libpurple/protocols/qq/qq_proxy.c:399 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:63 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:163 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:187 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:200 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:229 -#: ../libpurple/protocols/qq/udp_proxy_s5.c:243 -#: ../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:1416 -#: ../libpurple/protocols/yahoo/yahoochat.c:1442 -msgid "Unable to connect" -msgstr "Unable to connect" - #: ../libpurple/protocols/msn/servconn.c:137 msgid "Writing error" msgstr "Writing error" @@ -7384,58 +7363,58 @@ "Connection error from %s server (%s):\n" "%s" -#: ../libpurple/protocols/msn/session.c:336 +#: ../libpurple/protocols/msn/session.c:299 msgid "Our protocol is not supported by the server." msgstr "Our protocol is not supported by the server." -#: ../libpurple/protocols/msn/session.c:340 +#: ../libpurple/protocols/msn/session.c:303 msgid "Error parsing HTTP." msgstr "Error parsing HTTP." -#: ../libpurple/protocols/msn/session.c:344 +#: ../libpurple/protocols/msn/session.c:307 #: ../libpurple/protocols/oscar/flap_connection.c:384 -#: ../libpurple/protocols/yahoo/yahoo.c:207 +#: ../libpurple/protocols/yahoo/yahoo.c:205 msgid "You have signed on from another location." msgstr "You have signed on from another location." -#: ../libpurple/protocols/msn/session.c:349 +#: ../libpurple/protocols/msn/session.c:310 msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "The MSN servers are temporarily unavailable. Please wait and try again." -#: ../libpurple/protocols/msn/session.c:354 +#: ../libpurple/protocols/msn/session.c:315 msgid "The MSN servers are going down temporarily." msgstr "The MSN servers are going down temporarily." -#: ../libpurple/protocols/msn/session.c:359 +#: ../libpurple/protocols/msn/session.c:320 #, c-format msgid "Unable to authenticate: %s" msgstr "Unable to authenticate: %s" -#: ../libpurple/protocols/msn/session.c:364 +#: ../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:385 -#: ../libpurple/protocols/msn/session.c:387 +#: ../libpurple/protocols/msn/session.c:346 +#: ../libpurple/protocols/msn/session.c:348 msgid "Handshaking" msgstr "Handshaking" -#: ../libpurple/protocols/msn/session.c:388 +#: ../libpurple/protocols/msn/session.c:349 msgid "Starting authentication" msgstr "Starting authentication" -#: ../libpurple/protocols/msn/session.c:389 +#: ../libpurple/protocols/msn/session.c:350 msgid "Getting cookie" msgstr "Getting cookie" -#: ../libpurple/protocols/msn/session.c:391 +#: ../libpurple/protocols/msn/session.c:352 msgid "Sending cookie" msgstr "Sending cookie" -#: ../libpurple/protocols/msn/session.c:392 +#: ../libpurple/protocols/msn/session.c:353 msgid "Retrieving buddy list" msgstr "Retrieving buddy list" @@ -7488,25 +7467,22 @@ 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/userlist.c:243 +#: ../libpurple/protocols/msn/userlist.c:252 #, fuzzy, c-format msgid "%s has added you to his or her buddy list." msgstr "The user %s wants to add %s to his or her buddy list." -#: ../libpurple/protocols/msn/userlist.c:312 +#: ../libpurple/protocols/msn/userlist.c:321 #, fuzzy, c-format msgid "%s has removed you from his or her buddy list." msgstr "The user %s wants to add %s to his or her buddy list." -#. only notify the user about problems adding to the friends list -#. * maybe we should do something else for other lists, but it probably -#. * won't cause too many problems if we just ignore it -#: ../libpurple/protocols/msn/userlist.c:693 +#: ../libpurple/protocols/msn/userlist.c:643 #, fuzzy, c-format msgid "Unable to add \"%s\"." msgstr "Unable to read file %s." -#: ../libpurple/protocols/msn/userlist.c:696 +#: ../libpurple/protocols/msn/userlist.c:645 #, fuzzy msgid "The screen name specified is invalid." msgstr "The SecurID key entered is invalid." @@ -7534,7 +7510,7 @@ #. Notify an error message also, because this is important! #: ../libpurple/protocols/myspace/myspace.c:292 -#: ../libpurple/protocols/myspace/myspace.c:1798 +#: ../libpurple/protocols/myspace/myspace.c:1801 msgid "MySpaceIM Error" msgstr "" @@ -7553,196 +7529,196 @@ msgid "Logging in" msgstr "Logging" -#: ../libpurple/protocols/myspace/myspace.c:1278 +#: ../libpurple/protocols/myspace/myspace.c:1286 #, c-format msgid "Connection to server lost (no data received within %d seconds)" msgstr "" #. Can't write _()'d strings in array initializers. Workaround. -#: ../libpurple/protocols/myspace/myspace.c:1321 +#: ../libpurple/protocols/myspace/myspace.c:1328 #, fuzzy msgid "New mail messages" msgstr "New away message" -#: ../libpurple/protocols/myspace/myspace.c:1322 +#: ../libpurple/protocols/myspace/myspace.c:1329 msgid "New blog comments" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:1323 +#: ../libpurple/protocols/myspace/myspace.c:1330 msgid "New profile comments" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:1324 +#: ../libpurple/protocols/myspace/myspace.c:1331 msgid "New friend requests!" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:1325 +#: ../libpurple/protocols/myspace/myspace.c:1332 msgid "New picture comments" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:1355 +#: ../libpurple/protocols/myspace/myspace.c:1360 msgid "MySpace" msgstr "" #. 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:1538 +#: ../libpurple/protocols/myspace/myspace.c:1543 #: ../libpurple/protocols/sametime/sametime.c:1544 #, fuzzy msgid "Connected" msgstr "Connect" -#: ../libpurple/protocols/myspace/myspace.c:1549 -#: ../libpurple/protocols/myspace/myspace.c:1551 +#: ../libpurple/protocols/myspace/myspace.c:1554 +#: ../libpurple/protocols/myspace/myspace.c:1556 #, fuzzy msgid "No username set" msgstr "No screenname given." -#: ../libpurple/protocols/myspace/myspace.c:1550 +#: ../libpurple/protocols/myspace/myspace.c:1555 msgid "" "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile." "username and choose a username and try to login again." msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:1777 +#: ../libpurple/protocols/myspace/myspace.c:1782 #, c-format msgid "Protocol error, code %d: %s" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:1970 -#: ../libpurple/protocols/myspace/myspace.c:2004 +#: ../libpurple/protocols/myspace/myspace.c:1972 +#: ../libpurple/protocols/myspace/myspace.c:2006 #, fuzzy msgid "Failed to add buddy" msgstr "Failed to join buddy in chat" -#: ../libpurple/protocols/myspace/myspace.c:1970 +#: ../libpurple/protocols/myspace/myspace.c:1972 #, fuzzy msgid "'addbuddy' command failed." msgstr "Import Buddy List from Server" -#: ../libpurple/protocols/myspace/myspace.c:2004 -#: ../libpurple/protocols/myspace/myspace.c:2245 +#: ../libpurple/protocols/myspace/myspace.c:2006 +#: ../libpurple/protocols/myspace/myspace.c:2247 #, fuzzy msgid "persist command failed" msgstr "Switchboard failed" -#: ../libpurple/protocols/myspace/myspace.c:2113 +#: ../libpurple/protocols/myspace/myspace.c:2115 #, c-format msgid "No such user: %s" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:2114 +#: ../libpurple/protocols/myspace/myspace.c:2116 #, fuzzy msgid "User lookup" msgstr "User Rooms" -#: ../libpurple/protocols/myspace/myspace.c:2226 -#: ../libpurple/protocols/myspace/myspace.c:2245 -#: ../libpurple/protocols/myspace/myspace.c:2267 +#: ../libpurple/protocols/myspace/myspace.c:2228 +#: ../libpurple/protocols/myspace/myspace.c:2247 +#: ../libpurple/protocols/myspace/myspace.c:2269 #, fuzzy msgid "Failed to remove buddy" msgstr "Failed to join buddy in chat" -#: ../libpurple/protocols/myspace/myspace.c:2226 +#: ../libpurple/protocols/myspace/myspace.c:2228 msgid "'delbuddy' command failed" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:2267 +#: ../libpurple/protocols/myspace/myspace.c:2269 #, fuzzy msgid "blocklist command failed" msgstr "Switchboard failed" -#: ../libpurple/protocols/myspace/myspace.c:2313 +#: ../libpurple/protocols/myspace/myspace.c:2315 #, fuzzy msgid "Invalid input condition" msgstr "Finalizing connection" #. TODO: g_realloc like msn, yahoo, irc, jabber? -#: ../libpurple/protocols/myspace/myspace.c:2331 -#: ../libpurple/protocols/myspace/myspace.c:2362 +#: ../libpurple/protocols/myspace/myspace.c:2333 +#: ../libpurple/protocols/myspace/myspace.c:2364 #, fuzzy msgid "Read buffer full" msgstr "Queue full" -#: ../libpurple/protocols/myspace/myspace.c:2400 +#: ../libpurple/protocols/myspace/myspace.c:2402 #, fuzzy msgid "Unparseable message" msgstr "Unable to parse message" -#: ../libpurple/protocols/myspace/myspace.c:2469 +#: ../libpurple/protocols/myspace/myspace.c:2471 #, fuzzy, c-format msgid "Couldn't connect to host: %s (%d)" msgstr "Couldn't connect to host" -#: ../libpurple/protocols/myspace/myspace.c:2640 +#: ../libpurple/protocols/myspace/myspace.c:2642 #, fuzzy msgid "IM Friends" msgstr "_IM windows" -#: ../libpurple/protocols/myspace/myspace.c:2739 +#: ../libpurple/protocols/myspace/myspace.c:2741 #, c-format msgid "" "%d buddies were added or updated from the server (including buddies already " "on the server-side list)" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:2740 +#: ../libpurple/protocols/myspace/myspace.c:2742 #, fuzzy msgid "Add contacts from server" msgstr "Invalid response from server." -#: ../libpurple/protocols/myspace/myspace.c:2792 -#: ../libpurple/protocols/myspace/myspace.c:2857 +#: ../libpurple/protocols/myspace/myspace.c:2794 +#: ../libpurple/protocols/myspace/myspace.c:2859 msgid "Add friends from MySpace.com" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:2793 +#: ../libpurple/protocols/myspace/myspace.c:2795 #, fuzzy msgid "Importing friends failed" msgstr "Bad friend file" #. TODO: find out how -#: ../libpurple/protocols/myspace/myspace.c:2849 +#: ../libpurple/protocols/myspace/myspace.c:2851 msgid "Find people..." msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:2852 +#: ../libpurple/protocols/myspace/myspace.c:2854 #, fuzzy msgid "Change IM name..." msgstr "Change Password..." -#: ../libpurple/protocols/myspace/myspace.c:3154 +#: ../libpurple/protocols/myspace/myspace.c:3156 msgid "myim URL handler" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:3155 +#: ../libpurple/protocols/myspace/myspace.c:3157 msgid "No suitable MySpaceIM account could be found to open this myim URL." msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:3156 +#: ../libpurple/protocols/myspace/myspace.c:3158 msgid "Enable the proper MySpaceIM account and try again." msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:3279 +#: ../libpurple/protocols/myspace/myspace.c:3281 msgid "Show display name in status text" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:3282 +#: ../libpurple/protocols/myspace/myspace.c:3284 #, fuzzy msgid "Show headline in status text" msgstr "Show _aliases in tabs/titles" -#: ../libpurple/protocols/myspace/myspace.c:3287 +#: ../libpurple/protocols/myspace/myspace.c:3289 #, fuzzy msgid "Send emoticons" msgstr "Sound Options" -#: ../libpurple/protocols/myspace/myspace.c:3292 +#: ../libpurple/protocols/myspace/myspace.c:3294 msgid "Screen resolution (dots per inch)" msgstr "" -#: ../libpurple/protocols/myspace/myspace.c:3295 +#: ../libpurple/protocols/myspace/myspace.c:3297 #, fuzzy msgid "Base font size (points)" msgstr "Larger font size" @@ -7756,7 +7732,7 @@ #. TODO: link to username, if available #: ../libpurple/protocols/myspace/user.c:102 -#: ../libpurple/protocols/oscar/oscar.c:2960 +#: ../libpurple/protocols/oscar/oscar.c:2964 msgid "Profile" msgstr "Profile" @@ -8066,39 +8042,39 @@ msgid "Login failed (%s)." msgstr "Login failed (%s)." -#: ../libpurple/protocols/novell/novell.c:249 +#: ../libpurple/protocols/novell/novell.c:247 #, c-format msgid "Unable to send message. Could not get details for user (%s)." msgstr "Unable to send message. Could not get details for user (%s)." -#: ../libpurple/protocols/novell/novell.c:398 +#: ../libpurple/protocols/novell/novell.c:396 #, c-format msgid "Unable to add %s to your buddy list (%s)." msgstr "Unable to add %s to your buddy list (%s)." #. TODO: Improve this! message to who or for what conference? -#: ../libpurple/protocols/novell/novell.c:424 +#: ../libpurple/protocols/novell/novell.c:422 #, c-format msgid "Unable to send message (%s)." msgstr "Unable to send message (%s)." -#: ../libpurple/protocols/novell/novell.c:495 -#: ../libpurple/protocols/novell/novell.c:987 +#: ../libpurple/protocols/novell/novell.c:493 +#: ../libpurple/protocols/novell/novell.c:985 #, c-format msgid "Unable to invite user (%s)." msgstr "Unable to invite user (%s)." -#: ../libpurple/protocols/novell/novell.c:534 +#: ../libpurple/protocols/novell/novell.c:532 #, c-format msgid "Unable to send message to %s. Could not create the conference (%s)." msgstr "Unable to send message to %s. Could not create the conference (%s)." -#: ../libpurple/protocols/novell/novell.c:539 +#: ../libpurple/protocols/novell/novell.c:537 #, c-format msgid "Unable to send message. Could not create the conference (%s)." msgstr "Unable to send message. Could not create the conference (%s)." -#: ../libpurple/protocols/novell/novell.c:586 +#: ../libpurple/protocols/novell/novell.c:584 #, c-format msgid "" "Unable to move user %s to folder %s in the server side list. Error while " @@ -8107,7 +8083,7 @@ "Unable to move user %s to folder %s in the server side list. Error while " "creating folder (%s)." -#: ../libpurple/protocols/novell/novell.c:634 +#: ../libpurple/protocols/novell/novell.c:632 #, c-format msgid "" "Unable to add %s to your buddy list. Error creating folder in server side " @@ -8116,61 +8092,61 @@ "Unable to add %s to your buddy list. Error creating folder in server side " "list (%s)." -#: ../libpurple/protocols/novell/novell.c:707 +#: ../libpurple/protocols/novell/novell.c:705 #, c-format msgid "Could not get details for user %s (%s)." msgstr "Could not get details for user %s (%s)." -#: ../libpurple/protocols/novell/novell.c:753 -#: ../libpurple/protocols/novell/novell.c:899 +#: ../libpurple/protocols/novell/novell.c:751 +#: ../libpurple/protocols/novell/novell.c:897 #, c-format msgid "Unable to add user to privacy list (%s)." msgstr "Unable to add user to privacy list (%s)." -#: ../libpurple/protocols/novell/novell.c:800 +#: ../libpurple/protocols/novell/novell.c:798 #, c-format msgid "Unable to add %s to deny list (%s)." msgstr "Unable to add %s to deny list (%s)." -#: ../libpurple/protocols/novell/novell.c:853 +#: ../libpurple/protocols/novell/novell.c:851 #, c-format msgid "Unable to add %s to permit list (%s)." msgstr "Unable to add %s to permit list (%s)." -#: ../libpurple/protocols/novell/novell.c:921 +#: ../libpurple/protocols/novell/novell.c:919 #, c-format msgid "Unable to remove %s from privacy list (%s)." msgstr "Unable to remove %s from privacy list (%s)." -#: ../libpurple/protocols/novell/novell.c:944 -#: ../libpurple/protocols/novell/novell.c:1649 +#: ../libpurple/protocols/novell/novell.c:942 +#: ../libpurple/protocols/novell/novell.c:1647 #, c-format msgid "Unable to change server side privacy settings (%s)." msgstr "Unable to change server side privacy settings (%s)." -#: ../libpurple/protocols/novell/novell.c:1014 +#: ../libpurple/protocols/novell/novell.c:1012 #, c-format msgid "Unable to create conference (%s)." msgstr "Unable to create conference (%s)." -#: ../libpurple/protocols/novell/novell.c:1123 -#: ../libpurple/protocols/novell/novell.c:1694 +#: ../libpurple/protocols/novell/novell.c:1121 +#: ../libpurple/protocols/novell/novell.c:1692 msgid "Error communicating with server. Closing connection." msgstr "Error communicating with server. Closing connection." -#: ../libpurple/protocols/novell/novell.c:1478 +#: ../libpurple/protocols/novell/novell.c:1476 msgid "Telephone Number" msgstr "Telephone Number" -#: ../libpurple/protocols/novell/novell.c:1484 +#: ../libpurple/protocols/novell/novell.c:1482 msgid "Personal Title" msgstr "Personal Title" -#: ../libpurple/protocols/novell/novell.c:1488 +#: ../libpurple/protocols/novell/novell.c:1486 msgid "Mailstop" msgstr "Mailstop" -#: ../libpurple/protocols/novell/novell.c:1504 +#: ../libpurple/protocols/novell/novell.c:1502 #: ../libpurple/protocols/sametime/sametime.c:4122 msgid "User ID" msgstr "User ID" @@ -8181,41 +8157,41 @@ #. purple_notify_user_info_add_pair(user_info, tag, value); #. } #. -#: ../libpurple/protocols/novell/novell.c:1517 +#: ../libpurple/protocols/novell/novell.c:1515 msgid "Full name" msgstr "Full name" -#: ../libpurple/protocols/novell/novell.c:1639 +#: ../libpurple/protocols/novell/novell.c:1637 #, c-format msgid "GroupWise Conference %d" msgstr "GroupWise Conference %d" -#: ../libpurple/protocols/novell/novell.c:1670 +#: ../libpurple/protocols/novell/novell.c:1668 msgid "Unable to make SSL connection to server." msgstr "Unable to make SSL connection to server." -#: ../libpurple/protocols/novell/novell.c:1722 +#: ../libpurple/protocols/novell/novell.c:1720 msgid "Authenticating..." msgstr "Authenticating..." -#: ../libpurple/protocols/novell/novell.c:1734 +#: ../libpurple/protocols/novell/novell.c:1732 msgid "Unable to connect to server." msgstr "Unable to connect to server." -#: ../libpurple/protocols/novell/novell.c:1737 +#: ../libpurple/protocols/novell/novell.c:1735 msgid "Waiting for response..." msgstr "Waiting for response..." -#: ../libpurple/protocols/novell/novell.c:1872 +#: ../libpurple/protocols/novell/novell.c:1870 #, c-format msgid "%s has been invited to this conversation." msgstr "%s has been invited to this conversation." -#: ../libpurple/protocols/novell/novell.c:1900 +#: ../libpurple/protocols/novell/novell.c:1898 msgid "Invitation to Conversation" msgstr "Invitation to Conversation" -#: ../libpurple/protocols/novell/novell.c:1901 +#: ../libpurple/protocols/novell/novell.c:1899 #, c-format msgid "" "Invitation from: %s\n" @@ -8226,15 +8202,16 @@ "\n" "Sent: %s" -#: ../libpurple/protocols/novell/novell.c:1903 +#: ../libpurple/protocols/novell/novell.c:1901 msgid "Would you like to join the conversation?" msgstr "Would you like to join the conversation?" -#: ../libpurple/protocols/novell/novell.c:2017 +#. we don't want to reconnect in this case +#: ../libpurple/protocols/novell/novell.c:2012 msgid "You have been logged out because you logged in at another workstation." msgstr "You have been logged out because you logged in at another workstation." -#: ../libpurple/protocols/novell/novell.c:2074 +#: ../libpurple/protocols/novell/novell.c:2069 #, c-format msgid "" "%s appears to be offline and did not receive the message that you just sent." @@ -8245,7 +8222,7 @@ #. * purple_request_fields(gc, _("Server Address"),...); #. #. ...but for now just error out with a nice message. -#: ../libpurple/protocols/novell/novell.c:2172 +#: ../libpurple/protocols/novell/novell.c:2167 msgid "" "Unable to connect to server. Please enter the address of the server you wish " "to connect to." @@ -8253,11 +8230,12 @@ "Unable to connect to server. Please enter the address of the server you wish " "to connect to." -#: ../libpurple/protocols/novell/novell.c:2200 +#: ../libpurple/protocols/novell/novell.c:2195 msgid "Error. SSL support is not installed." msgstr "Error. SSL support is not installed." -#: ../libpurple/protocols/novell/novell.c:2509 +#: ../libpurple/protocols/novell/novell.c:2504 +#, c-format msgid "This conference has been closed. No more messages can be sent." msgstr "This conference has been closed. No more messages can be sent." @@ -8271,22 +8249,22 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/novell/novell.c:3523 -#: ../libpurple/protocols/novell/novell.c:3525 +#: ../libpurple/protocols/novell/novell.c:3518 +#: ../libpurple/protocols/novell/novell.c:3520 msgid "Novell GroupWise Messenger Protocol Plugin" msgstr "Novell GroupWise Messenger Protocol Plugin" -#: ../libpurple/protocols/novell/novell.c:3550 +#: ../libpurple/protocols/novell/novell.c:3545 msgid "Server address" msgstr "Server address" -#: ../libpurple/protocols/novell/novell.c:3554 +#: ../libpurple/protocols/novell/novell.c:3549 msgid "Server port" msgstr "Server port" -#: ../libpurple/protocols/oscar/flap_connection.c:389 -#: ../libpurple/protocols/yahoo/yahoo.c:2468 -#: ../libpurple/protocols/yahoo/yahoo.c:2635 +#: ../libpurple/protocols/oscar/flap_connection.c:387 +#: ../libpurple/protocols/yahoo/yahoo.c:2469 +#: ../libpurple/protocols/yahoo/yahoo.c:2636 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453 @@ -8294,9 +8272,9 @@ msgid "Server closed the connection." msgstr "Error creating connection" -#: ../libpurple/protocols/oscar/flap_connection.c:391 -#: ../libpurple/protocols/yahoo/yahoo.c:2462 -#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593 +#: ../libpurple/protocols/oscar/flap_connection.c:389 +#: ../libpurple/protocols/yahoo/yahoo.c:2463 +#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465 #, fuzzy, c-format @@ -8305,7 +8283,7 @@ "%s" msgstr "You were disconnected from the server." -#: ../libpurple/protocols/oscar/flap_connection.c:394 +#: ../libpurple/protocols/oscar/flap_connection.c:392 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421 #: ../libpurple/proxy.c:1478 @@ -8346,7 +8324,7 @@ msgstr "IRC Protocol Plugin" #: ../libpurple/protocols/oscar/libicq.c:147 -#: ../libpurple/protocols/yahoo/yahoo.c:4409 +#: ../libpurple/protocols/yahoo/yahoo.c:4410 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "Encoding" @@ -8521,7 +8499,7 @@ msgstr "Chat" #: ../libpurple/protocols/oscar/oscar.c:651 -#: ../libpurple/protocols/oscar/oscar.c:6008 +#: ../libpurple/protocols/oscar/oscar.c:6010 msgid "Get File" msgstr "Get File" @@ -8594,43 +8572,49 @@ msgstr "Camera" #: ../libpurple/protocols/oscar/oscar.c:725 -#: ../libpurple/protocols/oscar/oscar.c:5778 +#: ../libpurple/protocols/oscar/oscar.c:5780 +#, c-format msgid "Free For Chat" msgstr "Free For Chat" #: ../libpurple/protocols/oscar/oscar.c:729 -#: ../libpurple/protocols/oscar/oscar.c:5813 +#: ../libpurple/protocols/oscar/oscar.c:5815 +#, c-format msgid "Not Available" msgstr "Not Available" #: ../libpurple/protocols/oscar/oscar.c:731 -#: ../libpurple/protocols/oscar/oscar.c:5799 +#: ../libpurple/protocols/oscar/oscar.c:5801 +#, c-format msgid "Occupied" msgstr "Occupied" #: ../libpurple/protocols/oscar/oscar.c:735 +#, c-format msgid "Web Aware" msgstr "Web Aware" #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183 #: ../libpurple/protocols/qq/qq.c:288 -#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157 +#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060 +#, c-format msgid "Invisible" msgstr "Invisible" #: ../libpurple/protocols/oscar/oscar.c:739 +#, c-format msgid "Online" msgstr "Online" #: ../libpurple/protocols/oscar/oscar.c:838 -#: ../libpurple/protocols/oscar/oscar.c:3703 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128 +#: ../libpurple/protocols/oscar/oscar.c:3707 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126 msgid "IP Address" msgstr "IP Address" #: ../libpurple/protocols/oscar/oscar.c:845 -#: ../libpurple/protocols/oscar/oscar.c:2887 +#: ../libpurple/protocols/oscar/oscar.c:2891 msgid "Warning Level" msgstr "Warning Level" @@ -8677,15 +8661,15 @@ "letters, numbers and spaces, or contain only numbers." #: ../libpurple/protocols/oscar/oscar.c:1345 -#: ../libpurple/protocols/yahoo/yahoo.c:2104 +#: ../libpurple/protocols/yahoo/yahoo.c:2105 #, fuzzy msgid "Invalid screen name." msgstr "Invalid username." #: ../libpurple/protocols/oscar/oscar.c:1352 -#: ../libpurple/protocols/qq/login_logout.c:485 -#: ../libpurple/protocols/simple/simple.c:1047 -#: ../libpurple/protocols/yahoo/yahoo.c:2125 +#: ../libpurple/protocols/qq/login_logout.c:483 +#: ../libpurple/protocols/simple/simple.c:1045 +#: ../libpurple/protocols/yahoo/yahoo.c:2126 msgid "Incorrect password." msgstr "Incorrect password." @@ -8736,10 +8720,10 @@ #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. #. #: ../libpurple/protocols/oscar/oscar.c:1452 -#: ../libpurple/protocols/oscar/oscar.c:2228 -#: ../libpurple/protocols/oscar/oscar.c:2277 -#: ../libpurple/protocols/oscar/oscar.c:5883 -#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388 +#: ../libpurple/protocols/oscar/oscar.c:2232 +#: ../libpurple/protocols/oscar/oscar.c:2281 +#: ../libpurple/protocols/oscar/oscar.c:5885 +#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388 #, fuzzy msgid "_OK" msgstr "OK" @@ -8781,31 +8765,31 @@ msgid "Unable to initialize connection" msgstr "Unable to create new connection." -#: ../libpurple/protocols/oscar/oscar.c:2198 +#: ../libpurple/protocols/oscar/oscar.c:2202 msgid "Please authorize me so I can add you to my buddy list." msgstr "Please authorize me so I can add you to my buddy list." -#: ../libpurple/protocols/oscar/oscar.c:2226 +#: ../libpurple/protocols/oscar/oscar.c:2230 msgid "Authorization Request Message:" msgstr "Authorization Request Message:" -#: ../libpurple/protocols/oscar/oscar.c:2227 +#: ../libpurple/protocols/oscar/oscar.c:2231 msgid "Please authorize me!" msgstr "Please authorize me!" -#: ../libpurple/protocols/oscar/oscar.c:2268 -#: ../libpurple/protocols/oscar/oscar.c:2276 -#: ../libpurple/protocols/oscar/oscar.c:2403 -#: ../libpurple/protocols/oscar/oscar.c:5259 -#: ../libpurple/protocols/yahoo/yahoo.c:1029 +#: ../libpurple/protocols/oscar/oscar.c:2272 +#: ../libpurple/protocols/oscar/oscar.c:2280 +#: ../libpurple/protocols/oscar/oscar.c:2407 +#: ../libpurple/protocols/oscar/oscar.c:5263 +#: ../libpurple/protocols/yahoo/yahoo.c:1030 msgid "No reason given." msgstr "No reason given." -#: ../libpurple/protocols/oscar/oscar.c:2275 +#: ../libpurple/protocols/oscar/oscar.c:2279 msgid "Authorization Denied Message:" msgstr "Authorization Denied Message:" -#: ../libpurple/protocols/oscar/oscar.c:2403 +#: ../libpurple/protocols/oscar/oscar.c:2407 #, c-format msgid "" "The user %u has denied your request to add them to your buddy list for the " @@ -8816,17 +8800,17 @@ "following reason:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2404 +#: ../libpurple/protocols/oscar/oscar.c:2408 msgid "ICQ authorization denied." msgstr "ICQ authorization denied." #. Someone has granted you authorization -#: ../libpurple/protocols/oscar/oscar.c:2411 +#: ../libpurple/protocols/oscar/oscar.c:2415 #, 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:2419 +#: ../libpurple/protocols/oscar/oscar.c:2423 #, c-format msgid "" "You have received a special message\n" @@ -8839,7 +8823,7 @@ "From: %s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2427 +#: ../libpurple/protocols/oscar/oscar.c:2431 #, c-format msgid "" "You have received an ICQ page\n" @@ -8852,7 +8836,7 @@ "From: %s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2435 +#: ../libpurple/protocols/oscar/oscar.c:2439 #, c-format msgid "" "You have received an ICQ e-mail from %s [%s]\n" @@ -8865,40 +8849,40 @@ "Message is:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2456 +#: ../libpurple/protocols/oscar/oscar.c:2460 #, 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:2462 +#: ../libpurple/protocols/oscar/oscar.c:2466 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:2467 ../pidgin/gtkroomlist.c:309 +#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309 #, fuzzy msgid "_Add" msgstr "Add" -#: ../libpurple/protocols/oscar/oscar.c:2468 +#: ../libpurple/protocols/oscar/oscar.c:2472 #, fuzzy msgid "_Decline" msgstr "Decline" -#: ../libpurple/protocols/oscar/oscar.c:2592 +#: ../libpurple/protocols/oscar/oscar.c:2596 #, 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:2601 +#: ../libpurple/protocols/oscar/oscar.c:2605 #, 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:2610 +#: ../libpurple/protocols/oscar/oscar.c:2614 #, c-format msgid "" "You missed %hu message from %s because the rate limit has been exceeded." @@ -8909,21 +8893,21 @@ msgstr[1] "" "You missed %hu messages from %s because the rate limit has been exceeded." -#: ../libpurple/protocols/oscar/oscar.c:2619 +#: ../libpurple/protocols/oscar/oscar.c:2623 #, 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:2628 +#: ../libpurple/protocols/oscar/oscar.c:2632 #, 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:2637 +#: ../libpurple/protocols/oscar/oscar.c:2641 #, 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." @@ -8931,48 +8915,48 @@ 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:2792 +#: ../libpurple/protocols/oscar/oscar.c:2796 #, c-format msgid "Unable to send message: %s" msgstr "Unable to send message: %s" -#: ../libpurple/protocols/oscar/oscar.c:2792 -#: ../libpurple/protocols/oscar/oscar.c:2797 -#: ../libpurple/protocols/oscar/oscar.c:2861 +#: ../libpurple/protocols/oscar/oscar.c:2796 +#: ../libpurple/protocols/oscar/oscar.c:2801 +#: ../libpurple/protocols/oscar/oscar.c:2865 msgid "Unknown reason." msgstr "Unknown reason." -#: ../libpurple/protocols/oscar/oscar.c:2795 +#: ../libpurple/protocols/oscar/oscar.c:2799 #: ../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:2861 +#: ../libpurple/protocols/oscar/oscar.c:2865 #, c-format msgid "User information not available: %s" msgstr "User information not available: %s" -#: ../libpurple/protocols/oscar/oscar.c:2892 +#: ../libpurple/protocols/oscar/oscar.c:2896 msgid "Online Since" msgstr "Online Since" -#: ../libpurple/protocols/oscar/oscar.c:2897 +#: ../libpurple/protocols/oscar/oscar.c:2901 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185 msgid "Member Since" msgstr "Member Since" -#: ../libpurple/protocols/oscar/oscar.c:2932 +#: ../libpurple/protocols/oscar/oscar.c:2936 #, fuzzy msgid "Available Message" msgstr "Available Message:" -#: ../libpurple/protocols/oscar/oscar.c:3040 +#: ../libpurple/protocols/oscar/oscar.c:3044 msgid "Your AIM connection may be lost." msgstr "Your AIM connection may be lost." #. The conversion failed! -#: ../libpurple/protocols/oscar/oscar.c:3228 +#: ../libpurple/protocols/oscar/oscar.c:3232 msgid "" "[Unable to display a message from this user because it contained invalid " "characters.]" @@ -8980,7 +8964,7 @@ "[Unable to display a message from this user because it contained invalid " "characters.]" -#: ../libpurple/protocols/oscar/oscar.c:3392 +#: ../libpurple/protocols/oscar/oscar.c:3396 msgid "" "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." @@ -8988,83 +8972,84 @@ "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:3475 +#: ../libpurple/protocols/oscar/oscar.c:3479 #: ../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:3725 +#: ../libpurple/protocols/oscar/oscar.c:3729 #: ../libpurple/protocols/silc/util.c:585 #: ../libpurple/protocols/silc10/util.c:581 msgid "Mobile Phone" msgstr "Mobile Phone" -#: ../libpurple/protocols/oscar/oscar.c:3755 +#: ../libpurple/protocols/oscar/oscar.c:3759 msgid "Personal Web Page" msgstr "Personal Web Page" -#: ../libpurple/protocols/oscar/oscar.c:3779 +#: ../libpurple/protocols/oscar/oscar.c:3783 #: ../libpurple/protocols/qq/buddy_info.c:40 msgid "Additional Information" msgstr "Additional Information" -#: ../libpurple/protocols/oscar/oscar.c:3787 -#: ../libpurple/protocols/oscar/oscar.c:3800 +#: ../libpurple/protocols/oscar/oscar.c:3791 +#: ../libpurple/protocols/oscar/oscar.c:3804 msgid "Zip Code" msgstr "Postal Code" -#: ../libpurple/protocols/oscar/oscar.c:3811 +#: ../libpurple/protocols/oscar/oscar.c:3815 msgid "Division" msgstr "Division" -#: ../libpurple/protocols/oscar/oscar.c:3812 +#: ../libpurple/protocols/oscar/oscar.c:3816 msgid "Position" msgstr "Position" -#: ../libpurple/protocols/oscar/oscar.c:3814 +#: ../libpurple/protocols/oscar/oscar.c:3818 msgid "Web Page" msgstr "Web Page" -#: ../libpurple/protocols/oscar/oscar.c:3817 +#: ../libpurple/protocols/oscar/oscar.c:3821 msgid "Work Information" msgstr "Work Information" -#: ../libpurple/protocols/oscar/oscar.c:3873 +#: ../libpurple/protocols/oscar/oscar.c:3877 msgid "Pop-Up Message" msgstr "Pop-Up Message" -#: ../libpurple/protocols/oscar/oscar.c:3913 +#: ../libpurple/protocols/oscar/oscar.c:3917 #, fuzzy, 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 names are associated with %s" msgstr[1] "The following screen names are associated with %s" -#: ../libpurple/protocols/oscar/oscar.c:3918 +#: ../libpurple/protocols/oscar/oscar.c:3922 #, fuzzy msgid "Screen name" msgstr "_Screen name" -#: ../libpurple/protocols/oscar/oscar.c:3944 +#: ../libpurple/protocols/oscar/oscar.c:3948 #, 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:3965 +#: ../libpurple/protocols/oscar/oscar.c:3969 #, 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:3967 +#: ../libpurple/protocols/oscar/oscar.c:3971 msgid "Account Confirmation Requested" msgstr "Account Confirmation Requested" -#: ../libpurple/protocols/oscar/oscar.c:3998 +#: ../libpurple/protocols/oscar/oscar.c:4002 +#, c-format msgid "Error Changing Account Info" msgstr "Error Changing Account Info" -#: ../libpurple/protocols/oscar/oscar.c:4001 +#: ../libpurple/protocols/oscar/oscar.c:4005 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -9073,14 +9058,14 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "differs from the original." -#: ../libpurple/protocols/oscar/oscar.c:4004 +#: ../libpurple/protocols/oscar/oscar.c:4008 #, fuzzy, 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 the requested screen name " "is too long." -#: ../libpurple/protocols/oscar/oscar.c:4007 +#: ../libpurple/protocols/oscar/oscar.c:4011 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " @@ -9089,7 +9074,7 @@ "Error 0x%04x: Unable to format screen name because the requested screen name " "is too long." -#: ../libpurple/protocols/oscar/oscar.c:4010 +#: ../libpurple/protocols/oscar/oscar.c:4014 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because there is already a " @@ -9098,7 +9083,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:4013 +#: ../libpurple/protocols/oscar/oscar.c:4017 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address has " @@ -9107,7 +9092,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:4016 +#: ../libpurple/protocols/oscar/oscar.c:4020 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address is " @@ -9116,31 +9101,31 @@ "Error 0x%04x: Unable to change e-mail address because the given address is " "invalid." -#: ../libpurple/protocols/oscar/oscar.c:4019 +#: ../libpurple/protocols/oscar/oscar.c:4023 #, c-format msgid "Error 0x%04x: Unknown error." msgstr "Error 0x%04x: Unknown error." -#: ../libpurple/protocols/oscar/oscar.c:4029 +#: ../libpurple/protocols/oscar/oscar.c:4033 #, 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:4031 +#: ../libpurple/protocols/oscar/oscar.c:4035 msgid "Account Info" msgstr "Account Info" -#: ../libpurple/protocols/oscar/oscar.c:4214 +#: ../libpurple/protocols/oscar/oscar.c:4218 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:4485 +#: ../libpurple/protocols/oscar/oscar.c:4489 msgid "Unable to set AIM profile." msgstr "Unable to set AIM profile." -#: ../libpurple/protocols/oscar/oscar.c:4486 +#: ../libpurple/protocols/oscar/oscar.c:4490 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 " @@ -9150,7 +9135,7 @@ "completed. Your profile remains unset; try setting it again when you are " "fully connected." -#: ../libpurple/protocols/oscar/oscar.c:4500 +#: ../libpurple/protocols/oscar/oscar.c:4504 #, fuzzy, c-format msgid "" "The maximum profile length of %d byte has been exceeded. It has been " @@ -9165,11 +9150,11 @@ "The maximum profile length of %d bytes has been exceeded. Gaim has " "truncated it for you." -#: ../libpurple/protocols/oscar/oscar.c:4505 +#: ../libpurple/protocols/oscar/oscar.c:4509 msgid "Profile too long." msgstr "Profile too long." -#: ../libpurple/protocols/oscar/oscar.c:4550 +#: ../libpurple/protocols/oscar/oscar.c:4554 #, fuzzy, c-format msgid "" "The maximum away message length of %d byte has been exceeded. It has been " @@ -9184,11 +9169,11 @@ "The maximum away message length of %d bytes has been exceeded. Gaim has " "truncated it for you." -#: ../libpurple/protocols/oscar/oscar.c:4555 +#: ../libpurple/protocols/oscar/oscar.c:4559 msgid "Away message too long." msgstr "Away message too long." -#: ../libpurple/protocols/oscar/oscar.c:4624 +#: ../libpurple/protocols/oscar/oscar.c:4628 #, fuzzy, c-format msgid "" "Could not add the buddy %s because the screen name is invalid. Screen names " @@ -9199,17 +9184,17 @@ "must either start with a letter and contain only letters, numbers and " "spaces, or contain only numbers." -#: ../libpurple/protocols/oscar/oscar.c:4626 -#: ../libpurple/protocols/oscar/oscar.c:5056 -#: ../libpurple/protocols/oscar/oscar.c:5071 +#: ../libpurple/protocols/oscar/oscar.c:4630 +#: ../libpurple/protocols/oscar/oscar.c:5060 +#: ../libpurple/protocols/oscar/oscar.c:5075 msgid "Unable To Add" msgstr "Unable To Add" -#: ../libpurple/protocols/oscar/oscar.c:4735 +#: ../libpurple/protocols/oscar/oscar.c:4739 msgid "Unable To Retrieve Buddy List" msgstr "Unable To Retrieve Buddy List" -#: ../libpurple/protocols/oscar/oscar.c:4736 +#: ../libpurple/protocols/oscar/oscar.c:4740 #, fuzzy msgid "" "The AIM servers were temporarily unable to send your buddy list. Your buddy " @@ -9219,15 +9204,15 @@ "servers. Your buddy list is not lost, and will probably become available in " "a few hours." -#: ../libpurple/protocols/oscar/oscar.c:4918 -#: ../libpurple/protocols/oscar/oscar.c:4920 -#: ../libpurple/protocols/oscar/oscar.c:5136 -#: ../libpurple/protocols/oscar/oscar.c:5137 -#: ../libpurple/protocols/oscar/oscar.c:5142 +#: ../libpurple/protocols/oscar/oscar.c:4922 +#: ../libpurple/protocols/oscar/oscar.c:4924 +#: ../libpurple/protocols/oscar/oscar.c:5140 +#: ../libpurple/protocols/oscar/oscar.c:5141 +#: ../libpurple/protocols/oscar/oscar.c:5146 msgid "Orphans" msgstr "Orphans" -#: ../libpurple/protocols/oscar/oscar.c:5054 +#: ../libpurple/protocols/oscar/oscar.c:5058 #, c-format msgid "" "Could not add the buddy %s because you have too many buddies in your buddy " @@ -9236,17 +9221,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:5054 -#: ../libpurple/protocols/oscar/oscar.c:5069 +#: ../libpurple/protocols/oscar/oscar.c:5058 +#: ../libpurple/protocols/oscar/oscar.c:5073 msgid "(no name)" msgstr "(no name)" -#: ../libpurple/protocols/oscar/oscar.c:5068 +#: ../libpurple/protocols/oscar/oscar.c:5072 #, fuzzy, c-format msgid "Could not add the buddy %s for an unknown reason." msgstr "Your command failed for an unknown reason." -#: ../libpurple/protocols/oscar/oscar.c:5174 +#: ../libpurple/protocols/oscar/oscar.c:5178 #, c-format msgid "" "The user %s has given you permission to add you to their buddy list. Do you " @@ -9255,22 +9240,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:5182 +#: ../libpurple/protocols/oscar/oscar.c:5186 msgid "Authorization Given" msgstr "Authorization Given" #. Granted -#: ../libpurple/protocols/oscar/oscar.c:5255 +#: ../libpurple/protocols/oscar/oscar.c:5259 #, 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:5256 +#: ../libpurple/protocols/oscar/oscar.c:5260 msgid "Authorization Granted" msgstr "Authorization Granted" #. Denied -#: ../libpurple/protocols/oscar/oscar.c:5259 +#: ../libpurple/protocols/oscar/oscar.c:5263 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the " @@ -9281,52 +9266,52 @@ "following reason:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:5260 +#: ../libpurple/protocols/oscar/oscar.c:5264 msgid "Authorization Denied" msgstr "Authorization Denied" -#: ../libpurple/protocols/oscar/oscar.c:5296 +#: ../libpurple/protocols/oscar/oscar.c:5300 #: ../libpurple/protocols/toc/toc.c:1371 msgid "_Exchange:" msgstr "_Exchange:" -#: ../libpurple/protocols/oscar/oscar.c:5336 +#: ../libpurple/protocols/oscar/oscar.c:5340 msgid "Invalid chat name specified." msgstr "Invalid chat name specified." -#: ../libpurple/protocols/oscar/oscar.c:5405 +#: ../libpurple/protocols/oscar/oscar.c:5409 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:5567 -#: ../libpurple/protocols/oscar/oscar.c:5572 +#: ../libpurple/protocols/oscar/oscar.c:5569 +#: ../libpurple/protocols/oscar/oscar.c:5574 msgid "Away Message" msgstr "Away Message" -#: ../libpurple/protocols/oscar/oscar.c:5572 +#: ../libpurple/protocols/oscar/oscar.c:5574 #, fuzzy msgid "<i>(retrieving)</i>" msgstr " <i>(identified)</i>" -#: ../libpurple/protocols/oscar/oscar.c:5772 +#: ../libpurple/protocols/oscar/oscar.c:5774 msgid "iTunes Music Store Link" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5880 +#: ../libpurple/protocols/oscar/oscar.c:5882 #, c-format msgid "Buddy Comment for %s" msgstr "Buddy Comment for %s" -#: ../libpurple/protocols/oscar/oscar.c:5881 +#: ../libpurple/protocols/oscar/oscar.c:5883 msgid "Buddy Comment:" msgstr "Buddy Comment:" -#: ../libpurple/protocols/oscar/oscar.c:5928 +#: ../libpurple/protocols/oscar/oscar.c:5930 #, 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:5932 +#: ../libpurple/protocols/oscar/oscar.c:5934 #, fuzzy msgid "" "Because this reveals your IP address, it may be considered a security risk. " @@ -9335,68 +9320,68 @@ "Because this reveals your IP address, it may be considered a privacy risk. " "Do you wish to continue?" -#: ../libpurple/protocols/oscar/oscar.c:5938 +#: ../libpurple/protocols/oscar/oscar.c:5940 #: ../libpurple/protocols/oscar/peer.c:1045 #, fuzzy msgid "C_onnect" msgstr "Connect" -#: ../libpurple/protocols/oscar/oscar.c:5973 +#: ../libpurple/protocols/oscar/oscar.c:5975 #, fuzzy msgid "Get AIM Info" msgstr "Get Info" -#: ../libpurple/protocols/oscar/oscar.c:5979 +#: ../libpurple/protocols/oscar/oscar.c:5981 msgid "Edit Buddy Comment" msgstr "Edit Buddy Comment" -#: ../libpurple/protocols/oscar/oscar.c:5987 +#: ../libpurple/protocols/oscar/oscar.c:5989 msgid "Get Status Msg" msgstr "Get Status Msg" -#: ../libpurple/protocols/oscar/oscar.c:6000 +#: ../libpurple/protocols/oscar/oscar.c:6002 msgid "Direct IM" msgstr "Direct IM" -#: ../libpurple/protocols/oscar/oscar.c:6022 +#: ../libpurple/protocols/oscar/oscar.c:6024 msgid "Re-request Authorization" msgstr "Re-request Authorization" -#: ../libpurple/protocols/oscar/oscar.c:6081 +#: ../libpurple/protocols/oscar/oscar.c:6083 #, fuzzy msgid "Require authorization" msgstr "Request Authorization" -#: ../libpurple/protocols/oscar/oscar.c:6084 +#: ../libpurple/protocols/oscar/oscar.c:6086 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:6089 +#: ../libpurple/protocols/oscar/oscar.c:6091 #, fuzzy msgid "ICQ Privacy Options" msgstr "Proxy Options" -#: ../libpurple/protocols/oscar/oscar.c:6108 +#: ../libpurple/protocols/oscar/oscar.c:6110 msgid "The new formatting is invalid." msgstr "The new formatting is invalid." -#: ../libpurple/protocols/oscar/oscar.c:6109 +#: ../libpurple/protocols/oscar/oscar.c:6111 msgid "Screen name formatting can change only capitalization and whitespace." msgstr "Screen name formatting can change only capitalization and whitespace." -#: ../libpurple/protocols/oscar/oscar.c:6162 +#: ../libpurple/protocols/oscar/oscar.c:6164 msgid "Change Address To:" msgstr "Change Address To:" -#: ../libpurple/protocols/oscar/oscar.c:6208 +#: ../libpurple/protocols/oscar/oscar.c:6210 msgid "<i>you are not waiting for authorization</i>" msgstr "<i>you are not waiting for authorization</i>" -#: ../libpurple/protocols/oscar/oscar.c:6211 +#: ../libpurple/protocols/oscar/oscar.c:6213 msgid "You are awaiting authorization from the following buddies" msgstr "You are awaiting authorization from the following buddies" -#: ../libpurple/protocols/oscar/oscar.c:6212 +#: ../libpurple/protocols/oscar/oscar.c:6214 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -9404,80 +9389,80 @@ "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" -#: ../libpurple/protocols/oscar/oscar.c:6229 +#: ../libpurple/protocols/oscar/oscar.c:6231 msgid "Find Buddy by E-Mail" msgstr "Find Buddy by E-Mail" -#: ../libpurple/protocols/oscar/oscar.c:6230 +#: ../libpurple/protocols/oscar/oscar.c:6232 msgid "Search for a buddy by e-mail address" msgstr "Search for a buddy by e-mail address" -#: ../libpurple/protocols/oscar/oscar.c:6231 +#: ../libpurple/protocols/oscar/oscar.c:6233 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:6234 +#: ../libpurple/protocols/oscar/oscar.c:6236 #, fuzzy msgid "_Search" msgstr "Search" -#: ../libpurple/protocols/oscar/oscar.c:6392 +#: ../libpurple/protocols/oscar/oscar.c:6394 msgid "Set User Info (URL)..." msgstr "Set User Info (URL)..." -#: ../libpurple/protocols/oscar/oscar.c:6403 +#: ../libpurple/protocols/oscar/oscar.c:6405 msgid "Change Password (URL)" msgstr "Change Password (URL)" -#: ../libpurple/protocols/oscar/oscar.c:6407 +#: ../libpurple/protocols/oscar/oscar.c:6409 msgid "Configure IM Forwarding (URL)" msgstr "Configure IM Forwarding (URL)" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:6417 +#: ../libpurple/protocols/oscar/oscar.c:6419 #, fuzzy msgid "Set Privacy Options..." msgstr "Show more options" #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:6424 +#: ../libpurple/protocols/oscar/oscar.c:6426 msgid "Confirm Account" msgstr "Confirm Account" -#: ../libpurple/protocols/oscar/oscar.c:6428 +#: ../libpurple/protocols/oscar/oscar.c:6430 #, fuzzy msgid "Display Currently Registered E-Mail Address" msgstr "Display Currently Registered Address" -#: ../libpurple/protocols/oscar/oscar.c:6432 +#: ../libpurple/protocols/oscar/oscar.c:6434 #, fuzzy msgid "Change Currently Registered E-Mail Address..." msgstr "Change Currently Registered Address..." -#: ../libpurple/protocols/oscar/oscar.c:6439 +#: ../libpurple/protocols/oscar/oscar.c:6441 msgid "Show Buddies Awaiting Authorization" msgstr "Show Buddies Awaiting Authorization" -#: ../libpurple/protocols/oscar/oscar.c:6445 +#: ../libpurple/protocols/oscar/oscar.c:6447 #, fuzzy msgid "Search for Buddy by E-Mail Address..." msgstr "Search for Buddy by E-Mail..." -#: ../libpurple/protocols/oscar/oscar.c:6450 +#: ../libpurple/protocols/oscar/oscar.c:6452 msgid "Search for Buddy by Information" msgstr "Search for Buddy by Information" -#: ../libpurple/protocols/oscar/oscar.c:6518 +#: ../libpurple/protocols/oscar/oscar.c:6520 #, fuzzy msgid "Use recent buddies group" msgstr "User not in group" -#: ../libpurple/protocols/oscar/oscar.c:6521 +#: ../libpurple/protocols/oscar/oscar.c:6523 #, fuzzy msgid "Show how long you have been idle" msgstr "Allows you to hand-configure how long you've been idle for" -#: ../libpurple/protocols/oscar/oscar.c:6676 +#: ../libpurple/protocols/oscar/oscar.c:6678 msgid "" "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" @@ -9494,7 +9479,7 @@ msgstr "Attempting to connect to %s at %s:%hu for Direct IM." #: ../libpurple/protocols/oscar/peer.c:856 -#, fuzzy +#, fuzzy, c-format msgid "Attempting to connect via proxy server." msgstr "Attempting to connect to %s at %s:%hu for Direct IM." @@ -10006,7 +9991,7 @@ msgid "Error requesting login token" msgstr "Error creating connection" -#: ../libpurple/protocols/qq/login_logout.c:488 +#: ../libpurple/protocols/qq/login_logout.c:486 #, fuzzy msgid "Unable to login, check debug log" msgstr "Unable to login to AIM" @@ -10422,7 +10407,7 @@ msgid "Send TEST Announcement" msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417 +#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354 msgid "Topic:" msgstr "Topic:" @@ -10448,7 +10433,7 @@ msgid "No Sametime Community Server Specified" msgstr "Connecting to SILC Server" -#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323 +#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041 msgid "Connect" msgstr "Connect" @@ -10503,6 +10488,11 @@ "entry has been removed from your buddy list." msgstr "" +#: ../libpurple/protocols/sametime/sametime.c:4425 +#, fuzzy +msgid "Unable to add user" +msgstr "Unable to ban user %s" + #: ../libpurple/protocols/sametime/sametime.c:5011 #, fuzzy, c-format msgid "" @@ -10624,7 +10614,7 @@ "buttons below." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755 +#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756 msgid "Search Results" msgstr "Search Results" @@ -11204,6 +11194,7 @@ #: ../libpurple/protocols/silc/chat.c:153 #: ../libpurple/protocols/silc10/chat.c:152 +#, c-format msgid "<br><b>Channel Modes:</b> " msgstr "<br><b>Channel Modes:</b> " @@ -11242,6 +11233,7 @@ #: ../libpurple/protocols/silc/chat.c:435 #: ../libpurple/protocols/silc10/chat.c:413 +#, c-format msgid "" "Channel authentication is used to secure the channel from unauthorized " "access. The authentication may be based on passphrase and digital " @@ -11871,7 +11863,7 @@ msgstr "Connecting to SILC Server" #: ../libpurple/protocols/silc/silc.c:352 -#, fuzzy +#, fuzzy, c-format msgid "Could not load SILC key pair" msgstr "Could not load public key" @@ -11903,7 +11895,8 @@ msgstr "Your Current Mood" #: ../libpurple/protocols/silc/silc.c:741 -#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643 +#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641 +#, c-format msgid "Normal" msgstr "Normal" @@ -12306,7 +12299,7 @@ msgstr "Secure Internet Live Conferencing (SILC) Protocol" #: ../libpurple/protocols/silc/silc.c:1910 -#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038 +#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036 msgid "Network" msgstr "Network" @@ -12507,42 +12500,52 @@ msgstr "No server statistics available" #: ../libpurple/protocols/silc10/ops.c:1931 +#, c-format msgid "Failure: Version mismatch, upgrade your client" msgstr "Failure: Version mismatch; upgrade your client" #: ../libpurple/protocols/silc10/ops.c:1934 +#, c-format 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 +#, c-format msgid "Failure: Remote does not support proposed KE group" msgstr "Failure: Remote does not support proposed KE group" #: ../libpurple/protocols/silc10/ops.c:1940 +#, c-format msgid "Failure: Remote does not support proposed cipher" msgstr "Failure: Remote does not support proposed cipher" #: ../libpurple/protocols/silc10/ops.c:1943 +#, c-format msgid "Failure: Remote does not support proposed PKCS" msgstr "Failure: Remote does not support proposed PKCS" #: ../libpurple/protocols/silc10/ops.c:1946 +#, c-format msgid "Failure: Remote does not support proposed hash function" msgstr "Failure: Remote does not support proposed hash function" #: ../libpurple/protocols/silc10/ops.c:1949 +#, c-format msgid "Failure: Remote does not support proposed HMAC" msgstr "Failure: Remote does not support proposed HMAC" #: ../libpurple/protocols/silc10/ops.c:1951 +#, c-format msgid "Failure: Incorrect signature" msgstr "Failure: Incorrect signature" #: ../libpurple/protocols/silc10/ops.c:1953 +#, c-format msgid "Failure: Invalid cookie" msgstr "Failure: Invalid cookie" #: ../libpurple/protocols/silc10/ops.c:1964 +#, c-format msgid "Failure: Authentication failed" msgstr "Failure: Authentication failed" @@ -12572,34 +12575,34 @@ msgstr "Could not send" #: ../libpurple/protocols/simple/simple.c:438 -#: ../libpurple/protocols/simple/simple.c:1531 +#: ../libpurple/protocols/simple/simple.c:1529 msgid "Could not connect" msgstr "Could not connect" -#: ../libpurple/protocols/simple/simple.c:1061 +#: ../libpurple/protocols/simple/simple.c:1059 #, fuzzy msgid "Unknown server response." msgstr "Unknown error." -#: ../libpurple/protocols/simple/simple.c:1565 -#: ../libpurple/protocols/simple/simple.c:1607 -#: ../libpurple/protocols/simple/simple.c:1620 -#: ../libpurple/protocols/simple/simple.c:1671 +#: ../libpurple/protocols/simple/simple.c:1563 +#: ../libpurple/protocols/simple/simple.c:1605 +#: ../libpurple/protocols/simple/simple.c:1618 +#: ../libpurple/protocols/simple/simple.c:1669 #, fuzzy msgid "Could not create listen socket" msgstr "Couldn't create socket" -#: ../libpurple/protocols/simple/simple.c:1588 +#: ../libpurple/protocols/simple/simple.c:1586 #, fuzzy msgid "Couldn't resolve host" msgstr "Couldn't connect to host" -#: ../libpurple/protocols/simple/simple.c:1679 +#: ../libpurple/protocols/simple/simple.c:1677 #, fuzzy msgid "Could not resolve hostname" msgstr "Unable to resolve hostname." -#: ../libpurple/protocols/simple/simple.c:1696 +#: ../libpurple/protocols/simple/simple.c:1694 #, fuzzy msgid "SIP screen names may not contain whitespaces or @ symbols" msgstr "IRC nicks may not contain whitespace" @@ -12612,43 +12615,43 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/simple/simple.c:1872 +#: ../libpurple/protocols/simple/simple.c:1870 #, fuzzy msgid "SIP/SIMPLE Protocol Plugin" msgstr "SILC Protocol Plugin" #. * summary -#: ../libpurple/protocols/simple/simple.c:1873 +#: ../libpurple/protocols/simple/simple.c:1871 #, fuzzy msgid "The SIP/SIMPLE Protocol Plugin" msgstr "SILC Protocol Plugin" -#: ../libpurple/protocols/simple/simple.c:1901 +#: ../libpurple/protocols/simple/simple.c:1899 msgid "Publish status (note: everyone may watch you)" msgstr "" -#: ../libpurple/protocols/simple/simple.c:1907 +#: ../libpurple/protocols/simple/simple.c:1905 #, fuzzy msgid "Use UDP" msgstr "User ID" -#: ../libpurple/protocols/simple/simple.c:1909 +#: ../libpurple/protocols/simple/simple.c:1907 #, fuzzy msgid "Use proxy" msgstr "No Proxy" +#: ../libpurple/protocols/simple/simple.c:1909 +#, fuzzy +msgid "Proxy" +msgstr "No Proxy" + #: ../libpurple/protocols/simple/simple.c:1911 #, fuzzy -msgid "Proxy" -msgstr "No Proxy" +msgid "Auth User" +msgstr "AP User" #: ../libpurple/protocols/simple/simple.c:1913 #, fuzzy -msgid "Auth User" -msgstr "AP User" - -#: ../libpurple/protocols/simple/simple.c:1915 -#, fuzzy msgid "Auth Domain" msgstr "Automatic" @@ -12693,6 +12696,7 @@ msgstr "Warning of %s not allowed." #: ../libpurple/protocols/toc/toc.c:503 +#, c-format msgid "A message has been dropped, you are exceeding the server speed limit." msgstr "A message has been dropped, you are exceeding the server speed limit." @@ -12717,38 +12721,47 @@ msgstr "You missed an IM from %s because it was sent too fast." #: ../libpurple/protocols/toc/toc.c:518 +#, c-format msgid "Failure." msgstr "Failure." #: ../libpurple/protocols/toc/toc.c:521 +#, c-format msgid "Too many matches." msgstr "Too many matches." #: ../libpurple/protocols/toc/toc.c:524 +#, c-format msgid "Need more qualifiers." msgstr "Need more qualifiers." #: ../libpurple/protocols/toc/toc.c:527 +#, c-format msgid "Dir service temporarily unavailable." msgstr "Dir service temporarily unavailable." #: ../libpurple/protocols/toc/toc.c:530 +#, c-format msgid "E-mail lookup restricted." msgstr "E-mail lookup restricted." #: ../libpurple/protocols/toc/toc.c:533 +#, c-format msgid "Keyword ignored." msgstr "Keyword ignored." #: ../libpurple/protocols/toc/toc.c:536 +#, c-format msgid "No keywords." msgstr "No keywords." #: ../libpurple/protocols/toc/toc.c:539 +#, c-format msgid "User has no directory information." msgstr "User has no directory information." #: ../libpurple/protocols/toc/toc.c:543 +#, c-format msgid "Country not supported." msgstr "Country not supported." @@ -12758,19 +12771,22 @@ msgstr "Failure unknown: %s." #: ../libpurple/protocols/toc/toc.c:549 -#, fuzzy +#, fuzzy, c-format msgid "Incorrect screen name or password." msgstr "Incorrect nickname or password." #: ../libpurple/protocols/toc/toc.c:552 +#, c-format msgid "The service is temporarily unavailable." msgstr "The service is temporarily unavailable." #: ../libpurple/protocols/toc/toc.c:555 +#, c-format msgid "Your warning level is currently too high to log in." msgstr "Your warning level is currently too high to log in." #: ../libpurple/protocols/toc/toc.c:558 +#, c-format 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." @@ -12809,8 +12825,8 @@ msgid "Password Change Successful" msgstr "Password Change Successful" -#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871 -#: ../pidgin/gtkblist.c:6227 +#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582 +#: ../pidgin/gtkblist.c:5932 msgid "_Group:" msgstr "_Group:" @@ -12871,26 +12887,26 @@ msgid "TOC Protocol Plugin" msgstr "TOC Protocol Plugin" -#: ../libpurple/protocols/yahoo/yahoo.c:784 +#: ../libpurple/protocols/yahoo/yahoo.c:782 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:840 +#: ../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:959 +#: ../libpurple/protocols/yahoo/yahoo.c:960 #, c-format msgid "Yahoo! system message for %s:" msgstr "Yahoo! system message for %s:" -#: ../libpurple/protocols/yahoo/yahoo.c:1028 +#: ../libpurple/protocols/yahoo/yahoo.c:1029 #, fuzzy msgid "Authorization denied message:" msgstr "Authorization Denied Message:" -#: ../libpurple/protocols/yahoo/yahoo.c:1046 +#: ../libpurple/protocols/yahoo/yahoo.c:1047 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -12899,16 +12915,16 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." -#: ../libpurple/protocols/yahoo/yahoo.c:1049 +#: ../libpurple/protocols/yahoo/yahoo.c:1050 #, 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:1051 +#: ../libpurple/protocols/yahoo/yahoo.c:1052 msgid "Add buddy rejected" msgstr "Add buddy rejected" -#: ../libpurple/protocols/yahoo/yahoo.c:1993 +#: ../libpurple/protocols/yahoo/yahoo.c:1994 #, fuzzy, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -12919,11 +12935,11 @@ "method. This version of Gaim will likely not be able to successfully sign " "on to Yahoo. Check %s for updates." -#: ../libpurple/protocols/yahoo/yahoo.c:1996 +#: ../libpurple/protocols/yahoo/yahoo.c:1997 msgid "Failed Yahoo! Authentication" msgstr "Failed Yahoo! Authentication" -#: ../libpurple/protocols/yahoo/yahoo.c:2062 +#: ../libpurple/protocols/yahoo/yahoo.c:2063 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -12932,171 +12948,181 @@ "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:2065 +#: ../libpurple/protocols/yahoo/yahoo.c:2066 msgid "Ignore buddy?" msgstr "Ignore buddy?" -#: ../libpurple/protocols/yahoo/yahoo.c:2128 +#: ../libpurple/protocols/yahoo/yahoo.c:2129 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:2131 +#: ../libpurple/protocols/yahoo/yahoo.c:2132 #, 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:2185 +#: ../libpurple/protocols/yahoo/yahoo.c:2186 #, 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:2188 +#: ../libpurple/protocols/yahoo/yahoo.c:2189 msgid "Could not add buddy to server list" msgstr "Could not add buddy to server list" -#: ../libpurple/protocols/yahoo/yahoo.c:2307 +#: ../libpurple/protocols/yahoo/yahoo.c:2308 #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:2650 +#: ../libpurple/protocols/yahoo/yahoo.c:2651 #, fuzzy msgid "Received unexpected HTTP response from server." msgstr "Invalid response from server." -#: ../libpurple/protocols/yahoo/yahoo.c:2674 -#: ../libpurple/protocols/yahoo/yahoo.c:2860 -#: ../libpurple/protocols/yahoo/yahoo.c:2963 -#: ../libpurple/protocols/yahoo/yahoo.c:2973 +#: ../libpurple/protocols/yahoo/yahoo.c:2675 +#: ../libpurple/protocols/yahoo/yahoo.c:2861 +#: ../libpurple/protocols/yahoo/yahoo.c:2964 +#: ../libpurple/protocols/yahoo/yahoo.c:2974 #: ../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:2700 +#: ../libpurple/protocols/yahoo/yahoo.c:2701 #, fuzzy, c-format msgid "" "Lost connection with %s:\n" "%s" msgstr "Conversations with %s" -#: ../libpurple/protocols/yahoo/yahoo.c:2725 +#: ../libpurple/protocols/yahoo/yahoo.c:2726 #, c-format msgid "" "Could not establish a connection with %s:\n" "%s" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:3080 -#: ../libpurple/protocols/yahoo/yahoo.c:3766 +#: ../libpurple/protocols/yahoo/yahoo.c:3081 +#: ../libpurple/protocols/yahoo/yahoo.c:3767 #, fuzzy msgid "Not at Home" msgstr "Not At Home" -#: ../libpurple/protocols/yahoo/yahoo.c:3082 -#: ../libpurple/protocols/yahoo/yahoo.c:3769 +#: ../libpurple/protocols/yahoo/yahoo.c:3083 +#: ../libpurple/protocols/yahoo/yahoo.c:3770 #, fuzzy msgid "Not at Desk" msgstr "Not At Desk" -#: ../libpurple/protocols/yahoo/yahoo.c:3084 -#: ../libpurple/protocols/yahoo/yahoo.c:3772 +#: ../libpurple/protocols/yahoo/yahoo.c:3085 +#: ../libpurple/protocols/yahoo/yahoo.c:3773 #, fuzzy msgid "Not in Office" msgstr "Not In Office" -#: ../libpurple/protocols/yahoo/yahoo.c:3088 -#: ../libpurple/protocols/yahoo/yahoo.c:3778 +#: ../libpurple/protocols/yahoo/yahoo.c:3089 +#: ../libpurple/protocols/yahoo/yahoo.c:3779 msgid "On Vacation" msgstr "On Vacation" -#: ../libpurple/protocols/yahoo/yahoo.c:3092 -#: ../libpurple/protocols/yahoo/yahoo.c:3784 +#: ../libpurple/protocols/yahoo/yahoo.c:3093 +#: ../libpurple/protocols/yahoo/yahoo.c:3785 msgid "Stepped Out" msgstr "Stepped Out" -#: ../libpurple/protocols/yahoo/yahoo.c:3185 -#: ../libpurple/protocols/yahoo/yahoo.c:3215 +#: ../libpurple/protocols/yahoo/yahoo.c:3186 +#: ../libpurple/protocols/yahoo/yahoo.c:3216 msgid "Not on server list" msgstr "Not on server list" -#: ../libpurple/protocols/yahoo/yahoo.c:3232 -#: ../libpurple/protocols/yahoo/yahoo.c:3290 +#: ../libpurple/protocols/yahoo/yahoo.c:3233 +#: ../libpurple/protocols/yahoo/yahoo.c:3291 #, fuzzy msgid "Appear Online" msgstr "Appear Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3235 -#: ../libpurple/protocols/yahoo/yahoo.c:3311 +#: ../libpurple/protocols/yahoo/yahoo.c:3236 +#: ../libpurple/protocols/yahoo/yahoo.c:3312 #, fuzzy msgid "Appear Permanently Offline" msgstr "Appear Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3253 +#: ../libpurple/protocols/yahoo/yahoo.c:3254 #, fuzzy msgid "Presence" msgstr "Preferences" -#: ../libpurple/protocols/yahoo/yahoo.c:3296 +#: ../libpurple/protocols/yahoo/yahoo.c:3297 msgid "Appear Offline" msgstr "Appear Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3305 +#: ../libpurple/protocols/yahoo/yahoo.c:3306 #, fuzzy msgid "Don't Appear Permanently Offline" msgstr "Appear Offline" -#: ../libpurple/protocols/yahoo/yahoo.c:3353 +#: ../libpurple/protocols/yahoo/yahoo.c:3354 msgid "Join in Chat" msgstr "Join in Chat" -#: ../libpurple/protocols/yahoo/yahoo.c:3359 +#: ../libpurple/protocols/yahoo/yahoo.c:3360 msgid "Initiate Conference" msgstr "Initiate Conference" -#: ../libpurple/protocols/yahoo/yahoo.c:3387 +#: ../libpurple/protocols/yahoo/yahoo.c:3388 #, fuzzy msgid "Presence Settings" msgstr "Use Environmental Settings" -#: ../libpurple/protocols/yahoo/yahoo.c:3393 +#: ../libpurple/protocols/yahoo/yahoo.c:3394 msgid "Start Doodling" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:3494 +#: ../libpurple/protocols/yahoo/yahoo.c:3495 #, fuzzy msgid "Activate which ID?" msgstr "Active which ID?" -#: ../libpurple/protocols/yahoo/yahoo.c:3505 +#: ../libpurple/protocols/yahoo/yahoo.c:3506 msgid "Join whom in chat?" msgstr "Join whom in chat?" -#: ../libpurple/protocols/yahoo/yahoo.c:3517 +#: ../libpurple/protocols/yahoo/yahoo.c:3518 msgid "Activate ID..." msgstr "Activate ID..." -#: ../libpurple/protocols/yahoo/yahoo.c:3521 +#: ../libpurple/protocols/yahoo/yahoo.c:3522 #, fuzzy msgid "Join User in Chat..." msgstr "Join user in chat..." -#: ../libpurple/protocols/yahoo/yahoo.c:3526 +#: ../libpurple/protocols/yahoo/yahoo.c:3527 msgid "Open Inbox" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:4135 +#: ../libpurple/protocols/yahoo/yahoo.c:4119 +#, fuzzy +msgid "Buzz" +msgstr "Buzz!!" + +#: ../libpurple/protocols/yahoo/yahoo.c:4121 +#, c-format +msgid "Buzzing %s..." +msgstr "" + +#: ../libpurple/protocols/yahoo/yahoo.c:4136 #, fuzzy msgid "join <room>: Join a chat room on the Yahoo network" msgstr "join: <room> [server]: Join a chat on this server." -#: ../libpurple/protocols/yahoo/yahoo.c:4140 +#: ../libpurple/protocols/yahoo/yahoo.c:4141 #, fuzzy msgid "list: List rooms on the Yahoo network" msgstr "list: List channels on this network" -#: ../libpurple/protocols/yahoo/yahoo.c:4148 +#: ../libpurple/protocols/yahoo/yahoo.c:4149 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13110,62 +13136,62 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/yahoo/yahoo.c:4357 -#: ../libpurple/protocols/yahoo/yahoo.c:4359 +#: ../libpurple/protocols/yahoo/yahoo.c:4358 +#: ../libpurple/protocols/yahoo/yahoo.c:4360 msgid "Yahoo Protocol Plugin" msgstr "Yahoo Protocol Plugin" -#: ../libpurple/protocols/yahoo/yahoo.c:4382 +#: ../libpurple/protocols/yahoo/yahoo.c:4383 msgid "Yahoo Japan" msgstr "Yahoo Japan" -#: ../libpurple/protocols/yahoo/yahoo.c:4385 +#: ../libpurple/protocols/yahoo/yahoo.c:4386 #, fuzzy msgid "Pager server" msgstr "Proxy Server" -#: ../libpurple/protocols/yahoo/yahoo.c:4388 +#: ../libpurple/protocols/yahoo/yahoo.c:4389 #, fuzzy msgid "Japan Pager server" msgstr "Japan Pager host" -#: ../libpurple/protocols/yahoo/yahoo.c:4391 +#: ../libpurple/protocols/yahoo/yahoo.c:4392 msgid "Pager port" msgstr "Pager port" -#: ../libpurple/protocols/yahoo/yahoo.c:4394 +#: ../libpurple/protocols/yahoo/yahoo.c:4395 #, fuzzy msgid "File transfer server" msgstr "File transfer host" -#: ../libpurple/protocols/yahoo/yahoo.c:4397 +#: ../libpurple/protocols/yahoo/yahoo.c:4398 #, fuzzy msgid "Japan file transfer server" msgstr "Japan File transfer host" -#: ../libpurple/protocols/yahoo/yahoo.c:4400 +#: ../libpurple/protocols/yahoo/yahoo.c:4401 msgid "File transfer port" msgstr "File transfer port" -#: ../libpurple/protocols/yahoo/yahoo.c:4403 +#: ../libpurple/protocols/yahoo/yahoo.c:4404 #, fuzzy msgid "Chat room locale" msgstr "Chat Room List Url" -#: ../libpurple/protocols/yahoo/yahoo.c:4406 +#: ../libpurple/protocols/yahoo/yahoo.c:4407 msgid "Ignore conference and chatroom invitations" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:4414 +#: ../libpurple/protocols/yahoo/yahoo.c:4415 #, fuzzy msgid "Chat room list URL" msgstr "Chat Room List Url" -#: ../libpurple/protocols/yahoo/yahoo.c:4417 +#: ../libpurple/protocols/yahoo/yahoo.c:4418 msgid "Yahoo Chat server" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo.c:4420 +#: ../libpurple/protocols/yahoo/yahoo.c:4421 #, fuzzy msgid "Yahoo Chat port" msgstr "Yahoo Japan" @@ -13617,19 +13643,19 @@ msgid "%s has requested your attention!" msgstr "%s requested your information" -#: ../libpurple/server.c:793 +#: ../libpurple/server.c:796 #, fuzzy, c-format msgid "" "%s has invited %s to the chat room %s:\n" "%s" msgstr "%s has invited %s to the chat room %s\n" -#: ../libpurple/server.c:798 +#: ../libpurple/server.c:801 #, 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:802 +#: ../libpurple/server.c:805 msgid "Accept chat invitation?" msgstr "Accept chat invitation?" @@ -13677,64 +13703,49 @@ msgid "%s changed status from %s to %s" msgstr "%s has changed the topic to: %s" -#: ../libpurple/status.c:612 -#, fuzzy, c-format -msgid "%s (%s) changed status from %s to %s" -msgstr "%s has changed the topic to: %s" - -#: ../libpurple/status.c:623 +#: ../libpurple/status.c:619 #, fuzzy, c-format msgid "%s is now %s" msgstr "%s is now known as %s" -#: ../libpurple/status.c:625 -#, fuzzy, c-format -msgid "%s (%s) is now %s" -msgstr "%s is now known as %s" - -#: ../libpurple/status.c:631 +#: ../libpurple/status.c:624 #, fuzzy, c-format msgid "%s is no longer %s" msgstr "%s is no longer away." -#: ../libpurple/status.c:633 -#, fuzzy, c-format -msgid "%s (%s) is no longer %s" -msgstr "%s is no longer away." - -#: ../libpurple/status.c:1244 +#: ../libpurple/status.c:1234 #, c-format msgid "%s became idle" msgstr "%s became idle" -#: ../libpurple/status.c:1261 +#: ../libpurple/status.c:1251 #, c-format msgid "%s became unidle" msgstr "%s became unidle" -#: ../libpurple/status.c:1324 +#: ../libpurple/status.c:1314 #, fuzzy, c-format msgid "+++ %s became idle" msgstr "%s became idle" -#: ../libpurple/status.c:1326 +#: ../libpurple/status.c:1316 #, fuzzy, c-format msgid "+++ %s became unidle" msgstr "%s became unidle" -#: ../libpurple/util.c:701 +#: ../libpurple/util.c:718 #, c-format msgid "%x %X" msgstr "" -#: ../libpurple/util.c:2705 +#: ../libpurple/util.c:2722 #, fuzzy, c-format msgid "Error Reading %s" msgstr "" "Error reading %s: \n" "%s.\n" -#: ../libpurple/util.c:2706 +#: ../libpurple/util.c:2723 #, fuzzy, c-format msgid "" "An error was encountered reading your %s. They have not been loaded, and " @@ -13743,88 +13754,88 @@ "An error was encountered parsing your buddy list. It has not been loaded, " "and the old file has moved to blist.xml~." -#: ../libpurple/util.c:3206 +#: ../libpurple/util.c:3223 msgid "Calculating..." msgstr "Calculating..." -#: ../libpurple/util.c:3209 +#: ../libpurple/util.c:3226 msgid "Unknown." msgstr "Unknown." -#: ../libpurple/util.c:3235 +#: ../libpurple/util.c:3252 #, fuzzy, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "second" msgstr[1] "seconds" -#: ../libpurple/util.c:3247 +#: ../libpurple/util.c:3264 #, fuzzy, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "day" msgstr[1] "days" -#: ../libpurple/util.c:3255 +#: ../libpurple/util.c:3272 #, c-format msgid "%s, %d hour" msgid_plural "%s, %d hours" msgstr[0] "" msgstr[1] "" -#: ../libpurple/util.c:3261 +#: ../libpurple/util.c:3278 #, fuzzy, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "hour" msgstr[1] "hours" -#: ../libpurple/util.c:3269 +#: ../libpurple/util.c:3286 #, fuzzy, c-format msgid "%s, %d minute" msgid_plural "%s, %d minutes" msgstr[0] "minute" msgstr[1] "minutes" -#: ../libpurple/util.c:3275 +#: ../libpurple/util.c:3292 #, fuzzy, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "minute" msgstr[1] "minutes" -#: ../libpurple/util.c:3535 +#: ../libpurple/util.c:3552 #, c-format msgid "Could not open %s: Redirected too many times" msgstr "" -#: ../libpurple/util.c:3572 ../libpurple/util.c:3868 +#: ../libpurple/util.c:3589 ../libpurple/util.c:3885 #, fuzzy, c-format msgid "Unable to connect to %s" msgstr "Unable to connect to server." -#: ../libpurple/util.c:3695 +#: ../libpurple/util.c:3712 #, c-format msgid "" "Unable to allocate enough memory to hold the contents from %s. The web " "server may be trying something malicious." msgstr "" -#: ../libpurple/util.c:3730 +#: ../libpurple/util.c:3747 #, fuzzy, c-format msgid "Error reading from %s: %s" msgstr "" "Error reading %s: \n" "%s.\n" -#: ../libpurple/util.c:3761 +#: ../libpurple/util.c:3778 #, fuzzy, c-format msgid "Error writing to %s: %s" msgstr "" "Error writing %s: \n" "%s.\n" -#: ../libpurple/util.c:3786 +#: ../libpurple/util.c:3803 #, fuzzy, c-format msgid "Unable to connect to %s: %s" msgstr "Unable to connect to server." @@ -13923,7 +13934,7 @@ msgid "SOCKS 5" msgstr "SOCKS 5" -#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213 +#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211 msgid "Use Environmental Settings" msgstr "Use Environmental Settings" @@ -13945,15 +13956,15 @@ msgid "Proxy Options" msgstr "Proxy Options" -#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207 +#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205 msgid "Proxy _type:" msgstr "Proxy _type:" -#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228 +#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226 msgid "_Host:" msgstr "_Host:" -#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246 +#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244 msgid "_Port:" msgstr "_Port:" @@ -13961,7 +13972,7 @@ msgid "_Username:" msgstr "_Username:" -#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283 +#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281 msgid "Pa_ssword:" msgstr "Pa_ssword:" @@ -14015,31 +14026,11 @@ "<b>Accounts->Add/Edit</b> in the Buddy List window" msgstr "" -#: ../pidgin/gtkblist.c:524 -#, c-format -msgid "You have %d contact named %s. Would you like to merge them?" -msgid_plural "" -"You currently have %d contacts named %s. Would you like to merge them?" -msgstr[0] "" -msgstr[1] "" - -#: ../pidgin/gtkblist.c:525 -msgid "" -"Merging these contacts will cause them to share a single entry on the buddy " -"list and use a single conversation window. You can separate them again by " -"choosing 'Expand' from the contact's context menu" -msgstr "" - -#: ../pidgin/gtkblist.c:527 -#, fuzzy -msgid "_Merge" -msgstr "_Message:" - -#: ../pidgin/gtkblist.c:924 +#: ../pidgin/gtkblist.c:767 msgid "Join a Chat" msgstr "Join a Chat" -#: ../pidgin/gtkblist.c:945 +#: ../pidgin/gtkblist.c:788 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -14047,117 +14038,98 @@ "Please enter the appropriate information about the chat you would like to " "join.\n" -#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188 -#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396 +#. Set up stuff for the account box +#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530 +#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539 +#: ../pidgin/gtkroomlist.c:396 msgid "_Account:" msgstr "_Account:" -#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603 +#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603 #: ../pidgin/gtkprivacy.c:617 #, fuzzy msgid "_Block" msgstr "Block" -#: ../pidgin/gtkblist.c:1245 +#: ../pidgin/gtkblist.c:1088 #, fuzzy msgid "Un_block" msgstr "Block" -#: ../pidgin/gtkblist.c:1288 -msgid "Move to" -msgstr "" - -#: ../pidgin/gtkblist.c:1328 +#: ../pidgin/gtkblist.c:1139 msgid "Get _Info" msgstr "Get _Info" -#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90 +#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90 msgid "I_M" msgstr "I_M" -#: ../pidgin/gtkblist.c:1337 -#, fuzzy -msgid "_Send File..." -msgstr "_Send File" - -#: ../pidgin/gtkblist.c:1344 -#, fuzzy -msgid "Add Buddy _Pounce..." +#: ../pidgin/gtkblist.c:1148 +#, fuzzy +msgid "_Send File" +msgstr "Send File" + +#: ../pidgin/gtkblist.c:1155 +#, fuzzy +msgid "Add Buddy _Pounce" msgstr "Add Buddy _Pounce" -#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353 -#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491 +#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164 +#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292 msgid "View _Log" msgstr "View _Log" -#: ../pidgin/gtkblist.c:1359 -#, fuzzy -msgid "Hide when offline" -msgstr "Not allowed when offline" - -#: ../pidgin/gtkblist.c:1359 -#, fuzzy -msgid "Show when offline" -msgstr "Not allowed when offline" - -#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382 -#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497 +#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186 +#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298 msgid "_Alias..." msgstr "_Alias..." -#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384 -#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499 +#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188 +#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300 msgid "_Remove" msgstr "_Remove" -#: ../pidgin/gtkblist.c:1434 -#, fuzzy -msgid "Add _Buddy..." -msgstr "Add Buddy" - -#: ../pidgin/gtkblist.c:1437 -#, fuzzy -msgid "Add C_hat..." -msgstr "Add Chat" - -#: ../pidgin/gtkblist.c:1440 +#: ../pidgin/gtkblist.c:1238 +msgid "Add a _Buddy" +msgstr "Add a _Buddy" + +#: ../pidgin/gtkblist.c:1241 +msgid "Add a C_hat" +msgstr "Add a C_hat" + +#: ../pidgin/gtkblist.c:1244 msgid "_Delete Group" msgstr "_Delete Group" -#: ../pidgin/gtkblist.c:1442 +#: ../pidgin/gtkblist.c:1246 msgid "_Rename" msgstr "_Rename" #. join button -#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307 +#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88 msgid "_Join" msgstr "_Join" -#: ../pidgin/gtkblist.c:1464 +#: ../pidgin/gtkblist.c:1267 msgid "Auto-Join" msgstr "Auto-Join" -#: ../pidgin/gtkblist.c:1466 -#, fuzzy -msgid "Persistent" -msgstr "Permit" - -#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527 +#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329 msgid "_Collapse" msgstr "_Collapse" -#: ../pidgin/gtkblist.c:1532 +#: ../pidgin/gtkblist.c:1334 msgid "_Expand" msgstr "_Expand" -#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795 -#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898 +#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597 +#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616 #, fuzzy msgid "/Tools/Mute Sounds" msgstr "Mute Sounds" -#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903 +#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840 #: ../pidgin/gtkpounce.c:430 msgid "" "You are not currently signed on with an account that can add that buddy." @@ -14165,152 +14137,152 @@ "You are not currently signed on with an account that can add that buddy." #. Buddies menu -#: ../pidgin/gtkblist.c:3067 +#: ../pidgin/gtkblist.c:2869 msgid "/_Buddies" msgstr "/_Buddies" -#: ../pidgin/gtkblist.c:3068 +#: ../pidgin/gtkblist.c:2870 msgid "/Buddies/New Instant _Message..." msgstr "/Buddies/New Instant _Message..." -#: ../pidgin/gtkblist.c:3069 +#: ../pidgin/gtkblist.c:2871 msgid "/Buddies/Join a _Chat..." msgstr "/Buddies/Join a _Chat..." -#: ../pidgin/gtkblist.c:3070 +#: ../pidgin/gtkblist.c:2872 msgid "/Buddies/Get User _Info..." msgstr "/Buddies/Get User _Info..." -#: ../pidgin/gtkblist.c:3071 +#: ../pidgin/gtkblist.c:2873 msgid "/Buddies/View User _Log..." msgstr "/Buddies/View User _Log..." -#: ../pidgin/gtkblist.c:3073 +#: ../pidgin/gtkblist.c:2875 #, fuzzy msgid "/Buddies/Show" msgstr "/Buddies/_Signoff" -#: ../pidgin/gtkblist.c:3074 +#: ../pidgin/gtkblist.c:2876 #, fuzzy msgid "/Buddies/Show/_Offline Buddies" msgstr "/Buddies/Show _Offline Buddies" -#: ../pidgin/gtkblist.c:3075 +#: ../pidgin/gtkblist.c:2877 #, fuzzy msgid "/Buddies/Show/_Empty Groups" msgstr "/Buddies/Show _Empty Groups" -#: ../pidgin/gtkblist.c:3076 +#: ../pidgin/gtkblist.c:2878 #, fuzzy msgid "/Buddies/Show/Buddy _Details" msgstr "/Buddies/Show Offline Buddies" -#: ../pidgin/gtkblist.c:3077 +#: ../pidgin/gtkblist.c:2879 #, fuzzy msgid "/Buddies/Show/Idle _Times" msgstr "/Buddies/Show Offline Buddies" -#: ../pidgin/gtkblist.c:3078 +#: ../pidgin/gtkblist.c:2880 #, fuzzy msgid "/Buddies/Show/_Protocol Icons" msgstr "/Buddies/Show _Empty Groups" -#: ../pidgin/gtkblist.c:3079 +#: ../pidgin/gtkblist.c:2881 #, fuzzy msgid "/Buddies/_Sort Buddies" msgstr "/Buddies/Show Offline Buddies" -#: ../pidgin/gtkblist.c:3081 +#: ../pidgin/gtkblist.c:2883 msgid "/Buddies/_Add Buddy..." msgstr "/Buddies/_Add Buddy..." -#: ../pidgin/gtkblist.c:3082 +#: ../pidgin/gtkblist.c:2884 msgid "/Buddies/Add C_hat..." msgstr "/Buddies/Add C_hat..." -#: ../pidgin/gtkblist.c:3083 +#: ../pidgin/gtkblist.c:2885 msgid "/Buddies/Add _Group..." msgstr "/Buddies/Add _Group..." -#: ../pidgin/gtkblist.c:3085 +#: ../pidgin/gtkblist.c:2887 msgid "/Buddies/_Quit" msgstr "/Buddies/_Quit" #. Accounts menu -#: ../pidgin/gtkblist.c:3088 +#: ../pidgin/gtkblist.c:2890 #, fuzzy msgid "/_Accounts" msgstr "Accounts" -#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889 -#, fuzzy -msgid "/Accounts/Manage" +#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589 +#, fuzzy +msgid "/Accounts/Add\\/Edit" msgstr "Accounts" #. Tools -#: ../pidgin/gtkblist.c:3092 +#: ../pidgin/gtkblist.c:2894 msgid "/_Tools" msgstr "/_Tools" -#: ../pidgin/gtkblist.c:3093 +#: ../pidgin/gtkblist.c:2895 #, fuzzy msgid "/Tools/Buddy _Pounces" msgstr "/Tools/Buddy _Pounce" -#: ../pidgin/gtkblist.c:3094 +#: ../pidgin/gtkblist.c:2896 #, fuzzy msgid "/Tools/_Certificates" msgstr "/Tools/Pr_eferences" -#: ../pidgin/gtkblist.c:3095 +#: ../pidgin/gtkblist.c:2897 #, fuzzy msgid "/Tools/Plu_gins" msgstr "/Tools/Plugin Actions" -#: ../pidgin/gtkblist.c:3096 +#: ../pidgin/gtkblist.c:2898 msgid "/Tools/Pr_eferences" msgstr "/Tools/Pr_eferences" -#: ../pidgin/gtkblist.c:3097 +#: ../pidgin/gtkblist.c:2899 msgid "/Tools/Pr_ivacy" msgstr "/Tools/Pr_ivacy" -#: ../pidgin/gtkblist.c:3099 +#: ../pidgin/gtkblist.c:2901 msgid "/Tools/_File Transfers" msgstr "/Tools/_File Transfers" -#: ../pidgin/gtkblist.c:3100 +#: ../pidgin/gtkblist.c:2902 msgid "/Tools/R_oom List" msgstr "/Tools/R_oom List" -#: ../pidgin/gtkblist.c:3101 +#: ../pidgin/gtkblist.c:2903 #, fuzzy msgid "/Tools/System _Log" msgstr "/Tools/View System _Log" -#: ../pidgin/gtkblist.c:3103 +#: ../pidgin/gtkblist.c:2905 #, fuzzy msgid "/Tools/Mute _Sounds" msgstr "Mute Sounds" #. Help -#: ../pidgin/gtkblist.c:3105 +#: ../pidgin/gtkblist.c:2907 msgid "/_Help" msgstr "/_Help" -#: ../pidgin/gtkblist.c:3106 +#: ../pidgin/gtkblist.c:2908 msgid "/Help/Online _Help" msgstr "/Help/Online _Help" -#: ../pidgin/gtkblist.c:3107 +#: ../pidgin/gtkblist.c:2909 msgid "/Help/_Debug Window" msgstr "/Help/_Debug Window" -#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111 +#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913 msgid "/Help/_About" msgstr "/Help/_About" -#: ../pidgin/gtkblist.c:3140 +#: ../pidgin/gtkblist.c:2942 #, c-format msgid "" "\n" @@ -14319,111 +14291,116 @@ "\n" "<b>Account:</b> %s" -#: ../pidgin/gtkblist.c:3218 +#: ../pidgin/gtkblist.c:3020 #, fuzzy msgid "Buddy Alias" msgstr "Buddy List" -#: ../pidgin/gtkblist.c:3247 +#: ../pidgin/gtkblist.c:3049 #, fuzzy msgid "Logged In" msgstr "Logged out" -#: ../pidgin/gtkblist.c:3293 +#: ../pidgin/gtkblist.c:3095 #, fuzzy msgid "Last Seen" msgstr "Last name:" -#: ../pidgin/gtkblist.c:3314 +#: ../pidgin/gtkblist.c:3116 msgid "Spooky" msgstr "" -#: ../pidgin/gtkblist.c:3316 +#: ../pidgin/gtkblist.c:3118 msgid "Awesome" msgstr "" -#: ../pidgin/gtkblist.c:3318 +#: ../pidgin/gtkblist.c:3120 msgid "Rockin'" msgstr "" -#: ../pidgin/gtkblist.c:3657 +#: ../pidgin/gtkblist.c:3453 #, fuzzy, c-format msgid "Idle %dd %dh %02dm" msgstr "Idle (%dh%02dm) " -#: ../pidgin/gtkblist.c:3659 +#: ../pidgin/gtkblist.c:3455 #, fuzzy, c-format msgid "Idle %dh %02dm" msgstr "Idle (%dh%02dm) " -#: ../pidgin/gtkblist.c:3661 +#: ../pidgin/gtkblist.c:3457 #, fuzzy, c-format msgid "Idle %dm" msgstr "Idle (%dm) " -#: ../pidgin/gtkblist.c:3806 +#: ../pidgin/gtkblist.c:3602 #, fuzzy msgid "/Buddies/New Instant Message..." msgstr "/Buddies/New Instant _Message..." -#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840 +#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636 msgid "/Buddies/Join a Chat..." msgstr "/Buddies/Join a Chat..." -#: ../pidgin/gtkblist.c:3808 +#: ../pidgin/gtkblist.c:3604 #, fuzzy msgid "/Buddies/Get User Info..." msgstr "/Buddies/Get User _Info..." -#: ../pidgin/gtkblist.c:3809 +#: ../pidgin/gtkblist.c:3605 #, fuzzy msgid "/Buddies/Add Buddy..." msgstr "/Buddies/_Add Buddy..." -#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843 +#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639 #, fuzzy msgid "/Buddies/Add Chat..." msgstr "/Buddies/Add C_hat..." -#: ../pidgin/gtkblist.c:3811 +#: ../pidgin/gtkblist.c:3607 #, fuzzy msgid "/Buddies/Add Group..." msgstr "/Buddies/Add _Group..." -#: ../pidgin/gtkblist.c:3846 +#: ../pidgin/gtkblist.c:3642 msgid "/Tools/Privacy" msgstr "/Tools/Privacy" -#: ../pidgin/gtkblist.c:3849 +#: ../pidgin/gtkblist.c:3645 msgid "/Tools/Room List" msgstr "/Tools/Room List" -#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153 +#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153 #, fuzzy, c-format msgid "%d unread message from %s\n" msgid_plural "%d unread messages from %s\n" msgstr[0] "Message from %s" msgstr[1] "Message from %s" -#: ../pidgin/gtkblist.c:4104 +#: ../pidgin/gtkblist.c:3822 #, fuzzy msgid "Manually" msgstr "Manual" -#: ../pidgin/gtkblist.c:4107 +#: ../pidgin/gtkblist.c:3824 +#, fuzzy +msgid "Alphabetically" +msgstr "Alphabetical" + +#: ../pidgin/gtkblist.c:3825 msgid "By status" msgstr "By status" -#: ../pidgin/gtkblist.c:4108 +#: ../pidgin/gtkblist.c:3826 msgid "By log size" msgstr "By log size" -#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180 +#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179 #, fuzzy, c-format msgid "%s disconnected" msgstr "Disconnected." -#: ../pidgin/gtkblist.c:4349 +#: ../pidgin/gtkblist.c:4067 #, fuzzy, c-format msgid "<span color=\"red\">%s disconnected: %s</span>" msgstr "" @@ -14432,68 +14409,68 @@ "%s\n" "%s" -#: ../pidgin/gtkblist.c:4501 +#: ../pidgin/gtkblist.c:4219 #, fuzzy msgid "<b>Username:</b>" msgstr "" "\n" "<b>Warned:</b>" -#: ../pidgin/gtkblist.c:4508 +#: ../pidgin/gtkblist.c:4226 #, fuzzy msgid "<b>Password:</b>" msgstr "<b>_Password:</b>" -#: ../pidgin/gtkblist.c:4519 +#: ../pidgin/gtkblist.c:4237 #, fuzzy msgid "_Login" msgstr "Login" -#: ../pidgin/gtkblist.c:4602 +#: ../pidgin/gtkblist.c:4320 #, fuzzy msgid "/Accounts" msgstr "Accounts" #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy -#: ../pidgin/gtkblist.c:4616 +#: ../pidgin/gtkblist.c:4334 #, c-format msgid "" "<span weight='bold' size='larger'>Welcome to %s!</span>\n" "\n" "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</" -"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be " +"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be " "able to sign on, set your status, and talk to your friends." msgstr "" #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. -#: ../pidgin/gtkblist.c:4879 +#: ../pidgin/gtkblist.c:4597 #, fuzzy msgid "/Buddies/Show/Offline Buddies" msgstr "/Buddies/Show Offline Buddies" -#: ../pidgin/gtkblist.c:4882 +#: ../pidgin/gtkblist.c:4600 #, fuzzy msgid "/Buddies/Show/Empty Groups" msgstr "/Buddies/Show Empty Groups" -#: ../pidgin/gtkblist.c:4888 +#: ../pidgin/gtkblist.c:4606 #, fuzzy msgid "/Buddies/Show/Buddy Details" msgstr "/Buddies/Show Offline Buddies" -#: ../pidgin/gtkblist.c:4891 +#: ../pidgin/gtkblist.c:4609 #, fuzzy msgid "/Buddies/Show/Idle Times" msgstr "/Buddies/Show Offline Buddies" -#: ../pidgin/gtkblist.c:4894 +#: ../pidgin/gtkblist.c:4612 #, fuzzy msgid "/Buddies/Show/Protocol Icons" msgstr "/Buddies/Show Empty Groups" -#: ../pidgin/gtkblist.c:5796 +#: ../pidgin/gtkblist.c:5507 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. " @@ -14503,28 +14480,22 @@ "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" -#. Set up stuff for the account box -#: ../pidgin/gtkblist.c:5819 -#, fuzzy -msgid "A_ccount:" -msgstr "Account:" - #. End of account box -#: ../pidgin/gtkblist.c:5831 +#: ../pidgin/gtkblist.c:5542 #, fuzzy msgid "_Screen name:" msgstr "_Screen name" -#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209 +#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914 #, fuzzy msgid "A_lias:" msgstr "Alias:" -#: ../pidgin/gtkblist.c:6121 +#: ../pidgin/gtkblist.c:5826 msgid "This protocol does not support chat rooms." msgstr "This protocol does not support chat rooms." -#: ../pidgin/gtkblist.c:6137 +#: ../pidgin/gtkblist.c:5842 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." @@ -14532,7 +14503,7 @@ "You are not currently signed on with any protocols that have the ability to " "chat." -#: ../pidgin/gtkblist.c:6178 +#: ../pidgin/gtkblist.c:5883 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" @@ -14540,51 +14511,43 @@ "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" -#: ../pidgin/gtkblist.c:6237 -msgid "Autojoin when account becomes online." -msgstr "" - -#: ../pidgin/gtkblist.c:6238 -msgid "Hide chat when the window is closed." -msgstr "" - -#: ../pidgin/gtkblist.c:6264 +#: ../pidgin/gtkblist.c:5964 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:6909 +#: ../pidgin/gtkblist.c:6609 msgid "<PurpleMain>/Accounts/" msgstr "" -#: ../pidgin/gtkblist.c:6933 +#: ../pidgin/gtkblist.c:6633 #, fuzzy msgid "_Edit Account" msgstr "_Account" -#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136 +#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073 msgid "No actions available" msgstr "No actions available" -#: ../pidgin/gtkblist.c:6954 +#: ../pidgin/gtkblist.c:6654 #, fuzzy msgid "_Disable" msgstr "Visible" -#: ../pidgin/gtkblist.c:6966 +#: ../pidgin/gtkblist.c:6666 #, fuzzy msgid "Enable Account" msgstr "Account" -#: ../pidgin/gtkblist.c:6972 +#: ../pidgin/gtkblist.c:6672 msgid "<PurpleMain>/Accounts/Enable Account" msgstr "" -#: ../pidgin/gtkblist.c:7021 +#: ../pidgin/gtkblist.c:6721 #, fuzzy msgid "/Tools" msgstr "/_Tools" -#: ../pidgin/gtkblist.c:7091 +#: ../pidgin/gtkblist.c:6791 #, fuzzy msgid "/Buddies/Sort Buddies" msgstr "/Buddies/Show Offline Buddies" @@ -14595,7 +14558,7 @@ msgid "SSL Servers" msgstr "Server" -#: ../pidgin/gtkconn.c:181 +#: ../pidgin/gtkconn.c:180 #, c-format msgid "" "%s\n" @@ -14604,28 +14567,28 @@ "re-enable the account." msgstr "" -#: ../pidgin/gtkconv.c:523 +#: ../pidgin/gtkconv.c:482 #, fuzzy msgid "Unknown command." msgstr "Unknown command" -#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821 +#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780 #, fuzzy 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:815 +#: ../pidgin/gtkconv.c:774 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:868 +#: ../pidgin/gtkconv.c:827 msgid "Invite Buddy Into Chat Room" msgstr "Invite Buddy Into Chat Room" #. Put our happy label in it. -#: ../pidgin/gtkconv.c:898 +#: ../pidgin/gtkconv.c:857 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." @@ -14633,199 +14596,199 @@ "Please enter the name of the user you wish to invite, along with an optional " "invite message." -#: ../pidgin/gtkconv.c:919 +#: ../pidgin/gtkconv.c:878 msgid "_Buddy:" msgstr "_Buddy:" -#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194 +#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194 #: ../pidgin/gtksavedstatuses.c:1528 msgid "_Message:" msgstr "_Message:" -#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219 +#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219 #: ../pidgin/gtkft.c:543 msgid "Unable to open file." msgstr "Unable to open file." -#: ../pidgin/gtkconv.c:994 +#: ../pidgin/gtkconv.c:953 #, c-format msgid "<h1>Conversation with %s</h1>\n" msgstr "<h1>Conversation with %s</h1>\n" -#: ../pidgin/gtkconv.c:1032 +#: ../pidgin/gtkconv.c:991 msgid "Save Conversation" msgstr "Save Conversation" -#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743 +#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743 msgid "Find" msgstr "Find" -#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195 +#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195 msgid "_Search for:" msgstr "_Search for:" -#: ../pidgin/gtkconv.c:1675 +#: ../pidgin/gtkconv.c:1622 msgid "Un-Ignore" msgstr "Un-Ignore" -#: ../pidgin/gtkconv.c:1678 +#: ../pidgin/gtkconv.c:1625 msgid "Ignore" msgstr "Ignore" -#: ../pidgin/gtkconv.c:1698 +#: ../pidgin/gtkconv.c:1645 #, fuzzy msgid "Get Away Message" msgstr "New Away Message" -#: ../pidgin/gtkconv.c:1721 +#: ../pidgin/gtkconv.c:1668 #, fuzzy msgid "Last said" msgstr "Last name:" -#: ../pidgin/gtkconv.c:2665 +#: ../pidgin/gtkconv.c:2606 msgid "Unable to save icon file to disk." msgstr "Unable to save icon file to disk." -#: ../pidgin/gtkconv.c:2716 +#: ../pidgin/gtkconv.c:2657 msgid "Save Icon" msgstr "Save Icon" -#: ../pidgin/gtkconv.c:2768 +#: ../pidgin/gtkconv.c:2709 msgid "Animate" msgstr "Animate" -#: ../pidgin/gtkconv.c:2773 +#: ../pidgin/gtkconv.c:2714 msgid "Hide Icon" msgstr "Hide Icon" -#: ../pidgin/gtkconv.c:2776 +#: ../pidgin/gtkconv.c:2717 msgid "Save Icon As..." msgstr "Save Icon As..." -#: ../pidgin/gtkconv.c:2780 +#: ../pidgin/gtkconv.c:2721 #, fuzzy msgid "Set Custom Icon..." msgstr "Custom" -#: ../pidgin/gtkconv.c:2793 +#: ../pidgin/gtkconv.c:2734 #, fuzzy msgid "Remove Custom Icon" msgstr "Remove Contact" -#: ../pidgin/gtkconv.c:2924 +#: ../pidgin/gtkconv.c:2861 msgid "Show All" msgstr "" #. Conversation menu -#: ../pidgin/gtkconv.c:2943 +#: ../pidgin/gtkconv.c:2880 msgid "/_Conversation" msgstr "/_Conversation" -#: ../pidgin/gtkconv.c:2945 +#: ../pidgin/gtkconv.c:2882 msgid "/Conversation/New Instant _Message..." msgstr "/Conversation/New Instant _Message..." -#: ../pidgin/gtkconv.c:2950 +#: ../pidgin/gtkconv.c:2887 msgid "/Conversation/_Find..." msgstr "/Conversation/_Find..." -#: ../pidgin/gtkconv.c:2952 +#: ../pidgin/gtkconv.c:2889 msgid "/Conversation/View _Log" msgstr "/Conversation/View _Log" -#: ../pidgin/gtkconv.c:2953 +#: ../pidgin/gtkconv.c:2890 msgid "/Conversation/_Save As..." msgstr "/Conversation/_Save As..." -#: ../pidgin/gtkconv.c:2955 +#: ../pidgin/gtkconv.c:2892 #, fuzzy msgid "/Conversation/Clea_r Scrollback" msgstr "/Conversation/Clear" -#: ../pidgin/gtkconv.c:2959 +#: ../pidgin/gtkconv.c:2896 msgid "/Conversation/Se_nd File..." msgstr "/Conversation/Se_nd File..." -#: ../pidgin/gtkconv.c:2960 +#: ../pidgin/gtkconv.c:2897 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/Conversation/Add Buddy _Pounce..." -#: ../pidgin/gtkconv.c:2962 +#: ../pidgin/gtkconv.c:2899 msgid "/Conversation/_Get Info" msgstr "/Conversation/_Get Info" -#: ../pidgin/gtkconv.c:2964 +#: ../pidgin/gtkconv.c:2901 msgid "/Conversation/In_vite..." msgstr "/Conversation/In_vite..." -#: ../pidgin/gtkconv.c:2966 +#: ../pidgin/gtkconv.c:2903 #, fuzzy msgid "/Conversation/M_ore" msgstr "/Conversation/_Close" -#: ../pidgin/gtkconv.c:2970 +#: ../pidgin/gtkconv.c:2907 #, fuzzy msgid "/Conversation/Al_ias..." msgstr "/Conversation/Alias..." -#: ../pidgin/gtkconv.c:2972 +#: ../pidgin/gtkconv.c:2909 msgid "/Conversation/_Block..." msgstr "/Conversation/_Block..." -#: ../pidgin/gtkconv.c:2974 +#: ../pidgin/gtkconv.c:2911 #, fuzzy msgid "/Conversation/_Unblock..." msgstr "/Conversation/_Block..." -#: ../pidgin/gtkconv.c:2976 +#: ../pidgin/gtkconv.c:2913 msgid "/Conversation/_Add..." msgstr "/Conversation/_Add..." -#: ../pidgin/gtkconv.c:2978 +#: ../pidgin/gtkconv.c:2915 msgid "/Conversation/_Remove..." msgstr "/Conversation/_Remove..." -#: ../pidgin/gtkconv.c:2983 +#: ../pidgin/gtkconv.c:2920 msgid "/Conversation/Insert Lin_k..." msgstr "/Conversation/Insert Lin_k..." -#: ../pidgin/gtkconv.c:2985 +#: ../pidgin/gtkconv.c:2922 msgid "/Conversation/Insert Imag_e..." msgstr "/Conversation/Insert Imag_e..." -#: ../pidgin/gtkconv.c:2991 +#: ../pidgin/gtkconv.c:2928 msgid "/Conversation/_Close" msgstr "/Conversation/_Close" #. Options -#: ../pidgin/gtkconv.c:2995 +#: ../pidgin/gtkconv.c:2932 msgid "/_Options" msgstr "/_Options" -#: ../pidgin/gtkconv.c:2996 +#: ../pidgin/gtkconv.c:2933 msgid "/Options/Enable _Logging" msgstr "/Options/Enable _Logging" -#: ../pidgin/gtkconv.c:2997 +#: ../pidgin/gtkconv.c:2934 msgid "/Options/Enable _Sounds" msgstr "/Options/Enable _Sounds" -#: ../pidgin/gtkconv.c:2999 +#: ../pidgin/gtkconv.c:2936 #, fuzzy msgid "/Options/Show Formatting _Toolbars" msgstr "/Options/Show Formatting _Toolbar" -#: ../pidgin/gtkconv.c:3000 +#: ../pidgin/gtkconv.c:2937 #, fuzzy msgid "/Options/Show Ti_mestamps" msgstr "/Options/Show Timestamps" -#: ../pidgin/gtkconv.c:3124 +#: ../pidgin/gtkconv.c:3061 #, fuzzy msgid "/Conversation/More" msgstr "/Conversation/_Close" -#: ../pidgin/gtkconv.c:3180 +#: ../pidgin/gtkconv.c:3117 #, fuzzy msgid "/Options" msgstr "/_Options" @@ -14835,186 +14798,186 @@ #. 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:3215 ../pidgin/gtkconv.c:3247 +#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184 #, fuzzy msgid "/Conversation" msgstr "/_Conversation" -#: ../pidgin/gtkconv.c:3255 +#: ../pidgin/gtkconv.c:3192 msgid "/Conversation/View Log" msgstr "/Conversation/View Log" -#: ../pidgin/gtkconv.c:3261 +#: ../pidgin/gtkconv.c:3198 msgid "/Conversation/Send File..." msgstr "/Conversation/Send File..." -#: ../pidgin/gtkconv.c:3265 +#: ../pidgin/gtkconv.c:3202 msgid "/Conversation/Add Buddy Pounce..." msgstr "/Conversation/Add Buddy Pounce..." -#: ../pidgin/gtkconv.c:3271 +#: ../pidgin/gtkconv.c:3208 msgid "/Conversation/Get Info" msgstr "/Conversation/Get Info" -#: ../pidgin/gtkconv.c:3275 +#: ../pidgin/gtkconv.c:3212 msgid "/Conversation/Invite..." msgstr "/Conversation/Invite..." -#: ../pidgin/gtkconv.c:3281 +#: ../pidgin/gtkconv.c:3218 msgid "/Conversation/Alias..." msgstr "/Conversation/Alias..." -#: ../pidgin/gtkconv.c:3285 +#: ../pidgin/gtkconv.c:3222 msgid "/Conversation/Block..." msgstr "/Conversation/Block..." -#: ../pidgin/gtkconv.c:3289 +#: ../pidgin/gtkconv.c:3226 #, fuzzy msgid "/Conversation/Unblock..." msgstr "/Conversation/Block..." -#: ../pidgin/gtkconv.c:3293 +#: ../pidgin/gtkconv.c:3230 msgid "/Conversation/Add..." msgstr "/Conversation/Add..." -#: ../pidgin/gtkconv.c:3297 +#: ../pidgin/gtkconv.c:3234 msgid "/Conversation/Remove..." msgstr "/Conversation/Remove..." -#: ../pidgin/gtkconv.c:3303 +#: ../pidgin/gtkconv.c:3240 msgid "/Conversation/Insert Link..." msgstr "/Conversation/Insert Link..." -#: ../pidgin/gtkconv.c:3307 +#: ../pidgin/gtkconv.c:3244 msgid "/Conversation/Insert Image..." msgstr "/Conversation/Insert Image..." -#: ../pidgin/gtkconv.c:3313 +#: ../pidgin/gtkconv.c:3250 msgid "/Options/Enable Logging" msgstr "/Options/Enable Logging" -#: ../pidgin/gtkconv.c:3316 +#: ../pidgin/gtkconv.c:3253 msgid "/Options/Enable Sounds" msgstr "/Options/Enable Sounds" -#: ../pidgin/gtkconv.c:3329 +#: ../pidgin/gtkconv.c:3266 #, fuzzy msgid "/Options/Show Formatting Toolbars" msgstr "/Options/Show Formatting Toolbar" -#: ../pidgin/gtkconv.c:3332 +#: ../pidgin/gtkconv.c:3269 msgid "/Options/Show Timestamps" msgstr "/Options/Show Timestamps" -#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451 +#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388 msgid "User is typing..." msgstr "User is typing..." -#: ../pidgin/gtkconv.c:3454 +#: ../pidgin/gtkconv.c:3391 #, fuzzy msgid "User has typed something and stopped" msgstr "User has typed something and paused" #. Build the Send To menu -#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103 -#, fuzzy -msgid "S_end To" +#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022 +#, fuzzy +msgid "_Send To" msgstr "_Send As" -#: ../pidgin/gtkconv.c:4349 +#: ../pidgin/gtkconv.c:4286 #, fuzzy msgid "_Send" msgstr "Send" #. Setup the label telling how many people are in the room. -#: ../pidgin/gtkconv.c:4453 +#: ../pidgin/gtkconv.c:4390 msgid "0 people in room" msgstr "0 people in room" -#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944 +#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880 #, 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:6550 ../pidgin/gtkstatusbox.c:660 +#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660 #, fuzzy msgid "Typing" msgstr "Ping" -#: ../pidgin/gtkconv.c:6554 +#: ../pidgin/gtkconv.c:6490 #, fuzzy msgid "Stopped Typing" msgstr "Ping" -#: ../pidgin/gtkconv.c:6557 +#: ../pidgin/gtkconv.c:6493 #, fuzzy msgid "Nick Said" msgstr "Nick" -#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492 +#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492 #, fuzzy msgid "Unread Messages" msgstr "Send Message" -#: ../pidgin/gtkconv.c:6563 +#: ../pidgin/gtkconv.c:6499 #, fuzzy msgid "New Event" msgstr "Event" -#: ../pidgin/gtkconv.c:7654 +#: ../pidgin/gtkconv.c:7572 #, fuzzy msgid "clear: Clears all conversation scrollbacks." msgstr "%s has closed the conversation window." -#: ../pidgin/gtkconv.c:7817 +#: ../pidgin/gtkconv.c:7736 #, fuzzy msgid "Confirm close" msgstr "Confirm Account" -#: ../pidgin/gtkconv.c:7849 +#: ../pidgin/gtkconv.c:7768 #, fuzzy msgid "You have unread messages. Are you sure you want to close the window?" msgstr "Are you sure you want to delete %s?" -#: ../pidgin/gtkconv.c:8436 +#: ../pidgin/gtkconv.c:8355 msgid "Close other tabs" msgstr "" -#: ../pidgin/gtkconv.c:8442 +#: ../pidgin/gtkconv.c:8361 msgid "Close all tabs" msgstr "" -#: ../pidgin/gtkconv.c:8450 +#: ../pidgin/gtkconv.c:8369 msgid "Detach this tab" msgstr "" -#: ../pidgin/gtkconv.c:8456 +#: ../pidgin/gtkconv.c:8375 msgid "Close this tab" msgstr "" -#: ../pidgin/gtkconv.c:8951 +#: ../pidgin/gtkconv.c:8875 msgid "Close conversation" msgstr "Close conversation" -#: ../pidgin/gtkconv.c:9553 +#: ../pidgin/gtkconv.c:9477 msgid "Last created window" msgstr "Last created window" -#: ../pidgin/gtkconv.c:9555 +#: ../pidgin/gtkconv.c:9479 msgid "Separate IM and Chat windows" msgstr "Separate IM and Chat windows" -#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417 +#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415 msgid "New window" msgstr "New window" -#: ../pidgin/gtkconv.c:9559 +#: ../pidgin/gtkconv.c:9483 msgid "By group" msgstr "By group" -#: ../pidgin/gtkconv.c:9561 +#: ../pidgin/gtkconv.c:9485 msgid "By account" msgstr "By account" @@ -15149,7 +15112,7 @@ msgid "Afrikaans" msgstr "" -#: ../pidgin/gtkdialogs.c:134 +#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226 #, fuzzy msgid "Arabic" msgstr "Amharic" @@ -15159,7 +15122,7 @@ msgstr "" #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137 -#: ../pidgin/gtkdialogs.c:224 +#: ../pidgin/gtkdialogs.c:227 msgid "Bulgarian" msgstr "Bulgarian" @@ -15173,8 +15136,8 @@ msgid "Bosnian" msgstr "Romanian" -#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:225 -#: ../pidgin/gtkdialogs.c:226 +#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228 +#: ../pidgin/gtkdialogs.c:229 msgid "Catalan" msgstr "Catalan" @@ -15182,7 +15145,7 @@ msgid "Valencian-Catalan" msgstr "" -#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:227 +#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230 msgid "Czech" msgstr "Czech" @@ -15191,7 +15154,7 @@ msgstr "Danish" #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150 -#: ../pidgin/gtkdialogs.c:228 +#: ../pidgin/gtkdialogs.c:231 msgid "German" msgstr "German" @@ -15220,9 +15183,9 @@ msgid "Esperanto" msgstr "" -#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:229 -#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231 -#: ../pidgin/gtkdialogs.c:232 +#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232 +#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234 +#: ../pidgin/gtkdialogs.c:235 msgid "Spanish" msgstr "Spanish" @@ -15241,19 +15204,19 @@ msgid "Persian" msgstr "Serbian" -#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233 -#: ../pidgin/gtkdialogs.c:234 +#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236 +#: ../pidgin/gtkdialogs.c:237 msgid "Finnish" msgstr "Finnish" -#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:235 -#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237 -#: ../pidgin/gtkdialogs.c:238 +#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238 +#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240 +#: ../pidgin/gtkdialogs.c:241 msgid "French" msgstr "French" #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170 -#: ../pidgin/gtkdialogs.c:239 +#: ../pidgin/gtkdialogs.c:242 #, fuzzy msgid "Galician" msgstr "Italian" @@ -15266,7 +15229,7 @@ msgid "Gujarati Language Team" msgstr "" -#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:240 +#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243 msgid "Hebrew" msgstr "Hebrew" @@ -15274,7 +15237,7 @@ msgid "Hindi" msgstr "Hindi" -#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:241 +#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244 msgid "Hungarian" msgstr "Hungarian" @@ -15283,16 +15246,16 @@ msgid "Indonesian" msgstr "Macedonian" -#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242 +#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245 msgid "Italian" msgstr "Italian" -#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:243 -#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245 +#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248 msgid "Japanese" msgstr "Japanese" -#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249 #, fuzzy msgid "Georgian" msgstr "German" @@ -15311,8 +15274,8 @@ msgid "Kannada Translation team" msgstr "" -#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:247 -#: ../pidgin/gtkdialogs.c:248 +#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250 +#: ../pidgin/gtkdialogs.c:251 msgid "Korean" msgstr "Korean" @@ -15322,134 +15285,140 @@ msgid "Kurdish" msgstr "Turkish" -#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:249 -#: ../pidgin/gtkdialogs.c:250 +#: ../pidgin/gtkdialogs.c:185 +msgid "Lao" +msgstr "" + +#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252 +#: ../pidgin/gtkdialogs.c:253 msgid "Lithuanian" msgstr "Lithuanian" -#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187 -#: ../pidgin/gtkdialogs.c:251 +#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188 +#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254 msgid "Macedonian" msgstr "Macedonian" -#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:252 +#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255 +#: ../pidgin/gtkdialogs.c:256 #, fuzzy msgid "Bokmål Norwegian" msgstr "Norwegian" -#: ../pidgin/gtkdialogs.c:189 +#: ../pidgin/gtkdialogs.c:191 msgid "Nepali" msgstr "" -#: ../pidgin/gtkdialogs.c:190 +#: ../pidgin/gtkdialogs.c:192 #, fuzzy msgid "Dutch, Flemish" msgstr "Dutch; Flemish" -#: ../pidgin/gtkdialogs.c:191 +#: ../pidgin/gtkdialogs.c:193 #, fuzzy msgid "Norwegian Nynorsk" msgstr "Norwegian" -#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193 -#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:253 +#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195 +#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257 msgid "Polish" msgstr "Polish" -#: ../pidgin/gtkdialogs.c:195 +#: ../pidgin/gtkdialogs.c:197 msgid "Portuguese" msgstr "Portuguese" -#: ../pidgin/gtkdialogs.c:196 +#: ../pidgin/gtkdialogs.c:198 msgid "Portuguese-Brazil" msgstr "Portuguese-Brazil" -#: ../pidgin/gtkdialogs.c:197 +#: ../pidgin/gtkdialogs.c:199 #, fuzzy msgid "Pashto" msgstr "Photo" -#: ../pidgin/gtkdialogs.c:198 +#: ../pidgin/gtkdialogs.c:200 msgid "Romanian" msgstr "Romanian" -#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:254 -#: ../pidgin/gtkdialogs.c:255 +#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258 +#: ../pidgin/gtkdialogs.c:259 msgid "Russian" msgstr "Russian" -#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201 -#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257 -#: ../pidgin/gtkdialogs.c:258 +#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203 +#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261 +#: ../pidgin/gtkdialogs.c:262 msgid "Slovak" msgstr "Slovak" -#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259 +#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263 msgid "Slovenian" msgstr "Slovenian" -#: ../pidgin/gtkdialogs.c:203 +#: ../pidgin/gtkdialogs.c:205 msgid "Albanian" msgstr "Albanian" -#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205 +#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207 +#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265 msgid "Serbian" msgstr "Serbian" -#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260 -#: ../pidgin/gtkdialogs.c:261 +#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266 +#: ../pidgin/gtkdialogs.c:267 msgid "Swedish" msgstr "Swedish" -#: ../pidgin/gtkdialogs.c:207 +#: ../pidgin/gtkdialogs.c:209 #, fuzzy msgid "Tamil" msgstr "Terminal" -#: ../pidgin/gtkdialogs.c:208 +#: ../pidgin/gtkdialogs.c:210 msgid "Telugu" msgstr "" -#: ../pidgin/gtkdialogs.c:209 +#: ../pidgin/gtkdialogs.c:211 msgid "Thai" msgstr "" -#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262 +#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268 msgid "Turkish" msgstr "Turkish" -#: ../pidgin/gtkdialogs.c:211 +#: ../pidgin/gtkdialogs.c:213 msgid "Vietnamese" msgstr "Vietnamese" -#: ../pidgin/gtkdialogs.c:211 +#: ../pidgin/gtkdialogs.c:213 msgid "T.M.Thanh and the Gnome-Vi Team" msgstr "T.M.Thanh and the Gnome-Vi Team" -#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263 +#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:214 -#: ../pidgin/gtkdialogs.c:215 +#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216 +#: ../pidgin/gtkdialogs.c:217 msgid "Hong Kong Chinese" msgstr "" -#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217 -#: ../pidgin/gtkdialogs.c:264 +#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219 +#: ../pidgin/gtkdialogs.c:270 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: ../pidgin/gtkdialogs.c:223 +#: ../pidgin/gtkdialogs.c:225 msgid "Amharic" msgstr "Amharic" -#: ../pidgin/gtkdialogs.c:351 +#: ../pidgin/gtkdialogs.c:357 #, fuzzy, c-format msgid "About %s" msgstr "About Gaim" -#: ../pidgin/gtkdialogs.c:394 +#: ../pidgin/gtkdialogs.c:400 #, c-format msgid "" "%s is a graphical modular messaging client based on libpurple which is " @@ -15463,51 +15432,51 @@ "<BR><BR>" msgstr "" -#: ../pidgin/gtkdialogs.c:412 -#, fuzzy +#: ../pidgin/gtkdialogs.c:418 +#, fuzzy, c-format msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>" msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>" -#: ../pidgin/gtkdialogs.c:417 +#: ../pidgin/gtkdialogs.c:423 #, fuzzy msgid "Current Developers" msgstr "Retired Developers" -#: ../pidgin/gtkdialogs.c:432 +#: ../pidgin/gtkdialogs.c:438 msgid "Crazy Patch Writers" msgstr "Crazy Patch Writers" -#: ../pidgin/gtkdialogs.c:447 +#: ../pidgin/gtkdialogs.c:453 msgid "Retired Developers" msgstr "Retired Developers" -#: ../pidgin/gtkdialogs.c:462 +#: ../pidgin/gtkdialogs.c:468 #, fuzzy msgid "Retired Crazy Patch Writers" msgstr "Crazy Patch Writers" -#: ../pidgin/gtkdialogs.c:477 +#: ../pidgin/gtkdialogs.c:483 msgid "Artists" msgstr "" -#: ../pidgin/gtkdialogs.c:492 +#: ../pidgin/gtkdialogs.c:498 msgid "Current Translators" msgstr "Current Translators" -#: ../pidgin/gtkdialogs.c:512 +#: ../pidgin/gtkdialogs.c:518 msgid "Past Translators" msgstr "Past Translators" -#: ../pidgin/gtkdialogs.c:530 +#: ../pidgin/gtkdialogs.c:536 #, fuzzy msgid "Debugging Information" msgstr "User Information" -#: ../pidgin/gtkdialogs.c:900 +#: ../pidgin/gtkdialogs.c:906 msgid "Get User Info" msgstr "Get User Info" -#: ../pidgin/gtkdialogs.c:902 +#: ../pidgin/gtkdialogs.c:908 #, fuzzy msgid "" "Please enter the screen name or alias of the person whose info you would " @@ -15515,12 +15484,12 @@ msgstr "" "Please enter the screen name of the person whose info you would like to view." -#: ../pidgin/gtkdialogs.c:992 +#: ../pidgin/gtkdialogs.c:998 #, fuzzy msgid "View User Log" msgstr "Get User Log" -#: ../pidgin/gtkdialogs.c:994 +#: ../pidgin/gtkdialogs.c:1000 #, fuzzy msgid "" "Please enter the screen name or alias of the person whose log you would like " @@ -15528,32 +15497,32 @@ msgstr "" "Please enter the screen name of the person whose log you would like to view." -#: ../pidgin/gtkdialogs.c:1014 +#: ../pidgin/gtkdialogs.c:1020 msgid "Alias Contact" msgstr "Alias Contact" -#: ../pidgin/gtkdialogs.c:1015 +#: ../pidgin/gtkdialogs.c:1021 msgid "Enter an alias for this contact." msgstr "Enter an alias for this contact." -#: ../pidgin/gtkdialogs.c:1037 +#: ../pidgin/gtkdialogs.c:1043 #, c-format msgid "Enter an alias for %s." msgstr "Enter an alias for %s." -#: ../pidgin/gtkdialogs.c:1039 +#: ../pidgin/gtkdialogs.c:1045 msgid "Alias Buddy" msgstr "Alias Buddy" -#: ../pidgin/gtkdialogs.c:1060 +#: ../pidgin/gtkdialogs.c:1066 msgid "Alias Chat" msgstr "Alias Chat" -#: ../pidgin/gtkdialogs.c:1061 +#: ../pidgin/gtkdialogs.c:1067 msgid "Enter an alias for this chat." msgstr "Enter an alias for this chat." -#: ../pidgin/gtkdialogs.c:1100 +#: ../pidgin/gtkdialogs.c:1106 #, fuzzy, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -15568,16 +15537,16 @@ "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:1108 +#: ../pidgin/gtkdialogs.c:1114 msgid "Remove Contact" msgstr "Remove Contact" -#: ../pidgin/gtkdialogs.c:1111 +#: ../pidgin/gtkdialogs.c:1117 #, fuzzy msgid "_Remove Contact" msgstr "Remove Contact" -#: ../pidgin/gtkdialogs.c:1142 +#: ../pidgin/gtkdialogs.c:1148 #, fuzzy, c-format msgid "" "You are about to merge the group called %s into the group called %s. Do you " @@ -15586,17 +15555,17 @@ "You are about to remove the group %s and all its members from your buddy " "list. Do you want to continue?" -#: ../pidgin/gtkdialogs.c:1149 +#: ../pidgin/gtkdialogs.c:1155 #, fuzzy msgid "Merge Groups" msgstr "Remove Group" -#: ../pidgin/gtkdialogs.c:1152 +#: ../pidgin/gtkdialogs.c:1158 #, fuzzy msgid "_Merge Groups" msgstr "_Delete Group" -#: ../pidgin/gtkdialogs.c:1202 +#: ../pidgin/gtkdialogs.c:1208 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " @@ -15605,31 +15574,31 @@ "You are about to remove the group %s and all its members from your buddy " "list. Do you want to continue?" -#: ../pidgin/gtkdialogs.c:1205 +#: ../pidgin/gtkdialogs.c:1211 msgid "Remove Group" msgstr "Remove Group" -#: ../pidgin/gtkdialogs.c:1208 +#: ../pidgin/gtkdialogs.c:1214 #, fuzzy msgid "_Remove Group" msgstr "Remove Group" -#: ../pidgin/gtkdialogs.c:1241 +#: ../pidgin/gtkdialogs.c:1247 #, 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:1244 +#: ../pidgin/gtkdialogs.c:1250 msgid "Remove Buddy" msgstr "Remove Buddy" -#: ../pidgin/gtkdialogs.c:1247 +#: ../pidgin/gtkdialogs.c:1253 msgid "_Remove Buddy" msgstr "_Remove Buddy" -#: ../pidgin/gtkdialogs.c:1268 +#: ../pidgin/gtkdialogs.c:1274 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " @@ -15638,11 +15607,11 @@ "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" -#: ../pidgin/gtkdialogs.c:1271 +#: ../pidgin/gtkdialogs.c:1277 msgid "Remove Chat" msgstr "Remove Chat" -#: ../pidgin/gtkdialogs.c:1274 +#: ../pidgin/gtkdialogs.c:1280 #, fuzzy msgid "_Remove Chat" msgstr "Remove Chat" @@ -15672,7 +15641,7 @@ #: ../pidgin/gtkdocklet.c:535 #, fuzzy -msgid "Blink on New Message" +msgid "Blink on new message" msgstr "New Message..." #: ../pidgin/gtkdocklet.c:542 @@ -15774,7 +15743,7 @@ msgid "Paste as Plain _Text" msgstr "Pa_ste As Text" -#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192 +#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194 #, fuzzy msgid "_Reset formatting" msgstr "_Clear Formatting" @@ -15847,6 +15816,7 @@ msgstr "Save Image" #: ../pidgin/gtkimhtml.c:3522 +#, c-format msgid "_Save Image..." msgstr "_Save Image..." @@ -15882,11 +15852,11 @@ 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:430 ../pidgin/gtkimhtmltoolbar.c:1099 +#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102 msgid "Insert Link" msgstr "Insert Link" -#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260 +#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262 msgid "_Insert" msgstr "_Insert" @@ -15908,144 +15878,144 @@ msgid "Smile!" msgstr "Smile!" -#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217 +#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219 #, fuzzy msgid "_Font" msgstr "_Account" -#: ../pidgin/gtkimhtmltoolbar.c:1051 +#: ../pidgin/gtkimhtmltoolbar.c:1054 #, fuzzy msgid "Group Items" msgstr "Group Name" -#: ../pidgin/gtkimhtmltoolbar.c:1051 +#: ../pidgin/gtkimhtmltoolbar.c:1054 msgid "Ungroup Items" msgstr "" -#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287 +#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287 msgid "Bold" msgstr "Bold" -#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294 +#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294 msgid "Italic" msgstr "Italic" -#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301 +#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301 msgid "Underline" msgstr "Underline" -#: ../pidgin/gtkimhtmltoolbar.c:1088 +#: ../pidgin/gtkimhtmltoolbar.c:1091 msgid "Strikethrough" msgstr "" -#: ../pidgin/gtkimhtmltoolbar.c:1090 +#: ../pidgin/gtkimhtmltoolbar.c:1093 #, fuzzy msgid "Increase Font Size" msgstr "Ignore font si_zes" -#: ../pidgin/gtkimhtmltoolbar.c:1091 +#: ../pidgin/gtkimhtmltoolbar.c:1094 msgid "Decrease Font Size" msgstr "" -#: ../pidgin/gtkimhtmltoolbar.c:1093 +#: ../pidgin/gtkimhtmltoolbar.c:1096 msgid "Font Face" msgstr "Font Face" -#: ../pidgin/gtkimhtmltoolbar.c:1094 +#: ../pidgin/gtkimhtmltoolbar.c:1097 #, fuzzy msgid "Background Color" msgstr "Background colour" -#: ../pidgin/gtkimhtmltoolbar.c:1095 +#: ../pidgin/gtkimhtmltoolbar.c:1098 #, fuzzy msgid "Foreground Color" msgstr "Foreground font colour" -#: ../pidgin/gtkimhtmltoolbar.c:1097 +#: ../pidgin/gtkimhtmltoolbar.c:1100 #, fuzzy msgid "Reset Formatting" msgstr "Default Formatting" -#: ../pidgin/gtkimhtmltoolbar.c:1100 +#: ../pidgin/gtkimhtmltoolbar.c:1103 #, fuzzy msgid "Insert IM Image" msgstr "Insert Image" -#: ../pidgin/gtkimhtmltoolbar.c:1101 +#: ../pidgin/gtkimhtmltoolbar.c:1104 #, fuzzy msgid "Insert Smiley" msgstr "Insert smiley" -#: ../pidgin/gtkimhtmltoolbar.c:1177 +#: ../pidgin/gtkimhtmltoolbar.c:1179 #, fuzzy msgid "<b>_Bold</b>" msgstr "<b>_Password:</b>" -#: ../pidgin/gtkimhtmltoolbar.c:1178 +#: ../pidgin/gtkimhtmltoolbar.c:1180 #, fuzzy msgid "<i>_Italic</i>" msgstr " <i>(ircop)</i>" -#: ../pidgin/gtkimhtmltoolbar.c:1179 +#: ../pidgin/gtkimhtmltoolbar.c:1181 #, fuzzy msgid "<u>_Underline</u>" msgstr "Underline" -#: ../pidgin/gtkimhtmltoolbar.c:1180 +#: ../pidgin/gtkimhtmltoolbar.c:1182 msgid "<span strikethrough='true'>Strikethrough</span>" msgstr "" -#: ../pidgin/gtkimhtmltoolbar.c:1181 +#: ../pidgin/gtkimhtmltoolbar.c:1183 #, fuzzy msgid "<span size='larger'>_Larger</span>" msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>" -#: ../pidgin/gtkimhtmltoolbar.c:1183 +#: ../pidgin/gtkimhtmltoolbar.c:1185 #, fuzzy msgid "_Normal" msgstr "Normal" -#: ../pidgin/gtkimhtmltoolbar.c:1185 +#: ../pidgin/gtkimhtmltoolbar.c:1187 msgid "<span size='smaller'>_Smaller</span>" msgstr "" #. 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:1189 +#: ../pidgin/gtkimhtmltoolbar.c:1191 #, fuzzy msgid "_Font face" msgstr "Font Face" -#: ../pidgin/gtkimhtmltoolbar.c:1190 +#: ../pidgin/gtkimhtmltoolbar.c:1192 #, fuzzy msgid "Foreground _color" msgstr "Foreground font colour" -#: ../pidgin/gtkimhtmltoolbar.c:1191 +#: ../pidgin/gtkimhtmltoolbar.c:1193 #, fuzzy msgid "Bac_kground color" msgstr "Background colour" -#: ../pidgin/gtkimhtmltoolbar.c:1268 +#: ../pidgin/gtkimhtmltoolbar.c:1270 +#, fuzzy +msgid "_Smiley" +msgstr "Smile!" + +#: ../pidgin/gtkimhtmltoolbar.c:1276 #, fuzzy msgid "_Image" msgstr "Save Image" -#: ../pidgin/gtkimhtmltoolbar.c:1274 +#: ../pidgin/gtkimhtmltoolbar.c:1282 #, fuzzy msgid "_Link" msgstr "_Join" -#: ../pidgin/gtkimhtmltoolbar.c:1280 +#: ../pidgin/gtkimhtmltoolbar.c:1288 msgid "_Horizontal rule" msgstr "" -#: ../pidgin/gtkimhtmltoolbar.c:1302 -#, fuzzy -msgid "_Smile!" -msgstr "Smile!" - #: ../pidgin/gtklog.c:293 #, c-format msgid "" @@ -16150,14 +16120,13 @@ " -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" -" --display=DISPLAY X display to use\n" " -v, --version display the current version and exit\n" msgstr "" -#: ../pidgin/gtkmain.c:516 -#, c-format -msgid "" -"%s %s has segfaulted and attempted to dump a core file.\n" +#: ../pidgin/gtkmain.c:512 +#, c-format +msgid "" +"%s has segfaulted and attempted to dump a core file.\n" "This is a bug in the software and has happened through\n" "no fault of your own.\n" "\n" @@ -16178,7 +16147,7 @@ #. Translators may want to transliterate the name. #. It is not to be translated. -#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51 +#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51 #, fuzzy msgid "Pidgin" msgstr "Paging" @@ -16196,17 +16165,17 @@ "\n" "%s" -#: ../pidgin/gtknotify.c:537 +#: ../pidgin/gtknotify.c:540 #, 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:562 -#, c-format -msgid "<b>%d new e-mail.</b>" -msgid_plural "<b>%d new e-mails.</b>" +#: ../pidgin/gtknotify.c:564 +#, c-format +msgid "<b>You have %d new e-mail.</b>" +msgid_plural "<b>You have %d new e-mails.</b>" msgstr[0] "" msgstr[1] "" @@ -16436,7 +16405,7 @@ msgid "_Hide new IM conversations:" msgstr "Close conversation" -#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946 +#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944 msgid "When away" msgstr "When away" @@ -16492,65 +16461,61 @@ msgid "Show _formatting on incoming messages" msgstr "Show _formatting toolbar" -#: ../pidgin/gtkprefs.c:997 -msgid "Close IMs immediately when the tab is closed" -msgstr "" - -#: ../pidgin/gtkprefs.c:1000 +#: ../pidgin/gtkprefs.c:998 #, fuzzy msgid "Show _detailed information" msgstr "Profile Information" -#: ../pidgin/gtkprefs.c:1002 +#: ../pidgin/gtkprefs.c:1000 msgid "Enable buddy ic_on animation" msgstr "Enable buddy ic_on animation" -#: ../pidgin/gtkprefs.c:1009 +#: ../pidgin/gtkprefs.c:1007 msgid "_Notify buddies that you are typing to them" msgstr "_Notify buddies that you are typing to them" -#: ../pidgin/gtkprefs.c:1012 +#: ../pidgin/gtkprefs.c:1010 #, fuzzy msgid "Highlight _misspelled words" msgstr "_Highlight misspelled words" -#: ../pidgin/gtkprefs.c:1016 +#: ../pidgin/gtkprefs.c:1014 msgid "Use smooth-scrolling" msgstr "" -#: ../pidgin/gtkprefs.c:1019 +#: ../pidgin/gtkprefs.c:1017 #, fuzzy msgid "F_lash window when IMs are received" msgstr "_Flash Window when messages are received" -#: ../pidgin/gtkprefs.c:1021 +#: ../pidgin/gtkprefs.c:1019 #, fuzzy msgid "Minimi_ze new conversation windows" msgstr "IM Conversation Windows" -#: ../pidgin/gtkprefs.c:1025 +#: ../pidgin/gtkprefs.c:1023 #, fuzzy msgid "Font" msgstr "Font Face" +#: ../pidgin/gtkprefs.c:1025 +msgid "Use document font from _theme" +msgstr "" + #: ../pidgin/gtkprefs.c:1027 -msgid "Use document font from _theme" +msgid "Use font from _theme" msgstr "" #: ../pidgin/gtkprefs.c:1029 -msgid "Use font from _theme" -msgstr "" - -#: ../pidgin/gtkprefs.c:1031 #, fuzzy msgid "Conversation _font:" msgstr "Conversations" -#: ../pidgin/gtkprefs.c:1045 +#: ../pidgin/gtkprefs.c:1043 msgid "Default Formatting" msgstr "Default Formatting" -#: ../pidgin/gtkprefs.c:1064 +#: ../pidgin/gtkprefs.c:1062 #, fuzzy msgid "" "This is how your outgoing message text will appear when you use protocols " @@ -16559,124 +16524,124 @@ "This is how your outgoing message text will appear when you use protocols " "that support formatting. :)" -#: ../pidgin/gtkprefs.c:1130 +#: ../pidgin/gtkprefs.c:1128 #, fuzzy msgid "ST_UN server:" msgstr "_Server:" -#: ../pidgin/gtkprefs.c:1142 +#: ../pidgin/gtkprefs.c:1140 msgid "<span style=\"italic\">Example: stunserver.org</span>" msgstr "" -#: ../pidgin/gtkprefs.c:1146 +#: ../pidgin/gtkprefs.c:1144 #, fuzzy msgid "_Autodetect IP address" msgstr "_Autodetect IP Address" -#: ../pidgin/gtkprefs.c:1155 +#: ../pidgin/gtkprefs.c:1153 msgid "Public _IP:" msgstr "Public _IP:" -#: ../pidgin/gtkprefs.c:1184 +#: ../pidgin/gtkprefs.c:1182 msgid "Ports" msgstr "Ports" -#: ../pidgin/gtkprefs.c:1187 +#: ../pidgin/gtkprefs.c:1185 msgid "_Manually specify range of ports to listen on" msgstr "_Manually specify range of ports to listen on" -#: ../pidgin/gtkprefs.c:1190 +#: ../pidgin/gtkprefs.c:1188 #, fuzzy msgid "_Start port:" msgstr "_Start Port:" -#: ../pidgin/gtkprefs.c:1197 +#: ../pidgin/gtkprefs.c:1195 #, fuzzy msgid "_End port:" msgstr "_End Port:" -#: ../pidgin/gtkprefs.c:1205 +#: ../pidgin/gtkprefs.c:1203 msgid "Proxy Server" msgstr "Proxy Server" -#: ../pidgin/gtkprefs.c:1209 +#: ../pidgin/gtkprefs.c:1207 msgid "No proxy" msgstr "No proxy" -#: ../pidgin/gtkprefs.c:1265 +#: ../pidgin/gtkprefs.c:1263 msgid "_User:" msgstr "_User:" -#: ../pidgin/gtkprefs.c:1330 +#: ../pidgin/gtkprefs.c:1328 msgid "Seamonkey" msgstr "" +#: ../pidgin/gtkprefs.c:1329 +msgid "Opera" +msgstr "Opera" + +#: ../pidgin/gtkprefs.c:1330 +msgid "Netscape" +msgstr "Netscape" + #: ../pidgin/gtkprefs.c:1331 -msgid "Opera" -msgstr "Opera" +msgid "Mozilla" +msgstr "Mozilla" #: ../pidgin/gtkprefs.c:1332 -msgid "Netscape" -msgstr "Netscape" +msgid "Konqueror" +msgstr "Konqueror" #: ../pidgin/gtkprefs.c:1333 -msgid "Mozilla" -msgstr "Mozilla" - -#: ../pidgin/gtkprefs.c:1334 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../pidgin/gtkprefs.c:1335 #, fuzzy msgid "GNOME Default" msgstr "Gnome Default" -#: ../pidgin/gtkprefs.c:1336 +#: ../pidgin/gtkprefs.c:1334 msgid "Galeon" msgstr "Galeon" -#: ../pidgin/gtkprefs.c:1337 +#: ../pidgin/gtkprefs.c:1335 msgid "Firefox" msgstr "Firefox" -#: ../pidgin/gtkprefs.c:1338 +#: ../pidgin/gtkprefs.c:1336 msgid "Firebird" msgstr "Firebird" -#: ../pidgin/gtkprefs.c:1339 +#: ../pidgin/gtkprefs.c:1337 msgid "Epiphany" msgstr "Epiphany" -#: ../pidgin/gtkprefs.c:1348 +#: ../pidgin/gtkprefs.c:1346 msgid "Manual" msgstr "Manual" -#: ../pidgin/gtkprefs.c:1401 +#: ../pidgin/gtkprefs.c:1399 msgid "Browser Selection" msgstr "Browser Selection" -#: ../pidgin/gtkprefs.c:1405 +#: ../pidgin/gtkprefs.c:1403 msgid "_Browser:" msgstr "_Browser:" +#: ../pidgin/gtkprefs.c:1411 +msgid "_Open link in:" +msgstr "_Open link in:" + #: ../pidgin/gtkprefs.c:1413 -msgid "_Open link in:" -msgstr "_Open link in:" - -#: ../pidgin/gtkprefs.c:1415 msgid "Browser default" msgstr "Browser default" -#: ../pidgin/gtkprefs.c:1416 +#: ../pidgin/gtkprefs.c:1414 msgid "Existing window" msgstr "Existing window" -#: ../pidgin/gtkprefs.c:1418 +#: ../pidgin/gtkprefs.c:1416 msgid "New tab" msgstr "New tab" -#: ../pidgin/gtkprefs.c:1432 +#: ../pidgin/gtkprefs.c:1430 #, c-format msgid "" "_Manual:\n" @@ -16685,72 +16650,72 @@ "_Manual:\n" "(%s for URL)" -#: ../pidgin/gtkprefs.c:1472 +#: ../pidgin/gtkprefs.c:1470 #, fuzzy msgid "Log _format:" msgstr "Log _Format:" -#: ../pidgin/gtkprefs.c:1477 +#: ../pidgin/gtkprefs.c:1475 #, fuzzy msgid "Log all _instant messages" msgstr "_Log all instant messages" -#: ../pidgin/gtkprefs.c:1479 +#: ../pidgin/gtkprefs.c:1477 msgid "Log all c_hats" msgstr "Log all c_hats" -#: ../pidgin/gtkprefs.c:1481 +#: ../pidgin/gtkprefs.c:1479 msgid "Log all _status changes to system log" msgstr "" -#: ../pidgin/gtkprefs.c:1627 +#: ../pidgin/gtkprefs.c:1625 msgid "Sound Selection" msgstr "Sound Selection" +#: ../pidgin/gtkprefs.c:1635 +#, fuzzy, c-format +msgid "Quietest" +msgstr "Quit" + #: ../pidgin/gtkprefs.c:1637 -#, fuzzy -msgid "Quietest" +#, fuzzy, c-format +msgid "Quieter" msgstr "Quit" #: ../pidgin/gtkprefs.c:1639 -#, fuzzy -msgid "Quieter" -msgstr "Quit" - -#: ../pidgin/gtkprefs.c:1641 -#, fuzzy +#, fuzzy, c-format msgid "Quiet" msgstr "Quit" -#: ../pidgin/gtkprefs.c:1645 -#, fuzzy +#: ../pidgin/gtkprefs.c:1643 +#, fuzzy, c-format msgid "Loud" msgstr "Load" +#: ../pidgin/gtkprefs.c:1645 +#, fuzzy, c-format +msgid "Louder" +msgstr "hour" + #: ../pidgin/gtkprefs.c:1647 -#, fuzzy -msgid "Louder" -msgstr "hour" - -#: ../pidgin/gtkprefs.c:1649 -#, fuzzy +#, fuzzy, c-format msgid "Loudest" msgstr "Sounds" -#: ../pidgin/gtkprefs.c:1715 +#: ../pidgin/gtkprefs.c:1713 msgid "_Method:" msgstr "_Method:" -#: ../pidgin/gtkprefs.c:1717 +#: ../pidgin/gtkprefs.c:1715 msgid "Console beep" msgstr "Console beep" -#: ../pidgin/gtkprefs.c:1724 +#: ../pidgin/gtkprefs.c:1722 #, fuzzy msgid "No sounds" msgstr "Sounds" -#: ../pidgin/gtkprefs.c:1732 +#: ../pidgin/gtkprefs.c:1730 #, c-format msgid "" "Sound c_ommand:\n" @@ -16759,87 +16724,87 @@ "Sound c_ommand:\n" "(%s for filename)" -#: ../pidgin/gtkprefs.c:1759 +#: ../pidgin/gtkprefs.c:1757 msgid "Sounds when conversation has _focus" msgstr "Sounds when conversation has _focus" -#: ../pidgin/gtkprefs.c:1761 +#: ../pidgin/gtkprefs.c:1759 #, fuzzy msgid "Enable sounds:" msgstr "Failed" -#: ../pidgin/gtkprefs.c:1772 +#: ../pidgin/gtkprefs.c:1770 msgid "Volume:" msgstr "" -#: ../pidgin/gtkprefs.c:1852 +#: ../pidgin/gtkprefs.c:1850 msgid "Play" msgstr "Play" -#: ../pidgin/gtkprefs.c:1929 +#: ../pidgin/gtkprefs.c:1927 #, fuzzy msgid "_Report idle time:" msgstr "Show idle _times" -#: ../pidgin/gtkprefs.c:1934 +#: ../pidgin/gtkprefs.c:1932 msgid "Based on keyboard or mouse use" msgstr "" -#: ../pidgin/gtkprefs.c:1943 +#: ../pidgin/gtkprefs.c:1941 msgid "_Auto-reply:" msgstr "_Auto-reply:" -#: ../pidgin/gtkprefs.c:1947 +#: ../pidgin/gtkprefs.c:1945 #, fuzzy msgid "When both away and idle" msgstr "When away and idle" #. Auto-away stuff -#: ../pidgin/gtkprefs.c:1953 +#: ../pidgin/gtkprefs.c:1951 msgid "Auto-away" msgstr "Auto-away" -#: ../pidgin/gtkprefs.c:1955 +#: ../pidgin/gtkprefs.c:1953 #, fuzzy msgid "Change status when _idle" msgstr "Set away _when idle" -#: ../pidgin/gtkprefs.c:1959 +#: ../pidgin/gtkprefs.c:1957 #, fuzzy msgid "_Minutes before becoming idle:" msgstr "_Minutes before setting away:" -#: ../pidgin/gtkprefs.c:1967 +#: ../pidgin/gtkprefs.c:1965 #, fuzzy msgid "Change _status to:" msgstr "Change Address To:" #. Signon status stuff -#: ../pidgin/gtkprefs.c:1988 +#: ../pidgin/gtkprefs.c:1986 msgid "Status at Startup" msgstr "" -#: ../pidgin/gtkprefs.c:1990 +#: ../pidgin/gtkprefs.c:1988 msgid "Use status from last _exit at startup" msgstr "" -#: ../pidgin/gtkprefs.c:1996 +#: ../pidgin/gtkprefs.c:1994 msgid "Status to a_pply at startup:" msgstr "" +#: ../pidgin/gtkprefs.c:2032 +msgid "Interface" +msgstr "Interface" + #: ../pidgin/gtkprefs.c:2034 -msgid "Interface" -msgstr "Interface" - -#: ../pidgin/gtkprefs.c:2036 msgid "Smiley Themes" msgstr "Smiley Themes" -#: ../pidgin/gtkprefs.c:2043 +#: ../pidgin/gtkprefs.c:2041 msgid "Browser" msgstr "Browser" -#: ../pidgin/gtkprefs.c:2047 +#: ../pidgin/gtkprefs.c:2045 #, fuzzy msgid "Status / Idle" msgstr "Away / Idle" @@ -17361,7 +17326,7 @@ msgid "Received Messages" msgstr "Send Message" -#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245 +#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251 #, fuzzy, c-format msgid "Select Color for %s" msgstr "Select Text Colour" @@ -17637,7 +17602,7 @@ "\n" "<b>Idle:</b>" -#: ../pidgin/plugins/history.c:192 +#: ../pidgin/plugins/history.c:188 msgid "History" msgstr "History" @@ -17894,42 +17859,52 @@ msgid "GtkTreeView Horizontal Separation" msgstr "" -#: ../pidgin/plugins/pidginrc.c:69 +#: ../pidgin/plugins/pidginrc.c:73 #, fuzzy msgid "Conversation Entry" msgstr "Conversations" -#: ../pidgin/plugins/pidginrc.c:70 +#: ../pidgin/plugins/pidginrc.c:74 +#, fuzzy +msgid "Conversation History" +msgstr "Conversations" + +#: ../pidgin/plugins/pidginrc.c:75 +#, fuzzy +msgid "Log Viewer" +msgstr "Login server" + +#: ../pidgin/plugins/pidginrc.c:76 #, fuzzy msgid "Request Dialog" msgstr "Request ambiguous" -#: ../pidgin/plugins/pidginrc.c:71 +#: ../pidgin/plugins/pidginrc.c:77 #, fuzzy msgid "Notify Dialog" msgstr "Notify For" -#: ../pidgin/plugins/pidginrc.c:247 +#: ../pidgin/plugins/pidginrc.c:253 #, fuzzy msgid "Select Color" msgstr "Select Text Colour" -#: ../pidgin/plugins/pidginrc.c:294 -#, fuzzy +#: ../pidgin/plugins/pidginrc.c:300 +#, fuzzy, c-format msgid "Select Interface Font" msgstr "Select Font" -#: ../pidgin/plugins/pidginrc.c:297 +#: ../pidgin/plugins/pidginrc.c:303 #, fuzzy, c-format msgid "Select Font for %s" msgstr "Select Font" -#: ../pidgin/plugins/pidginrc.c:365 +#: ../pidgin/plugins/pidginrc.c:371 #, fuzzy msgid "GTK+ Interface Font" msgstr "Interface Options" -#: ../pidgin/plugins/pidginrc.c:385 +#: ../pidgin/plugins/pidginrc.c:391 msgid "GTK+ Text Shortcut Theme" msgstr "" @@ -17953,40 +17928,40 @@ #. widget_bool_widgets[i]); #. } #. -#: ../pidgin/plugins/pidginrc.c:422 +#: ../pidgin/plugins/pidginrc.c:428 #, fuzzy msgid "Interface colors" msgstr "Ignore c_olours" -#: ../pidgin/plugins/pidginrc.c:446 +#: ../pidgin/plugins/pidginrc.c:452 msgid "Widget Sizes" msgstr "" -#: ../pidgin/plugins/pidginrc.c:467 +#: ../pidgin/plugins/pidginrc.c:473 #, fuzzy msgid "Fonts" msgstr "Accounts" -#: ../pidgin/plugins/pidginrc.c:491 +#: ../pidgin/plugins/pidginrc.c:497 #, fuzzy msgid "Gtkrc File Tools" msgstr "Gaim File Control" -#: ../pidgin/plugins/pidginrc.c:496 +#: ../pidgin/plugins/pidginrc.c:502 #, c-format msgid "Write settings to %s%sgtkrc-2.0" msgstr "" -#: ../pidgin/plugins/pidginrc.c:505 +#: ../pidgin/plugins/pidginrc.c:511 msgid "Re-read gtkrc files" msgstr "" -#: ../pidgin/plugins/pidginrc.c:538 +#: ../pidgin/plugins/pidginrc.c:544 #, fuzzy msgid "Pidgin GTK+ Theme Control" msgstr "Gaim File Control" -#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541 +#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547 msgid "Provides access to commonly used gtkrc settings." msgstr "" @@ -18168,6 +18143,7 @@ msgstr "" #: ../pidgin/plugins/timestamp_format.c:26 +#, c-format msgid "_Force 24-hour time format" msgstr "" @@ -18395,6 +18371,110 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "" +#, fuzzy +#~ msgid "Offline buddies" +#~ msgstr "Dim i_dle buddies" + +#, fuzzy +#~ msgid "Sort" +#~ msgstr "Port" + +#, fuzzy +#~ msgid "By Status" +#~ msgstr "By status" + +#, fuzzy +#~ msgid "By Log Size" +#~ msgstr "By log size" + +#, fuzzy +#~ msgid "Unable to connect to contact server" +#~ msgstr "Unable to connect to server." + +#, fuzzy +#~ msgid "Unable to retrieve MSN Address Book" +#~ msgstr "Unable To Retrieve Buddy List" + +#, fuzzy +#~ msgid "Current media" +#~ msgstr "Currently on" + +#, fuzzy +#~ msgid "Windows Live Messenger Protocol Plugin" +#~ msgstr "Novell GroupWise Messenger Protocol Plugin" + +#, fuzzy +#~ msgid "Windows Live ID authentication Failed" +#~ msgstr "Normal authentication failed!" + +#, fuzzy +#~ msgid "%s just sent you a Nudge!" +#~ msgstr "%s wants to send you a file" + +#, fuzzy +#~ msgid "Unknown error (%d)" +#~ msgstr "Unknown error" + +#, fuzzy +#~ msgid "Unable to connect to OIM server" +#~ msgstr "Unable to connect to server." + +#, fuzzy +#~ msgid "%s (%s) changed status from %s to %s" +#~ msgstr "%s has changed the topic to: %s" + +#, fuzzy +#~ msgid "%s (%s) is now %s" +#~ msgstr "%s is now known as %s" + +#, fuzzy +#~ msgid "%s (%s) is no longer %s" +#~ msgstr "%s is no longer away." + +#, fuzzy +#~ msgid "_Merge" +#~ msgstr "_Message:" + +#, fuzzy +#~ msgid "_Send File..." +#~ msgstr "_Send File" + +#, fuzzy +#~ msgid "Add Buddy _Pounce..." +#~ msgstr "Add Buddy _Pounce" + +#, fuzzy +#~ msgid "Hide when offline" +#~ msgstr "Not allowed when offline" + +#, fuzzy +#~ msgid "Show when offline" +#~ msgstr "Not allowed when offline" + +#, fuzzy +#~ msgid "Add _Buddy..." +#~ msgstr "Add Buddy" + +#, fuzzy +#~ msgid "Add C_hat..." +#~ msgstr "Add Chat" + +#, fuzzy +#~ msgid "Persistent" +#~ msgstr "Permit" + +#, fuzzy +#~ msgid "/Accounts/Manage" +#~ msgstr "Accounts" + +#, fuzzy +#~ msgid "A_ccount:" +#~ msgstr "Account:" + +#, fuzzy +#~ msgid "S_end To" +#~ msgstr "_Send As" + #~ msgid "Hide Disconnect Errors" #~ msgstr "Hide Disconnect Errors" @@ -18455,10 +18535,6 @@ #~ msgid "GtkTreeView Expander Size" #~ msgstr "Expander Size" -#, fuzzy -#~ msgid "Conversation History" -#~ msgstr "Conversations" - #~ msgid "" #~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/" #~ "\">http://gaim.sourceforge.net</a>." @@ -18515,12 +18591,6 @@ #~ msgid "Alias Contact..." #~ msgstr "Alias Contact..." -#~ msgid "Add a _Buddy" -#~ msgstr "Add a _Buddy" - -#~ msgid "Add a C_hat" -#~ msgstr "Add a C_hat" - #~ msgid "/Tools/Account Ac_tions" #~ msgstr "/Tools/Account Ac_tions" @@ -18783,9 +18853,6 @@ #~ "\n" #~ "<b>%s:</b> %s" -#~ msgid "Has you" -#~ msgstr "Has you" - #~ msgid "Hidden" #~ msgstr "Hidden" @@ -18795,9 +18862,6 @@ #~ msgid "MSN Profile" #~ msgstr "MSN Profile" -#~ msgid "MSN Protocol Plugin" -#~ msgstr "MSN Protocol Plugin" - #~ msgid "Login server" #~ msgstr "Login server"