diff po/he.po @ 8778:8bf735cf9d1c

[gaim-migrate @ 9540] (17:44:08) Faceprint: ping (17:44:17) Me: semi-pong (17:44:26) Faceprint: in a position to commit, or not? (17:44:40) Me: more or less (17:44:48) Me: not in a possition to think though (17:44:56) Faceprint: no real thought required (17:45:29) Faceprint: jabber.c, in jabber_login_callback, before the check to see if gc is in gaim_connections_get_all(), please add: (17:45:32) Faceprint: if (source < 0) { gaim_connection_error(gc, _("Couldn't connect to host")); return; } (17:45:53) Faceprint: and change the if statement in irc_login_cb in irc.c to be the same oh and vi automatically tabbing sucks and sometime i ran make dist committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 23 Apr 2004 21:50:17 +0000
parents 60cd196efd47
children 8c4d99bea74d
line wrap: on
line diff
--- a/po/he.po	Fri Apr 23 17:34:41 2004 +0000
+++ b/po/he.po	Fri Apr 23 21:50:17 2004 +0000
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
-"POT-Creation-Date: 2004-04-08 00:00-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-22 22:29-0400\n"
 "PO-Revision-Date: 2004-04-10 04:12+0200\n"
 "Last-Translator: Pavel Bibergal <cyberkm203@hotmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -29,14 +30,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113
-#: plugins/autorecon.c:115
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "כאשר מנתקים אותך, מתחבר מחדש עצמאית"
 
-#: plugins/chkmail.c:90
-#: plugins/chkmail.c:113
-#: plugins/chkmail.c:122
+#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
 msgid "Mail Server"
 msgstr "שרת הדואר"
 
@@ -79,9 +77,11 @@
 #. Explanation
 #: plugins/contact_priority.c:139
 msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the contact.\n"
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
 "The default values (offline = 4,away = 2, and idle = 1)\n"
-"will use what used to be the built-in order active->idle->away->away+idle->offline."
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 
 #: plugins/contact_priority.c:142
@@ -104,15 +104,20 @@
 #. *< version
 #. *< summary
 #: plugins/contact_priority.c:194
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr ""
 
 #. *< description
 #: plugins/contact_priority.c:196
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr ""
-
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+#.
 #. *  DEFINES, MACROS & DATA TYPES
+#.
 #: plugins/docklet/docklet-win32.c:44
 msgid "Gaim"
 msgstr "גיים"
@@ -126,9 +131,7 @@
 msgid "Gaim - Away"
 msgstr "גיים - לא זמין"
 
-#: plugins/docklet/docklet.c:114
-#: src/gtkaccount.c:497
-#: src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr "כניסה אוטומתית"
 
@@ -144,26 +147,19 @@
 msgid "New..."
 msgstr "חדש..."
 
-#: plugins/docklet/docklet.c:153
-#: src/gtkprefs.c:1621
-#: src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:951
-#: src/protocols/jabber/jutil.c:32
-#: src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119
-#: src/protocols/oscar/oscar.c:2951
-#: src/protocols/oscar/oscar.c:4735
-#: src/protocols/oscar/oscar.c:5760
-#: src/protocols/oscar/oscar.c:6378
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
 #. else...
-#: plugins/docklet/docklet.c:159
-#: src/away.c:522
-#: src/protocols/oscar/oscar.c:4653
-#: src/protocols/oscar/oscar.c:6386
+#: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
 msgid "Back"
 msgstr "חזר"
 
@@ -171,21 +167,16 @@
 msgid "Mute Sounds"
 msgstr "השתק צלילים"
 
-#: plugins/docklet/docklet.c:172
-#: src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 msgid "File Transfers"
 msgstr "משלוח קבצים"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173
-#: src/gtkaccount.c:2070
-#: src/main.c:287
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: plugins/docklet/docklet.c:174
-#: src/gtkprefs.c:2609
-#: src/main.c:293
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -225,8 +216,16 @@
 
 #. *  description
 #: plugins/docklet/docklet.c:511
-msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
-msgstr "מציג סמל באזור ההתרעה (לדוגמא: של GNOME, KDE או Windows) שמראה את המצב הנוכחי, מאפשר גישה מהירה ל פעולות הנפוצות ביותר, הצגה/הסתרה של חלון \"רשימת אנשי קשר\". כמו כן נותן אפשרות לגרום להודעות נכנסות להמתין בתור עד לחיצה על הסמל באזור האתרעה - כמו ב ICQ"
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+"מציג סמל באזור ההתרעה (לדוגמא: של GNOME, KDE או Windows) שמראה את המצב "
+"הנוכחי, מאפשר גישה מהירה ל פעולות הנפוצות ביותר, הצגה/הסתרה של חלון \"רשימת "
+"אנשי קשר\". כמו כן נותן אפשרות לגרום להודעות נכנסות להמתין בתור עד לחיצה על "
+"הסמל באזור האתרעה - כמו ב ICQ"
 
 #. *< api_version
 #. *< type
@@ -243,29 +242,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:225
-#: plugins/filectl.c:227
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "מאפשר לך לשלוט בגיים ע\"י הכנסת פקודות לקובץ"
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr "לא מחובר ל AIM"
 
-#: plugins/gaim-remote/remote.c:97
-#: plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "אין ניתן שם תצוגה."
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr "לא ניתן שם החדר."
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 #, fuzzy
 msgid "Invalid AIM URI"
 msgstr "הכתובת '%s' אינה תקפה"
 
+#: plugins/gaim-remote/remote.c:651
+#, fuzzy, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr "נכשל בטעינת התמונה '%s': %s"
+
+#: plugins/gaim-remote/remote.c:674
+#, fuzzy
+msgid "Unable to open socket"
+msgstr "אין אפשרות לקרוא את השקע"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -273,20 +282,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:715
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr "שליטה מרוחקת"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:718
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr "מאפשר שליטה מרוחקת בתוכנות גיים"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:720
-msgid "Gives Gaim the ability to be remote-controlled through third-party applications or through the gaim-remote tool."
+#: plugins/gaim-remote/remote.c:727
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
 msgstr ""
 
 #. *< api_version
@@ -364,28 +375,22 @@
 msgstr ""
 
 #: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:76
+#: plugins/gevolution/assoc-buddy.c:74
 msgid "Local Addressbook"
 msgstr "פנקס כתובות מקומי"
 
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:86
-#: plugins/gevolution/assoc-buddy.c:97
-#: src/gtkblist.c:2918
-#: src/gtkprefs.c:870
-#: src/gtkprefs.c:1649
-#: src/protocols/jabber/jabber.c:915
+#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
+#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
+#: src/protocols/jabber/jabber.c:916
 msgid "None"
 msgstr "ללא"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180
-#: src/gtkprefs.c:2026
-#: src/gtkroomlist.c:561
-#: src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1384
-#: src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "שם"
 
@@ -400,21 +405,19 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385
-#: src/protocols/oscar/oscar.c:6649
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
 msgid "Search"
 msgstr "חיפוש"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310
-#: src/gtkblist.c:3936
-#: src/gtkblist.c:4264
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
 msgid "Group:"
 msgstr "קבוצה:"
 
 #. "New Person" button
 #: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:488
+#: plugins/gevolution/assoc-buddy.c:486
 msgid "New Person"
 msgstr "אישיות חדשה"
 
@@ -424,32 +427,29 @@
 msgstr "בחר איש קשר"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:372
-msgid "Select a person from your address book to add this buddy to, or create a new person."
+#: plugins/gevolution/assoc-buddy.c:370
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
 msgstr ""
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:451
+#: plugins/gevolution/assoc-buddy.c:449
 msgid "Show user details"
 msgstr "הצג פרטי המשתמש"
 
-#: plugins/gevolution/assoc-buddy.c:452
+#: plugins/gevolution/assoc-buddy.c:450
 msgid "Hide user details"
 msgstr "הסתר פרטי המשתמש"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:505
+#: plugins/gevolution/assoc-buddy.c:503
 msgid "_Associate Buddy"
 msgstr "שייך איש _קשר"
 
-#: plugins/gevolution/gevo-util.c:66
-#: plugins/gevolution/gevolution.c:90
-#: src/blist.c:674
-#: src/blist.c:861
-#: src/blist.c:2094
-#: src/gtkblist.c:3761
-#: src/protocols/jabber/roster.c:66
-#: src/protocols/msn/notification.c:786
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
 msgid "Buddies"
 msgstr "אנשי קשר"
 
@@ -468,8 +468,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 
-#: plugins/gevolution/gevolution.c:380
-#: src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
 msgid "Account"
 msgstr "חשבון"
 
@@ -489,8 +488,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr ""
 
@@ -521,9 +519,8 @@
 msgstr "בקשת מידע"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341
-#: src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:3171
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: src/protocols/oscar/oscar.c:425
 msgid "Buddy Icon"
 msgstr "סמל איש הקשר"
 
@@ -539,16 +536,18 @@
 msgid "E-mail:"
 msgstr "דוא\"ל:"
 
-#: plugins/history.c:74
+#: plugins/history.c:70
 msgid "History"
 msgstr "היסטוריה"
 
-#: plugins/history.c:76
+#: plugins/history.c:72
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: plugins/history.c:77
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+#: plugins/history.c:73
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
 
 #. *< api_version
@@ -567,8 +566,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:83
-#: plugins/iconaway.c:85
+#: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 
@@ -584,8 +582,7 @@
 msgid "idle for"
 msgstr "לא פעיל"
 
-#: plugins/idle.c:90
-#: plugins/timestamp.c:109
+#: plugins/idle.c:90 plugins/timestamp.c:109
 msgid "minutes."
 msgstr " דקות"
 
@@ -598,8 +595,7 @@
 msgid "I'dle Mak'er"
 msgstr "מחרוזת מ&ענה:"
 
-#: plugins/idle.c:121
-#: plugins/idle.c:122
+#: plugins/idle.c:121 plugins/idle.c:122
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr ""
 
@@ -624,7 +620,9 @@
 
 #. *  description
 #: plugins/ipc-test-client.c:89
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
 msgstr ""
 
 #. *< api_version
@@ -748,8 +746,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:765
-#: plugins/notify.c:767
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -760,7 +757,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:530
+#: plugins/perl/perl.c:531
 #, fuzzy
 msgid "Perl Plugin Loader"
 msgstr "תוסף תסריטי פרל"
@@ -768,8 +765,7 @@
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:532
-#: plugins/perl/perl.c:533
+#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -782,7 +778,9 @@
 msgstr ""
 
 #: plugins/raw.c:157
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 
 #: plugins/relnot.c:62
@@ -799,11 +797,12 @@
 
 #: plugins/relnot.c:73
 #, c-format
-msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-msgstr ""
-
-#: plugins/relnot.c:77
-#: plugins/relnot.c:78
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
 #, fuzzy
 msgid "New Version Available"
 msgstr "Name=ישנן חדשות זמינות"
@@ -830,7 +829,9 @@
 
 #. *  description
 #: plugins/relnot.c:139
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
 msgstr ""
 
 #. *< api_version
@@ -848,8 +849,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468
-#: plugins/signals-test.c:470
+#: plugins/signals-test.c:468 plugins/signals-test.c:470
 #, fuzzy
 msgid "Test to see that all signals are working properly."
 msgstr "בודק שכל האירועים עובדים כמו שצריך"
@@ -869,8 +869,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:34
-#: plugins/simple.c:36
+#: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "בודק עם רוב הדברים עובדים"
 
@@ -902,8 +901,7 @@
 msgid "Text replacement"
 msgstr "החלפת הטקסט"
 
-#: plugins/spellchk.c:537
-#: plugins/spellchk.c:538
+#: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
@@ -922,8 +920,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:226
-#: plugins/ssl/ssl-gnutls.c:228
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -942,8 +939,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:315
-#: plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -962,13 +958,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:94
-#: plugins/ssl/ssl.c:96
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30
-#: src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s התרחק/ה מהמחשב"
@@ -1004,18 +998,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:81
-#: plugins/statenotify.c:84
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr ""
-
-#: plugins/tcl/tcl.c:349
+#: plugins/statenotify.c:81 plugins/statenotify.c:84
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+#: plugins/tcl/tcl.c:350
 #, fuzzy
 msgid "Tcl Plugin Loader"
 msgstr "תוסף הדגמה של גיים"
 
-#: plugins/tcl/tcl.c:351
-#: plugins/tcl/tcl.c:352
+#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
 #, fuzzy
 msgid "Provides support for loading Tcl plugins"
 msgstr "מוסיף תמיכה לפעולות עכבר"
@@ -1027,8 +1021,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74
-#: plugins/ticker/ticker.c:328
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "טיקר אנשי קשר"
 
@@ -1036,8 +1029,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:331
-#: plugins/ticker/ticker.c:333
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
@@ -1069,8 +1061,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:176
-#: plugins/timestamp.c:178
+#: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
@@ -1096,8 +1087,7 @@
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365
-#: src/gtkprefs.c:873
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
 msgid "Buddy List Window"
 msgstr "חלון רשימת החברים"
 
@@ -1129,59 +1119,55 @@
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:348
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "גרסת הרצה של GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:356
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "הפעלה"
 
-#: plugins/win32/winprefs/winprefs.c:357
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "הפעל את Gaim בעת הפעלת חלונות"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366
-#: src/gtkblist.c:2959
-#: src/gtkprefs.c:2525
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
+#: src/gtkprefs.c:2505
 msgid "Buddy List"
 msgstr "רשימת אנשי קשר"
 
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:363
 #, fuzzy
 msgid "_Dockable Buddy List"
 msgstr "שגיעה ברשימת הידידים"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:371
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "חלון \"_רשימת הידידים\" תמיד עליון"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:381
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "חלון \"רשימת אנשי קשר\" תמיד עליון"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386
-#: src/gtkprefs.c:911
-#: src/gtkprefs.c:2526
-#: src/protocols/msn/msn.c:1721
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
+#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "שיחות"
 
-#: plugins/win32/winprefs/winprefs.c:387
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:405
 msgid "WinGaim Options"
 msgstr "אפשרויות גיים לחלונות"
 
-#: plugins/win32/winprefs/winprefs.c:411
-#: plugins/win32/winprefs/winprefs.c:412
+#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
@@ -1196,11 +1182,14 @@
 msgstr "<span size=\"larger\" weight=\"bold\">התקן ערכת נושא חדשה</span>"
 
 #: src/about.c:94
-msgid "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgid ""
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
 #: src/about.c:104
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 
 #: src/about.c:109
@@ -1223,9 +1212,7 @@
 msgid "win32 port"
 msgstr "גירסה לחלונות"
 
-#: src/about.c:119
-#: src/about.c:120
-#: src/about.c:121
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "מפתח"
 
@@ -1274,13 +1261,11 @@
 msgid "Current Translators"
 msgstr "מתרגמים פעילים"
 
-#: src/about.c:163
-#: src/about.c:196
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr "קטלנית"
 
-#: src/about.c:164
-#: src/about.c:197
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr "צ'כית"
 
@@ -1292,23 +1277,19 @@
 msgid "British English"
 msgstr "אנגלית בריטית"
 
-#: src/about.c:167
-#: src/about.c:198
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr "גרמנית"
 
-#: src/about.c:168
-#: src/about.c:199
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr "ספרדית"
 
-#: src/about.c:169
-#: src/about.c:200
+#: src/about.c:169 src/about.c:201
 msgid "Finnish"
 msgstr "פינית"
 
-#: src/about.c:170
-#: src/about.c:201
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr "צרפתית"
 
@@ -1320,13 +1301,11 @@
 msgid "Hungarian"
 msgstr "הונגרית"
 
-#: src/about.c:173
-#: src/about.c:203
+#: src/about.c:173 src/about.c:204
 msgid "Italian"
 msgstr "איטלקית"
 
-#: src/about.c:174
-#: src/about.c:205
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr "קוריאנית"
 
@@ -1336,205 +1315,161 @@
 msgstr "Name=הולנדית"
 
 #: src/about.c:176
+msgid "Macedonian"
+msgstr ""
+
+#: src/about.c:177
 msgid "Norwegian"
 msgstr "נורבגית"
 
-#: src/about.c:177
-#: src/about.c:206
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "פולנית"
 
-#: src/about.c:178
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "פורטוגזית"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "פורטוגזית ברזילאית"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Romanian"
 msgstr "רומנית"
 
-#: src/about.c:181
-#: src/about.c:207
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "רוסית"
 
-#: src/about.c:182
-msgid "Serbian"
-msgstr "סרבית"
-
 #: src/about.c:183
-#: src/about.c:209
+msgid "Serbian"
+msgstr "סרבית"
+
+#: src/about.c:184 src/about.c:210
 msgid "Swedish"
 msgstr "שוודית"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Vietnamese"
 msgstr "ויאטנמית"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Gnome Vi Team"
 msgstr "צוות VI של גנום"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "סינית פשוטה"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "סינית מסורתית"
 
-#: src/about.c:193
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "מתרגמים לשעבר"
 
-#: src/about.c:194
+#: src/about.c:195
 msgid "Amharic"
 msgstr "אמהרית"
 
-#: src/about.c:195
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "בולגרית"
 
-#: src/about.c:202
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "עברית"
 
-#: src/about.c:204
+#: src/about.c:205
 msgid "Japanese"
 msgstr "יפנית"
 
-#: src/about.c:208
+#: src/about.c:209
 msgid "Slovak"
 msgstr "סלובקית"
 
-#: src/about.c:210
+#: src/about.c:211
 msgid "Chinese"
 msgstr "סינית"
 
-#: src/account.c:279
-#: src/protocols/jabber/jabber.c:992
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
 msgid "New passwords do not match."
 msgstr "הסיסמה החדשה ווידואה אינם תואמים."
 
-#: src/account.c:287
+#: src/account.c:288
 #, fuzzy
 msgid "Fill out all fields completely."
 msgstr "יש למלא את כל שדות הטופס."
 
-#: src/account.c:312
+#: src/account.c:313
 msgid "Original password"
 msgstr "סיסמא מקורית"
 
-#: src/account.c:318
+#: src/account.c:320
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: src/account.c:324
+#: src/account.c:327
 msgid "New password (again)"
 msgstr "ודא סיסמה חדשה"
 
-#: src/account.c:329
+#: src/account.c:333
 #, c-format
 msgid "Change password for %s"
 msgstr "שנה סיסמא עבור %s"
 
-#: src/account.c:337
+#: src/account.c:341
 #, fuzzy
 msgid "Please enter your current password and your new password."
 msgstr "הכנס סיסמא:"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#: src/account.c:340
-#: src/connection.c:198
-#: src/dialogs.c:471
-#: src/dialogs.c:527
-#: src/gtkblist.c:2317
-#: src/gtkrequest.c:228
-#: src/protocols/jabber/jabber.c:1037
-#: src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:215
-#: src/protocols/oscar/oscar.c:2555
-#: src/protocols/oscar/oscar.c:2636
-#: src/protocols/oscar/oscar.c:6439
-#: src/protocols/oscar/oscar.c:6535
-#: src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6666
-#: src/protocols/yahoo/yahoo.c:2503
-#: src/protocols/yahoo/yahoo.c:2511
-#: src/request.h:1237
+#.
+#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "אישור"
 
-#: src/account.c:341
-#: src/account.c:375
-#: src/connection.c:199
-#: src/dialogs.c:305
-#: src/dialogs.c:317
-#: src/dialogs.c:330
-#: src/dialogs.c:351
-#: src/dialogs.c:472
-#: src/dialogs.c:528
-#: src/dialogs.c:851
-#: src/dialogs.c:872
-#: src/dialogs.c:889
-#: src/dialogs.c:908
-#: src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235
-#: src/gtkblist.c:2318
-#: src/gtkblist.c:4303
-#: src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:397
-#: src/gtkprivacy.c:575
-#: src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613
-#: src/gtkprivacy.c:624
-#: src/gtkrequest.c:229
-#: src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:692
-#: src/protocols/jabber/jabber.c:659
-#: src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:183
-#: src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:205
-#: src/protocols/msn/msn.c:216
-#: src/protocols/msn/msn.c:229
-#: src/protocols/oscar/oscar.c:2519
-#: src/protocols/oscar/oscar.c:2556
-#: src/protocols/oscar/oscar.c:2592
-#: src/protocols/oscar/oscar.c:2637
-#: src/protocols/oscar/oscar.c:6257
-#: src/protocols/oscar/oscar.c:6440
-#: src/protocols/oscar/oscar.c:6536
-#: src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:6650
-#: src/protocols/oscar/oscar.c:6667
-#: src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512
-#: src/request.h:1237
-#: src/request.h:1247
+#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/account.c:367
+#: src/account.c:374
 #, fuzzy, c-format
 msgid "Change user information for %s"
 msgstr "&שם משתמש עבור עורך רשימת השינויים:"
 
-#: src/account.c:374
-#: src/dialogs.c:839
-#: src/gtkrequest.c:235
-#: src/protocols/jabber/buddy.c:513
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "שמור"
 
@@ -1559,39 +1494,44 @@
 msgid "Set All Away"
 msgstr "קבע מצב \"לא נמצא\" כללי"
 
-#: src/blist.c:579
-#: src/gtkprefs.c:2528
+#: src/blist.c:590 src/gtkprefs.c:2508
 msgid "Chats"
 msgstr "שיחות"
 
-#: src/blist.c:1181
-#: src/blist.c:1190
-#, c-format
+#: src/blist.c:1192
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies and the group were not removed.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr "הקבוצה לא נמחקה"
 
-#: src/blist.c:1240
-#: src/gtkaccount.c:164
-#: src/gtkft.c:153
-#: src/gtkutils.c:860
-#: src/protocols/jabber/buddy.c:569
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/blist.c:1567
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr "שם הקבוצה שגוי"
 
-#: src/blist.c:2209
-msgid "An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-
-#: src/blist.c:2211
+#: src/blist.c:2220
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded."
+msgstr ""
+
+#: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr "שגיעה ברשימת אנשי הקשר"
 
-#: src/connection.c:119
-#: src/connection.c:170
+#: src/connection.c:119 src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "חסר תוסף הפרוטוקול עבור %s"
@@ -1617,60 +1557,59 @@
 msgid "Unable to send message."
 msgstr "לא ניתן לשלוח הודעה"
 
-#: src/conversation.c:1968
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr "%s נכנס לחדר"
 
-#: src/conversation.c:1971
+#: src/conversation.c:1972
 #, fuzzy, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s נכנס לחדר"
 
-#: src/conversation.c:2063
+#: src/conversation.c:2064
 #, fuzzy, c-format
 msgid "You are now known as %s"
 msgstr "%s ידוע  כעט בשם %s"
 
-#: src/conversation.c:2066
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ידוע  כעט בשם %s"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s עזב את החדר (%s)."
 
-#: src/conversation.c:2111
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr "%s עזב את החדר"
 
-#: src/conversation.c:2184
+#: src/conversation.c:2185
 #, fuzzy, c-format
 msgid "(+%d more)"
 msgstr " רתוי"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2187
 #, fuzzy, c-format
 msgid " left the room (%s)."
 msgstr "%s עזב את החדר"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr "חלון אחרון שנוצר"
 
-#: src/conversation.c:2468
-#: src/gtkprefs.c:1399
+#: src/conversation.c:2469 src/gtkprefs.c:1413
 msgid "New window"
 msgstr "חלון חדש"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2471
 msgid "By group"
 msgstr "לפי קבוצות"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2473
 msgid "By account"
 msgstr "לפי חשבון"
 
@@ -1683,7 +1622,8 @@
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
 "\n"
-"This will increase %s's warning level and he or she will be subject to harsher rate limiting.\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
 msgstr ""
 
 #: src/dialogs.c:182
@@ -1696,51 +1636,52 @@
 
 #: src/dialogs.c:301
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:303
-#: src/dialogs.c:304
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "הסר איש קשר"
 
 #: src/dialogs.c:313
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:315
-#: src/dialogs.c:316
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+
+#: src/dialogs.c:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "הסר שיחה"
 
 #: src/dialogs.c:325
 #, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:328
-#: src/dialogs.c:329
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "הסר קבוצה"
 
 #: src/dialogs.c:346
 #, c-format
-msgid "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:349
-#: src/dialogs.c:350
+msgid ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
 
-#: src/dialogs.c:453
-#: src/dialogs.c:509
+#: src/dialogs.c:453 src/dialogs.c:509
 msgid "_Screen name"
 msgstr "שם _לתצוגה"
 
-#: src/dialogs.c:459
-#: src/dialogs.c:515
+#: src/dialogs.c:459 src/dialogs.c:515
 msgid "_Account"
 msgstr "_חשבון"
 
@@ -1758,21 +1699,19 @@
 msgstr "מידע כללי על המשתמש"
 
 #: src/dialogs.c:524
-msgid "Please enter the screen name of the person whose info you would like to view."
-msgstr ""
-
-#: src/dialogs.c:552
-#: src/gtkimhtmltoolbar.c:240
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr ""
+
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "בחירת צבע טקסט"
 
-#: src/dialogs.c:580
-#: src/gtkimhtmltoolbar.c:310
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "בחירת צבע רקע"
 
-#: src/dialogs.c:619
-#: src/gtkimhtmltoolbar.c:164
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "בחירת גופן"
 
@@ -1781,7 +1720,8 @@
 msgstr ""
 
 #: src/dialogs.c:694
-msgid "Please give the message a title, or choose \"Use\" to use without saving."
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
 #: src/dialogs.c:704
@@ -1814,10 +1754,7 @@
 msgid "Enter an alias for this chat."
 msgstr "הזן שם נוסף לשיחה זו."
 
-#: src/dialogs.c:871
-#: src/dialogs.c:888
-#: src/dialogs.c:907
-#: src/gtkrequest.c:236
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
 msgid "Alias"
 msgstr "שם נוסף"
 
@@ -1867,7 +1804,7 @@
 msgid "Size of the expander arrow"
 msgstr "גודלו של חץ ההרחבה"
 
-#: src/gaim-remote.c:66
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1880,12 +1817,11 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:175
-#: src/gaim-remote.c:191
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr ""
 
-#: src/gaim-remote.c:204
+#: src/gaim-remote.c:203
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1908,7 +1844,7 @@
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:223
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1919,23 +1855,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:375
-#: src/gaimrc.c:1451
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr "ברירת המחדל (משעמם)"
 
-#: src/gaimrc.c:1260
-#: src/gtkblist.c:2920
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr "אלפבתית"
 
-#: src/gaimrc.c:1262
-#: src/gtkblist.c:2921
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr "לפי מצב"
 
-#: src/gaimrc.c:1264
-#: src/gtkblist.c:2922
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr "לפי גודל הרישום"
 
@@ -1956,8 +1888,7 @@
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: src/gtkaccount.c:406
-#: src/gtkblist.c:3908
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
 msgid "Screen Name:"
 msgstr "שם לתצוגה:"
 
@@ -1965,9 +1896,7 @@
 msgid "Password:"
 msgstr "סיסמא:"
 
-#: src/gtkaccount.c:484
-#: src/gtkblist.c:3922
-#: src/gtkblist.c:4250
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 msgid "Alias:"
 msgstr "תיאור:"
 
@@ -2003,39 +1932,32 @@
 msgstr " %s אפשרויות"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr "השתמש בהגדרות כלליות"
 
 #. No Proxy
-#: src/gtkaccount.c:784
-#: src/gtkaccount.c:832
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr "ללא מתווך"
 
 #. HTTP
-#: src/gtkaccount.c:790
-#: src/gtkaccount.c:839
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796
-#: src/gtkaccount.c:846
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:802
-#: src/gtkaccount.c:853
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808
-#: src/gtkaccount.c:860
-#: src/gtkprefs.c:1200
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
 msgid "Use Environmental Settings"
 msgstr "השתמש בהגדרות הסביבה"
 
@@ -2051,18 +1973,15 @@
 msgid "Proxy Options"
 msgstr "אפשרויות מתווך"
 
-#: src/gtkaccount.c:937
-#: src/gtkprefs.c:1194
+#: src/gtkaccount.c:937 src/gtkprefs.c:1208
 msgid "Proxy _type:"
 msgstr "סוג ה_מתווך"
 
-#: src/gtkaccount.c:946
-#: src/gtkprefs.c:1224
+#: src/gtkaccount.c:946 src/gtkprefs.c:1238
 msgid "_Host:"
 msgstr "_מארח:"
 
-#: src/gtkaccount.c:950
-#: src/gtkprefs.c:1242
+#: src/gtkaccount.c:950 src/gtkprefs.c:1256
 msgid "_Port:"
 msgstr "_יציאה:"
 
@@ -2070,8 +1989,7 @@
 msgid "_Username:"
 msgstr "_שם משתמש:"
 
-#: src/gtkaccount.c:963
-#: src/gtkprefs.c:1279
+#: src/gtkaccount.c:963 src/gtkprefs.c:1293
 msgid "Pa_ssword:"
 msgstr "סי_סמא"
 
@@ -2093,8 +2011,7 @@
 msgstr "פחות"
 
 #. Register button
-#: src/gtkaccount.c:1385
-#: src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "הרשם"
 
@@ -2103,23 +2020,18 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "האם אתה בטוח שברצונך למחוק את %s?"
 
-#: src/gtkaccount.c:1743
-#: src/gtkrequest.c:232
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gtkaccount.c:1857
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
 msgid "Screen Name"
 msgstr "שם לתצוגה"
 
-#: src/gtkaccount.c:1880
-#: src/protocols/jabber/jabber.c:949
-#: src/protocols/oscar/oscar.c:2957
-#: src/protocols/oscar/oscar.c:4733
-#: src/protocols/oscar/oscar.c:6377
-#: src/protocols/yahoo/yahoo.c:2298
-#: src/protocols/zephyr/zephyr.c:1213
-#: src/protocols/zephyr/zephyr.c:1223
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "מחובר"
 
@@ -2151,20 +2063,16 @@
 msgstr "להוסיף את איש הקשר לרשימה שלך?"
 
 #. Add button
-#: src/gtkaccount.c:2234
-#: src/gtkblist.c:4302
-#: src/gtkconv.c:1080
-#: src/gtkconv.c:3295
-#: src/gtkconv.c:3386
-#: src/gtkrequest.c:233
-#: src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2799
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
+#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gtkblist.c:801
-#: src/gtkblist.c:4190
-msgid "You are not currently signed on with any protocols that have the ability to chat."
+#: src/gtkblist.c:801 src/gtkblist.c:4236
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
 msgstr ""
 
 #: src/gtkblist.c:814
@@ -2172,225 +2080,216 @@
 msgstr "הצטרף לשיחה"
 
 #: src/gtkblist.c:835
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr ""
-
-#: src/gtkblist.c:848
-#: src/gtkpounce.c:361
-#: src/gtkroomlist.c:365
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
 msgid "_Account:"
 msgstr "חש_בון:"
 
-#: src/gtkblist.c:1086
-#: src/gtkblist.c:3109
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
 msgid "Get _Info"
 msgstr "הצג _פרטים"
 
-#: src/gtkblist.c:1089
-#: src/gtkblist.c:3100
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
 msgid "I_M"
 msgstr "הודעה"
 
-#: src/gtkblist.c:1091
+#: src/gtkblist.c:1092
 #, fuzzy
 msgid "Add Buddy _Pounce"
 msgstr "להוסיף איש קשר לרשימה שלך?"
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
-#: src/gtkblist.c:1113
-#: src/gtkblist.c:1214
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
 msgid "_Alias..."
 msgstr "_שם נוסף..."
 
-#: src/gtkblist.c:1115
-#: src/gtkblist.c:1216
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_הסר"
 
-#: src/gtkblist.c:1160
+#: src/gtkblist.c:1206
 msgid "Add a _Buddy"
 msgstr "הוספת _איש קשר"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1208
 msgid "Add a C_hat"
 msgstr "הוסף _שיחה"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1210
 msgid "_Delete Group"
 msgstr "הסר _קבוצה"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:1212
 msgid "_Rename"
 msgstr "_שנה שם"
 
 #. join button
-#: src/gtkblist.c:1192
-#: src/gtkroomlist.c:261
-#: src/gtkroomlist.c:417
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
 #: src/stock.c:87
 msgid "_Join"
 msgstr "הצ_טרף"
 
-#: src/gtkblist.c:1194
+#: src/gtkblist.c:1240
 msgid "Auto-Join"
 msgstr "הצטרף אוטומטית"
 
-#: src/gtkblist.c:1230
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr "_קפל"
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr "ה_רחב"
 
-#: src/gtkblist.c:1918
-#: src/gtkconv.c:3873
-msgid "You are not currently signed on with an account that can add that buddy."
+#: src/gtkblist.c:1964 src/gtkconv.c:3911
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: src/gtkblist.c:2266
+#: src/gtkblist.c:2312
 msgid "/_Buddies"
 msgstr "/_אנשי קשר"
 
-#: src/gtkblist.c:2267
+#: src/gtkblist.c:2313
 msgid "/Buddies/New Instant _Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: src/gtkblist.c:2268
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה.."
 
-#: src/gtkblist.c:2269
+#: src/gtkblist.c:2315
 msgid "/Buddies/Get User _Info..."
 msgstr "/אנשי קשר/הצג _פרטי המשתמש.."
 
-#: src/gtkblist.c:2271
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/אנשי קשר/הצג אנשי קשר ש_אינם מחוברים"
 
-#: src/gtkblist.c:2272
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/אנשי קשר/הצג _קבוצות ריקות"
 
-#: src/gtkblist.c:2273
+#: src/gtkblist.c:2319
 msgid "/Buddies/_Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר"
 
-#: src/gtkblist.c:2274
+#: src/gtkblist.c:2320
 #, fuzzy
 msgid "/Buddies/Add C_hat..."
 msgstr "להוסיף איש קשר לרשימה שלך?"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:2321
 #, fuzzy
 msgid "/Buddies/Add _Group..."
 msgstr "הוסף קבוצה חדשה..."
 
-#: src/gtkblist.c:2277
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr "/אנשי קשר/_התנתקות"
 
-#: src/gtkblist.c:2278
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr "/אנשי קשר/_יציאה"
 
 #. Tools
-#: src/gtkblist.c:2281
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "/_כלים"
 
-#: src/gtkblist.c:2282
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr ""
 
-#: src/gtkblist.c:2283
+#: src/gtkblist.c:2329
 #, fuzzy
 msgid "/Tools/Buddy _Pounce"
 msgstr "שגיעה ברשימת הידידים"
 
-#: src/gtkblist.c:2284
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr "/כלים/פעולות של _פרוטוקול"
 
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr "/כלים/_חשבונות"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2333
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/_העברת קבצים..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2334
 msgid "/Tools/R_oom List"
 msgstr "/כלים/_רשימת החלונות"
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2335
 msgid "/Tools/Pr_eferences"
 msgstr ""
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr "/כלים/הצג את קובץ דו\"ח המערכת"
 
 #. Help
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
-#: src/gtkblist.c:2297
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr "/עזרה/_חלון ניפוי באגים"
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr "/עזרה/_אודות"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "שנה את שם הקבוצה"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2360
 msgid "New group name"
 msgstr "תן שם לקבוצה החדשה"
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2361
 msgid "Please enter a new name for the selected group."
 msgstr "אנא הזן שם חדש לקבוצה שנבחרה."
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2389
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr "חשבון:"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2453
 #, fuzzy
 msgid "<b>Status:</b> Offline"
 msgstr "אין אפשרות להמשיך במצב לא מקוון"
 
-#: src/gtkblist.c:2422
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:2438
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2398,14 +2297,14 @@
 "\n"
 "<b>חשבון:</b>"
 
-#: src/gtkblist.c:2439
+#: src/gtkblist.c:2485
 #, fuzzy
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
 msgstr "Name=כינוי"
 
-#: src/gtkblist.c:2440
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2413,7 +2312,7 @@
 "\n"
 "<b>שם נוסף:</b>"
 
-#: src/gtkblist.c:2441
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2421,14 +2320,14 @@
 "\n"
 "<b>כינוי:</b>"
 
-#: src/gtkblist.c:2442
+#: src/gtkblist.c:2488
 #, fuzzy
 msgid ""
 "\n"
 "<b>Logged In:</b>"
 msgstr "%s התחבר"
 
-#: src/gtkblist.c:2443
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2436,143 +2335,145 @@
 "\n"
 "<b>לא פעיל:</b>"
 
-#: src/gtkblist.c:2444
+#: src/gtkblist.c:2490
 #, fuzzy
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr "על-ידי %1"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2492
 #, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr "Description=רוח רפאים"
 
-#: src/gtkblist.c:2447
+#: src/gtkblist.c:2493
 #, fuzzy
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr "לפי מצב"
 
-#: src/gtkblist.c:2448
+#: src/gtkblist.c:2494
 #, fuzzy
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr "לפי מצב"
 
-#: src/gtkblist.c:2718
+#: src/gtkblist.c:2764
 #, fuzzy, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "&הסר העברות במנוחה"
 
-#: src/gtkblist.c:2720
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr "לא פעיל (%d דקות)"
 
-#: src/gtkblist.c:2725
+#: src/gtkblist.c:2771
 #, fuzzy, c-format
 msgid "Warned (%d%%) "
 msgstr "על-ידי %1"
 
-#: src/gtkblist.c:2728
+#: src/gtkblist.c:2774
 msgid "Offline "
 msgstr "לא מקוון"
 
-#: src/gtkblist.c:2986
+#: src/gtkblist.c:3032
 #, fuzzy
 msgid "/Tools/Away"
 msgstr "הודעות מרוחק"
 
-#: src/gtkblist.c:2989
+#: src/gtkblist.c:3035
 #, fuzzy
 msgid "/Tools/Buddy Pounce"
 msgstr "שגיעה ברשימת הידידים"
 
-#: src/gtkblist.c:2992
+#: src/gtkblist.c:3038
 #, fuzzy
 msgid "/Tools/Protocol Actions"
 msgstr "לא ניתן לבצע פעולות"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
-#: src/gtkblist.c:3080
+#.
+#: src/gtkblist.c:3126
 #, fuzzy
 msgid "/Buddies/Show Offline Buddies"
 msgstr "הצג גם &משתמשים מנותקים ברשימה"
 
-#: src/gtkblist.c:3082
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr "/אנשי קשר/הצג קבוצות ריקות"
 
-#: src/gtkblist.c:3106
+#: src/gtkblist.c:3152
 #, fuzzy
 msgid "Send a message to the selected buddy"
 msgstr "שליחת הודעה אל שחקן מרוחק"
 
-#: src/gtkblist.c:3115
+#: src/gtkblist.c:3161
 msgid "Get information on the selected buddy"
 msgstr "הצג פרטים עבור איש קשר שנבחר"
 
-#: src/gtkblist.c:3118
+#: src/gtkblist.c:3164
 msgid "_Chat"
 msgstr "_שיחה"
 
-#: src/gtkblist.c:3123
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "הצטרף לחדר השיחה:"
 
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3172
 msgid "_Away"
 msgstr "_רחוק מהמחשב"
 
-#: src/gtkblist.c:3131
+#: src/gtkblist.c:3177
 #, fuzzy
 msgid "Set an away message"
 msgstr "תצורת הודעות לא-נמצא"
 
-#: src/gtkblist.c:3863
-#: src/protocols/yahoo/yahoo.c:2430
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "הוספת חבר..."
 
-#: src/gtkblist.c:3886
-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. The alias will be displayed in place of the screen name whenever possible.\n"
+#: src/gtkblist.c:3932
+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. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3946
-#: src/gtkblist.c:4230
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
 msgid "Account:"
 msgstr "חשבון:"
 
-#: src/gtkblist.c:4197
+#: src/gtkblist.c:4243
 msgid "Add Chat"
 msgstr "הוסף שיחה"
 
-#: src/gtkblist.c:4220
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr ""
-
-#: src/gtkblist.c:4299
+#: src/gtkblist.c:4266
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+#: src/gtkblist.c:4345
 msgid "Add Group"
 msgstr "הוסף קבוצה"
 
-#: src/gtkblist.c:4300
+#: src/gtkblist.c:4346
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:4820
+#: src/gtkblist.c:4866
 msgid "No actions available"
 msgstr "לא ניתן לבצע פעולות"
 
-#: src/gtkconn.c:78
-#: src/gtkconn.c:250
-#: src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "מוכן."
 
@@ -2588,8 +2489,7 @@
 msgid "Cancel All"
 msgstr "בטל הכל"
 
-#: src/gtkconn.c:361
-#: src/gtkconn.c:593
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "הת_חבר שוב"
 
@@ -2614,366 +2514,359 @@
 msgid "Time"
 msgstr "זמן"
 
-#: src/gtkconv.c:173
+#: src/gtkconv.c:172
 #, fuzzy, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "ההתקשרות עם ssh נכשלה.\n"
 
-#: src/gtkconv.c:191
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr "הקובץ כבר קיים"
 
-#: src/gtkconv.c:192
-#: src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "לשכתב?"
 
-#: src/gtkconv.c:478
+#: src/gtkconv.c:505
 #, fuzzy
 msgid "Invite Buddy Into Chat Room"
 msgstr "משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:506
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr ""
-
-#: src/gtkconv.c:527
+#: src/gtkconv.c:533
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#: src/gtkconv.c:554
 msgid "_Buddy:"
 msgstr "_איש הקשר:"
 
-#: src/gtkconv.c:547
+#: src/gtkconv.c:574
 msgid "_Message:"
 msgstr "ה_ודעה:"
 
-#: src/gtkconv.c:640
+#: src/gtkconv.c:667
 msgid "Find"
 msgstr "חפש"
 
-#: src/gtkconv.c:666
+#: src/gtkconv.c:693
 msgid "_Search for:"
 msgstr "_חפש בעבור: "
 
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1071
 msgid "IM"
 msgstr "הודעה"
 
-#: src/gtkconv.c:1046
+#: src/gtkconv.c:1079
 #, fuzzy
 msgid "Un-Ignore"
 msgstr "התעלם מה_כל"
 
-#: src/gtkconv.c:1048
-#: src/gtkprefs.c:803
+#: src/gtkconv.c:1081 src/gtkprefs.c:817
 msgid "Ignore"
 msgstr "התעלם"
 
 #. Info button
-#: src/gtkconv.c:1057
-#: src/gtkconv.c:3309
+#: src/gtkconv.c:1090 src/gtkconv.c:3346
 msgid "Info"
 msgstr "מידע"
 
-#: src/gtkconv.c:1066
+#: src/gtkconv.c:1099
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "הועבר"
 
 #. Remove button
-#: src/gtkconv.c:1078
-#: src/gtkconv.c:3302
-#: src/gtkconv.c:3393
-#: src/gtkrequest.c:234
+#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "הסר"
 
-#: src/gtkconv.c:2168
+#: src/gtkconv.c:2201
 msgid "Animate"
 msgstr "הנפש"
 
-#: src/gtkconv.c:2173
+#: src/gtkconv.c:2206
 msgid "Hide Icon"
 msgstr "הסתר סמל"
 
-#: src/gtkconv.c:2179
+#: src/gtkconv.c:2212
 msgid "Save Icon As..."
 msgstr "שמירת סמל בשם..."
 
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2579
 msgid "User is typing..."
 msgstr "המשתמש כותב כרגע..."
 
-#: src/gtkconv.c:2550
+#: src/gtkconv.c:2587
 msgid "User has typed something and paused"
 msgstr "המשתמש כתב משהו והפסיק"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2653
+#: src/gtkconv.c:2690
 msgid "_Send As"
 msgstr "שלח בתור"
 
-#: src/gtkconv.c:3073
+#: src/gtkconv.c:3110
 msgid "Save Conversation"
 msgstr "שמור שיחה"
 
 #. Conversation menu
-#: src/gtkconv.c:3090
+#: src/gtkconv.c:3127
 msgid "/_Conversation"
 msgstr "/_שיחה"
 
-#: src/gtkconv.c:3092
+#: src/gtkconv.c:3129
 #, fuzzy
 msgid "/Conversation/New Instant _Message..."
 msgstr "/ידידים/הו_דעה חדשה..."
 
-#: src/gtkconv.c:3097
+#: src/gtkconv.c:3134
 #, fuzzy
 msgid "/Conversation/_Find..."
 msgstr ".אצמנ אל `%s' ץבוק"
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3136
 #, fuzzy
 msgid "/Conversation/View _Log"
 msgstr "הצגת רישום משחק"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3137
 #, fuzzy
 msgid "/Conversation/_Save As..."
 msgstr "שמירת סמל בשם..."
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3142
 #, fuzzy
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "להוסיף ידיד לרשימה שלך?"
 
-#: src/gtkconv.c:3107
+#: src/gtkconv.c:3144
 #, fuzzy
 msgid "/Conversation/_Get Info"
 msgstr "מידע כללי על המשתמש"
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3146
 #, fuzzy
 msgid "/Conversation/_Warn..."
 msgstr "הזהר את המשתמש"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3148
 #, fuzzy
 msgid "/Conversation/In_vite..."
 msgstr "הפעל _במסוף"
 
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:3153
 #, fuzzy
 msgid "/Conversation/A_lias..."
 msgstr "שנוי &כינוי..."
 
-#: src/gtkconv.c:3118
+#: src/gtkconv.c:3155
 #, fuzzy
 msgid "/Conversation/_Block..."
 msgstr "גודל בלוק"
 
-#: src/gtkconv.c:3120
+#: src/gtkconv.c:3157
 #, fuzzy
 msgid "/Conversation/_Add..."
 msgstr "הוסף מדפסת"
 
-#: src/gtkconv.c:3122
+#: src/gtkconv.c:3159
 #, fuzzy
 msgid "/Conversation/_Remove..."
 msgstr "הסר ידיד"
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3164
 #, fuzzy
 msgid "/Conversation/Insert Lin_k..."
 msgstr "הכנס ערך ASCII"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3166
 #, fuzzy
 msgid "/Conversation/Insert Imag_e..."
 msgstr "הכנס ערך ASCII"
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3171
 #, fuzzy
 msgid "/Conversation/_Close"
 msgstr "סגור חלון"
 
 #. Options
-#: src/gtkconv.c:3138
+#: src/gtkconv.c:3175
 msgid "/_Options"
 msgstr "/_אפשרויות"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3176
 msgid "/Options/Enable _Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: src/gtkconv.c:3140
+#: src/gtkconv.c:3177
 msgid "/Options/Enable _Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: src/gtkconv.c:3141
+#: src/gtkconv.c:3178
 #, fuzzy
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "הצג או הסתר סרגל כלים"
 
-#: src/gtkconv.c:3183
+#: src/gtkconv.c:3220
 #, fuzzy
 msgid "/Conversation/View Log"
 msgstr "הצגת רישום משחק"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3225
 #, fuzzy
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "להוסיף ידיד לרשימה שלך?"
 
-#: src/gtkconv.c:3194
+#: src/gtkconv.c:3231
 #, fuzzy
 msgid "/Conversation/Get Info"
 msgstr "מידע כללי על המשתמש"
 
-#: src/gtkconv.c:3198
+#: src/gtkconv.c:3235
 #, fuzzy
 msgid "/Conversation/Warn..."
 msgstr "הזהר את המשתמש"
 
-#: src/gtkconv.c:3202
+#: src/gtkconv.c:3239
 #, fuzzy
 msgid "/Conversation/Invite..."
 msgstr "הזמן משתמש"
 
-#: src/gtkconv.c:3208
+#: src/gtkconv.c:3245
 #, fuzzy
 msgid "/Conversation/Alias..."
 msgstr "Name=כינוי"
 
-#: src/gtkconv.c:3212
+#: src/gtkconv.c:3249
 #, fuzzy
 msgid "/Conversation/Block..."
 msgstr "גודל בלוק"
 
-#: src/gtkconv.c:3216
+#: src/gtkconv.c:3253
 #, fuzzy
 msgid "/Conversation/Add..."
 msgstr "הוסף מדפסת"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3257
 #, fuzzy
 msgid "/Conversation/Remove..."
 msgstr "הסר ידיד"
 
-#: src/gtkconv.c:3226
+#: src/gtkconv.c:3263
 #, fuzzy
 msgid "/Conversation/Insert Link..."
 msgstr "ה_עתק מיקום הקישור"
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3267
 #, fuzzy
 msgid "/Conversation/Insert Image..."
 msgstr "פרטי רקע תמונה"
 
-#: src/gtkconv.c:3236
+#: src/gtkconv.c:3273
 #, fuzzy
 msgid "/Options/Enable Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3276
 #, fuzzy
 msgid "/Options/Enable Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3279
 #, fuzzy
 msgid "/Options/Show Formatting Toolbar"
 msgstr "הצג או הסתר סרגל כלים"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3265
-#: src/gtkconv.c:3267
-#: src/gtkconv.c:3365
-#: src/gtkconv.c:3367
+#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
 msgid "Send"
 msgstr "שלח"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3281
+#: src/gtkconv.c:3318
 msgid "Warn"
 msgstr "אזהר"
 
-#: src/gtkconv.c:3284
+#: src/gtkconv.c:3321
 msgid "Warn the user"
 msgstr "הזהר את המשתמש"
 
 #. Block button
-#: src/gtkconv.c:3288
-#: src/gtkprivacy.c:612
-#: src/gtkprivacy.c:623
+#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "חסום"
 
-#: src/gtkconv.c:3291
+#: src/gtkconv.c:3328
 msgid "Block the user"
 msgstr "חסום משתמש"
 
-#: src/gtkconv.c:3298
+#: src/gtkconv.c:3335
 msgid "Add the user to your buddy list"
 msgstr "הוסף את המשתמש לרשימת אנשי הקשר שלך"
 
-#: src/gtkconv.c:3305
+#: src/gtkconv.c:3342
 msgid "Remove the user from your buddy list"
 msgstr "הסר את המשתמש מרשימץ אנשי הקשר שלך"
 
-#: src/gtkconv.c:3312
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3349 src/gtkconv.c:3671
 #, fuzzy
 msgid "Get the user's information"
 msgstr "מידע משתמש של %1"
 
 #. Invite
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3416
 msgid "Invite"
 msgstr "הזמן"
 
-#: src/gtkconv.c:3382
+#: src/gtkconv.c:3419
 msgid "Invite a user"
 msgstr "הזמן משתמש"
 
-#: src/gtkconv.c:3389
+#: src/gtkconv.c:3426
 #, fuzzy
 msgid "Add the chat to your buddy list"
 msgstr "הוסף את המשתמש לרשימת הידידים שלך"
 
-#: src/gtkconv.c:3396
+#: src/gtkconv.c:3433
 #, fuzzy
 msgid "Remove the chat from your buddy list"
 msgstr "הסר את המשתמש מרשימץ הידידים שלך"
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3533
 msgid "Topic:"
 msgstr "כותרת:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3556
+#: src/gtkconv.c:3593
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3648
 msgid "IM the user"
 msgstr "שלח הודעה מיידית למשתמש זה"
 
-#: src/gtkconv.c:3623
+#: src/gtkconv.c:3660
 msgid "Ignore the user"
 msgstr "התעלם מהמשתמש"
 
-#: src/gtkconv.c:4164
+#: src/gtkconv.c:4202
 msgid "Close conversation"
 msgstr "סגור חלון"
 
-#: src/gtkconv.c:4675
-#: src/gtkconv.c:4707
-#: src/gtkconv.c:4828
-#: src/gtkconv.c:4895
-#: src/gtkconv.c:5414
-#: src/gtkconv.c:5417
+#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#, fuzzy, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "0 אנשים בחדר זה"
+msgstr[1] "0 אנשים בחדר זה"
+
+#: src/gtkconv.c:5484 src/gtkconv.c:5487
 #, fuzzy
 msgid "<main>/Conversation/Close"
 msgstr "/קובץ/_סגור חלון"
@@ -2995,8 +2888,7 @@
 msgid "%.2f KB/s"
 msgstr "%.2f ק\"ב"
 
-#: src/gtkft.c:156
-#: src/gtkft.c:957
+#: src/gtkft.c:156 src/gtkft.c:957
 msgid "Finished"
 msgstr "הושלם"
 
@@ -3074,8 +2966,7 @@
 msgstr "הסתר פרטי העברות"
 
 #. Pause button
-#: src/gtkft.c:696
-#: src/stock.c:90
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "השהייה"
 
@@ -3130,112 +3021,116 @@
 "Remote port: %d"
 msgstr ""
 
-#: src/gtkimhtml.c:858
+#: src/gtkimhtml.c:1139
 msgid "_Copy E-Mail Address"
 msgstr "העתק _כתובת הדוא\"ל"
 
-#: src/gtkimhtml.c:870
+#: src/gtkimhtml.c:1151
 msgid "_Copy Link Location"
 msgstr "ה_עתק מיקום הקישור"
 
-#: src/gtkimhtml.c:880
+#: src/gtkimhtml.c:1161
 msgid "_Open Link in Browser"
 msgstr "_פתח את הקישור בדפדפן"
 
-#: src/gtkimhtml.c:2310
-msgid "Unable to guess the image type based on the file extension supplied.  Defaulting to PNG."
-msgstr ""
-
-#: src/gtkimhtml.c:2318
+#: src/gtkimhtml.c:2643
+msgid ""
+"Unable to guess the image type based on the file extension supplied.  "
+"Defaulting to PNG."
+msgstr ""
+
+#: src/gtkimhtml.c:2651
 #, fuzzy, c-format
 msgid "Error saving image: %s"
 msgstr ""
 "אירעה שגיאה בשמירת התמונה:\n"
 "%1"
 
-#: src/gtkimhtml.c:2327
+#: src/gtkimhtml.c:2660
 msgid "Save Image"
 msgstr "שמור תמונה"
 
-#: src/gtkimhtml.c:2350
+#: src/gtkimhtml.c:2683
 msgid "_Save Image..."
 msgstr "שמור _תמונה..."
 
-#: src/gtkimhtmltoolbar.c:381
+#: src/gtkimhtmltoolbar.c:383
 msgid "_URL"
 msgstr "_קישור"
 
-#: src/gtkimhtmltoolbar.c:385
+#: src/gtkimhtmltoolbar.c:387
 msgid "_Description"
 msgstr "_תיאור"
 
-#: src/gtkimhtmltoolbar.c:390
+#: src/gtkimhtmltoolbar.c:392
 msgid "Insert Link"
 msgstr "הוספת קישור"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:396
+#: src/gtkimhtmltoolbar.c:394
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:398
 msgid "_Insert"
 msgstr "ה_כנס"
 
-#: src/gtkimhtmltoolbar.c:453
+#: src/gtkimhtmltoolbar.c:455
 #, fuzzy, c-format
 msgid "Failed to store image: %s\n"
 msgstr "נכשל בטעינת התמונה '%s': %s"
 
-#: src/gtkimhtmltoolbar.c:479
+#: src/gtkimhtmltoolbar.c:481
 msgid "Insert Image"
 msgstr "הכנס תמונה"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:623
+#: src/gtkimhtmltoolbar.c:625
 msgid "Smile!"
 msgstr "חייך!"
 
-#: src/gtkimhtmltoolbar.c:811
+#: src/gtkimhtmltoolbar.c:825
 msgid "Bold"
 msgstr "מודגש"
 
-#: src/gtkimhtmltoolbar.c:822
+#: src/gtkimhtmltoolbar.c:836
 msgid "Italic"
 msgstr "נטוי"
 
-#: src/gtkimhtmltoolbar.c:833
+#: src/gtkimhtmltoolbar.c:847
 msgid "Underline"
 msgstr "קו תחתון"
 
-#: src/gtkimhtmltoolbar.c:849
+#: src/gtkimhtmltoolbar.c:863
 msgid "Larger font size"
 msgstr "הגדל גודל גופן"
 
-#: src/gtkimhtmltoolbar.c:861
+#: src/gtkimhtmltoolbar.c:875
 msgid "Smaller font size"
 msgstr "הקטן גודל גופן"
 
-#: src/gtkimhtmltoolbar.c:878
+#: src/gtkimhtmltoolbar.c:892
 msgid "Font Face"
 msgstr "תיאור הגופן"
 
-#: src/gtkimhtmltoolbar.c:890
+#: src/gtkimhtmltoolbar.c:904
 msgid "Foreground font color"
 msgstr "צבע הגופן"
 
-#: src/gtkimhtmltoolbar.c:902
+#: src/gtkimhtmltoolbar.c:916
 msgid "Background color"
 msgstr "צבע הרקע"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:931
 msgid "Insert link"
 msgstr "הכנס קישור"
 
-#: src/gtkimhtmltoolbar.c:927
+#: src/gtkimhtmltoolbar.c:941
 msgid "Insert image"
 msgstr "הכנס תמונה"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:952
 msgid "Insert smiley"
 msgstr "הכנס חיוך"
 
@@ -3245,13 +3140,18 @@
 msgstr "פתח באמצעות..."
 
 #. Window **********
-#: src/gtklog.c:368
-#: src/gtklog.c:384
+#: src/gtklog.c:368 src/gtklog.c:384
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
 #. Descriptive label
 #: src/gtknotify.c:217
+#, fuzzy, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s התרחק/ה מהמחשב"
+msgstr[1] "%s התרחק/ה מהמחשב"
+
 #: src/gtknotify.c:229
 #, fuzzy, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
@@ -3283,24 +3183,23 @@
 msgid "The browser command \"%s\" is invalid."
 msgstr "המיקום המצוין אינו תקני."
 
-#: src/gtknotify.c:444
-#: src/gtknotify.c:458
-#: src/gtknotify.c:473
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
 #: src/gtknotify.c:581
 #, fuzzy
 msgid "Unable to open URL"
 msgstr "לא ניתן לפתוח קובץ דו\"ח!\n"
 
-#: src/gtknotify.c:455
-#: src/gtknotify.c:470
+#: src/gtknotify.c:455 src/gtknotify.c:470
 #, fuzzy, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "שגיאה בהפעלת פקודה"
 
 #: src/gtknotify.c:582
 #, fuzzy
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
 
 #: src/gtkpounce.c:143
 msgid "Select a file"
@@ -3312,8 +3211,7 @@
 msgstr "הזן את הפרטים הבאים כדי לתזמן את המשימה:\n"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336
-#: src/gtkpounce.c:756
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 #, fuzzy
 msgid "New Buddy Pounce"
 msgstr "שגיעה ברשימת הידידים"
@@ -3463,43 +3361,44 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:385
+#: src/gtkprefs.c:399
 msgid "Interface Options"
 msgstr "הגדרות ממשק המשתמש"
 
-#: src/gtkprefs.c:387
+#: src/gtkprefs.c:401
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:581
-msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
-msgstr "בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת הערכות."
-
-#: src/gtkprefs.c:616
+#: src/gtkprefs.c:595
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת "
+"הערכות."
+
+#: src/gtkprefs.c:630
 msgid "Icon"
 msgstr "סמל"
 
-#: src/gtkprefs.c:623
-#: src/gtkprefs.c:2063
-#: src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748
-#: src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "תיאור"
 
-#: src/gtkprefs.c:690
+#: src/gtkprefs.c:704
 msgid "Style"
 msgstr "סגנון"
 
-#: src/gtkprefs.c:691
+#: src/gtkprefs.c:705
 msgid "_Bold"
 msgstr "_מודגש"
 
-#: src/gtkprefs.c:693
+#: src/gtkprefs.c:707
 msgid "_Italic"
 msgstr "_נטוי"
 
-#: src/gtkprefs.c:695
+#: src/gtkprefs.c:709
 msgid "_Underline"
 msgstr "_קו תחתון"
 
@@ -3509,578 +3408,568 @@
 #. * non-functional code.
 #. *
 #. * remove this after string freeze ends
-#: src/gtkprefs.c:705
+#.
+#: src/gtkprefs.c:719
 msgid "_Strikethrough"
 msgstr "ק_ו חוצה"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:722
 msgid "Face"
 msgstr "סוג"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:725
 msgid "Use custo_m face"
 msgstr "השתמש בגופן מותאם אישית"
 
-#: src/gtkprefs.c:728
+#: src/gtkprefs.c:742
 msgid "Use custom si_ze"
 msgstr "השתמש בגודל מותאם אישית"
 
-#: src/gtkprefs.c:740
+#: src/gtkprefs.c:754
 msgid "Color"
 msgstr "צבע"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:758
 msgid "_Text color"
 msgstr "צבע הטק_סט"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:777
 msgid "Bac_kground color"
 msgstr "צבע הרקע"
 
-#: src/gtkprefs.c:791
-#: src/gtkprefs.c:1023
-#: src/gtkprefs.c:1071
+#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
 msgid "Display"
 msgstr "תצוגה"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:806
 msgid "Show graphical _smileys"
 msgstr "הצג פרצופים מ_חייכים"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:808
 #, fuzzy
 msgid "Show _timestamp on messages"
 msgstr "הצג הודעות ניפוי של פקודות."
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:810
 msgid "Show _URLs as links"
 msgstr "הצג את כתובות אינטרנט בתור קישורים"
 
-#: src/gtkprefs.c:800
+#: src/gtkprefs.c:814
 msgid "_Highlight misspelled words"
 msgstr "הדגש מי_לים עם שגיאות כתיב"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:818
 msgid "Ignore c_olors"
 msgstr "התעלם מ_צבעים"
 
-#: src/gtkprefs.c:806
+#: src/gtkprefs.c:820
 msgid "Ignore font _faces"
 msgstr "התעלם מ_סוג הגופן"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:822
 msgid "Ignore font si_zes"
 msgstr "התעלם מ_גודל הגופן"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:835
 msgid "Send Message"
 msgstr "שליחת הודעה"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:836
 msgid "Enter _sends message"
 msgstr "_שלח הודעה בלחיצת \"Enter\""
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:838
 msgid "C_ontrol-Enter sends message"
 msgstr "שלח הודעה בלחיצת \"Ctrl+Enter\""
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:841
 msgid "Window Closing"
 msgstr "סגירת החלונות"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:842
 msgid "_Escape closes window"
 msgstr "_סגור חלון בלחיצת \"ESC\""
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:845
 msgid "Insertions"
 msgstr "הכנסות"
 
-#: src/gtkprefs.c:832
+#: src/gtkprefs.c:846
 #, fuzzy
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Comment=הוספה מובנית של תגיות HTML"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:848
 msgid "Control-(number) _inserts smileys"
 msgstr " הוספת חיוך ב \"Ctrl+מספר\" "
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:864
 msgid "Buddy List Sorting"
 msgstr "סידור רשימת אנשי הקשר"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:873
 msgid "_Sorting:"
 msgstr "ס_דר:"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:878
 msgid "Buddy List Toolbar"
 msgstr "סרגל כלים של רשימת אנשי הקשר"
 
-#: src/gtkprefs.c:865
-#: src/gtkprefs.c:996
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
 msgid "Show _buttons as:"
 msgstr "הצג לחצים בתור:"
 
-#: src/gtkprefs.c:867
-#: src/gtkprefs.c:998
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
 msgid "Pictures"
 msgstr "תמונות"
 
-#: src/gtkprefs.c:868
-#: src/gtkprefs.c:999
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
 msgid "Text"
 msgstr "טקסט"
 
-#: src/gtkprefs.c:869
-#: src/gtkprefs.c:1000
-#: src/gtkprefs.c:1051
+#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
 msgid "Pictures and text"
 msgstr "טקסט עם תמונות"
 
-#: src/gtkprefs.c:874
-#: src/gtkprefs.c:1011
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
 #, fuzzy
 msgid "_Raise window on events"
 msgstr "_שחזר חלון במיקוד"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:891
 msgid "Group Display"
 msgstr "תצוגת קבוצות"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:892
 msgid "Show _numbers in groups"
 msgstr "מי_ספור הקבוצות"
 
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:895
 msgid "Buddy Display"
 msgstr "תצוגת אנשי הקשר"
 
-#: src/gtkprefs.c:882
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:896 src/gtkprefs.c:1032
 msgid "Show buddy _icons"
 msgstr "הצ_ג סמלים של אנשי קשר"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:898
 #, fuzzy
 msgid "Show _warning levels"
 msgstr "<b>רמות צבעי הסוללה (%)</b>"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:900
 #, fuzzy
 msgid "Show idle _times"
 msgstr "מספר הפעמים שיש להתאים"
 
-#: src/gtkprefs.c:888
+#: src/gtkprefs.c:902
 #, fuzzy
 msgid "Dim i_dle buddies"
 msgstr "הצג חברים לפי"
 
-#: src/gtkprefs.c:890
+#: src/gtkprefs.c:904
 #, fuzzy
 msgid "_Automatically expand contacts"
 msgstr "אנשי קשר מו&רשים:"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:929
 msgid "_Placement:"
 msgstr "מי_קום:"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:936
 msgid "Send _URLs as links"
 msgstr "שלח _כתובות אינרנט בתור קישורים"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:939
 #, fuzzy
 msgid "Show _formatting toolbar"
 msgstr "הצג/הסתר סרגל כלים"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:942
 msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/gtkprefs.c:931
+#: src/gtkprefs.c:945
 msgid "Tab Options"
 msgstr "הגדרות כרטיסיה"
 
-#: src/gtkprefs.c:933
+#: src/gtkprefs.c:947
 msgid "_Tab Placement:"
 msgstr "מי_קום לשונית:"
 
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:949
 msgid "Top"
 msgstr "למעלה"
 
-#: src/gtkprefs.c:936
+#: src/gtkprefs.c:950
 msgid "Bottom"
 msgstr "למטה"
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:951
 msgid "Left"
 msgstr "שמאל"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:952
 msgid "Right"
 msgstr "ימין"
 
-#: src/gtkprefs.c:944
+#: src/gtkprefs.c:958
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "הצג שיחות והודעות מיידיות בכרטיסיות"
 
-#: src/gtkprefs.c:947
+#: src/gtkprefs.c:961
 #, fuzzy
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "הצג שיחות והודעות מיידיות בכרטיסיות"
 
-#: src/gtkprefs.c:957
+#: src/gtkprefs.c:971
 msgid "Show _close button on tabs"
 msgstr "הצג לחצן סגירה על גבי כרטיסייה"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:982
 #, fuzzy
 msgid "Show status _icons on tabs"
 msgstr "הצג לחצן סגירה על גבי כרטיסייה"
 
-#: src/gtkprefs.c:995
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
 msgid "Window"
 msgstr "חלון"
 
-#: src/gtkprefs.c:1005
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
 msgid "New window _width:"
 msgstr "רוחב החלון:"
 
-#: src/gtkprefs.c:1007
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
 msgid "New window _height:"
 msgstr "גובה החלון:"
 
-#: src/gtkprefs.c:1009
-#: src/gtkprefs.c:1060
+#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
 msgid "_Entry field height:"
 msgstr "גובה חלון הטקסט:"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1027
 msgid "Hide window on _send"
 msgstr "הסתר חלון לאחר שליחת ההודעה"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1031
 msgid "Buddy Icons"
 msgstr "סמלים אנשי הקשר"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1034
 msgid "Enable buddy icon a_nimation"
 msgstr "אפשר אנימצית של סמל אנשי הקשר"
 
-#: src/gtkprefs.c:1024
+#: src/gtkprefs.c:1038
 msgid "Show _logins in window"
 msgstr "הצג חיבורים בחלון"
 
-#: src/gtkprefs.c:1027
+#: src/gtkprefs.c:1041
 #, fuzzy
 msgid "Typing Notification"
 msgstr "אזור התרעה"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:1042
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1079
 msgid "Tab Completion"
 msgstr "השלמות"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1080
 #, fuzzy
 msgid "_Tab-complete nicks"
 msgstr "אתחול רשת הושלם."
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:1082
 msgid "_Old-style tab completion"
 msgstr ""
 
-#: src/gtkprefs.c:1072
+#: src/gtkprefs.c:1086
 #, fuzzy
 msgid "_Show people joining in window"
 msgstr "ה_צג תוצאות בחלון הפלט"
 
-#: src/gtkprefs.c:1074
+#: src/gtkprefs.c:1088
 #, fuzzy
 msgid "_Show people leaving in window"
 msgstr "ה_צג תוצאות בחלון הפלט"
 
-#: src/gtkprefs.c:1076
+#: src/gtkprefs.c:1090
 #, fuzzy
 msgid "Co_lorize screen names"
 msgstr "השתמש בכינוים צבעונים"
 
-#: src/gtkprefs.c:1097
-#: src/protocols/oscar/oscar.c:5699
+#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4220
 msgid "IP Address"
 msgstr "כתובת IP"
 
-#: src/gtkprefs.c:1099
+#: src/gtkprefs.c:1113
 #, fuzzy
 msgid "_Autodetect IP Address"
 msgstr "כתובת &IP של שרת ה-DNS:"
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1122
 #, fuzzy
 msgid "Public _IP:"
 msgstr "PL_IP"
 
-#: src/gtkprefs.c:1132
+#: src/gtkprefs.c:1146
 msgid "Ports"
 msgstr "יציאות"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1149
 msgid "_Manually specify range of ports to listen on"
 msgstr ""
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1152
 msgid "_Start Port:"
 msgstr "יציאה _ראשונה:"
 
-#: src/gtkprefs.c:1145
+#: src/gtkprefs.c:1159
 msgid "_End Port:"
 msgstr "יציאה _אחרונה:"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1207
 msgid "Proxy Type"
 msgstr "סוג המתווך"
 
-#: src/gtkprefs.c:1196
+#: src/gtkprefs.c:1210
 msgid "No proxy"
 msgstr "ללא מתווך"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1217
 msgid "Proxy Server"
 msgstr "הגדרות המתווך"
 
-#: src/gtkprefs.c:1261
+#: src/gtkprefs.c:1275
 msgid "_User:"
 msgstr "_משתמש:"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1331
 msgid "Opera"
 msgstr "אופרה"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "נטסקייפ"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "מוזילה"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "קונקווירור"
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1335
 msgid "Galeon"
 msgstr "גלאון"
 
-#: src/gtkprefs.c:1322
+#: src/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "פיירבירד"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "פיירפוקס"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1338
 msgid "Gnome Default"
 msgstr "ברירת מחדל של GNOME"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1347
 msgid "Manual"
 msgstr "מותאם אישית"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "בחירת הדפדפן"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_דפדפן:"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1409
 msgid "_Open link in:"
 msgstr "_פתח את הקישור בדפדפן הבא:"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1411
 msgid "Browser default"
 msgstr "דפדפן ברירת המחדל"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1412
 msgid "Existing window"
 msgstr "חלון קיים"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1414
 msgid "New tab"
 msgstr "כרטיסיה חדשה"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1428
 #, fuzzy, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr "כתובת למפת הראדר"
 
-#: src/gtkprefs.c:1451
+#: src/gtkprefs.c:1465
 msgid "Message Logs"
 msgstr "רישום ההודעות"
 
-#: src/gtkprefs.c:1454
+#: src/gtkprefs.c:1468
 msgid "Log _Format:"
 msgstr "מבנה ה_רישום:"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1471
 msgid "_Log all instant messages"
 msgstr "_רשום את כל ההודעות"
 
-#: src/gtkprefs.c:1459
-msgid "Log all c_hats"
-msgstr "רשום את כל השי_חות"
-
-#: src/gtkprefs.c:1462
-msgid "System Logs"
-msgstr "רישומי מערכת"
-
-#: src/gtkprefs.c:1464
-msgid "_Enable system log"
-msgstr "אפשר _כתיבה לקובץ רישום המערכת"
-
-#: src/gtkprefs.c:1467
-msgid "Log when buddies _sign on/sign off"
-msgstr ""
-
 #: src/gtkprefs.c:1473
+msgid "Log all c_hats"
+msgstr "רשום את כל השי_חות"
+
+#: src/gtkprefs.c:1476
+msgid "System Logs"
+msgstr "רישומי מערכת"
+
+#: src/gtkprefs.c:1478
+msgid "_Enable system log"
+msgstr "אפשר _כתיבה לקובץ רישום המערכת"
+
+#: src/gtkprefs.c:1481
+msgid "Log when buddies _sign on/sign off"
+msgstr ""
+
+#: src/gtkprefs.c:1487
 msgid "Log when buddies become _idle/un-idle"
 msgstr ""
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1493
 msgid "Log when buddies go away/come _back"
 msgstr ""
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1499
 msgid "Log your _own signons/idleness/awayness"
 msgstr ""
 
-#: src/gtkprefs.c:1536
+#: src/gtkprefs.c:1550
 msgid "Sound Options"
 msgstr "הגדרות הצליל"
 
-#: src/gtkprefs.c:1537
-msgid "_No sounds when you log in"
+#: src/gtkprefs.c:1551
+#, fuzzy
+msgid "Sounds when you _log in"
 msgstr "_השתק צלילים בזמן הכניסה למערכת"
 
-#: src/gtkprefs.c:1539
+#: src/gtkprefs.c:1553
+#, fuzzy
+msgid "Sounds when conversation has _focus"
+msgstr "סגור חלון"
+
+#: src/gtkprefs.c:1555
 msgid "_Sounds while away"
 msgstr "השמע צלילים במצב \"לא נמצא\""
 
-#: src/gtkprefs.c:1543
+#: src/gtkprefs.c:1559
 msgid "Sound Method"
 msgstr "יציאת הצליל"
 
-#: src/gtkprefs.c:1544
+#: src/gtkprefs.c:1560
 msgid "_Method:"
 msgstr "שי_טה:"
 
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1562
 msgid "Console beep"
 msgstr "&צפצף"
 
-#: src/gtkprefs.c:1548
+#: src/gtkprefs.c:1564
 msgid "Automatic"
 msgstr "אוטומתי"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1571
 msgid "Command"
 msgstr "פקודה"
 
-#: src/gtkprefs.c:1565
+#: src/gtkprefs.c:1581
 #, fuzzy, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr "שם קובץ צליל לפעולה \"הוסף\":"
 
-#: src/gtkprefs.c:1622
+#: src/gtkprefs.c:1638
 msgid "_Sending messages removes away status"
 msgstr ""
 
-#: src/gtkprefs.c:1624
+#: src/gtkprefs.c:1640
 msgid "_Queue new messages when away"
 msgstr ""
 
-#: src/gtkprefs.c:1627
+#: src/gtkprefs.c:1643
 msgid "Auto-response"
 msgstr "תגובת מענה:"
 
-#: src/gtkprefs.c:1630
+#: src/gtkprefs.c:1646
 msgid "Seconds before _resending:"
 msgstr "_שניות לפני מסירה מחודשת:"
 
-#: src/gtkprefs.c:1633
+#: src/gtkprefs.c:1649
 msgid "_Send auto-response"
 msgstr "שלח תגובה באופן אוטומטי"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1651
 msgid "_Only send auto-response when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1653
 msgid "Send auto-response in _active conversations"
 msgstr ""
 
-#: src/gtkprefs.c:1646
-#: src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2294
+#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
+#: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "חוסר פעילות"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1663
 #, fuzzy
 msgid "Idle _time reporting:"
 msgstr "זמן מעבד במשימת סרק"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1666
 msgid "Gaim usage"
 msgstr "בשימוש של גיים"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1669
 msgid "X usage"
 msgstr "בשימוש של X"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1671
 msgid "Windows usage"
 msgstr "בשימוש החלונות"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1679
 #, fuzzy
 msgid "Auto-away"
 msgstr "שימוש ב\"לא נמצא\" אוטומטי"
 
-#: src/gtkprefs.c:1664
+#: src/gtkprefs.c:1680
 #, fuzzy
 msgid "Set away _when idle"
 msgstr "כאשר נשאלת, ברחת."
 
-#: src/gtkprefs.c:1668
+#: src/gtkprefs.c:1684
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1676
+#: src/gtkprefs.c:1692
 #, fuzzy
 msgid "Away m_essage:"
 msgstr "זיהויי הו&דעה"
 
-#: src/gtkprefs.c:1831
+#: src/gtkprefs.c:1767
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4090,7 +3979,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1772
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4100,109 +3989,109 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:2019
+#: src/gtkprefs.c:1999
 msgid "Load"
 msgstr "טען"
 
-#: src/gtkprefs.c:2033
+#: src/gtkprefs.c:2013
 msgid "Summary"
 msgstr "סיכום"
 
-#: src/gtkprefs.c:2081
+#: src/gtkprefs.c:2061
 msgid "Details"
 msgstr "פרטים"
 
-#: src/gtkprefs.c:2208
+#: src/gtkprefs.c:2188
 msgid "Sound Selection"
 msgstr "בחירת הצליל"
 
-#: src/gtkprefs.c:2315
+#: src/gtkprefs.c:2295
 msgid "Play"
 msgstr "נגן"
 
-#: src/gtkprefs.c:2322
+#: src/gtkprefs.c:2302
 msgid "Event"
 msgstr "אירוע"
 
-#: src/gtkprefs.c:2341
+#: src/gtkprefs.c:2321
 msgid "Test"
 msgstr "בדיקה"
 
-#: src/gtkprefs.c:2345
+#: src/gtkprefs.c:2325
 msgid "Reset"
 msgstr "אפס"
 
-#: src/gtkprefs.c:2349
+#: src/gtkprefs.c:2329
 msgid "Choose..."
 msgstr "בחר..."
 
-#: src/gtkprefs.c:2484
+#: src/gtkprefs.c:2464
 msgid "_Edit"
 msgstr "_ערוך"
 
-#: src/gtkprefs.c:2520
+#: src/gtkprefs.c:2500
 msgid "Interface"
 msgstr "ממשק המשתמש"
 
-#: src/gtkprefs.c:2521
+#: src/gtkprefs.c:2501
 msgid "Smiley Themes"
 msgstr "ערכות החיוכים"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2502
 msgid "Fonts"
 msgstr "גופנים"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2503
 msgid "Message Text"
 msgstr "טקסט ההודעות"
 
-#: src/gtkprefs.c:2524
+#: src/gtkprefs.c:2504
 msgid "Shortcuts"
 msgstr "קיצורי מקשים"
 
-#: src/gtkprefs.c:2527
+#: src/gtkprefs.c:2507
 msgid "IMs"
 msgstr "הודעות מיידיות"
 
-#: src/gtkprefs.c:2529
+#: src/gtkprefs.c:2509
 msgid "Network"
 msgstr "רשת"
 
-#: src/gtkprefs.c:2530
+#: src/gtkprefs.c:2510
 msgid "Proxy"
 msgstr "מתווך"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2533
+#: src/gtkprefs.c:2513
 msgid "Browser"
 msgstr "דפדפן"
 
-#: src/gtkprefs.c:2535
+#: src/gtkprefs.c:2515
 msgid "Logging"
 msgstr "רישום"
 
-#: src/gtkprefs.c:2536
+#: src/gtkprefs.c:2516
 msgid "Sounds"
 msgstr "צלילים"
 
-#: src/gtkprefs.c:2537
+#: src/gtkprefs.c:2517
 msgid "Sound Events"
 msgstr "ארועי צליל"
 
-#: src/gtkprefs.c:2538
+#: src/gtkprefs.c:2518
 #, fuzzy
 msgid "Away / Idle"
 msgstr "זמן חוסר פעילות"
 
-#: src/gtkprefs.c:2539
+#: src/gtkprefs.c:2519
 msgid "Away Messages"
 msgstr "הודעות מרוחק"
 
-#: src/gtkprefs.c:2541
+#: src/gtkprefs.c:2522
 msgid "Protocols"
 msgstr "פרוטוקולים"
 
-#: src/gtkprefs.c:2557
+#: src/gtkprefs.c:2523
 msgid "Plugins"
 msgstr "תוספים"
 
@@ -4228,8 +4117,7 @@
 msgid "Block only the users below"
 msgstr "אפשר רק למשתמשים הבאים"
 
-#: src/gtkprivacy.c:374
-#: src/protocols/jabber/jabber.c:1398
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr "פרטיות"
 
@@ -4243,8 +4131,7 @@
 msgid "Set privacy for:"
 msgstr "לא נקבע <%s> לערכת הנושא \"%s\""
 
-#: src/gtkprivacy.c:569
-#: src/gtkprivacy.c:585
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr "אפשר למשתמש"
 
@@ -4256,8 +4143,7 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:574
-#: src/gtkprivacy.c:587
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "הרשה"
 
@@ -4271,8 +4157,7 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:608
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
 msgid "Block User"
 msgstr "חסום משתמש"
 
@@ -4296,29 +4181,29 @@
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#: src/gtkrequest.c:226
-#: src/protocols/gg/gg.c:663
-#: src/request.h:1228
+#.
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "כן"
 
-#: src/gtkrequest.c:227
-#: src/protocols/gg/gg.c:663
-#: src/request.h:1228
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "לא"
 
-#: src/gtkrequest.c:230
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr "החל"
 
-#: src/gtkrequest.c:231
-#: src/protocols/msn/msn.c:248
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
 msgid "Close"
 msgstr "סגור"
 
 #: src/gtkroomlist.c:322
-msgid "You are not currently signed on with any protocols that have the ability to list rooms."
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
 msgstr ""
 
 #: src/gtkroomlist.c:335
@@ -4370,92 +4255,99 @@
 msgid "Someone says your name in chat"
 msgstr "מישהו מזכיר את שמך בשיחה"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "לא ניתן להשמיע צליל, מכוון שקובץ \"%s\" לא קיים."
 
-#: src/gtksound.c:173
-msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
-msgstr "לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
-
-#: src/gtksound.c:185
-#, c-format
-msgid "Unable to play sound because the configured sound command could not be launched: %s"
-msgstr ""
-
-#: src/gtkutils.c:297
+#: src/gtksound.c:174
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr ""
+"לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
+
+#: src/gtksound.c:186
+#, c-format
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
+msgstr ""
+
+#: src/gtkutils.c:133
 msgid "Can't save icon file to disk."
 msgstr "לא ניתן לשמור את הסמל לדיסק"
 
-#: src/gtkutils.c:332
+#: src/gtkutils.c:168
 msgid "Save Icon"
 msgstr "שמירת סמל"
 
-#: src/log.c:103
+#: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:474
+#: src/log.c:476
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:559
-#, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
 #: src/log.c:561
 #, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:612
-#: src/log.c:798
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:563
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:614 src/log.c:800
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:622
-#: src/log.c:810
+#: src/log.c:624 src/log.c:812
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:659
+#: src/log.c:661
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:743
+#: src/log.c:745
 #, fuzzy, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "CTCP %1 תשובה: %2"
 
-#: src/log.c:843
+#: src/log.c:845
 msgid "Plain text"
 msgstr "טקסט רגיל"
 
-#: src/main.c:156
+#: src/main.c:155
 msgid "Please create an account."
 msgstr "אנא צור חשבון חדש"
 
-#: src/main.c:238
+#: src/main.c:237
 msgid "Login"
 msgstr "כניסה"
 
-#: src/main.c:256
+#: src/main.c:255
 msgid "<b>Screen Name:</b>"
 msgstr "<b>שם לתצוגה:</b>"
 
-#: src/main.c:270
+#: src/main.c:269
 msgid "<b>Password:</b>"
 msgstr "<b>סיסמא</b>"
 
-#: src/main.c:299
+#: src/main.c:298
 msgid "Sign on"
 msgstr "התחבר"
 
 #. full help text
-#: src/main.c:523
+#: src/main.c:522
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4475,42 +4367,39 @@
 msgstr ""
 
 #. short message
-#: src/main.c:538
+#: src/main.c:537
 #, fuzzy, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ".רתוי בר עדימ תגצהל `%s --help' שיקהל הסנ"
 
-#: src/plugin.c:269
-#, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr ""
-
-#: src/plugin.c:274
-#: src/plugin.c:302
+#: src/plugin.c:277
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+
+#: src/plugin.c:282 src/plugin.c:310
 msgid "Gaim was unable to load your plugin."
 msgstr "גיים לא מצליח לטעון את התוסף שלך."
 
-#: src/plugin.c:298
+#: src/plugin.c:306
 #, fuzzy, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "גיים לא מצליח לטעון את התוסף שלך."
 
-#: src/prefs.c:113
-#: src/status.c:273
+#: src/prefs.c:113 src/status.c:273
 #, fuzzy
 msgid "Slightly less boring default"
 msgstr "&HTML ושימוש בסגנון ברירת המחדל(משעמם)"
 
-#: src/protocols/gg/gg.c:49
-#: src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:347
-#: src/protocols/msn/state.c:27
-#: src/protocols/msn/state.c:28
-#: src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36
-#: src/protocols/oscar/oscar.c:5718
-#: src/protocols/yahoo/yahoo.c:2598
-#: src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
+#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
+#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "זמין"
 
@@ -4522,18 +4411,12 @@
 msgid "Away for friends only"
 msgstr "מרוחק מהמחשב רק לחברים"
 
-#: src/protocols/gg/gg.c:53
-#: src/protocols/jabber/jabber.c:955
-#: src/protocols/jabber/presence.c:126
-#: src/protocols/oscar/oscar.c:2955
-#: src/protocols/oscar/oscar.c:4648
-#: src/protocols/oscar/oscar.c:4726
-#: src/protocols/oscar/oscar.c:4750
-#: src/protocols/oscar/oscar.c:6383
-#: src/protocols/oscar/oscar.c:6388
-#: src/protocols/yahoo/yahoo.c:2292
-#: src/protocols/yahoo/yahoo.c:2618
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
+#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "בלתי נראה"
 
@@ -4549,17 +4432,14 @@
 msgid "Unable to resolve hostname."
 msgstr "אין אפשרות להסיק את שם המארח"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr "לא ניתן להתחבר לשרת"
 
-#: src/protocols/gg/gg.c:142
-#: src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204
-#: src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452
-#: src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:103
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
+#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/jabber/jabber.c:104
 msgid "Invalid response from server."
 msgstr "שגיעה בתגובה מהשרת"
 
@@ -4593,18 +4473,12 @@
 msgstr "אין אפשרות לקרוא את השקע"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402
-#: src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208
-#: src/protocols/msn/msn.c:501
-#: src/protocols/msn/servconn.c:214
-#: src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1957
-#: src/protocols/yahoo/yahoo.c:1988
-#: src/protocols/yahoo/yahoo.c:2051
-#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "לא ניתן להתחבר"
@@ -4633,8 +4507,7 @@
 "שגיאה בטעינת קובץ הספריה של התוסף \"%1\".\n"
 "(קוד: \"%2\")"
 
-#: src/protocols/gg/gg.c:455
-#: src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
@@ -4674,69 +4547,51 @@
 msgid "Active"
 msgstr "פעיל"
 
-#: src/protocols/gg/gg.c:667
-#: src/protocols/oscar/oscar.c:4103
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
 msgid "UIN"
 msgstr "מספר זיהוי"
 
 #. First Name
-#: src/protocols/gg/gg.c:671
-#: src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4108
-#: src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "שם פרטי"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676
-#: src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4111
-#: src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: src/protocols/gg/gg.c:680
-#: src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
 msgid "Nick"
 msgstr "כינוי"
 
-#: src/protocols/gg/gg.c:687
-#: src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
 msgid "Birth Year"
 msgstr "שנת לידה"
 
-#: src/protocols/gg/gg.c:696
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
 #: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "מין:"
 
 #. City
-#: src/protocols/gg/gg.c:704
-#: src/protocols/jabber/jabber.c:620
-#: src/protocols/oscar/oscar.c:4157
-#: src/protocols/oscar/oscar.c:4173
-#: src/protocols/trepia/trepia.c:331
-#: src/protocols/trepia/trepia.c:410
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "עיר"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725
-#: src/protocols/msn/msn.c:1320
-#: src/protocols/msn/msn.c:1564
-#: src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:2997
-#: src/protocols/oscar/oscar.c:3308
-#: src/protocols/toc/toc.c:498
-#: src/protocols/yahoo/yahoo.c:2897
-#: src/protocols/yahoo/yahoo.c:2919
-#: src/protocols/yahoo/yahoo.c:2942
-#: src/protocols/yahoo/yahoo.c:3100
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 msgid "Buddy Information"
 msgstr "מידע עבור איש הקשר"
 
@@ -4777,7 +4632,9 @@
 msgstr ""
 
 #: src/protocols/gg/gg.c:972
-msgid "Gaim was unable to complete your request due to a problem communicating with the Gadu-Gadu HTTP server.  Please try again later."
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating with "
+"the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
 #: src/protocols/gg/gg.c:1000
@@ -4785,7 +4642,9 @@
 msgstr ""
 
 #: src/protocols/gg/gg.c:1001
-msgid "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try again later."
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
 msgstr ""
 
 #: src/protocols/gg/gg.c:1074
@@ -4793,9 +4652,9 @@
 msgid "Couldn't export buddy list"
 msgstr "להוסיף ידיד לרשימה שלך?"
 
-#: src/protocols/gg/gg.c:1075
-#: src/protocols/gg/gg.c:1098
-msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
+#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
 #: src/protocols/gg/gg.c:1097
@@ -4807,7 +4666,9 @@
 msgstr "אין אפשרות להיכנס אל הספריה"
 
 #: src/protocols/gg/gg.c:1147
-msgid "Gaim was unable to search the Directory because it was unable to connect to the directory server.  Please try again later."
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please try again later."
 msgstr ""
 
 #: src/protocols/gg/gg.c:1180
@@ -4816,15 +4677,16 @@
 msgstr "לא מצליח לשמור סיסמה מאובטחת"
 
 #: src/protocols/gg/gg.c:1181
-msgid "Gaim was unable to change your password due to an error connecting to the Gadu-Gadu server.  Please try again later."
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
 msgstr ""
 
 #: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "חיפוש במדריך"
 
-#: src/protocols/gg/gg.c:1207
-#: src/protocols/jabber/jabber.c:1054
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "שנה סיסמא"
@@ -4850,7 +4712,9 @@
 msgstr "המתשמש %s אינו רשאי יותר לגשת למערכת"
 
 #: src/protocols/gg/gg.c:1261
-msgid "Gaim was unable to access this user's profile due to an error connecting to the directory server.  Please try again later."
+msgid ""
+"Gaim was unable to access this user's profile due to an error connecting to "
+"the directory server.  Please try again later."
 msgstr ""
 
 #. *< api_version
@@ -4864,8 +4728,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374
-#: src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
 #, fuzzy
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
@@ -4879,23 +4742,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:575
-#: src/protocols/msn/notification.c:902
-#: src/protocols/msn/notification.c:1069
-#: src/protocols/oscar/oscar.c:2727
-#: src/protocols/oscar/oscar.c:5361
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:5451
 msgid "Authorize"
 msgstr "אישור"
 
-#: src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:576
-#: src/protocols/msn/notification.c:904
-#: src/protocols/msn/notification.c:1071
-#: src/protocols/oscar/oscar.c:2729
-#: src/protocols/oscar/oscar.c:5362
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:5452
 msgid "Deny"
 msgstr "דחה"
 
@@ -4921,26 +4778,28 @@
 msgstr ".(%s) תרכומ-יתלב הדוקפ"
 
 #: src/protocols/irc/cmds.c:137
-msgid "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+msgid ""
+"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
+"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
+"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 msgstr ""
 
 #: src/protocols/irc/cmds.c:146
-msgid "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-
-#: src/protocols/irc/cmds.c:469
-#: src/protocols/jabber/chat.c:527
+msgid ""
+"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
+"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+msgstr ""
+
+#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "הנושא הוא: %s"
 
-#: src/protocols/irc/cmds.c:472
-#: src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "אין כותרת"
 
-#: src/protocols/irc/dcc_send.c:272
-#: src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
 #: src/protocols/yahoo/yahoo_filexfer.c:208
 #: src/protocols/yahoo/yahoo_filexfer.c:217
 #, fuzzy
@@ -4975,11 +4834,9 @@
 msgid "View MOTD"
 msgstr "הצג הודעת היום"
 
-#: src/protocols/irc/irc.c:154
-#: src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:3186
-#: src/protocols/oscar/oscar.c:6484
-#: src/protocols/yahoo/yahoo.c:2455
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "שלח קובץ"
 
@@ -4987,38 +4844,33 @@
 msgid "_Channel:"
 msgstr "_ערוץ:"
 
-#: src/protocols/irc/irc.c:173
-#: src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_סיסמא:"
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:193
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:211
-#: src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "מתחבר: %s"
 
-#: src/protocols/irc/irc.c:220
+#: src/protocols/irc/irc.c:221
 #, fuzzy
 msgid "Couldn't create socket"
 msgstr "אין אפשרות ליצור שקע תקף"
 
-#: src/protocols/irc/irc.c:369
-#: src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "שגיאה בקריאה"
 
-#: src/protocols/irc/irc.c:503
-#: src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "משתמשים"
 
-#: src/protocols/irc/irc.c:506
-#: src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "נושא"
 
@@ -5031,39 +4883,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:613
 msgid "IRC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:614
 #, fuzzy
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "תוסף פרוטוקול IRC"
 
-#: src/protocols/irc/irc.c:630
-#: src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1361
-#: src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "שרת"
 
-#: src/protocols/irc/irc.c:633
-#: src/protocols/jabber/jabber.c:1382
-#: src/protocols/msn/msn.c:1704
-#: src/protocols/napster/napster.c:663
+#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
+#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
 #: src/protocols/trepia/trepia.c:1307
 msgid "Port"
 msgstr "י_ציאה"
 
-#: src/protocols/irc/irc.c:636
-#: src/protocols/zephyr/zephyr.c:1428
+#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
 msgid "Encoding"
 msgstr "קידוד"
 
-#: src/protocols/irc/irc.c:639
-#: src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:580
+#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:581
 msgid "Username"
 msgstr "שם משתמש"
 
@@ -5088,8 +4934,7 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:192
-#: src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 msgid "Realname"
 msgstr "שם אמיתי"
 
@@ -5227,31 +5072,29 @@
 msgid "Wallops from %s"
 msgstr "From Colour"
 
-#: src/protocols/irc/parse.c:164
-#: src/protocols/zephyr/zephyr.c:198
-msgid "(There was an error converting this message.  Check the 'Encoding' option in the Account Editor)"
-msgstr ""
-
-#: src/protocols/irc/parse.c:317
-#, c-format
-msgid "Reply time from %s: %lu seconds"
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
 msgstr ""
 
 #: src/protocols/irc/parse.c:318
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr "פונג"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:319
 #, fuzzy
 msgid "CTCP PING reply"
 msgstr "המענה גדול מדיי"
 
-#: src/protocols/irc/parse.c:420
-#: src/protocols/oscar/oscar.c:582
-#: src/protocols/toc/toc.c:218
-#: src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641
-#: src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
+#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "מנותק."
 
@@ -5266,21 +5109,19 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:160
-#: src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238
-#: src/protocols/jabber/auth.c:239
+#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
+#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
 #, fuzzy
 msgid "Plaintext Authentication"
 msgstr "האימות נכשל"
 
-#: src/protocols/jabber/auth.c:162
-#: src/protocols/jabber/auth.c:240
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:170
-#: src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
@@ -5289,135 +5130,110 @@
 msgid "Invalid challenge from server"
 msgstr "שגיעה בתגובה מהשרת"
 
-#: src/protocols/jabber/buddy.c:247
-#: src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "שם מלא"
 
-#: src/protocols/jabber/buddy.c:248
-#: src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "שם משפחה"
 
-#: src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "שם פרטי"
 
-#: src/protocols/jabber/buddy.c:250
-#: src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600
-#: src/protocols/yahoo/yahoo.c:2996
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "כינוי"
 
-#: src/protocols/jabber/buddy.c:251
-#: src/protocols/jabber/jabber.c:640
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
 msgid "URL"
 msgstr "קישור"
 
-#: src/protocols/jabber/buddy.c:252
-#: src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "כתובת"
 
-#: src/protocols/jabber/buddy.c:253
-#: src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "מידע כתובת מורחב"
 
-#: src/protocols/jabber/buddy.c:254
-#: src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "מיקום"
 
-#: src/protocols/jabber/buddy.c:255
-#: src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "איזור"
 
-#: src/protocols/jabber/buddy.c:256
-#: src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:630
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr "מיקוד"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339
-#: src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "מדינה"
 
-#: src/protocols/jabber/buddy.c:258
-#: src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "טלפון"
 
-#: src/protocols/jabber/buddy.c:259
-#: src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717
-#: src/protocols/yahoo/yahoo.c:2992
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "דוא\"ל"
 
-#: src/protocols/jabber/buddy.c:260
-#: src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "שם האירגון"
 
-#: src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 #, fuzzy
 msgid "Organization Unit"
 msgstr "בחירת יחידה"
 
-#: src/protocols/jabber/buddy.c:262
-#: src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "תואר"
 
-#: src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "תפקיד"
 
-#: src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4137
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4247
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: src/protocols/jabber/buddy.c:508
-#: src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 #, fuzzy
 msgid "Edit Jabber vCard"
 msgstr "Name=מידע vCard"
 
 #: src/protocols/jabber/buddy.c:510
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "זיהוי Jabber"
 
-#: src/protocols/jabber/buddy.c:562
-#: src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580
-#: src/protocols/jabber/jabber.c:929
-#: src/protocols/msn/msn.c:335
-#: src/protocols/oscar/oscar.c:5689
-#: src/protocols/oscar/oscar.c:5743
-#: src/protocols/oscar/oscar.c:5745
-#: src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "מצב"
 
-#: src/protocols/jabber/buddy.c:578
-#: src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
 msgid "Resource"
 msgstr "משאב"
 
@@ -5425,10 +5241,8 @@
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
-#: src/protocols/jabber/buddy.c:643
-#: src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4154
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 msgid "Address"
 msgstr "כתובת"
 
@@ -5472,8 +5286,7 @@
 msgid "Unsubscribe"
 msgstr "בטל את המנוי אצל"
 
-#: src/protocols/jabber/chat.c:42
-#: src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
 msgid "_Room:"
 msgstr "_חדר:"
 
@@ -5501,8 +5314,7 @@
 msgid "%s is not a valid server name"
 msgstr "שם הקובץ של הארכיון אינו תקף.\n"
 
-#: src/protocols/jabber/chat.c:171
-#: src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "הכנס את שם השרת"
@@ -5512,8 +5324,7 @@
 msgid "%s is not a valid room handle"
 msgstr "ןיקת ןויכרא ץבוק וניא `%s' :touch"
 
-#: src/protocols/jabber/chat.c:177
-#: src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 #, fuzzy
 msgid "Invalid Room Handle"
 msgstr "%s אינו יכול לטפל בשכבות "
@@ -5523,8 +5334,7 @@
 msgid "Configuration error"
 msgstr "תינכתב הרומח הלקת"
 
-#: src/protocols/jabber/chat.c:341
-#: src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
 #, fuzzy
 msgid "Unable to configure"
 msgstr "אין אפשרות לקבוע את תצורת שרת ההדפסה."
@@ -5538,8 +5348,7 @@
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:408
-#: src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
 #, fuzzy
 msgid "Registration error"
 msgstr "שגיאת רישום"
@@ -5548,14 +5357,12 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:600
-#: src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
 #, fuzzy
 msgid "Roomlist Error"
 msgstr "תינכתב הרומח הלקת"
 
-#: src/protocols/jabber/chat.c:601
-#: src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
 #, fuzzy
 msgid "Error retreiving roomlist"
 msgstr "ההוזמ-יתלב הלקת"
@@ -5573,495 +5380,453 @@
 msgid "Select a conference server to query"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:692
+#: src/protocols/jabber/chat.c:693
 msgid "Find Rooms"
 msgstr "חפש חדרים"
 
-#: src/protocols/jabber/jabber.c:73
+#: src/protocols/jabber/jabber.c:74
 #, fuzzy
 msgid "Error initializing session"
 msgstr "שגיאה בהסרת המשימה"
 
-#: src/protocols/jabber/jabber.c:203
-#: src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:83
-#: src/protocols/msn/msn.c:103
-#: src/protocols/msn/msn.c:161
-#: src/protocols/msn/msn.c:261
-#: src/protocols/msn/msn.c:559
-#: src/protocols/msn/msn.c:732
-#: src/protocols/msn/msn.c:761
-#: src/protocols/msn/msn.c:793
-#: src/protocols/msn/msn.c:801
-#: src/protocols/msn/msn.c:834
-#: src/protocols/msn/msn.c:842
-#: src/protocols/msn/msn.c:856
-#: src/protocols/msn/msn.c:865
-#: src/protocols/msn/msn.c:880
-#: src/protocols/msn/msn.c:890
-#: src/protocols/msn/msn.c:912
-#: src/protocols/msn/msn.c:962
-#: src/protocols/msn/msn.c:1000
-#: src/protocols/msn/msn.c:1102
-#: src/protocols/msn/msn.c:1135
-#: src/protocols/msn/msn.c:1156
-#: src/protocols/msn/msn.c:1167
-#: src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1202
-#: src/protocols/msn/msn.c:1214
-#: src/protocols/msn/msn.c:1295
-#: src/protocols/msn/notification.c:147
-#: src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1298
-#: src/protocols/msn/notification.c:1318
-#: src/protocols/msn/session.c:203
-#: src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698
-#: src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031
-#: src/protocols/trepia/trepia.c:1130
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
 #: src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "שגיאה בכתיבה"
 
-#: src/protocols/jabber/jabber.c:241
-#: src/protocols/jabber/jabber.c:261
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
 msgid "Read Error"
 msgstr "שגיאה בקריאה"
 
-#: src/protocols/jabber/jabber.c:316
+#: src/protocols/jabber/jabber.c:317
 #, fuzzy
 msgid "Connection Failed"
 msgstr "ההתחברות נכשלה"
 
-#: src/protocols/jabber/jabber.c:319
+#: src/protocols/jabber/jabber.c:320
 msgid "SSL Handshake Failed"
 msgstr "כשל בלחיצת היד של SSL"
 
-#: src/protocols/jabber/jabber.c:362
-#: src/protocols/jabber/jabber.c:691
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
 #, fuzzy
 msgid "Invalid Jabber ID"
 msgstr "זיהוי משתמש Jabber לא תקין"
 
-#: src/protocols/jabber/jabber.c:390
-#: src/protocols/jabber/jabber.c:718
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
 #, fuzzy
 msgid "SSL support unavailable"
 msgstr "אין תמיכה ב-SSL."
 
-#: src/protocols/jabber/jabber.c:400
-#: src/protocols/jabber/jabber.c:728
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "אין אפשרות ליצור שקע"
 
-#: src/protocols/jabber/jabber.c:425
+#: src/protocols/jabber/jabber.c:426
 #, fuzzy, c-format
 msgid "Registration of %s@%s successful"
 msgstr "רישום בוצע בהצלחה"
 
-#: src/protocols/jabber/jabber.c:427
-#: src/protocols/jabber/jabber.c:428
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
 msgid "Registration Successful"
 msgstr "רישום בוצע בהצלחה"
 
-#: src/protocols/jabber/jabber.c:434
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
 msgid "Unknown Error"
 msgstr "שגיאה לא ידועה"
 
-#: src/protocols/jabber/jabber.c:436
-#: src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
 msgid "Registration Failed"
 msgstr "הרישום נכשל"
 
-#: src/protocols/jabber/jabber.c:548
-#: src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
 msgid "Already Registered"
 msgstr "הכינוי כבר רשום."
 
-#: src/protocols/jabber/jabber.c:584
-#: src/protocols/jabber/jabber.c:1025
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
 msgid "Password"
 msgstr "סיסמה"
 
-#: src/protocols/jabber/jabber.c:595
+#: src/protocols/jabber/jabber.c:596
 msgid "E-Mail"
 msgstr "דואר"
 
 #. State
-#: src/protocols/jabber/jabber.c:625
-#: src/protocols/oscar/oscar.c:4160
-#: src/protocols/oscar/oscar.c:4176
-#: src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "מחוז"
 
-#: src/protocols/jabber/jabber.c:635
+#: src/protocols/jabber/jabber.c:636
 msgid "Phone"
 msgstr "טלפון"
 
-#: src/protocols/jabber/jabber.c:645
+#: src/protocols/jabber/jabber.c:646
 msgid "Date"
 msgstr "תאריך"
 
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:654
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:656
-#: src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
 #, fuzzy
 msgid "Register New Jabber Account"
 msgstr "רשום חשבון Gadu-Gadu חדש"
 
-#: src/protocols/jabber/jabber.c:774
-#: src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:492
-#: src/protocols/napster/napster.c:499
-#: src/protocols/oscar/oscar.c:749
-#: src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2176
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "מתחבר"
 
-#: src/protocols/jabber/jabber.c:778
+#: src/protocols/jabber/jabber.c:779
 msgid "Initializing Stream"
 msgstr "מאתחל זרם"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:785
 msgid "Authenticating"
 msgstr "מאמת"
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:794
 msgid "Re-initializing Stream"
 msgstr "מאתחל את הזרם מחדש"
 
-#: src/protocols/jabber/jabber.c:873
-#: src/protocols/jabber/jabber.c:1152
-#: src/protocols/jabber/jabber.c:1193
-#: src/protocols/jabber/jabber.c:1226
-#: src/protocols/oscar/oscar.c:5743
-#: src/protocols/oscar/oscar.c:5768
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
-#: src/protocols/jabber/jabber.c:904
+#: src/protocols/jabber/jabber.c:905
 msgid "Both"
 msgstr "שניהם"
 
-#: src/protocols/jabber/jabber.c:906
+#: src/protocols/jabber/jabber.c:907
 #, fuzzy
 msgid "From (To pending)"
 msgstr "<b>בתאריך:</b> %1 <b>משעה:</b> %2 <b>עד שעה:</b> %3"
 
-#: src/protocols/jabber/jabber.c:908
+#: src/protocols/jabber/jabber.c:909
 msgid "From"
 msgstr "מ"
 
-#: src/protocols/jabber/jabber.c:911
+#: src/protocols/jabber/jabber.c:912
 msgid "To"
 msgstr "אל"
 
-#: src/protocols/jabber/jabber.c:913
+#: src/protocols/jabber/jabber.c:914
 #, fuzzy
 msgid "None (To pending)"
 msgstr "מקסימום בקשות _ממתינות:"
 
-#: src/protocols/jabber/jabber.c:917
+#: src/protocols/jabber/jabber.c:918
 msgid "Subscription"
 msgstr "רישום"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:938
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/protocols/jabber/jabber.c:950
-#: src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66
-#: src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:952
-#: src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68
-#: src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
 
-#: src/protocols/jabber/jabber.c:953
-#: src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70
-#: src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:2945
-#: src/protocols/oscar/oscar.c:4738
-#: src/protocols/oscar/oscar.c:6379
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:6427
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
-#: src/protocols/jabber/jabber.c:970
+#: src/protocols/jabber/jabber.c:971
 msgid "Password Changed"
 msgstr "סיסמה שונתה"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:972
 msgid "Your password has been changed."
 msgstr "הסיסמה שלך שונתה."
 
-#: src/protocols/jabber/jabber.c:975
-#: src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
 msgid "Error changing password"
 msgstr "שגיאה במהלך שינוי הסיסמה"
 
-#: src/protocols/jabber/jabber.c:1030
+#: src/protocols/jabber/jabber.c:1031
 msgid "Password (again)"
 msgstr "סיסמא (שנית)"
 
-#: src/protocols/jabber/jabber.c:1035
-#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
 msgid "Change Jabber Password"
 msgstr "הסיסמה שלך שונתה בהצלחה"
 
-#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1037
 msgid "Please enter your new password"
 msgstr "הזן את הסיסמה החדשה שלך."
 
-#: src/protocols/jabber/jabber.c:1047
-#: src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: src/protocols/jabber/jabber.c:1132
+#: src/protocols/jabber/jabber.c:1133
 msgid "Bad Request"
 msgstr "בקשה שגויה"
 
-#: src/protocols/jabber/jabber.c:1134
+#: src/protocols/jabber/jabber.c:1135
 msgid "Conflict"
 msgstr "התנגשות"
 
-#: src/protocols/jabber/jabber.c:1136
+#: src/protocols/jabber/jabber.c:1137
 #, fuzzy
 msgid "Feature Not Implemented"
 msgstr "טרם יושם."
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Forbidden"
 msgstr "אסור"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Gone"
 msgstr "לא-נמצא"
 
-#: src/protocols/jabber/jabber.c:1142
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
 #, fuzzy
 msgid "Internal Server Error"
 msgstr "שגיאה פנימית בשרת"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Item Not Found"
 msgstr "פריט לא נמצא"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 #, fuzzy
 msgid "Malformed Jabber ID"
 msgstr "זיהוי משתמש Jabber לא תקין"
 
-#: src/protocols/jabber/jabber.c:1148
+#: src/protocols/jabber/jabber.c:1149
 #, fuzzy
 msgid "Not Acceptable"
 msgstr "# Not a target:"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Not Allowed"
 msgstr "לא מורשה"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 #, fuzzy
 msgid "Payment Required"
 msgstr "ממשקים נדרשים"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 #, fuzzy
 msgid "Recipient Unavailable"
 msgstr "שרת לא זמין"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 #, fuzzy
 msgid "Registration Required"
 msgstr "ממשקים נדרשים"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Remote Server Not Found"
 msgstr "שרת לא נמצא"
 
-#: src/protocols/jabber/jabber.c:1164
+#: src/protocols/jabber/jabber.c:1165
 #, fuzzy
 msgid "Remote Server Timeout"
 msgstr ""
 "תם הזמן המוקצב בשרת\n"
 "%1"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Server Overloaded"
 msgstr "עומס יתר על השרת"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Service Unavailable"
 msgstr "השירות אינו זמין"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 #, fuzzy
 msgid "Subscription Required"
 msgstr "ממשקים נדרשים"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 #, fuzzy
 msgid "Unexpected Request"
 msgstr "בקשת מידע"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1180
 #, fuzzy
 msgid "Authorization Aborted"
 msgstr "הגיבוי בוטל."
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1182
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1184
+#: src/protocols/jabber/jabber.c:1185
 #, fuzzy
 msgid "Invalid authzid"
 msgstr "%s תינכת רובע יוגש ןייפאמ -- %c\n"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 #, fuzzy
 msgid "Invalid Authorization Mechanism"
 msgstr "המנגנון חלש מדי"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 #, fuzzy
 msgid "Authorization mechanism too weak"
 msgstr "ההרשאה נדחית."
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1196
 #, fuzzy
 msgid "Temporary Authentication Failure"
 msgstr "כישלון זמני בהסקת השם"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1198
 #, fuzzy
 msgid "Authentication Failure"
 msgstr "כשל באימות"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Bad Format"
 msgstr "מבנה לא תקין"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 #, fuzzy
 msgid "Bad Namespace Prefix"
 msgstr "נתיב יישום GNOME"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1207
 msgid "Resource Conflict"
 msgstr "התנגשויות המשאבים"
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1209
 #, fuzzy
 msgid "Connection Timeout"
 msgstr "אפשרויות זמנים מוקצבים"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1211
 msgid "Host Gone"
 msgstr "המארח נעלם"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Host Unknown"
 msgstr "מארח לא מוכר"
 
-#: src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1215
 #, fuzzy
 msgid "Improper Addressing"
 msgstr "סיומת קובץ לא תקינה"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Invalid ID"
 msgstr "זיהוי לא תקין"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 #, fuzzy
 msgid "Invalid Namespace"
 msgstr "%s תינכת רובע יוגש ןייפאמ -- %c\n"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1223
 #, fuzzy
 msgid "Invalid XML"
 msgstr "ה_טלת XML"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 #, fuzzy
 msgid "Non-matching Hosts"
 msgstr "םאות `%cend %s' רסח"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 #, fuzzy
 msgid "Policy Violation"
 msgstr "הפרעת התחלקות"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 #, fuzzy
 msgid "Remote Connection Failed"
 msgstr "%1 - חיבור לשולחן עבודה מרוחק"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1233
 #, fuzzy
 msgid "Resource Constraint"
 msgstr "בחר את מעצור '%s'"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Restricted XML"
 msgstr "XML מוגבל"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 #, fuzzy
 msgid "See Other Host"
 msgstr "תצוגות למ_ארח:"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "System Shutdown"
 msgstr "כיבוי המערכת"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Undefined Condition"
 msgstr "מקרה לא מוגדר מראש"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 #, fuzzy
 msgid "Unsupported Encoding"
 msgstr "קידוד ברירת המחדל"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 #, fuzzy
 msgid "Unsupported Stanza Type"
 msgstr "סוג הנפשה שאינו נתמך"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 #, fuzzy
 msgid "Unsupported Version"
 msgstr "גירסת החבילה"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 #, fuzzy
 msgid "XML Not Well Formed"
 msgstr "מבנה הכתובת %1 אינו תקין."
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Stream Error"
 msgstr "שגיאה בזרם"
 
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
+msgstr "הסתר פרטים על מערכת ההפעלה"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6073,34 +5838,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1340
-#: src/protocols/jabber/jabber.c:1342
+#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
 msgid "Jabber Protocol Plugin"
 msgstr "תוסף פרוטוקול Jabber"
 
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1389
 #, fuzzy
 msgid "Use TLS if available"
 msgstr "השתמש בהרחבות מצב התצוגה של XFree86 (אם הן זמינות)"
 
-#: src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/jabber.c:1394
 #, fuzzy
 msgid "Force old SSL"
 msgstr "בעת חיבור SSL"
 
-#: src/protocols/jabber/jabber.c:1377
+#: src/protocols/jabber/jabber.c:1399
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/jabber.c:1408
 #, fuzzy
 msgid "Connect server"
 msgstr "&התחברות לשרת..."
 
-#: src/protocols/jabber/jabber.c:1403
-msgid "Hide Operating System"
-msgstr "הסתר פרטים על מערכת ההפעלה"
-
 #: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
@@ -6146,13 +5906,14 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/presence.c:277
-#: src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
 #: src/protocols/jabber/presence.c:279
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
 msgstr ""
 
 #: src/protocols/jabber/presence.c:281
@@ -6179,13 +5940,11 @@
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: src/protocols/jabber/si.c:580
-#: src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
 msgid "File Send Failed"
 msgstr "כשל בשליחת קובץ"
 
-#: src/protocols/msn/dispatch.c:42
-#: src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
 #, fuzzy
 msgid "Unable to request USR\n"
 msgstr ""
@@ -6193,19 +5952,16 @@
 "\n"
 "פרטים: %s"
 
-#: src/protocols/msn/dispatch.c:59
-#: src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
 msgid "Unable to login using MD5"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:68
-#: src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
 #, fuzzy
 msgid "Unable to send USR"
 msgstr "לא ניתן לשלוח הודעה"
 
-#: src/protocols/msn/dispatch.c:73
-#: src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr "מבקש אישור לשליחת סיסמא"
 
@@ -6214,8 +5970,7 @@
 msgid "Protocol version not supported"
 msgstr "גירסת ה-HTTP אינה נתמכת"
 
-#: src/protocols/msn/dispatch.c:117
-#: src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
 #, fuzzy
 msgid "Unable to request CVR\n"
 msgstr ""
@@ -6223,8 +5978,7 @@
 "\n"
 "פרטים: %s"
 
-#: src/protocols/msn/dispatch.c:126
-#: src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
 #, fuzzy
 msgid "Unable to request INF\n"
 msgstr ""
@@ -6232,8 +5986,7 @@
 "\n"
 "פרטים: %s"
 
-#: src/protocols/msn/dispatch.c:147
-#: src/protocols/msn/notification.c:1563
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
 #, fuzzy
 msgid "Got invalid XFR"
 msgstr "םדוק יוטיב-תתל היוגש היינפה"
@@ -6247,15 +6000,13 @@
 msgid "Unable to parse message."
 msgstr "לא ניתן לשלוח הודעה"
 
-#: src/protocols/msn/dispatch.c:232
-#: src/protocols/msn/notification.c:515
-#: src/protocols/msn/notification.c:1812
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "לא ניתן להתחבר לשרת"
 
-#: src/protocols/msn/dispatch.c:236
-#: src/protocols/msn/notification.c:1819
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr "מתאם עם השרת"
 
@@ -6310,8 +6061,7 @@
 msgid "Not on list"
 msgstr "לא נמצא ברשימה"
 
-#: src/protocols/msn/error.c:68
-#: src/protocols/zephyr/zephyr.c:526
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "המשתמש לא מחובר.."
 
@@ -6371,8 +6121,7 @@
 "\n"
 "... יותר מידי שגיאות כדי להציג ..."
 
-#: src/protocols/msn/error.c:110
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "לא מחובר"
 
@@ -6407,8 +6156,7 @@
 msgid "Server busy"
 msgstr "שרת עסוק"
 
-#: src/protocols/msn/error.c:136
-#: src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
 #: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "שרת לא זמין"
@@ -6434,8 +6182,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: src/protocols/msn/error.c:160
-#: src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "לא ניתן לכתוב"
 
@@ -6473,8 +6220,7 @@
 msgid "Server too busy"
 msgstr "המודם תפוס."
 
-#: src/protocols/msn/error.c:196
-#: src/protocols/oscar/oscar.c:1162
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "האימות נכשל"
@@ -6509,251 +6255,237 @@
 msgid "MSN Error: %s\n"
 msgstr "תינכתב הרומח הלקת"
 
-#: src/protocols/msn/msn.c:71
+#: src/protocols/msn/msn.c:72
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:191
 #, fuzzy
 msgid "Set your friendly name."
 msgstr "אנא הקלד את שמך."
 
-#: src/protocols/msn/msn.c:179
+#: src/protocols/msn/msn.c:192
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:204
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:226
 #, fuzzy
 msgid "Set your mobile phone number."
 msgstr "ניהול קשר עם הטלפון הנייד שלך."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:235
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:223
-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?"
-msgstr ""
-
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:236
+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?"
+msgstr ""
+
+#: src/protocols/msn/msn.c:240
 msgid "Allow"
 msgstr "אפשר"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:241
 msgid "Disallow"
 msgstr "אל תאפשר"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:258
 #, fuzzy
 msgid "Send a mobile message."
 msgstr "שלח בתור הודעה"
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:260
 msgid "Page"
 msgstr "דף"
 
-#: src/protocols/msn/msn.c:348
-#: src/protocols/msn/msn.c:651
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "מרוחק מהמחשב"
 
-#: src/protocols/msn/msn.c:349
-#: src/protocols/msn/msn.c:653
-#: src/protocols/msn/state.c:31
-#: src/protocols/yahoo/yahoo.c:2274
-#: src/protocols/yahoo/yahoo.c:2600
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "חוזר עוד שניה"
 
-#: src/protocols/msn/msn.c:350
-#: src/protocols/msn/msn.c:655
-#: src/protocols/msn/state.c:29
-#: src/protocols/yahoo/yahoo.c:2276
-#: src/protocols/yahoo/yahoo.c:2602
-#: src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "עסוק"
 
-#: src/protocols/msn/msn.c:351
-#: src/protocols/msn/msn.c:657
-#: src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2284
-#: src/protocols/yahoo/yahoo.c:2610
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "משוחח בטלפון"
 
-#: src/protocols/msn/msn.c:352
-#: src/protocols/msn/msn.c:659
-#: src/protocols/msn/state.c:34
-#: src/protocols/yahoo/yahoo.c:2288
-#: src/protocols/yahoo/yahoo.c:2614
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "אוכל"
 
-#: src/protocols/msn/msn.c:353
-#: src/protocols/msn/msn.c:661
-#: src/protocols/zephyr/zephyr.c:1210
-#: src/protocols/zephyr/zephyr.c:1225
+#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: src/protocols/msn/msn.c:365
+#: src/protocols/msn/msn.c:378
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "קבע את הטקסט של 'השם מכיל'"
 
-#: src/protocols/msn/msn.c:373
+#: src/protocols/msn/msn.c:386
 #, fuzzy
 msgid "Set Home Phone Number"
 msgstr "אפשר מספרי טלפון בינלאומיים."
 
-#: src/protocols/msn/msn.c:379
+#: src/protocols/msn/msn.c:392
 #, fuzzy
 msgid "Set Work Phone Number"
 msgstr "אפשר מספרי טלפון בינלאומיים."
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:398
 #, fuzzy
 msgid "Set Mobile Phone Number"
 msgstr "אפשר מספרי טלפון בינלאומיים."
 
-#: src/protocols/msn/msn.c:394
+#: src/protocols/msn/msn.c:407
 #, fuzzy
 msgid "Enable/Disable Mobile Devices"
 msgstr "מאפשר או מכבה צלילים"
 
-#: src/protocols/msn/msn.c:401
+#: src/protocols/msn/msn.c:414
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:427
+#: src/protocols/msn/msn.c:440
 msgid "Send to Mobile"
 msgstr "שלח לפלאפון"
 
-#: src/protocols/msn/msn.c:436
+#: src/protocols/msn/msn.c:449
 msgid "Initiate Chat"
 msgstr "יזם שיחה"
 
-#: src/protocols/msn/msn.c:460
-msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-
-#: src/protocols/msn/msn.c:774
-#, c-format
-msgid "An MSN screen name must be in the form \"user@server.com\". Perhaps you meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:778
-#: src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:473
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+
+#: src/protocols/msn/msn.c:785
+#, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
 msgid "Invalid MSN screen name"
 msgstr "שם לתצוגה לא תקין עבור MSN"
 
-#: src/protocols/msn/msn.c:814
-#, c-format
-msgid "An MSN screen name must be in the form \"user@server.com\". Perhaps you meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1321
-#: src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/msn/msn.c:825
+#, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1391
-#: src/protocols/oscar/oscar.c:4142
-#: src/protocols/trepia/trepia.c:285
-#: src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3008
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "גיל"
 
 #. Gender
-#: src/protocols/msn/msn.c:1398
-#: src/protocols/oscar/oscar.c:4128
-#: src/protocols/trepia/trepia.c:279
-#: src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3016
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "מין"
 
-#: src/protocols/msn/msn.c:1406
-#: src/protocols/yahoo/yahoo.c:3012
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "מצב משפחתי"
 
-#: src/protocols/msn/msn.c:1413
-#: src/protocols/yahoo/yahoo.c:3004
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "מיקום"
 
-#: src/protocols/msn/msn.c:1421
-#: src/protocols/yahoo/yahoo.c:3020
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "עיסוק"
 
-#: src/protocols/msn/msn.c:1438
-#: src/protocols/msn/msn.c:1444
-#: src/protocols/msn/msn.c:1451
-#: src/protocols/msn/msn.c:1458
-#: src/protocols/msn/msn.c:1465
+#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
 msgid "A Little About Me"
 msgstr "קצת אודותיי"
 
-#: src/protocols/msn/msn.c:1474
-#: src/protocols/msn/msn.c:1487
-#: src/protocols/msn/msn.c:1494
+#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
 msgid "Favorite Things"
 msgstr "דברים מועדפים"
 
-#: src/protocols/msn/msn.c:1503
-#: src/protocols/msn/msn.c:1509
-#: src/protocols/msn/msn.c:1516
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
 #, fuzzy
 msgid "Hobbies and Interests"
 msgstr "%s-ו %s :תוהז תויקית-תת\n"
 
-#: src/protocols/msn/msn.c:1525
-#: src/protocols/msn/msn.c:1531
-#: src/protocols/yahoo/yahoo.c:3055
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "ציטוט"
 
-#: src/protocols/msn/msn.c:1539
-#: src/protocols/yahoo/yahoo.c:3091
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "עודכן לאחרונה"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1550
-#: src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "כתובת אתר בית"
 
-#: src/protocols/msn/msn.c:1572
-#: src/protocols/yahoo/yahoo.c:3106
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
 #, fuzzy, c-format
 msgid "User information for %s unavailable"
 msgstr "קו להצגת מידע"
 
-#: src/protocols/msn/msn.c:1574
-#: src/protocols/yahoo/yahoo.c:3108
+#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
 #, fuzzy
 msgid "The user's profile is empty."
 msgstr "שם המשתמש ריק."
 
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1631
+#, fuzzy
+msgid "Display timeout notices"
+msgstr "s (קבל הודעות של השרת)"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6765,36 +6497,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1679
-#: src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
 msgid "MSN Protocol Plugin"
 msgstr "תוסף פרוטוקול MSN"
 
-#: src/protocols/msn/msn.c:1699
-#: src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
 #, fuzzy
 msgid "Login server"
 msgstr ".הסינכ השרמ וניא תרשה\n"
 
-#: src/protocols/msn/msn.c:1708
+#: src/protocols/msn/msn.c:1746
 msgid "Use HTTP Method"
 msgstr "השתמש בשיטת HTTP"
 
-#: src/protocols/msn/msn.c:1726
-msgid "Display conversation closed notices"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1731
-#, fuzzy
-msgid "Display timeout notices"
-msgstr "s (קבל הודעות של השרת)"
-
 #: src/protocols/msn/nexus.c:56
 msgid "Unable to connect to server"
 msgstr "לא ניתן להתחבר לשרת"
 
-#: src/protocols/msn/nexus.c:121
-#: src/protocols/msn/nexus.c:130
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
 #, fuzzy
 msgid "Unable to write to MSN Nexus server."
 msgstr "לא ניתן להתחבר לשרת"
@@ -6807,14 +6527,12 @@
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:309
-#: src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "מקבל רשימת אנשי הקשר"
 
-#: src/protocols/msn/notification.c:334
-#: src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1451
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1646
 msgid "Password sent"
 msgstr "הסיסמא נשלחה"
 
@@ -6826,41 +6544,60 @@
 msgid "Protocol not supported"
 msgstr "הפרוטוקול אינו נתמך"
 
-#: src/protocols/msn/notification.c:439
+#: src/protocols/msn/notification.c:440
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 
-#: src/protocols/msn/notification.c:444
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr ""
 
-#: src/protocols/msn/notification.c:571
+#: src/protocols/msn/notification.c:584
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:896
-#: src/protocols/msn/notification.c:1063
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:1361
-#, c-format
-msgid "Your MSN buddy list for %s is temporarily unavailable. Please wait and try again."
-msgstr ""
-
-#: src/protocols/msn/notification.c:1606
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+
+#: src/protocols/msn/notification.c:1607
 #, fuzzy
 msgid "Unable to transfer to notification server"
 msgstr "אין אפשרות להתחבר לשרת של MySQL."
 
-#: src/protocols/msn/notification.c:1762
-#: src/protocols/msn/servconn.c:523
+#: src/protocols/msn/notification.c:1776
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/msn/servconn.c:389
 msgid "IO Error."
 msgstr "שגיאת קלט/פלט"
 
-#: src/protocols/msn/servconn.c:573
+#: src/protocols/msn/servconn.c:527
 msgid "Received HTTP error. Please report this."
 msgstr ""
 
@@ -6873,7 +6610,7 @@
 msgid "%s has closed the conversation window."
 msgstr "Comment=חלון החל לזוז"
 
-#: src/protocols/msn/switchboard.c:288
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr "יכול להיות שהודעת הMSN לא התקבלה."
 
@@ -6909,7 +6646,9 @@
 msgstr "מידע זיכרון התהליך"
 
 #: src/protocols/napster/napster.c:422
-msgid "You were disconnected from the server, because you logged on from a different location"
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
 msgstr ""
 
 #. MSG_CLIENT_PING
@@ -6922,8 +6661,7 @@
 msgid "Get Info"
 msgstr "הצג פרטים"
 
-#: src/protocols/napster/napster.c:555
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "_קבוצה:"
@@ -6939,11 +6677,205 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640
-#: src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
 msgid "NAPSTER Protocol Plugin"
 msgstr "תוסף פרוטוקול Napster"
 
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:225
+#, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:371
+#, fuzzy, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr "האם כתגובה להוסיף את %1 לרשימת הקשר שלך?"
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, fuzzy, c-format
+msgid "Unable to send message (0x%X)."
+msgstr "לא ניתן לשלוח הודעה"
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:489
+#, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, fuzzy, c-format
+msgid "GroupWise Conference %d"
+msgstr "אין אפשרות לאתחל את הפרוטוקול %1"
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+#: src/protocols/novell/novell.c:982
+#, fuzzy
+msgid "Userid"
+msgstr "משתמשים"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+#, fuzzy
+msgid "Full name"
+msgstr "שם מלא"
+
+#: src/protocols/novell/novell.c:1016
+#, fuzzy
+msgid "User Properties"
+msgstr "אפשרויות המשתמש"
+
+#: src/protocols/novell/novell.c:1084
+#, fuzzy
+msgid "Unable to make SSL connection to server."
+msgstr "לא ניתן להתחבר לשרת"
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1147
+#, fuzzy
+msgid "Authenticating..."
+msgstr "מאמת"
+
+#: src/protocols/novell/novell.c:1162
+#, fuzzy
+msgid "Waiting for response..."
+msgstr "ממתין לתשובה..."
+
+#: src/protocols/novell/novell.c:1302
+#, fuzzy
+msgid "Invitation to Conversation"
+msgstr "שמור שיחה"
+
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1305
+#, fuzzy
+msgid "Would you like to join the conversation?"
+msgstr "לשכתב?"
+
+#: src/protocols/novell/novell.c:1408
+msgid "You have been logged out because you logged in at another workstation."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "הזן את שם המשתמש ברצונך לחסום"
+
+#: src/protocols/novell/novell.c:1582
+msgid "Error. SSL support is not installed."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgid "Offline"
+msgstr "מנותק"
+
+#: src/protocols/novell/novell.c:2164
+#, c-format
+msgid ""
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2168
+#, fuzzy, c-format
+msgid "<b>Status:</b> %s"
+msgstr "מצב:"
+
+#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+#, fuzzy
+msgid "Appear Offline"
+msgstr "מנותק"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2428
+#, fuzzy
+msgid "Server address"
+msgstr "כתובת"
+
+#: src/protocols/novell/novell.c:2432
+#, fuzzy
+msgid "Server port"
+msgstr "שרת"
+
 #: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
 msgstr "מספר שגיאה לא תקף."
@@ -7048,222 +6980,347 @@
 msgid "Not while on AOL"
 msgstr "והשלכ שקמל הרושק הניא `%s' הדוקפה"
 
-#: src/protocols/oscar/oscar.c:521
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "קול"
+
+#: src/protocols/oscar/oscar.c:431
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "צרף כתובת מס&רים מידיים"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "שיחה"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+msgid "Get File"
+msgstr "קבל קובץ"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "משחקים"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr "תוספות"
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "שלח רשימת אנשי הקשר"
+
+#: src/protocols/oscar/oscar.c:453
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "GenericName=תואם Direct Connect"
+
+#: src/protocols/oscar/oscar.c:456
+#, fuzzy
+msgid "AP User"
+msgstr "זיהוי משתמש"
+
+#: src/protocols/oscar/oscar.c:459
+#, fuzzy
+msgid "ICQ RTF"
+msgstr "Name=ICQ"
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "כופר במוסכמות"
+
+#: src/protocols/oscar/oscar.c:465
+#, fuzzy
+msgid "ICQ Server Relay"
+msgstr "שגיאה פנימית בשרת"
+
+#: src/protocols/oscar/oscar.c:468
+#, fuzzy
+msgid "Old ICQ UTF8"
+msgstr "Comment=איש-קשר ICQ"
+
+#: src/protocols/oscar/oscar.c:471
+#, fuzzy
+msgid "Trillian Encryption"
+msgstr "מפתח הצפנה"
+
+#: src/protocols/oscar/oscar.c:474
+#, fuzzy
+msgid "ICQ UTF8"
+msgstr "Name=ICQ"
+
+#: src/protocols/oscar/oscar.c:477
+#, fuzzy
+msgid "Hiptop"
+msgstr "היסטוריה"
+
+#: src/protocols/oscar/oscar.c:480
+#, fuzzy
+msgid "Security Enabled"
+msgstr "העריכה זמינה"
+
+#: src/protocols/oscar/oscar.c:483
+#, fuzzy
+msgid "Video Chat"
+msgstr "שיחת ידידים"
+
+#: src/protocols/oscar/oscar.c:487
+#, fuzzy
+msgid "iChat AV"
+msgstr "שיחה"
+
+#: src/protocols/oscar/oscar.c:490
+#, fuzzy
+msgid "Live Video"
+msgstr "וידאו AVI"
+
+#: src/protocols/oscar/oscar.c:493
+msgid "Camera"
+msgstr "מצלמה"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:6430
+msgid "Free For Chat"
+msgstr "פנוי לשיחה"
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6428
+msgid "Not Available"
+msgstr "לא זמין"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:6429
+msgid "Occupied"
+msgstr "עסוק"
+
+#: src/protocols/oscar/oscar.c:522
+#, fuzzy
+msgid "Web Aware"
+msgstr "&מודע רשת"
+
+#: src/protocols/oscar/oscar.c:590
+msgid "Capabilities"
+msgstr "יכולות"
+
+#: src/protocols/oscar/oscar.c:596
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "הערת '#if 0'"
+
+#: src/protocols/oscar/oscar.c:716
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:523
+#: src/protocols/oscar/oscar.c:718
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "%d םע לשכנ sys$search\n"
 
-#: src/protocols/oscar/oscar.c:594
-#: src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:805
 msgid "Chat is currently unavailable"
 msgstr "השיחה אינה זמינה כעט."
 
-#: src/protocols/oscar/oscar.c:681
-#: src/protocols/oscar/oscar.c:745
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
 #, fuzzy
 msgid "Couldn't connect to host"
 msgstr "התחבר למארח זה"
 
-#: src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:886
 #, fuzzy
 msgid "Screen name sent"
 msgstr "שם משתמש ב &AIM:"
 
-#: src/protocols/oscar/oscar.c:705
-#, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:733
+#: src/protocols/oscar/oscar.c:900
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:928
 msgid "Unable to login to AIM"
 msgstr "לאניתן להתחבר ל AIM"
 
-#: src/protocols/oscar/oscar.c:837
-#: src/protocols/oscar/oscar.c:1255
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
 msgid "Could Not Connect"
 msgstr "לא ניתן להתחבר"
 
-#: src/protocols/oscar/oscar.c:845
+#: src/protocols/oscar/oscar.c:1040
 #, fuzzy
 msgid "Connection established, cookie sent"
 msgstr "בוצע חיבור ישיר ל %1 "
 
-#: src/protocols/oscar/oscar.c:958
-#: src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 #, fuzzy
 msgid "Unable to establish file descriptor."
 msgstr "מתאר הקובץ לכתיבת IOR"
 
-#: src/protocols/oscar/oscar.c:963
+#: src/protocols/oscar/oscar.c:1158
 #, fuzzy
 msgid "Unable to create new connection."
 msgstr "אין אפשרות ליצור מסמך חדש."
 
-#: src/protocols/oscar/oscar.c:1034
+#: src/protocols/oscar/oscar.c:1229
 #, fuzzy
 msgid "Unable to establish listener socket."
 msgstr ".(SSL) חטבואמ רשק ץורע םיקהל ןתינ אל\n"
 
-#: src/protocols/oscar/oscar.c:1139
-#: src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "שם משתמש או סיסמה שגויים"
 
-#: src/protocols/oscar/oscar.c:1144
+#: src/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1148
+#: src/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1153
-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."
-msgstr "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, תיאלץ להמתין אפילו יותר."
-
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1348
+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."
+msgstr ""
+"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
+"תיאלץ להמתין אפילו יותר."
+
+#: src/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1190
+#: src/protocols/oscar/oscar.c:1385
 msgid "Internal Error"
 msgstr "שגיאה פנימית"
 
-#: src/protocols/oscar/oscar.c:1262
+#: src/protocols/oscar/oscar.c:1457
 #, fuzzy
 msgid "Received authorization"
 msgstr "ההרשאה נדחית."
 
-#: src/protocols/oscar/oscar.c:1298
-#: src/protocols/oscar/oscar.c:1328
-#: src/protocols/oscar/oscar.c:1416
-#, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1301
-#: src/protocols/oscar/oscar.c:1331
+#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1611
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
 #, fuzzy
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "גיים לא מצליח לטעון את התוסף שלך."
 
-#: src/protocols/oscar/oscar.c:1419
+#: src/protocols/oscar/oscar.c:1614
 #, fuzzy
 msgid "Gaim was unable to get a valid login hash."
 msgstr "גיים לא מצליח לטעון את התוסף שלך."
 
-#: src/protocols/oscar/oscar.c:2001
-#: src/protocols/oscar/oscar.c:5874
+#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
 #, fuzzy, c-format
 msgid "Direct IM with %s established"
 msgstr "בוצע חיבור ישיר ל %1 "
 
-#: src/protocols/oscar/oscar.c:2332
-#: src/protocols/oscar/oscar.c:2354
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2510
+#: src/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2513
-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2518
-#: src/protocols/oscar/oscar.c:6256
+#: src/protocols/oscar/oscar.c:2716
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
 msgid "Connect"
 msgstr "התחבר"
 
-#: src/protocols/oscar/oscar.c:2545
+#: src/protocols/oscar/oscar.c:2750
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2553
+#: src/protocols/oscar/oscar.c:2758
 #, fuzzy
 msgid "Authorization Request Message:"
 msgstr "דרוש אימות(אימות מחדש) מאת"
 
-#: src/protocols/oscar/oscar.c:2554
+#: src/protocols/oscar/oscar.c:2759
 #, fuzzy
 msgid "Please authorize me!"
 msgstr "&שם איש-קשר:"
 
-#: src/protocols/oscar/oscar.c:2583
-#, c-format
-msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2588
-#: src/protocols/oscar/oscar.c:2590
+#: src/protocols/oscar/oscar.c:2788
+#, c-format
+msgid ""
+"The user %s requires authorization before being added to a buddy list.  Do "
+"you want to send an authorization request?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
 #, fuzzy
 msgid "Request Authorization"
 msgstr "דרוש אימות"
 
-#: src/protocols/oscar/oscar.c:2626
-#: src/protocols/oscar/oscar.c:2628
-#: src/protocols/oscar/oscar.c:2635
-#: src/protocols/oscar/oscar.c:2717
-#: src/protocols/oscar/oscar.c:2737
-#: src/protocols/oscar/oscar.c:3093
-#: src/protocols/oscar/oscar.c:3153
-#: src/protocols/oscar/oscar.c:5353
-#: src/protocols/oscar/oscar.c:5399
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5489
 msgid "No reason given."
 msgstr "לא ניתנה סיבה."
 
-#: src/protocols/oscar/oscar.c:2634
+#: src/protocols/oscar/oscar.c:2839
 #, fuzzy
 msgid "Authorization Denied Message:"
 msgstr "גודל מקסימלי של הודעה"
 
-#: src/protocols/oscar/oscar.c:2717
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2725
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
 #, fuzzy
 msgid "Authorization Request"
 msgstr "דרוש &אימות עבור אנשי-קשר שרוצים להוסיף אותך לרשימתם"
 
-#: src/protocols/oscar/oscar.c:2737
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:2942
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2943
 #, fuzzy
 msgid "ICQ authorization denied."
 msgstr "הגישה אל %1 נדחית"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2745
+#: src/protocols/oscar/oscar.c:2950
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2753
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7272,7 +7329,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2761
+#: src/protocols/oscar/oscar.c:2966
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7281,7 +7338,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2769
+#: src/protocols/oscar/oscar.c:2974
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7290,476 +7347,426 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "משתמש %u הפנה אותך לאיש קשר %s - פרטים: %s"
 
-#: src/protocols/oscar/oscar.c:2796
+#: src/protocols/oscar/oscar.c:3001
 #, fuzzy
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "האם כתגובה להוסיף את %1 לרשימת הקשר שלך?"
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:3005
 msgid "Decline"
 msgstr "דחה"
 
-#: src/protocols/oscar/oscar.c:2882
-#: src/protocols/oscar/oscar.c:2891
-#: src/protocols/oscar/oscar.c:2900
-#: src/protocols/oscar/oscar.c:2909
-#: src/protocols/oscar/oscar.c:2918
-#: src/protocols/oscar/oscar.c:2927
-#: src/protocols/oscar/oscar.c:2943
-#: src/protocols/oscar/oscar.c:4747
-#: src/protocols/oscar/oscar.c:6382
-#, c-format
-msgid "Free For Chat"
-msgstr "פנוי לשיחה"
-
-#: src/protocols/oscar/oscar.c:2947
-#: src/protocols/oscar/oscar.c:4741
-#: src/protocols/oscar/oscar.c:6380
-msgid "Not Available"
-msgstr "לא זמין"
-
-#: src/protocols/oscar/oscar.c:2949
-#: src/protocols/oscar/oscar.c:4744
-#: src/protocols/oscar/oscar.c:6381
-msgid "Occupied"
-msgstr "עסוק"
-
-#: src/protocols/oscar/oscar.c:2953
-#, fuzzy
-msgid "Web Aware"
-msgstr "&מודע רשת"
-
-#: src/protocols/oscar/oscar.c:2996
+#: src/protocols/oscar/oscar.c:3090
+#, 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] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:3099
+#, 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] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:3108
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:3117
+#, 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] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:3126
+#, 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] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:3135
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:3189
 #, fuzzy, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "המיקום הנוכחי של הניגון<BR><HR><B><I>הקובץ הנוכחי</I></B>:"
 
-#: src/protocols/oscar/oscar.c:3055
+#: src/protocols/oscar/oscar.c:3248
 #, fuzzy, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "ההוזמ-יתלב הלקת"
 
-#: src/protocols/oscar/oscar.c:3056
+#: src/protocols/oscar/oscar.c:3249
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3091
+#: src/protocols/oscar/oscar.c:3284
 #, fuzzy, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "הודעת ה Yahoo שלך לא נשלחה."
 
-#: src/protocols/oscar/oscar.c:3150
+#: src/protocols/oscar/oscar.c:3343
 #, fuzzy, c-format
 msgid "User information for %s unavailable:"
 msgstr "קו להצגת מידע"
 
-#: src/protocols/oscar/oscar.c:3174
-msgid "Voice"
-msgstr "קול"
-
-#: src/protocols/oscar/oscar.c:3177
-#, fuzzy
-msgid "AIM Direct IM"
-msgstr "צרף כתובת מס&רים מידיים"
-
-#: src/protocols/oscar/oscar.c:3180
-msgid "Chat"
-msgstr "שיחה"
-
-#: src/protocols/oscar/oscar.c:3183
-#: src/protocols/oscar/oscar.c:6492
-msgid "Get File"
-msgstr "קבל קובץ"
-
-#: src/protocols/oscar/oscar.c:3190
-msgid "Games"
-msgstr "משחקים"
-
-#: src/protocols/oscar/oscar.c:3193
-msgid "Add-Ins"
-msgstr "תוספות"
-
-#: src/protocols/oscar/oscar.c:3196
-msgid "Send Buddy List"
-msgstr "שלח רשימת אנשי הקשר"
-
-#: src/protocols/oscar/oscar.c:3199
-#, fuzzy
-msgid "ICQ Direct Connect"
-msgstr "GenericName=תואם Direct Connect"
-
-#: src/protocols/oscar/oscar.c:3202
-#, fuzzy
-msgid "AP User"
-msgstr "זיהוי משתמש"
-
-#: src/protocols/oscar/oscar.c:3205
-#, fuzzy
-msgid "ICQ RTF"
-msgstr "Name=ICQ"
-
-#: src/protocols/oscar/oscar.c:3208
-msgid "Nihilist"
-msgstr "כופר במוסכמות"
-
-#: src/protocols/oscar/oscar.c:3211
-#, fuzzy
-msgid "ICQ Server Relay"
-msgstr "שגיאה פנימית בשרת"
-
-#: src/protocols/oscar/oscar.c:3214
-#, fuzzy
-msgid "Old ICQ UTF8"
-msgstr "Comment=איש-קשר ICQ"
-
-#: src/protocols/oscar/oscar.c:3217
-#, fuzzy
-msgid "Trillian Encryption"
-msgstr "מפתח הצפנה"
-
-#: src/protocols/oscar/oscar.c:3220
-#, fuzzy
-msgid "ICQ UTF8"
-msgstr "Name=ICQ"
-
-#: src/protocols/oscar/oscar.c:3223
-#, fuzzy
-msgid "Hiptop"
-msgstr "היסטוריה"
-
-#: src/protocols/oscar/oscar.c:3226
-#, fuzzy
-msgid "Security Enabled"
-msgstr "העריכה זמינה"
-
-#: src/protocols/oscar/oscar.c:3229
-#, fuzzy
-msgid "Video Chat"
-msgstr "שיחת ידידים"
-
-#: src/protocols/oscar/oscar.c:3233
-#, fuzzy
-msgid "iChat AV"
-msgstr "שיחה"
-
-#: src/protocols/oscar/oscar.c:3236
-#, fuzzy
-msgid "Live Video"
-msgstr "וידאו AVI"
-
-#: src/protocols/oscar/oscar.c:3239
-msgid "Camera"
-msgstr "מצלמה"
-
-#: src/protocols/oscar/oscar.c:3268
-#, fuzzy, c-format
-msgid "Username: <b>%s</b><br>\n"
-msgstr "ע&יון..."
-
-#: src/protocols/oscar/oscar.c:3269
-#, fuzzy, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr ""
-"\n"
-"רמת האזהרה החדשה שלך היא %1%."
-
-#: src/protocols/oscar/oscar.c:3272
-#, fuzzy, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr "<b>%1</b><br>פגו: %2<br>נותרו: %3"
-
-#: src/protocols/oscar/oscar.c:3276
-#, fuzzy, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr "<b>%1</b><br>פגו: %2<br>נותרו: %3"
-
-#: src/protocols/oscar/oscar.c:3281
-#, fuzzy, c-format
-msgid "Idle: <b>%s</b>"
-msgstr "סרק"
-
-#: src/protocols/oscar/oscar.c:3284
-#, fuzzy
-msgid "Idle: <b>Active</b>"
-msgstr "תהליכים פעילים"
-
-#: src/protocols/oscar/oscar.c:3356
+#: src/protocols/oscar/oscar.c:3366
+#, fuzzy
+msgid "Warning Level"
+msgstr "<b>רמות צבעי הסוללה (%)</b>"
+
+#: src/protocols/oscar/oscar.c:3369
+#, fuzzy
+msgid "Online Since"
+msgstr "מחובר מאז:"
+
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#, fuzzy
+msgid "Member Since"
+msgstr "מחובר מאז:"
+
+#: src/protocols/oscar/oscar.c:3455
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3757
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3641
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3859
 #, fuzzy
 msgid "Rate limiting error."
 msgstr "ההוזמ-יתלב הלקת"
 
-#: src/protocols/oscar/oscar.c:3758
-msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3821
-msgid "You have been disconnected because you have signed on with this screen name at another location."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:3860
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3923
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3925
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3854
+#: src/protocols/oscar/oscar.c:3956
 #, fuzzy
 msgid "Finalizing connection"
 msgstr "החיבור נסגר."
 
-#: src/protocols/oscar/oscar.c:4114
-#: src/protocols/oscar/oscar.c:4120
+#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
 msgid "Email Address"
 msgstr "כתובת דוא\"ל"
 
-#: src/protocols/oscar/oscar.c:4125
+#: src/protocols/oscar/oscar.c:4238
 msgid "Mobile Phone"
 msgstr "פלאפון"
 
-#: src/protocols/oscar/oscar.c:4128
-#: src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "נקבה"
 
-#: src/protocols/oscar/oscar.c:4128
-#: src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "זכר"
 
-#: src/protocols/oscar/oscar.c:4145
+#: src/protocols/oscar/oscar.c:4255
 #, fuzzy
 msgid "Personal Web Page"
 msgstr "דפדפן אינטרנט"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4259
 #, fuzzy
 msgid "Additional Information"
 msgstr "מידע נוסף: %1"
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4264
 msgid "Home Address"
 msgstr "כתובת בבית"
 
-#: src/protocols/oscar/oscar.c:4163
-#: src/protocols/oscar/oscar.c:4179
+#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
 msgid "Zip Code"
 msgstr "מיקוד"
 
-#: src/protocols/oscar/oscar.c:4168
+#: src/protocols/oscar/oscar.c:4272
 msgid "Work Address"
 msgstr "כתובת העבודה"
 
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4280
 msgid "Work Information"
 msgstr "פרטי עבודה"
 
-#: src/protocols/oscar/oscar.c:4186
+#: src/protocols/oscar/oscar.c:4281
 msgid "Company"
 msgstr "חברה"
 
-#: src/protocols/oscar/oscar.c:4189
+#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr "מחלקה"
 
-#: src/protocols/oscar/oscar.c:4192
+#: src/protocols/oscar/oscar.c:4283
 msgid "Position"
 msgstr "משרה"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4285
 msgid "Web Page"
 msgstr "דף אינטרנט"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4291
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "פרטי ICQ עבור %s"
 
-#: src/protocols/oscar/oscar.c:4251
+#: src/protocols/oscar/oscar.c:4341
 #, fuzzy
 msgid "Pop-Up Message"
 msgstr "גודל מקסימלי של הודעה"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4362
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4366
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
 
-#: src/protocols/oscar/oscar.c:4293
+#: src/protocols/oscar/oscar.c:4383
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4314
+#: src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4316
+#: src/protocols/oscar/oscar.c:4406
 #, fuzzy
 msgid "Account Confirmation Requested"
 msgstr "כבה מבלי לבקש אישור"
 
-#: src/protocols/oscar/oscar.c:4344
+#: src/protocols/oscar/oscar.c:4434
 #, fuzzy
 msgid "Error Changing Account Info"
 msgstr "שגיאה בקריאת מידע הקובץ."
 
-#: src/protocols/oscar/oscar.c:4347
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4350
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name ends in a space."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4353
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4356
-#, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4359
-#, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4362
-#, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:4437
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4440
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4443
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4446
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4449
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4452
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4455
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "שגיאת חבילה: שגיאה לא ידועה"
 
-#: src/protocols/oscar/oscar.c:4375
+#: src/protocols/oscar/oscar.c:4465
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4376
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
 #, fuzzy
 msgid "Account Info"
 msgstr "<< פחות _מידע"
 
-#: src/protocols/oscar/oscar.c:4381
+#: src/protocols/oscar/oscar.c:4471
 #, fuzzy, c-format
 msgid "The email address for %s is %s"
 msgstr "בתפריט עבור \"%s\"."
 
-#: src/protocols/oscar/oscar.c:4596
+#: src/protocols/oscar/oscar.c:4686
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות להגדיר את תכונות העבודה: "
 
-#: src/protocols/oscar/oscar.c:4597
-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 fully connected."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4624
-#: src/protocols/oscar/oscar.c:4629
+#: src/protocols/oscar/oscar.c:4687
+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 "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4714
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:4719
 #, fuzzy
 msgid "Profile too long."
 msgstr "%s: המחרוזת ארוכה מידי!"
 
-#: src/protocols/oscar/oscar.c:4645
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
 msgid "Visible"
 msgstr "נראה"
 
-#: src/protocols/oscar/oscar.c:4663
+#: src/protocols/oscar/oscar.c:4753
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4664
-msgid "You have probably requested to set your away message before the login procedure completed.  You remain in a \"present\" state; try setting it again when you are fully connected."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4704
-#: src/protocols/oscar/oscar.c:4709
+#: src/protocols/oscar/oscar.c:4754
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4794
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:4799
 #, fuzzy
 msgid "Away message too long."
 msgstr "אם המסר &ארוך מדי:"
 
-#: src/protocols/oscar/oscar.c:4802
-#, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4803
-#: src/protocols/oscar/oscar.c:5220
-#: src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:4892
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5323
 msgid "Unable To Add"
 msgstr "לא ניתן להוסיף"
 
-#: src/protocols/oscar/oscar.c:4939
+#: src/protocols/oscar/oscar.c:5029
 #, fuzzy
 msgid "Unable To Retrieve Buddy List"
 msgstr "כשלון ביבוא רשימת השרותים"
 
-#: src/protocols/oscar/oscar.c:4940
-msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5116
-#: src/protocols/oscar/oscar.c:5117
-#: src/protocols/oscar/oscar.c:5122
-#: src/protocols/oscar/oscar.c:5277
-#: src/protocols/oscar/oscar.c:5278
-#: src/protocols/oscar/oscar.c:5283
+#: src/protocols/oscar/oscar.c:5030
+msgid ""
+"Gaim was temporarily unable to retrieve your buddy list from the AIM "
+"servers.  Your buddy list is not lost, and will probably become available in "
+"a few hours."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5219
-#, c-format
-msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5219
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5309
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
 msgid "(no name)"
 msgstr "(ללא שם)"
 
-#: src/protocols/oscar/oscar.c:5232
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5314
-#, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5320
+#: src/protocols/oscar/oscar.c:5322
+#, c-format
+msgid ""
+"Could not add the buddy %s for an unknown reason.  The most common reason "
+"for this is that you have the maximum number of allowed buddies in your "
+"buddy list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5404
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5410
 #, fuzzy
 msgid "Authorization Given"
 msgstr "שם פרטי"
 
-#: src/protocols/oscar/oscar.c:5353
+#: src/protocols/oscar/oscar.c:5443
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7767,208 +7774,197 @@
 msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5395
+#: src/protocols/oscar/oscar.c:5485
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5396
+#: src/protocols/oscar/oscar.c:5486
 #, fuzzy
 msgid "Authorization Granted"
 msgstr "<b>[בקשת אימות אושרה:]</b> %1"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5399
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:5489
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5400
+#: src/protocols/oscar/oscar.c:5490
 msgid "Authorization Denied"
 msgstr "ההרשאה נדחית."
 
-#: src/protocols/oscar/oscar.c:5437
-#: src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
 #, fuzzy
 msgid "_Exchange:"
 msgstr "החלפה:"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5549
 #, fuzzy
 msgid "Invalid chat name specified."
 msgstr "השתמש בשם עבודה מצויין על ידי המשתמש"
 
-#: src/protocols/oscar/oscar.c:5705
-msgid "Capabilities"
-msgstr "יכולות"
-
-#: src/protocols/oscar/oscar.c:5711
-#, fuzzy
-msgid "Buddy Comment"
-msgstr "הערת '#if 0'"
-
-#: src/protocols/oscar/oscar.c:5737
+#: src/protocols/oscar/oscar.c:5790
 #, fuzzy
 msgid "Away Message"
 msgstr "<b>[הודעת \"לא-נמצא\":]</b> %1"
 
-#: src/protocols/oscar/oscar.c:5745
-#: src/protocols/oscar/oscar.c:5770
-#: src/protocols/yahoo/yahoo.c:2296
-msgid "Offline"
-msgstr "מנותק"
-
-#: src/protocols/oscar/oscar.c:6236
+#: src/protocols/oscar/oscar.c:6284
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "אין אפשרות לפתוח קובץ זמני."
 
-#: src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:6297
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6252
-msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6300
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6485
 #, fuzzy
 msgid "Buddy Comment:"
 msgstr "הערת '#if 0'"
 
-#: src/protocols/oscar/oscar.c:6453
+#: src/protocols/oscar/oscar.c:6501
 #, fuzzy
 msgid "Edit Buddy Comment"
 msgstr "כבד הערות EOF"
 
-#: src/protocols/oscar/oscar.c:6461
+#: src/protocols/oscar/oscar.c:6509
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "הועבר"
 
-#: src/protocols/oscar/oscar.c:6476
+#: src/protocols/oscar/oscar.c:6524
 #, fuzzy
 msgid "Direct IM"
 msgstr "חלונות הודעה"
 
-#: src/protocols/oscar/oscar.c:6505
+#: src/protocols/oscar/oscar.c:6553
 #, fuzzy
 msgid "Re-request Authorization"
 msgstr "דרוש אימות(אימות מחדש) מאת"
 
-#: src/protocols/oscar/oscar.c:6526
+#: src/protocols/oscar/oscar.c:6574
 #, fuzzy
 msgid "The new formatting is invalid."
 msgstr "המיקום המצוין אינו תקני."
 
-#: src/protocols/oscar/oscar.c:6527
+#: src/protocols/oscar/oscar.c:6575
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6533
+#: src/protocols/oscar/oscar.c:6581
 #, fuzzy
 msgid "New screen name formatting:"
 msgstr "(לא נקבע כינוי)"
 
-#: src/protocols/oscar/oscar.c:6582
+#: src/protocols/oscar/oscar.c:6630
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-#: src/protocols/oscar/oscar.c:6626
+#: src/protocols/oscar/oscar.c:6674
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6629
+#: src/protocols/oscar/oscar.c:6677
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6630
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6644
+#: src/protocols/oscar/oscar.c:6678
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6692
 msgid "Find Buddy by E-mail"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
-#: src/protocols/oscar/oscar.c:6645
+#: src/protocols/oscar/oscar.c:6693
 msgid "Search for a buddy by e-mail address"
 msgstr "חפש איש קשר לפי כתובת בדואר האלרקטרוני שלו"
 
-#: src/protocols/oscar/oscar.c:6646
+#: src/protocols/oscar/oscar.c:6694
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:6711
 #, fuzzy
 msgid "Available Message:"
 msgstr "קרא &הודעת \"לא זמין\""
 
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:6712
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6740
+#: src/protocols/oscar/oscar.c:6788
 #, fuzzy
 msgid "Set User Info..."
 msgstr "מידע כללי על המשתמש"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6795
 #, fuzzy
 msgid "Set User Info (URL)..."
 msgstr "מיבא פרטי משתמש עבור %1 ..."
 
-#: src/protocols/oscar/oscar.c:6755
+#: src/protocols/oscar/oscar.c:6803
 #, fuzzy
 msgid "Set Available Message..."
 msgstr "                  קבע את גוף ההודעה"
 
-#: src/protocols/oscar/oscar.c:6762
+#: src/protocols/oscar/oscar.c:6810
 msgid "Change Password..."
 msgstr "שנה סיסמא..."
 
-#: src/protocols/oscar/oscar.c:6769
+#: src/protocols/oscar/oscar.c:6817
 #, fuzzy
 msgid "Change Password (URL)"
 msgstr "הסיסמה שלך שונתה בהצלחה."
 
-#: src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:6825
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6836
 #, fuzzy
 msgid "Format Screen Name..."
 msgstr "שם משתמש ב &AIM:"
 
-#: src/protocols/oscar/oscar.c:6794
+#: src/protocols/oscar/oscar.c:6842
 #, fuzzy
 msgid "Confirm Account"
 msgstr "לפי חשבון"
 
-#: src/protocols/oscar/oscar.c:6800
+#: src/protocols/oscar/oscar.c:6848
 #, fuzzy
 msgid "Display Currently Registered Address"
 msgstr "%s: לא יכול לקרוא את כתובת התצוגה"
 
-#: src/protocols/oscar/oscar.c:6806
+#: src/protocols/oscar/oscar.c:6854
 #, fuzzy
 msgid "Change Currently Registered Address..."
 msgstr "שנה את נראות חלון הפלט בחלון הנוכחי"
 
-#: src/protocols/oscar/oscar.c:6815
+#: src/protocols/oscar/oscar.c:6863
 #, fuzzy
 msgid "Show Buddies Awaiting Authorization"
 msgstr "/ידידים/הצג _קבוצות ריקות"
 
-#: src/protocols/oscar/oscar.c:6823
+#: src/protocols/oscar/oscar.c:6871
 #, fuzzy
 msgid "Search for Buddy by Email..."
 msgstr "חפש ידיד לפי כתובת בדואר האלרקטרוני שלו"
 
-#: src/protocols/oscar/oscar.c:6830
+#: src/protocols/oscar/oscar.c:6878
 #, fuzzy
 msgid "Search for Buddy by Information"
 msgstr "חפש ידיד לפי כתובת בדואר האלרקטרוני שלו"
@@ -7984,17 +7980,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:6954
-#: src/protocols/oscar/oscar.c:6956
+#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "תוסף פרוטוקולים Aim/ICQ"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7021
 #, fuzzy
 msgid "Auth host"
 msgstr "המארח הוא %s\n"
 
-#: src/protocols/oscar/oscar.c:6978
+#: src/protocols/oscar/oscar.c:7026
 #, fuzzy
 msgid "Auth port"
 msgstr "_יציאת המדפסת:"
@@ -8103,8 +8098,12 @@
 msgstr "רמת האזהרה שלך גבוהה מדיי כרגע מכדי להיכנס למערכת."
 
 #: src/protocols/toc/toc.c:580
-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."
-msgstr "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, תיאלץ להמתין אפילו יותר."
+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."
+msgstr ""
+"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
+"תיאלץ להמתין אפילו יותר."
 
 #: src/protocols/toc/toc.c:582
 #, c-format
@@ -8137,7 +8136,10 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:908
-msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgid ""
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 
 #: src/protocols/toc/toc.c:1402
@@ -8159,10 +8161,8 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "כשל בהעברת הקובץ, כנראה צד שני ביטל"
 
-#: src/protocols/toc/toc.c:1745
-#: src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909
-#: src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 #, fuzzy
 msgid "Could not connect for transfer."
 msgstr "אין אפשרות לחדש את העברת הקובץ"
@@ -8177,6 +8177,12 @@
 msgstr "שמירת סמל בשם..."
 
 #: src/protocols/toc/toc.c:2076
+#, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/protocols/toc/toc.c:2083
 #, fuzzy, c-format
 msgid "%s requests you to send them a file"
@@ -8193,8 +8199,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
 msgid "TOC Protocol Plugin"
 msgstr "תוסף פרוטוקול TOC"
 
@@ -8273,8 +8278,7 @@
 msgid "Visit Homepage"
 msgstr "בקר באתר הבית"
 
-#: src/protocols/trepia/trepia.c:821
-#: src/protocols/trepia/trepia.c:824
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "משתמשים מקומיים"
 
@@ -8293,14 +8297,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283
-#: src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
 #, fuzzy
 msgid "Trepia Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #: src/protocols/yahoo/yahoo.c:308
-msgid "You have been logged off as you have logged in on a different machine or device."
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
 msgstr ""
 
 #: src/protocols/yahoo/yahoo.c:747
@@ -8323,7 +8328,9 @@
 
 #: src/protocols/yahoo/yahoo.c:869
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
 msgstr ""
 
 #: src/protocols/yahoo/yahoo.c:872
@@ -8331,192 +8338,184 @@
 msgid "Add buddy rejected"
 msgstr "להוסיף איש קשר לרשימה שלך?"
 
-#: src/protocols/yahoo/yahoo.c:1598
-#, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1601
+#: src/protocols/yahoo/yahoo.c:1599
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1602
 #, fuzzy
 msgid "Failed Yahoo! Authentication"
 msgstr "אימות המתווך נכשל."
 
-#: src/protocols/yahoo/yahoo.c:1674
-#, c-format
-msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1677
+#: src/protocols/yahoo/yahoo.c:1675
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1678
 #, fuzzy
 msgid "Ignore buddy?"
 msgstr "הוספת חבר..."
 
-#: src/protocols/yahoo/yahoo.c:1710
+#: src/protocols/yahoo/yahoo.c:1711
 msgid "Invalid username."
 msgstr "שם המשתמש שגוי."
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1714
 msgid "Incorrect password."
 msgstr "סיסמה לא נכונה."
 
-#: src/protocols/yahoo/yahoo.c:1716
+#: src/protocols/yahoo/yahoo.c:1717
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1719
+#: src/protocols/yahoo/yahoo.c:1720
 #, fuzzy, c-format
 msgid "Unknown error number %d."
 msgstr "שגיאה בלתי-ידועה %1."
 
-#: src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1778
+#: src/protocols/yahoo/yahoo.c:1779
 #, fuzzy
 msgid "Could not add buddy to server list"
 msgstr "להוסיף ידיד לרשימה שלך?"
 
-#: src/protocols/yahoo/yahoo.c:1888
-#: src/protocols/yahoo/yahoo.c:2019
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr "לא ניתן לקרוא"
 
-#: src/protocols/yahoo/yahoo.c:2041
-#: src/protocols/yahoo/yahoo.c:2151
-#: src/protocols/yahoo/yahoo.c:2194
-#: src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 #, fuzzy
 msgid "Connection problem"
 msgstr "בעיה של KNotify "
 
-#: src/protocols/yahoo/yahoo.c:2278
-#: src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr "לא נמצא בבית"
 
-#: src/protocols/yahoo/yahoo.c:2280
-#: src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr "לא ליד השולחן"
 
-#: src/protocols/yahoo/yahoo.c:2282
-#: src/protocols/yahoo/yahoo.c:2608
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr "לא נמצא במשרד"
 
-#: src/protocols/yahoo/yahoo.c:2286
-#: src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: src/protocols/yahoo/yahoo.c:2290
-#: src/protocols/yahoo/yahoo.c:2616
-#: src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 #, fuzzy
 msgid "Stepped Out"
 msgstr "התנתק"
 
-#: src/protocols/yahoo/yahoo.c:2354
-#: src/protocols/yahoo/yahoo.c:2386
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
 #, fuzzy
 msgid "Not on server list"
 msgstr "אופן השימוש: /list - הצג רשימה של ערוצים ציבוריים בשרת."
 
-#: src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/yahoo/yahoo.c:2407
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<b>%s:</b> %s"
 msgstr "מצב:"
 
-#: src/protocols/yahoo/yahoo.c:2442
+#: src/protocols/yahoo/yahoo.c:2443
 #, fuzzy
 msgid "Join in Chat"
 msgstr "הצטרף לשיחה בתור:"
 
-#: src/protocols/yahoo/yahoo.c:2448
+#: src/protocols/yahoo/yahoo.c:2449
 #, fuzzy
 msgid "Initiate Conference"
 msgstr "אין אפשרות לאתחל את הפרוטוקול %1"
 
-#: src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2502
 #, fuzzy
 msgid "Active which ID?"
 msgstr "רשימת זיהויי לוח"
 
-#: src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2510
 #, fuzzy
 msgid "Join who in chat?"
 msgstr "אחרים מדברים בשיחה"
 
-#: src/protocols/yahoo/yahoo.c:2520
+#: src/protocols/yahoo/yahoo.c:2521
 #, fuzzy
 msgid "Activate ID..."
 msgstr "זיהוי קבוצה"
 
-#: src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/yahoo/yahoo.c:2527
 #, fuzzy
 msgid "Join user in chat..."
 msgstr "המשתמש %1 כבר נמצא בשיחה זו."
 
-#: src/protocols/yahoo/yahoo.c:2915
-msgid "<b>Sorry, profiles marked as containing adult content are not supported at this time.</b><br><br>\n"
-msgstr ""
-
 #: src/protocols/yahoo/yahoo.c:2916
+msgid ""
+"<b>Sorry, profiles marked as containing adult content are not supported at "
+"this time.</b><br><br>\n"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser<br>"
+msgstr ""
+
 #: src/protocols/yahoo/yahoo.c:2939
-msgid "If you wish to view this profile, you will need to visit this link in your web browser<br>"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2938
-msgid "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2986
-#: src/protocols/yahoo/yahoo.c:2987
+msgid ""
+"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr "זיהוי Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3031
-#: src/protocols/yahoo/yahoo.c:3034
-#: src/protocols/yahoo/yahoo.c:3037
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr "תחביבים"
 
-#: src/protocols/yahoo/yahoo.c:3046
-#: src/protocols/yahoo/yahoo.c:3049
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 #, fuzzy
 msgid "Latest News"
 msgstr "מאמר חדשות"
 
-#: src/protocols/yahoo/yahoo.c:3063
+#: src/protocols/yahoo/yahoo.c:3064
 msgid "Home Page"
 msgstr "דף הבית"
 
-#: src/protocols/yahoo/yahoo.c:3075
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr "קישור מגניב 1"
 
-#: src/protocols/yahoo/yahoo.c:3079
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr "קישור מגניב 2"
 
-#: src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr "קישור מגניב 3"
 
-#: src/protocols/yahoo/yahoo.c:3087
-#, fuzzy
-msgid "Member Since"
-msgstr "מחובר מאז:"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8528,37 +8527,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3294
-#: src/protocols/yahoo/yahoo.c:3296
+#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
 msgid "Yahoo Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3314
 #, fuzzy
 msgid "Pager host"
 msgstr "המארח הוא %s\n"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3317
 msgid "Pager port"
 msgstr "יציאת ביפר"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3320
 #, fuzzy
 msgid "File transfer host"
 msgstr "פרוטוקול להעברת קבצים"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3323
 #, fuzzy
 msgid "File transfer port"
 msgstr "פרוטוקול להעברת קבצים"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3326
 #, fuzzy
 msgid "Chat Room List Url"
 msgstr "משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
 
 #: src/protocols/yahoo/yahoo_filexfer.c:200
-msgid "Gaim cannot send files over Yahoo! that are bigger than One Megabyte (1,048,576 bytes)."
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
 msgstr ""
 
 #: src/protocols/yahoo/yahoochat.c:198
@@ -8607,8 +8607,7 @@
 msgid "Webcams"
 msgstr "מצלמות אינטרנט"
 
-#: src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
 msgid "Unable to fetch room list."
 msgstr "לא ניתן לקבל רשימת החדרים"
 
@@ -8616,54 +8615,53 @@
 msgid "User Rooms"
 msgstr "חדרים של משתמשים"
 
-#: src/protocols/zephyr/zephyr.c:554
+#: src/protocols/zephyr/zephyr.c:557
 #, fuzzy, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "ע&יון..."
 
-#: src/protocols/zephyr/zephyr.c:556
+#: src/protocols/zephyr/zephyr.c:559
 #, fuzzy, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "ע&יון..."
 
-#: src/protocols/zephyr/zephyr.c:558
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:562
+#: src/protocols/zephyr/zephyr.c:565
 #, fuzzy, c-format
 msgid "<br>At %s since %s"
 msgstr "מדפסת IPP ב %s"
 
-#: src/protocols/zephyr/zephyr.c:830
-#: src/protocols/zephyr/zephyr.c:831
-#: src/protocols/zephyr/zephyr.c:1019
-#: src/protocols/zephyr/zephyr.c:1020
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: src/protocols/zephyr/zephyr.c:857
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr ""
 
 #: src/protocols/zephyr/zephyr.c:858
-msgid "Because Zephyr uses your system username, you are unable to have multiple accounts on it when logged in as the same user."
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1195
+msgid ""
+"Because Zephyr uses your system username, you are unable to have multiple "
+"accounts on it when logged in as the same user."
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1164
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1235
+#: src/protocols/zephyr/zephyr.c:1206
 msgid "_Class:"
 msgstr "_מחלקה:"
 
-#: src/protocols/zephyr/zephyr.c:1240
+#: src/protocols/zephyr/zephyr.c:1212
 #, fuzzy
 msgid "_Instance:"
 msgstr "תצורה:"
 
-#: src/protocols/zephyr/zephyr.c:1245
+#: src/protocols/zephyr/zephyr.c:1218
 msgid "_Recipient:"
 msgstr "_נמען:"
 
@@ -8678,22 +8676,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1400
-#: src/protocols/zephyr/zephyr.c:1402
+#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
 msgid "Zephyr Protocol Plugin"
 msgstr "תוסף פרוטוקול Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1419
+#: src/protocols/zephyr/zephyr.c:1392
 #, fuzzy
 msgid "Export to .anyone"
 msgstr "ייצוא: %1 ל-PDF"
 
-#: src/protocols/zephyr/zephyr.c:1422
+#: src/protocols/zephyr/zephyr.c:1395
 #, fuzzy
 msgid "Export to .zephyr.subs"
 msgstr "יצא לסימניות &HTML..."
 
-#: src/protocols/zephyr/zephyr.c:1425
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "Exposure"
 msgstr "חשיפה"
 
@@ -8712,17 +8709,20 @@
 msgstr "הגדרות לא תקפות של מתווכים"
 
 #: src/proxy.c:1696
-msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:189
+#: src/prpl.h:195
 msgid "Custom"
 msgstr "מותאם אישית"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#: src/request.h:1247
+#.
+#: src/request.h:1250
 msgid "Accept"
 msgstr "אשר"
 
@@ -8730,66 +8730,69 @@
 msgid "Please enter your password"
 msgstr "הכנס סיסמא:"
 
-#: src/server.c:961
-#: src/server.c:975
-#, c-format
+#: src/server.c:962
+#, fuzzy, c-format
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "(הודעה 1)"
+msgstr[1] "(הודעה 1)"
+
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(הודעה 1)"
 
-#: src/server.c:1154
-#: src/server.c:1164
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s התחבר"
 
-#: src/server.c:1178
+#: src/server.c:1184
 #, fuzzy, c-format
 msgid "%s signed on"
 msgstr "לא מחובר"
 
-#: src/server.c:1194
+#: src/server.c:1200
 #, fuzzy, c-format
 msgid "%s came back"
 msgstr "/מעבר/_אחורה"
 
-#: src/server.c:1196
+#: src/server.c:1202
 #, fuzzy, c-format
 msgid "%s went away"
 msgstr "הודעות מרוחק"
 
-#: src/server.c:1211
+#: src/server.c:1217
 #, fuzzy, c-format
 msgid "%s became idle"
 msgstr "זמן חוסר פעילות"
 
-#: src/server.c:1225
+#: src/server.c:1231
 #, fuzzy, c-format
 msgid "%s became unidle"
 msgstr "&הסר העברות במנוחה"
 
-#: src/server.c:1238
-#: src/server.c:1246
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s התנתק"
 
-#: src/server.c:1261
+#: src/server.c:1267
 #, c-format
 msgid "%s signed off"
 msgstr "%s התנתק"
 
-#: src/server.c:1311
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1314
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr "אלמוני"
 
-#: src/server.c:1424
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8798,12 +8801,12 @@
 "משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
 "%s"
 
-#: src/server.c:1428
+#: src/server.c:1434
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
 
-#: src/server.c:1434
+#: src/server.c:1440
 msgid "Accept chat invitation?"
 msgstr "לקבל הזמנה לשיחה?"
 
@@ -8830,23 +8833,34 @@
 msgid "_Warn"
 msgstr "ה_זהר"
 
-#: src/util.c:2014
+#: src/util.c:2040
 msgid "Calculating..."
 msgstr "מחשב..."
 
-#: src/util.c:2017
+#: src/util.c:2043
 msgid "Unknown."
 msgstr "לא ידוע"
 
-#: src/util.c:2048
-#: src/util.c:2053
-#: src/util.c:2058
-#: src/util.c:2061
-#: src/util.c:2049
-#: src/util.c:2067
-#: src/util.c:2069
-#: src/util.c:2072
-#: src/util.c:2404
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#, fuzzy
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] " דקות"
+msgstr[1] " דקות"
+
+#: src/util.c:2430
 #, fuzzy
 msgid "g003: Error opening connection.\n"
 msgstr "שגיאה בפתיחת %1 לקריאה"
@@ -8864,3 +8878,28 @@
 msgid "Notification"
 msgstr "הודעה"
 
+#, fuzzy
+#~ msgid "Username: <b>%s</b><br>\n"
+#~ msgstr "ע&יון..."
+
+#, fuzzy
+#~ msgid "Warning Level: <b>%d%%</b><br>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "רמת האזהרה החדשה שלך היא %1%."
+
+#, fuzzy
+#~ msgid "Online Since: <b>%s</b><br>\n"
+#~ msgstr "<b>%1</b><br>פגו: %2<br>נותרו: %3"
+
+#, fuzzy
+#~ msgid "Member Since: <b>%s</b><br>\n"
+#~ msgstr "<b>%1</b><br>פגו: %2<br>נותרו: %3"
+
+#, fuzzy
+#~ msgid "Idle: <b>%s</b>"
+#~ msgstr "סרק"
+
+#, fuzzy
+#~ msgid "Idle: <b>Active</b>"
+#~ msgstr "תהליכים פעילים"