diff po/he.po @ 6118:ed983e8a1851

[gaim-migrate @ 6582] Updated POTFILES.in and I guess a few billion po files due to a couple .c files being removed. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 14 Jul 2003 06:11:31 +0000
parents e7060fb06338
children 25b26e3ecf60
line wrap: on
line diff
--- a/po/he.po	Mon Jul 14 06:08:18 2003 +0000
+++ b/po/he.po	Mon Jul 14 06:11:31 2003 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
-"POT-Creation-Date: 2003-06-04 23:59+0000\n"
+"POT-Creation-Date: 2003-07-13 22:05-0700\n"
 "PO-Revision-Date: 2003-06-05 21:53-0000\n"
 "Last-Translator: Pavel Bibergal <cyberkm@barak-online.net>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -15,74 +15,65 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/docklet/docklet.c:91
-#: src/win32/systray.c:359
+#: plugins/docklet/docklet.c:110 src/gtkaccount.c:444 src/gtkaccount.c:1599
 msgid "Auto-login"
 msgstr "כניסה אוטומתית"
 
-#: plugins/docklet/docklet.c:95
+#: plugins/docklet/docklet.c:113
 msgid "New Message.."
 msgstr "הודעה חדשה..."
 
-#: plugins/docklet/docklet.c:96
+#: plugins/docklet/docklet.c:114
 msgid "Join A Chat..."
 msgstr "הצטרף לשיחה..."
 
-#: plugins/docklet/docklet.c:127
+#: plugins/docklet/docklet.c:145
 msgid "New..."
 msgstr "חדש..."
 
-#: plugins/docklet/docklet.c:131
-#: src/protocols/gg/gg.c:71
-#: src/protocols/irc/irc.c:1033
-#: src/protocols/jabber/jabber.c:1181
-#: src/protocols/jabber/jabber.c:3443
-#: src/protocols/jabber/jabber.c:3497
-#: src/protocols/oscar/oscar.c:2822
-#: src/protocols/oscar/oscar.c:4510
-#: src/protocols/oscar/oscar.c:5397
-#: src/protocols/oscar/oscar.c:5727
-#: src/gtkblist.c:1529
-#: src/gtkpounce.c:565
-#: src/gtkprefs.c:1439
+#: plugins/docklet/docklet.c:149 src/protocols/gg/gg.c:54
+#: src/protocols/irc/irc.c:1020 src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3491
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4548
+#: src/protocols/oscar/oscar.c:5447 src/protocols/oscar/oscar.c:5841
+#: src/gtkblist.c:1589 src/gtkpounce.c:460 src/gtkprefs.c:1491
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
-#: plugins/docklet/docklet.c:137
-#: src/away.c:534
+#: plugins/docklet/docklet.c:155 src/away.c:531
 msgid "Back"
 msgstr "חזר"
 
-#: plugins/docklet/docklet.c:145
+#: plugins/docklet/docklet.c:163
 msgid "Mute Sounds"
 msgstr "השתק צלילים"
 
-#: plugins/docklet/docklet.c:150
-msgid "File Transfers..."
-msgstr "משלוח קבצים..."
-
-#: plugins/docklet/docklet.c:151
-msgid "Accounts..."
-msgstr "חשבונות..."
-
-#: plugins/docklet/docklet.c:152
-msgid "Preferences..."
-msgstr "העדפות..."
-
-#: plugins/docklet/docklet.c:161
-#: src/win32/systray.c:159
+#: plugins/docklet/docklet.c:168 src/gtkft.c:557
+msgid "File Transfers"
+msgstr "משלוח קבצים"
+
+#. And now for the buttons
+#: plugins/docklet/docklet.c:169 src/gtkaccount.c:1750 src/main.c:415
+msgid "Accounts"
+msgstr "חשבונות"
+
+#: plugins/docklet/docklet.c:170 src/gtkprefs.c:2337 src/main.c:425
+msgid "Preferences"
+msgstr "העדפות"
+
+#: plugins/docklet/docklet.c:179
 msgid "Signoff"
 msgstr "נתק"
 
-#: plugins/docklet/docklet.c:165
+#: plugins/docklet/docklet.c:183
 msgid "Quit"
 msgstr "יציאה"
 
-#: plugins/docklet/docklet.c:462
+#: plugins/docklet/docklet.c:412
 msgid "Tray Icon Configuration"
 msgstr "הגדרות סמל מגש המערכת"
 
-#: plugins/docklet/docklet.c:466
+#: plugins/docklet/docklet.c:416
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_הסתר הודעות חדשות עד הלחיצה על סמל מגש המערכת"
 
@@ -93,20 +84,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:490
+#: plugins/docklet/docklet.c:440
 msgid "System Tray Icon"
 msgstr "סמל מגש המערכת"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:493
+#: plugins/docklet/docklet.c:443
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "הצג סמל של גיים במגש המערכת"
 
 #. *  description
-#: plugins/docklet/docklet.c:495
-msgid "Interacts with a Notification Area applet (in GNOME or KDE, for example) to display 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."
+#: plugins/docklet/docklet.c:445
+msgid ""
+"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
+"example) to display 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 ""
 
 #. *< api_version
@@ -116,21 +112,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:85
+#: plugins/autorecon.c:103
 msgid "Auto-Reconnect"
 msgstr "התחבר מחדש בצורה אוטומתית"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:88
-#: plugins/autorecon.c:90
+#: plugins/autorecon.c:106 plugins/autorecon.c:108
 msgid "When you are kicked offline, this reconnects you."
 msgstr "כאשר מנתקים אותך, מתחבר מחדש עצמאית"
 
-#: plugins/chkmail.c:89
-#: plugins/chkmail.c:112
-#: plugins/chkmail.c:121
+#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
 msgid "Mail Server"
 msgstr "שרת הדואר"
 
@@ -154,15 +147,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/events.c:225
+#: plugins/events.c:236
 msgid "Event Test"
 msgstr "בדיקת אירוע"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/events.c:228
-#: plugins/events.c:230
+#: plugins/events.c:239 plugins/events.c:241
 msgid "Test to see that all events are working properly."
 msgstr "בודק שכל האירועים עובדים כמו שצריך"
 
@@ -180,8 +172,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:206
-#: plugins/filectl.c:208
+#: plugins/filectl.c:206 plugins/filectl.c:208
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "מאפשר לך לשלוט בגיים ע\"י הכנסת פקודות לקובץ"
 
@@ -241,16 +232,18 @@
 msgid "Change"
 msgstr "שינוי"
 
-#: plugins/history.c:79
+#: plugins/history.c:87
 msgid "History"
 msgstr "היסטוריה"
 
-#: plugins/history.c:81
+#: plugins/history.c:89
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: plugins/history.c:82
-msgid "When a new conversation is opened this plugin will insert the last XXX of the last conversation into the current conversation."
+#: plugins/history.c:90
+msgid ""
+"When a new conversation is opened this plugin will insert the last XXX of "
+"the last conversation into the current conversation."
 msgstr ""
 
 #. *< api_version
@@ -260,46 +253,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:75
+#: plugins/iconaway.c:74
 msgid "Iconify on Away"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/iconaway.c:78
-#: plugins/iconaway.c:80
-msgid "Iconifies the away box and the buddy list when you go away."
-msgstr ""
-
-#: plugins/idle.c:86
-#: src/protocols/irc/irc.c:948
+#: plugins/iconaway.c:77 plugins/iconaway.c:79
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+
+#: plugins/idle.c:70 src/protocols/irc/irc.c:935
 msgid "Idle Time"
 msgstr "זמן חוסר פעילות"
 
-#: plugins/idle.c:94
+#: plugins/idle.c:78
 msgid "Set"
 msgstr "קבע"
 
-#: plugins/idle.c:99
+#: plugins/idle.c:83
 msgid "idle for"
 msgstr "לא פעיל"
 
-#: plugins/idle.c:106
-#: plugins/timestamp.c:86
+#: plugins/idle.c:90 plugins/timestamp.c:88
 msgid "minutes."
 msgstr " דקות"
 
-#: plugins/idle.c:112
+#: plugins/idle.c:96
 msgid "_Set"
 msgstr "_קבע"
 
-#: plugins/idle.c:135
+#: plugins/idle.c:119
 msgid "I'dle Mak'er"
 msgstr ""
 
-#: plugins/idle.c:137
-#: plugins/idle.c:138
+#: plugins/idle.c:121 plugins/idle.c:122
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr ""
 
@@ -317,8 +306,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/mailchk.c:152
-#: plugins/mailchk.c:154
+#: plugins/mailchk.c:152 plugins/mailchk.c:154
 msgid "Checks for new local mail."
 msgstr "בדוק עבור דואר מקומי חדש"
 
@@ -402,8 +390,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:702
-#: plugins/notify.c:704
+#: plugins/notify.c:702 plugins/notify.c:704
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -416,7 +403,9 @@
 msgstr ""
 
 #: plugins/raw.c:155
-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 ""
 
 #. *< api_version
@@ -433,53 +422,51 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/simple.c:33
-#: plugins/simple.c:35
+#: plugins/simple.c:33 plugins/simple.c:35
 msgid "Tests to see that most things are working."
 msgstr "בודק עם רוב הדברים עובדים"
 
-#: plugins/spellchk.c:411
+#: plugins/spellchk.c:394
 msgid "Text Replacements"
 msgstr "החלפות הטקסט"
 
-#: plugins/spellchk.c:435
+#: plugins/spellchk.c:418
 msgid "You type"
 msgstr "אתה רושם"
 
-#: plugins/spellchk.c:447
+#: plugins/spellchk.c:430
 msgid "You send"
 msgstr "אתה שולח"
 
-#: plugins/spellchk.c:473
+#: plugins/spellchk.c:456
 msgid "Add a new text replacement"
 msgstr "הוסף טקסט להחלפה"
 
-#: plugins/spellchk.c:480
+#: plugins/spellchk.c:463
 msgid "You _type:"
 msgstr "אתה ר_ושם:"
 
-#: plugins/spellchk.c:494
+#: plugins/spellchk.c:477
 msgid "You _send:"
 msgstr "אתה _שולח:"
 
-#: plugins/spellchk.c:534
+#: plugins/spellchk.c:517
 msgid "Text replacement"
 msgstr "החלפת הטקסט"
 
-#: plugins/spellchk.c:536
-#: plugins/spellchk.c:537
+#: plugins/spellchk.c:519 plugins/spellchk.c:520
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
-#: plugins/timestamp.c:72
+#: plugins/timestamp.c:74
 msgid "iChat Timestamp"
 msgstr ""
 
-#: plugins/timestamp.c:79
+#: plugins/timestamp.c:81
 msgid "Delay"
 msgstr "השהייה"
 
-#: plugins/timestamp.c:92
+#: plugins/timestamp.c:94
 msgid "_Apply"
 msgstr "_התחל"
 
@@ -490,33 +477,74 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:145
+#: plugins/timestamp.c:148
 msgid "Timestamp"
 msgstr "חותמת זמן "
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:148
-#: plugins/timestamp.c:150
+#: plugins/timestamp.c:151 plugins/timestamp.c:153
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
+#: plugins/gaim-remote/remote.c:86
+msgid "Not connected to AIM"
+msgstr "לא מחובר ל AIM"
+
+#: plugins/gaim-remote/remote.c:95 plugins/gaim-remote/remote.c:134
+msgid "No screenname given."
+msgstr "אין ניתן שם תצוגה."
+
+#: plugins/gaim-remote/remote.c:171
+msgid "No roomname given."
+msgstr "לא ניתן שם החדר."
+
+#: plugins/gaim-remote/remote.c:190
+msgid "Invalid AIM URI"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaim-remote/remote.c:735
+#, fuzzy
+msgid "Remote Control"
+msgstr "Gaim בקרת קבצים"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaim-remote/remote.c:738
+msgid "Provides remote control for gaim applications."
+msgstr ""
+
+#. *  description
+#: plugins/gaim-remote/remote.c:740
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr ""
+
 #. Configuration frame
-#: plugins/gestures/gestures.c:210
+#: plugins/gestures/gestures.c:222
 msgid "Mouse Gestures Configuration"
 msgstr "הגדרות פעולות העכבר"
 
-#: plugins/gestures/gestures.c:217
+#: plugins/gestures/gestures.c:229
 msgid "Middle mouse button"
 msgstr "לחצן אמצעי של העכבר"
 
-#: plugins/gestures/gestures.c:222
+#: plugins/gestures/gestures.c:234
 msgid "Right mouse button"
 msgstr "לחצן ימני של העכבר"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:234
+#: plugins/gestures/gestures.c:246
 msgid "_Visual gesture display"
 msgstr "הצג פעולות העכבר בצורה וויזואלית"
 
@@ -527,19 +555,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:261
+#: plugins/gestures/gestures.c:273
 msgid "Mouse Gestures"
 msgstr "פעולות עכבר"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:264
+#: plugins/gestures/gestures.c:276
 msgid "Provides support for mouse gestures"
 msgstr "מוסיף תמיכה לפעולות עכבר"
 
 #. *  description
-#: plugins/gestures/gestures.c:266
+#: plugins/gestures/gestures.c:278
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -556,49 +584,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74
-#: plugins/ticker/ticker.c:283
+#: plugins/ticker/ticker.c:68 plugins/ticker/ticker.c:280
 msgid "Buddy Ticker"
 msgstr "טיקר ידידים"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:286
-#: plugins/ticker/ticker.c:288
+#: plugins/ticker/ticker.c:283 plugins/ticker/ticker.c:285
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:123
-#: plugins/win32/transparency/win2ktrans.c:412
-#: plugins/win32/transparency/win2ktrans.c:446
+#: plugins/win32/transparency/win2ktrans.c:133
+#: plugins/win32/transparency/win2ktrans.c:359
+#: plugins/win32/transparency/win2ktrans.c:393
 msgid "Opacity:"
 msgstr "שקיפות:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:393
+#: plugins/win32/transparency/win2ktrans.c:340
 msgid "IM Conversation Windows"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:394
+#: plugins/win32/transparency/win2ktrans.c:341
 msgid "_IM window transparency"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:404
+#: plugins/win32/transparency/win2ktrans.c:351
 msgid "_Show slider bar in IM window"
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429
-#: src/gtkprefs.c:903
+#: plugins/win32/transparency/win2ktrans.c:376 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "חלון רשימת הידידים"
 
-#: plugins/win32/transparency/win2ktrans.c:430
+#: plugins/win32/transparency/win2ktrans.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "חלון רשימת הידידים תמיד עליון"
 
-#: plugins/win32/transparency/win2ktrans.c:433
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Buddy List window transparency"
 msgstr ""
 
@@ -609,15 +634,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:489
+#: plugins/win32/transparency/win2ktrans.c:436
 msgid "Transparency"
 msgstr "שקיפות"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:492
-#: plugins/win32/transparency/win2ktrans.c:494
+#: plugins/win32/transparency/win2ktrans.c:439
+#: plugins/win32/transparency/win2ktrans.c:441
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows.\n"
 "\n"
@@ -625,24 +650,23 @@
 msgstr ""
 
 #. IM Convo trans options
-#: plugins/win32/winprefs/winprefs.c:141
+#: plugins/win32/winprefs/winprefs.c:124
 msgid "Startup"
 msgstr "הפעלה"
 
-#: plugins/win32/winprefs/winprefs.c:142
+#: plugins/win32/winprefs/winprefs.c:125
 msgid "_Start Gaim on Windows startup"
 msgstr "הפעל את Gaim בעת הפעלת חלונות"
 
-#: plugins/win32/winprefs/winprefs.c:170
+#: plugins/win32/winprefs/winprefs.c:152
 msgid "WinGaim Options"
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:172
-#: plugins/win32/winprefs/winprefs.c:173
+#: plugins/win32/winprefs/winprefs.c:154 plugins/win32/winprefs/winprefs.c:155
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#: plugins/perl/perl.c:396
+#: plugins/perl/perl.c:405
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr ""
 
@@ -653,14 +677,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1382
+#: plugins/perl/perl.c:1392
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1384
-#: plugins/perl/perl.c:1385
+#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -671,312 +694,310 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:68
+#: plugins/statenotify.c:72
 msgid "Buddy State Notification"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/statenotify.c:71
-#: plugins/statenotify.c:74
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr ""
-
-#: src/protocols/gg/gg.c:69
-#: src/protocols/jabber/jabber.c:1189
-#: src/protocols/msn/msn.c:308
-#: 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/yahoo/yahoo.c:1265
-#: src/protocols/yahoo/yahoo.c:1344
+#: plugins/statenotify.c:75 plugins/statenotify.c:78
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
+#: src/protocols/msn/msn.c:311 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/yahoo/yahoo.c:1257
+#: src/protocols/yahoo/yahoo.c:1336
 msgid "Available"
 msgstr "זמין"
 
-#: src/protocols/gg/gg.c:70
+#: src/protocols/gg/gg.c:53
 msgid "Available for friends only"
 msgstr "זמין רק לחברים"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:55
 msgid "Away for friends only"
 msgstr "מרוחק מהמחשב רק לחברים"
 
-#: src/protocols/gg/gg.c:73
-#: src/protocols/jabber/jabber.c:3446
-#: src/protocols/jabber/jabber.c:3509
-#: src/protocols/oscar/oscar.c:2826
-#: src/protocols/oscar/oscar.c:4498
-#: src/protocols/oscar/oscar.c:4525
-#: src/protocols/oscar/oscar.c:5732
-#: src/protocols/yahoo/yahoo.c:1080
-#: src/protocols/yahoo/yahoo.c:1287
-#: src/protocols/yahoo/yahoo.c:1354
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
+#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:5846 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:57
 msgid "Invisible for friends only"
 msgstr "בלתי נראה רק לחברים"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:58
 msgid "Unavailable"
 msgstr "לא זמין"
 
-#: src/protocols/gg/gg.c:159
+#: src/protocols/gg/gg.c:139
 msgid "Unable to resolve hostname."
 msgstr "אין אפשרות להסיק את שם המארח"
 
-#: src/protocols/gg/gg.c:162
+#: src/protocols/gg/gg.c:142
 msgid "Unable to connect to server."
 msgstr "לא ניתן להתחבר לשרת"
 
-#: src/protocols/gg/gg.c:165
+#: src/protocols/gg/gg.c:145
 msgid "Invalid response from server."
 msgstr "שגיעה בתגובה מהשרת"
 
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:148
 msgid "Error while reading from socket."
 msgstr "שגיאה בקריאת נתונים מהשקע"
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:151
 msgid "Error while writing to socket."
 msgstr "שגיאה בכתיבת ההודעה אל השקע."
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:154
 msgid "Authentication failed."
 msgstr "האימות נכשל."
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "קוד שגיאה לא מוכר"
 
-#: src/protocols/gg/gg.c:282
+#: src/protocols/gg/gg.c:262
 #, c-format
 msgid "Status: %s"
 msgstr "מצב: %s"
 
-#: src/protocols/gg/gg.c:303
+#: src/protocols/gg/gg.c:283
 msgid "Could not connect"
 msgstr "לא ניתן להתחבר"
 
-#: src/protocols/gg/gg.c:310
+#: src/protocols/gg/gg.c:290
 msgid "Unable to read socket"
 msgstr "אין אפשרות לקרוא את השקע"
 
-#: src/protocols/gg/gg.c:420
+#: src/protocols/gg/gg.c:402
 msgid "Unable to connect."
 msgstr "לא ניתן להתחבר"
 
-#: src/protocols/gg/gg.c:436
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "קורא נתונים"
 
-#: src/protocols/gg/gg.c:439
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:442
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "קורא מפתח של השרת"
 
-#: src/protocols/gg/gg.c:445
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:454
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:473
-#: src/protocols/gg/gg.c:569
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #, c-format
 msgid "Connect to %s failed"
 msgstr "ההתחברות אל %s לא הצליחה."
 
-#: src/protocols/gg/gg.c:522
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "לא ניתן להתחבר לשרת"
 
-#: src/protocols/gg/gg.c:535
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "שלח בתור הודעה"
 
-#: src/protocols/gg/gg.c:542
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "מחפש את שרת הGG"
 
-#: src/protocols/gg/gg.c:545
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:594
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:633
 msgid "Couldn't get search results"
 msgstr "לא ניתן לקבל תוצאות החיפוש"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:638
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:663
 msgid "Active"
 msgstr "פעיל"
 
-#: src/protocols/gg/gg.c:688
+#. *
+#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
+#.
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:168 src/request.h:804
 msgid "Yes"
 msgstr "כן"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:169 src/request.h:804
 msgid "No"
 msgstr "לא"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:668
 msgid "UIN"
 msgstr "מספר זיהוי"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:672
 msgid "First name"
 msgstr "שם פרטי"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:677
 msgid "Second Name"
 msgstr "שמ משפחה"
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:681 src/protocols/gg/gg.c:1380
 msgid "Nick"
 msgstr "כינוי"
 
-#: src/protocols/gg/gg.c:712
-#: src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:688 src/protocols/gg/gg.c:691
 msgid "Birth year"
 msgstr "שנת לידה"
 
-#: src/protocols/gg/gg.c:721
-#: src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:697 src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:701
 msgid "Sex"
 msgstr "מין:"
 
-#. Line 5
-#: src/protocols/gg/gg.c:729
-#: src/dialogs.c:2065
-#: src/dialogs.c:2709
+#. City
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:2035 src/dialogs.c:2684
 msgid "City"
 msgstr "עיר"
 
-#: src/protocols/gg/gg.c:762
+#: src/protocols/gg/gg.c:738
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:770
+#: src/protocols/gg/gg.c:746
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:809
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:838
+#: src/protocols/gg/gg.c:817
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:846
+#: src/protocols/gg/gg.c:825
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:833
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:861
+#: src/protocols/gg/gg.c:841
 msgid "Password changed successfully"
 msgstr "הסיסמא הוחלפה בהצלחה"
 
-#: src/protocols/gg/gg.c:867
+#: src/protocols/gg/gg.c:848
 msgid "Password couldn't be changed"
 msgstr "לא ניתן להחליף סיסמא"
 
-#: src/protocols/gg/gg.c:979
+#: src/protocols/gg/gg.c:965
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:980
-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:1008
+#: src/protocols/gg/gg.c:966
+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:994
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1009
-msgid "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try again later."
-msgstr ""
-
-#: src/protocols/gg/gg.c:1078
+#: src/protocols/gg/gg.c:995
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
 msgid "Couldn't export buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1079
-#: src/protocols/gg/gg.c:1102
-msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
-msgstr ""
-
-#: src/protocols/gg/gg.c:1101
+#: src/protocols/gg/gg.c:1065 src/protocols/gg/gg.c:1088
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1087
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1150
+#: src/protocols/gg/gg.c:1136
 msgid "Unable to access directory"
 msgstr "אין אפשרות להיכנס אל הספריה"
 
-#: src/protocols/gg/gg.c:1151
-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:1184
+#: src/protocols/gg/gg.c:1137
+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:1170
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1185
-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:1201
+#: src/protocols/gg/gg.c:1171
+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:1187
 msgid "Directory Search"
 msgstr "חיפוש במדריך"
 
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4322
+#: src/protocols/oscar/oscar.c:6110 src/protocols/toc/toc.c:1474
+#: src/dialogs.c:2146 src/dialogs.c:2155
+msgid "Change Password"
+msgstr "שנה סיסמא"
+
+#: src/protocols/gg/gg.c:1203
+msgid "Import Buddy List from Server"
+msgstr ""
+
 #: src/protocols/gg/gg.c:1209
-#: src/protocols/jabber/jabber.c:4325
-#: src/protocols/oscar/oscar.c:5927
-#: src/protocols/toc/toc.c:1453
-#: src/dialogs.c:2176
-#: src/dialogs.c:2185
-msgid "Change Password"
-msgstr "שנה סיסמא"
-
-#: src/protocols/gg/gg.c:1217
-msgid "Import Buddy List from Server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1223
 msgid "Export Buddy List to Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1229
+#: src/protocols/gg/gg.c:1215
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1262
+#: src/protocols/gg/gg.c:1248
 msgid "Unable to access user profile."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1263
-msgid "Gaim was unable to access this user's profile due to an error connecting to the directory server.  Please try again later."
+#: src/protocols/gg/gg.c:1249
+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
@@ -989,8 +1010,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1375
-#: src/protocols/gg/gg.c:1377
+#: src/protocols/gg/gg.c:1361 src/protocols/gg/gg.c:1363
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
@@ -998,49 +1018,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2670
-#: src/dialogs.c:2477
-#: src/gtkconv.c:813
-#: src/gtkconv.c:2656
-#: src/gtkconv.c:3798
-#: src/prpl.c:414
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2673
+#: src/dialogs.c:2452 src/gtkconv.c:1113 src/gtkconv.c:2964 src/gtkconv.c:4124
+#: src/gtkrequest.c:175 src/prpl.c:312
 msgid "Add"
 msgstr "הוסף"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277
-#: src/protocols/irc/irc.c:1116
-#: src/protocols/irc/irc.c:1445
-#: src/protocols/msn/msn.c:168
-#: src/protocols/msn/msn.c:179
-#: src/protocols/msn/msn.c:190
-#: src/protocols/msn/msn.c:201
-#: src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2402
-#: src/protocols/oscar/oscar.c:2439
-#: src/protocols/oscar/oscar.c:2474
-#: src/protocols/oscar/oscar.c:2519
-#: src/protocols/oscar/oscar.c:5605
-#: src/protocols/oscar/oscar.c:5810
-#: src/protocols/oscar/oscar.c:5858
-#: src/protocols/yahoo/yahoo.c:1197
-#: src/buddy_chat.c:312
-#: src/dialogs.c:470
-#: src/dialogs.c:481
-#: src/dialogs.c:493
-#: src/dialogs.c:2122
-#: src/dialogs.c:2237
-#: src/dialogs.c:2298
-#: src/dialogs.c:2466
-#: src/dialogs.c:2651
-#: src/dialogs.c:2800
-#: src/dialogs.c:3469
-#: src/dialogs.c:3961
-#: src/dialogs.c:4442
-#: src/dialogs.c:5015
-#: src/multi.c:177
-#: src/prpl.c:415
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1104
+#: src/protocols/irc/irc.c:1433 src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:217
+#: src/protocols/oscar/oscar.c:2404 src/protocols/oscar/oscar.c:2441
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2521
+#: src/protocols/oscar/oscar.c:5719 src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:5983 src/protocols/oscar/oscar.c:6043
+#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1188
+#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
+#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
+#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
+#: src/dialogs.c:4883 src/gtkaccount.c:1488 src/gtkconn.c:146
+#: src/gtkrequest.c:171 src/prpl.c:313 src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -1049,22 +1047,16 @@
 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/jabber.c:1721
-#: src/protocols/msn/notification.c:461
-#: src/protocols/msn/notification.c:721
-#: src/protocols/oscar/oscar.c:2598
-#: src/protocols/oscar/oscar.c:5053
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
+#: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
+#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
 msgid "Authorize"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1722
-#: src/protocols/msn/notification.c:462
-#: src/protocols/msn/notification.c:723
-#: src/protocols/oscar/oscar.c:2600
-#: src/protocols/oscar/oscar.c:5054
-#: src/dialogs.c:2465
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2603 src/protocols/oscar/oscar.c:5098
+#: src/dialogs.c:2440
 msgid "Deny"
 msgstr "דחה"
 
@@ -1072,15 +1064,11 @@
 msgid "Send message through server"
 msgstr "שלח הודעה דרך השרת"
 
-#: src/protocols/icq/gaim_icq.c:344
-#: src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2375
-#: src/protocols/jabber/jabber.c:4244
-#: src/protocols/jabber/jabber.c:4290
-#: src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:422
-#: src/protocols/msn/notification.c:1333
-#: src/protocols/napster/napster.c:515
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
+#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:425 src/protocols/msn/notification.c:1376
+#: src/protocols/napster/napster.c:496
 msgid "Unable to connect"
 msgstr "לא ניתן להתחבר"
 
@@ -1088,8 +1076,7 @@
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/protocols/icq/gaim_icq.c:497
-#: src/protocols/oscar/oscar.c:3905
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
 msgid "Nick:"
 msgstr "כינוי:"
 
@@ -1097,249 +1084,234 @@
 msgid "Gaim User"
 msgstr "משתמש ב Gaim"
 
-#: src/protocols/irc/irc.c:199
-msgid "(There was an error converting this message.  Check the 'Encoding' option in the Account Editor)"
-msgstr ""
-
-#: src/protocols/irc/irc.c:500
-#: src/protocols/irc/irc.c:2624
+#: src/protocols/irc/irc.c:186
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr ""
+
+#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2607
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr ""
 
-#: src/protocols/irc/irc.c:553
-#: src/protocols/irc/irc.c:2633
+#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2616
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr ""
 
-#: src/protocols/irc/irc.c:688
+#: src/protocols/irc/irc.c:675
 msgid "No topic is set"
 msgstr "אין כותרת"
 
-#: src/protocols/irc/irc.c:709
-#: src/protocols/irc/irc.c:1766
+#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1754
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:754
+#: src/protocols/irc/irc.c:741
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:931
-#: src/protocols/irc/irc.c:944
+#: src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:931
 msgid "User"
 msgstr "משתמש"
 
-#: src/protocols/irc/irc.c:935
+#. Splits
+#: src/protocols/irc/irc.c:922 src/protocols/irc/irc.c:3030
+#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "שרת"
 
+#: src/protocols/irc/irc.c:926 src/protocols/irc/irc.c:1081
+#: src/protocols/irc/irc.c:1646
+msgid "IRC Operator"
+msgstr ""
+
 #: src/protocols/irc/irc.c:939
-#: src/protocols/irc/irc.c:1094
-#: src/protocols/irc/irc.c:1658
-msgid "IRC Operator"
-msgstr ""
-
-#: src/protocols/irc/irc.c:952
 msgid "Channels"
 msgstr "ערוצים"
 
-#: src/protocols/irc/irc.c:958
+#: src/protocols/irc/irc.c:945
 #, c-format
 msgid "%s is an Identified User"
 msgstr ""
 
-#: src/protocols/irc/irc.c:973
+#: src/protocols/irc/irc.c:960
 #, c-format
 msgid "%ld seconds [signon: %s]"
 msgstr ""
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1094
+#: src/protocols/irc/irc.c:1081
 msgid "Rehashing server"
 msgstr ""
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1097
+#: src/protocols/irc/irc.c:1084
 msgid "No such nick/channel"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1097
-#: src/protocols/irc/irc.c:1100
-#: src/protocols/irc/irc.c:1105
-#: src/protocols/irc/irc.c:1109
-#: src/protocols/irc/irc.c:1474
-#: src/protocols/irc/irc.c:1616
+#: src/protocols/irc/irc.c:1084 src/protocols/irc/irc.c:1087
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:1604
 msgid "IRC Error"
 msgstr ""
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1087
 msgid "No such server"
 msgstr "אין שרת כזה"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1105
+#: src/protocols/irc/irc.c:1092
 msgid "No nickname given"
 msgstr ""
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1108
+#: src/protocols/irc/irc.c:1095
 msgid "You're not an IRC operator!"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1112
+#: src/protocols/irc/irc.c:1099
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "הכינוי כבר בשימוש, בחר כינוי חדש."
 
 #. Build OK Button
-#: src/protocols/irc/irc.c:1115
-#: src/protocols/msn/msn.c:167
-#: src/protocols/msn/msn.c:178
-#: src/protocols/msn/msn.c:189
-#: src/protocols/msn/msn.c:200
-#: src/protocols/oscar/oscar.c:2438
-#: src/protocols/oscar/oscar.c:2518
-#: src/protocols/oscar/oscar.c:5809
-#: src/protocols/oscar/oscar.c:5857
-#: src/protocols/yahoo/yahoo.c:1196
-#: src/dialogs.c:2233
-#: src/dialogs.c:2366
-#: src/dialogs.c:2650
-#: src/dialogs.c:2796
-#: src/dialogs.c:3954
-#: src/dialogs.c:4436
+#: src/protocols/irc/irc.c:1103 src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2440
+#: src/protocols/oscar/oscar.c:2520 src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5982 src/protocols/oscar/oscar.c:6042
+#: src/protocols/yahoo/yahoo.c:1187 src/dialogs.c:2203 src/dialogs.c:2341
+#: src/dialogs.c:2625 src/dialogs.c:2771 src/dialogs.c:3934
+#: src/gtkrequest.c:170 src/request.h:813
 msgid "OK"
 msgstr "אישור"
 
-#: src/protocols/irc/irc.c:1401
-#: src/protocols/irc/irc.c:1407
-#: src/protocols/irc/irc.c:1413
-#: src/protocols/irc/irc.c:1427
+#: src/protocols/irc/irc.c:1389 src/protocols/irc/irc.c:1395
+#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1415
 msgid "IRC CTCP info"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1437
+#: src/protocols/irc/irc.c:1425
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1440
-msgid "This requires a direct connection to be established between the two computers.  Messages sent will not pass through the IRC server"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1444
-#: src/protocols/oscar/oscar.c:2401
-#: src/protocols/oscar/oscar.c:5604
+#: src/protocols/irc/irc.c:1428
+msgid ""
+"This requires a direct connection to be established between the two "
+"computers.  Messages sent will not pass through the IRC server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:5718
 msgid "Connect"
 msgstr "התחבר"
 
-#: src/protocols/irc/irc.c:1471
+#: src/protocols/irc/irc.c:1459
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr ""
 
-#: src/protocols/irc/irc.c:1552
-#: src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292
-#: src/protocols/msn/notification.c:734
+#: src/protocols/irc/irc.c:1540 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
 msgid "Unable to write"
 msgstr "לא ניתן לכתוב"
 
-#: src/protocols/irc/irc.c:1614
+#: src/protocols/irc/irc.c:1602
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1619
+#: src/protocols/irc/irc.c:1607
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1675
-#: src/protocols/irc/irc.c:2934
+#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2917
 msgid "CTCP ClientInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1681
-#: src/protocols/irc/irc.c:2940
+#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2923
 msgid "CTCP UserInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1687
-#: src/protocols/irc/irc.c:2946
+#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2929
 msgid "CTCP Version"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1715
-#: src/protocols/irc/irc.c:2952
+#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2935
 msgid "CTCP Ping"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1966
-#: src/protocols/oscar/oscar.c:690
-#: src/protocols/toc/toc.c:255
+#: src/protocols/irc/irc.c:1948 src/protocols/oscar/oscar.c:678
+#: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "מתחבר: %s"
 
-#: src/protocols/irc/irc.c:1980
+#: src/protocols/irc/irc.c:1962 src/protocols/trepia/trepia.c:1148
 msgid "Unable to create socket"
 msgstr "אין אפשרות ליצור שקע"
 
-#: src/protocols/irc/irc.c:2221
+#: src/protocols/irc/irc.c:2203
 #, c-format
 msgid "Topic for %s is %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2317
+#: src/protocols/irc/irc.c:2299
 #, c-format
 msgid "You have left %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2318
+#: src/protocols/irc/irc.c:2300
 msgid "IRC Part"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2373
+#: src/protocols/irc/irc.c:2355
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr ""
 
+#: src/protocols/irc/irc.c:2372
+msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2377
+msgid ""
+"<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
+"<nick><BR>PING <nick></B><BR>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2385
+msgid "<B>DCC commands:<BR>CHAT <nick></B>"
+msgstr ""
+
 #: src/protocols/irc/irc.c:2390
-msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-msgstr ""
-
-#: src/protocols/irc/irc.c:2395
-msgid "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION <nick><BR>PING <nick></B><BR>"
-msgstr ""
-
-#: src/protocols/irc/irc.c:2403
-msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-msgstr ""
-
-#: src/protocols/irc/irc.c:2408
-msgid "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for CTCP commands<BR>Type /HELP DCC for DCC commands"
-msgstr ""
-
-#: src/protocols/irc/irc.c:2431
+msgid ""
+"<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
+"TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
+"W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
+"CTCP commands<BR>Type /HELP DCC for DCC commands"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2413
 msgid "<B>Unknown command</B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2491
+#: src/protocols/irc/irc.c:2473
 msgid "Channel:"
 msgstr "ערוץ:"
 
-#: src/protocols/irc/irc.c:2496
-#: src/main.c:357
+#: src/protocols/irc/irc.c:2478 src/gtkaccount.c:426 src/main.c:399
 msgid "Password:"
 msgstr "סיסמא:"
 
-#: src/protocols/irc/irc.c:2921
+#: src/protocols/irc/irc.c:2904
 msgid "DCC Chat"
 msgstr ""
 
@@ -1353,338 +1325,340 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3027
-#: src/protocols/irc/irc.c:3029
+#: src/protocols/irc/irc.c:3010 src/protocols/irc/irc.c:3012
 msgid "IRC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
-#: src/protocols/irc/irc.c:3049
-#: src/protocols/jabber/jabber.c:2962
-#: src/protocols/jabber/jabber.c:4422
-#: src/protocols/napster/napster.c:660
-msgid "Server:"
-msgstr "שרת:"
-
-#: src/protocols/irc/irc.c:3054
-#: src/protocols/jabber/jabber.c:4433
-#: src/protocols/msn/msn.c:1220
-#: src/protocols/napster/napster.c:666
-msgid "Port:"
-msgstr "יציאה:"
-
-#: src/protocols/irc/irc.c:3060
-msgid "Encoding:"
+#. Account Options
+#: src/protocols/irc/irc.c:3034 src/protocols/jabber/jabber.c:4425
+#: src/protocols/msn/msn.c:1223 src/protocols/napster/napster.c:644
+#: src/protocols/trepia/trepia.c:1377 src/gtkprefs.c:1142
+msgid "Port"
+msgstr "י_ציאה"
+
+#: src/protocols/irc/irc.c:3038
+#, fuzzy
+msgid "Encoding"
 msgstr "קידוד:"
 
+#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
+#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
+#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
+#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:582
+#: src/protocols/msn/msn.c:598 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:649 src/protocols/msn/msn.c:681
+#: src/protocols/msn/msn.c:689 src/protocols/msn/msn.c:722
+#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:744
+#: src/protocols/msn/msn.c:753 src/protocols/msn/msn.c:767
+#: src/protocols/msn/msn.c:776 src/protocols/msn/msn.c:798
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:886
+#: src/protocols/msn/msn.c:981 src/protocols/msn/msn.c:1005
+#: src/protocols/msn/msn.c:1025 src/protocols/msn/msn.c:1036
+#: src/protocols/msn/msn.c:1047 src/protocols/msn/msn.c:1071
+#: src/protocols/msn/msn.c:1083 src/protocols/msn/notification.c:127
+#: src/protocols/msn/notification.c:156 src/protocols/msn/notification.c:949
+#: src/protocols/msn/notification.c:969 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:782 src/protocols/trepia/trepia.c:1065
+#: src/protocols/trepia/trepia.c:1109 src/protocols/trepia/trepia.c:1208
+#: src/protocols/trepia/trepia.c:1264
+msgid "Write error"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:981
+msgid "Unable to change password."
+msgstr "לא ניתן לשנות את הסיסמא"
+
+#: src/protocols/jabber/jabber.c:982
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:988
+msgid "Unable to change password"
+msgstr "לא ניתן לשנות את הסיסמא"
+
 #: src/protocols/jabber/jabber.c:989
-msgid "Unable to change password."
-msgstr "לא ניתן לשנות את הסיסמא"
-
-#: src/protocols/jabber/jabber.c:990
-msgid "The current password you entered is incorrect.  Your password has not been changed."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:996
-msgid "Unable to change password"
-msgstr "לא ניתן לשנות את הסיסמא"
-
-#: src/protocols/jabber/jabber.c:997
-msgid "The new password you entered is the same as your current password.  Your password remains the same."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1174
-#: src/blist.c:721
-#: src/gtkpounce.c:299
+msgid ""
+"The new password you entered is the same as your current password.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:794 src/gtkaccount.c:148
+#: src/gtkpounce.c:307
 msgid "Unknown"
 msgstr "לא ידוע"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1183
-#: src/protocols/jabber/jabber.c:3442
-#: src/protocols/jabber/jabber.c:3493
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3436
+#: src/protocols/jabber/jabber.c:3487
 msgid "Chatty"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1185
-#: src/protocols/jabber/jabber.c:3444
-#: src/protocols/jabber/jabber.c:3501
+#: src/protocols/jabber/jabber.c:1180 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3495
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1187
-#: src/protocols/jabber/jabber.c:3445
-#: src/protocols/jabber/jabber.c:3505
-#: src/protocols/oscar/oscar.c:2816
-#: src/protocols/oscar/oscar.c:4513
-#: src/protocols/oscar/oscar.c:5728
+#: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5842
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1421
 #, c-format
 msgid "Jabber Error %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1533
+#: src/protocols/jabber/jabber.c:1528
 #, c-format
 msgid "Error %s: %s"
 msgstr "שגיאה %s%s"
 
-#: src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1531
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1714
+#: src/protocols/jabber/jabber.c:1709
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1742
-#, c-format
-msgid "The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1745
+#: src/protocols/jabber/jabber.c:1737
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1740
 msgid "No such user."
 msgstr "אין משתמש כזה"
 
 #. Should never happen.
-#: src/protocols/jabber/jabber.c:1836
-#: src/protocols/msn/notification.c:87
-#: src/protocols/msn/notification.c:88
-#: src/protocols/msn/notification.c:620
-#: src/blist.c:439
-#: src/dialogs.c:922
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:502 src/dialogs.c:855
 msgid "Buddies"
 msgstr "ידידים"
 
-#: src/protocols/jabber/jabber.c:1909
+#: src/protocols/jabber/jabber.c:1904
 msgid "Authenticating"
 msgstr "מאמת"
 
-#: src/protocols/jabber/jabber.c:1944
+#: src/protocols/jabber/jabber.c:1938
 msgid "Unknown login error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2294
+#: src/protocols/jabber/jabber.c:2288
 msgid "Password successfully changed."
 msgstr "הסיסמא הוחלפה בהצלחה"
 
-#: src/protocols/jabber/jabber.c:2339
-#: src/protocols/jabber/jabber.c:4242
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
 msgid "Connection lost"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2346
+#: src/protocols/jabber/jabber.c:2340
 msgid "Connected"
 msgstr "מחובר"
 
-#: src/protocols/jabber/jabber.c:2349
+#: src/protocols/jabber/jabber.c:2343
 msgid "Requesting Authentication Method"
 msgstr ""
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2369
-#: src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:413
-#: src/protocols/napster/napster.c:507
-#: src/protocols/yahoo/yahoo.c:995
+#: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
+#: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:489
+#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
 msgid "Connecting"
 msgstr "מתחבר"
 
-#: src/protocols/jabber/jabber.c:2695
+#: src/protocols/jabber/jabber.c:2689
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2697
+#: src/protocols/jabber/jabber.c:2691
 msgid "Unable to add buddy."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2698
+#: src/protocols/jabber/jabber.c:2692
 msgid "Jabber Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2957
+#: src/protocols/jabber/jabber.c:2951
 msgid "Room:"
 msgstr "חדר:"
 
-#: src/protocols/jabber/jabber.c:2968
+#: src/protocols/jabber/jabber.c:2956
+msgid "Server:"
+msgstr "שרת:"
+
+#: src/protocols/jabber/jabber.c:2962
 msgid "Handle:"
 msgstr "ידית:"
 
-#: src/protocols/jabber/jabber.c:2998
+#: src/protocols/jabber/jabber.c:2992
 msgid "Unable to join chat"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3234
-#: src/protocols/jabber/jabber.c:3285
-#: src/protocols/jabber/jabber.c:3710
+#: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
+#: src/protocols/jabber/jabber.c:3704
 msgid "Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3235
+#: src/protocols/jabber/jabber.c:3229
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/protocols/jabber/jabber.c:3286
-#: src/protocols/jabber/jabber.c:3345
-#: src/protocols/jabber/jabber.c:3356
-#: src/protocols/jabber/jabber.c:3736
+#: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
 msgid "Status"
 msgstr "מצב"
 
-#: src/protocols/jabber/jabber.c:3356
-#: src/protocols/jabber/jabber.c:3378
-#: src/protocols/oscar/oscar.c:5401
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
+#: src/protocols/oscar/oscar.c:5455
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
-#: src/protocols/jabber/jabber.c:3391
+#: src/protocols/jabber/jabber.c:3385
 msgid "View Error Msg"
 msgstr "הצג הודעת השגיעה"
 
-#: src/protocols/jabber/jabber.c:3403
-#: src/gtkconv.c:800
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1100
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3410
+#: src/protocols/jabber/jabber.c:3404
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3413
+#: src/protocols/jabber/jabber.c:3407
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3420
+#: src/protocols/jabber/jabber.c:3414
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3428
+#: src/protocols/jabber/jabber.c:3422
 msgid "Re-request authorization"
 msgstr ""
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3441
-#: src/protocols/jabber/jabber.c:3491
-#: src/protocols/oscar/oscar.c:2828
-#: src/protocols/oscar/oscar.c:4508
-#: src/protocols/oscar/oscar.c:5726
-#: src/protocols/yahoo/yahoo.c:1084
-#: src/protocols/zephyr/zephyr.c:865
-#: src/protocols/zephyr/zephyr.c:875
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4546
+#: src/protocols/oscar/oscar.c:5840 src/protocols/yahoo/yahoo.c:1075
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1588
 msgid "Online"
 msgstr "מחובר"
 
-#: src/protocols/jabber/jabber.c:3631
+#: src/protocols/jabber/jabber.c:3625
 msgid "Full Name"
 msgstr "שם מלא"
 
-#: src/protocols/jabber/jabber.c:3632
+#: src/protocols/jabber/jabber.c:3626
 msgid "Family Name"
 msgstr "שם משפחה"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3627
 msgid "Given Name"
 msgstr "שם פרטי"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/jabber.c:3628
 msgid "Nickname"
 msgstr "כינוי"
 
-#: src/protocols/jabber/jabber.c:3635
-#: src/dialogs.c:2921
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2896
 msgid "URL"
 msgstr "קישור"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3630
 msgid "Street Address"
 msgstr "כתובת"
 
-#: src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3631
 msgid "Extended Address"
 msgstr "מידע כתובת מורחב"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/jabber.c:3632
 msgid "Locality"
 msgstr "מיקום"
 
-#: src/protocols/jabber/jabber.c:3639
+#: src/protocols/jabber/jabber.c:3633
 msgid "Region"
 msgstr "איזור"
 
-#: src/protocols/jabber/jabber.c:3640
+#: src/protocols/jabber/jabber.c:3634
 msgid "Postal Code"
 msgstr "מיקוד"
 
-#. Line 7
-#: src/protocols/jabber/jabber.c:3641
-#: src/dialogs.c:2087
-#: src/dialogs.c:2727
+#. Country
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:2057 src/dialogs.c:2702
 msgid "Country"
 msgstr "מדינה"
 
+#: src/protocols/jabber/jabber.c:3636
+msgid "Telephone"
+msgstr "טלפון"
+
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2760
+msgid "Email"
+msgstr "דוא\"ל"
+
+#: src/protocols/jabber/jabber.c:3638
+msgid "Organization Name"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3639
+msgid "Organization Unit"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3640
+msgid "Title"
+msgstr "תואר"
+
+#: src/protocols/jabber/jabber.c:3641
+msgid "Role"
+msgstr "תפקיד"
+
 #: src/protocols/jabber/jabber.c:3642
-msgid "Telephone"
-msgstr "טלפון"
-
-#: src/protocols/jabber/jabber.c:3643
-#: src/dialogs.c:2785
-msgid "Email"
-msgstr "דוא\"ל"
-
-#: src/protocols/jabber/jabber.c:3644
-msgid "Organization Name"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:3645
-msgid "Organization Unit"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:3646
-msgid "Title"
-msgstr "תואר"
-
-#: src/protocols/jabber/jabber.c:3647
-msgid "Role"
-msgstr "תפקיד"
-
-#: src/protocols/jabber/jabber.c:3648
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: src/protocols/jabber/jabber.c:3649
-#: src/dialogs.c:2931
-#: src/gtkprefs.c:658
-#: src/gtkprefs.c:1766
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2906 src/gtkprefs.c:601
+#: src/gtkprefs.c:1821
 msgid "Description"
 msgstr "תיאור"
 
-#: src/protocols/jabber/jabber.c:3674
-msgid "All items below are optional. Enter only the information with which you feel comfortable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:3675
+#: src/protocols/jabber/jabber.c:3668
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3669
 msgid "User Identity"
 msgstr "זהות המשתמש"
 
-#: src/protocols/jabber/jabber.c:4101
+#: src/protocols/jabber/jabber.c:4098
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:4176
+#: src/protocols/jabber/jabber.c:4173
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:4198
+#: src/protocols/jabber/jabber.c:4194
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:4311
-#: src/protocols/oscar/oscar.c:5921
-#: src/protocols/toc/toc.c:1441
-#: src/dialogs.c:2261
+#: src/protocols/jabber/jabber.c:4308 src/protocols/oscar/oscar.c:6096
+#: src/protocols/toc/toc.c:1462 src/dialogs.c:2232
 msgid "Set User Info"
 msgstr ""
 
@@ -1698,21 +1672,21 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4400
-#: src/protocols/jabber/jabber.c:4402
+#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
 msgid "Jabber Protocol Plugin"
 msgstr "תוסף פרוטוקול Jabber"
 
-#: src/protocols/jabber/jabber.c:4428
-msgid "Resource:"
+#: src/protocols/jabber/jabber.c:4421
+#, fuzzy
+msgid "Resource"
 msgstr "משאב:"
 
-#: src/protocols/jabber/jabber.c:4439
-msgid "Connect Server:"
+#: src/protocols/jabber/jabber.c:4429
+#, fuzzy
+msgid "Connect server"
 msgstr "התחבר לשרת:"
 
-#: src/protocols/msn/dispatch.c:45
-#: src/protocols/msn/notification.c:229
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
 msgid "Protocol not supported"
 msgstr "הפרוטוקול אינו נתמך"
 
@@ -1720,8 +1694,7 @@
 msgid "Unable to request INF\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:68
-#: src/protocols/msn/notification.c:252
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:252
 msgid "Unable to login using MD5"
 msgstr ""
 
@@ -1729,8 +1702,7 @@
 msgid "Unable to send USR\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:82
-#: src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:82 src/protocols/msn/notification.c:266
 msgid "Requesting to send password"
 msgstr "מבקש אישור לשליחת סיסמא"
 
@@ -1746,19 +1718,16 @@
 msgid "Unable to parse message."
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:171
-#: src/protocols/msn/notification.c:405
-#: src/protocols/msn/notification.c:1342
+#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
+#: src/protocols/msn/notification.c:1385
 msgid "Unable to write to server"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:175
-#: src/protocols/msn/notification.c:1349
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
 msgid "Syncing with server"
 msgstr "מתאם עם השרת"
 
-#: src/protocols/msn/dispatch.c:189
-#: src/protocols/msn/notification.c:1363
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
 msgid "Error reading from server"
 msgstr ""
 
@@ -1830,8 +1799,7 @@
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/error.c:89
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
 msgid "Not logged in"
 msgstr ""
 
@@ -1924,191 +1892,144 @@
 msgid "Unknown Error Code %d"
 msgstr "קוד שגיאה לא מוכר %s"
 
-#: src/protocols/msn/msn.c:57
+#: src/protocols/msn/msn.c:60
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:69
-#: src/protocols/msn/msn.c:88
-#: src/protocols/msn/msn.c:146
-#: src/protocols/msn/msn.c:468
-#: src/protocols/msn/msn.c:579
-#: src/protocols/msn/msn.c:595
-#: src/protocols/msn/msn.c:630
-#: src/protocols/msn/msn.c:646
-#: src/protocols/msn/msn.c:678
-#: src/protocols/msn/msn.c:686
-#: src/protocols/msn/msn.c:719
-#: src/protocols/msn/msn.c:727
-#: src/protocols/msn/msn.c:741
-#: src/protocols/msn/msn.c:750
-#: src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:773
-#: src/protocols/msn/msn.c:795
-#: src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:883
-#: src/protocols/msn/msn.c:976
-#: src/protocols/msn/msn.c:1000
-#: src/protocols/msn/msn.c:1020
-#: src/protocols/msn/msn.c:1031
-#: src/protocols/msn/msn.c:1042
-#: src/protocols/msn/msn.c:1066
-#: src/protocols/msn/msn.c:1078
-#: src/protocols/msn/notification.c:127
-#: src/protocols/msn/notification.c:156
-#: src/protocols/msn/notification.c:907
-#: src/protocols/msn/notification.c:927
-msgid "Write error"
-msgstr ""
-
-#: src/protocols/msn/msn.c:163
+#: src/protocols/msn/msn.c:166
 msgid "Set your friendly name."
 msgstr ""
 
-#: src/protocols/msn/msn.c:164
+#: src/protocols/msn/msn.c:167
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:176
+#: src/protocols/msn/msn.c:179
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:187
+#: src/protocols/msn/msn.c:190
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:198
+#: src/protocols/msn/msn.c:201
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:210
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:208
-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:212
+#: src/protocols/msn/msn.c:211
+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:215
 msgid "Allow"
 msgstr "אפשר"
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:216
 msgid "Disallow"
 msgstr "אל תאפשר"
 
-#: src/protocols/msn/msn.c:230
-msgid "Send a mobile message."
-msgstr ""
-
-#: src/protocols/msn/msn.c:232
-msgid "Page"
-msgstr "דף"
-
 #: src/protocols/msn/msn.c:233
-#: src/about.c:169
-#: src/dialogs.c:4251
-#: src/prpl.c:515
-#: src/server.c:1462
+msgid "Send a mobile message."
+msgstr ""
+
+#: src/protocols/msn/msn.c:235
+msgid "Page"
+msgstr "דף"
+
+#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4231
+#: src/gtkrequest.c:173 src/server.c:1458
 msgid "Close"
 msgstr "סגור"
 
-#: src/protocols/msn/msn.c:296
-#: src/protocols/yahoo/yahoo.c:1135
+#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr ""
 
-#: src/protocols/msn/msn.c:309
-#: src/protocols/msn/msn.c:555
+#: src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:558
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "מרוחק מהמחשב"
 
-#: src/protocols/msn/msn.c:310
-#: src/protocols/msn/msn.c:557
-#: src/protocols/msn/state.c:31
-#: src/protocols/yahoo/yahoo.c:1062
-#: src/protocols/yahoo/yahoo.c:1269
-#: src/protocols/yahoo/yahoo.c:1345
+#: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:560
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
+#: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "חוזר עוד שניה"
 
-#: src/protocols/msn/msn.c:311
-#: src/protocols/msn/msn.c:559
-#: src/protocols/msn/state.c:29
-#: src/protocols/yahoo/yahoo.c:1064
-#: src/protocols/yahoo/yahoo.c:1271
-#: src/protocols/yahoo/yahoo.c:1346
+#: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:562
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
+#: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "עסוק"
 
-#: src/protocols/msn/msn.c:312
-#: src/protocols/msn/msn.c:561
-#: src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:1072
-#: src/protocols/yahoo/yahoo.c:1279
-#: src/protocols/yahoo/yahoo.c:1350
+#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:564
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
+#: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:313
-#: src/protocols/msn/msn.c:563
-#: src/protocols/msn/state.c:34
-#: src/protocols/yahoo/yahoo.c:1076
-#: src/protocols/yahoo/yahoo.c:1283
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:566
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
+#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "אוכל"
 
-#: src/protocols/msn/msn.c:314
-#: src/protocols/msn/msn.c:565
-#: src/protocols/zephyr/zephyr.c:862
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:568
+#: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: src/protocols/msn/msn.c:326
+#: src/protocols/msn/msn.c:329
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:337
 msgid "Set Home Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:343
 msgid "Set Work Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:349
 msgid "Set Mobile Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:358
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:365
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:387
 msgid "Send to Mobile"
 msgstr "שלח לפלאפון"
 
-#: src/protocols/msn/msn.c:659
-#, c-format
-msgid "An MSN screenname 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:663
-#: src/protocols/msn/msn.c:703
+#: src/protocols/msn/msn.c:662
+#, c-format
+msgid ""
+"An MSN screenname 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:666 src/protocols/msn/msn.c:706
 msgid "Invalid MSN screenname"
 msgstr ""
 
-#: src/protocols/msn/msn.c:699
-#, c-format
-msgid "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant %s@hotmail.com. No changes were made to your block list."
+#: src/protocols/msn/msn.c:702
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
+"%s@hotmail.com. No changes were made to your block list."
 msgstr ""
 
 #. *< api_version
@@ -2121,13 +2042,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1194
-#: src/protocols/msn/msn.c:1196
+#: src/protocols/msn/msn.c:1199 src/protocols/msn/msn.c:1201
 msgid "MSN Protocol Plugin"
 msgstr "תוסף פרוטוקול MSN"
 
-#: src/protocols/msn/msn.c:1214
-msgid "Login Server:"
+#: src/protocols/msn/msn.c:1218 src/protocols/trepia/trepia.c:1372
+#, fuzzy
+msgid "Login server"
 msgstr "שרת:"
 
 #: src/protocols/msn/notification.c:235
@@ -2138,7 +2059,7 @@
 msgid "Unable to send USR"
 msgstr ""
 
-#: src/protocols/msn/notification.c:297
+#: src/protocols/msn/notification.c:297 src/protocols/trepia/trepia.c:719
 msgid "Retrieving buddy list"
 msgstr "מקבל רשימת הידידים"
 
@@ -2158,95 +2079,96 @@
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr ""
 
-#: src/protocols/msn/notification.c:457
+#: src/protocols/msn/notification.c:462
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:715
+#: src/protocols/msn/notification.c:741
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:1126
-msgid "Got invalid XFR"
-msgstr ""
-
 #: src/protocols/msn/notification.c:1168
+msgid "Got invalid XFR"
+msgstr ""
+
+#: src/protocols/msn/notification.c:1210
 msgid "Unable to transfer to notification server"
 msgstr ""
 
-#: src/protocols/msn/notification.c:1304
+#: src/protocols/msn/notification.c:1346
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute(s). You will automatically be signed out at that time. Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minute(s). 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 ""
-
-#: src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1082
-#: src/gtkpounce.c:569
-#: src/gtkprefs.c:1461
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr ""
+
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1513
 msgid "Idle"
 msgstr "חוסר פעילות"
 
-#: src/protocols/msn/switchboard.c:122
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:126
+#: src/protocols/msn/switchboard.c:128
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:230
+#: src/protocols/msn/switchboard.c:250
 msgid "An MSN message may not have been received."
 msgstr "יכול להיות שהודעת הMSN לא התקבלה."
 
-#: src/protocols/napster/napster.c:249
+#: src/protocols/napster/napster.c:232
 msgid "Unable to read header from server"
 msgstr ""
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr ""
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:337
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#: src/protocols/napster/napster.c:345
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "נותקת מהשרת."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:401
+#: src/protocols/napster/napster.c:382
 #, c-format
 msgid "%s requested your information"
 msgstr ""
 
-#: src/protocols/napster/napster.c:431
-msgid "You were disconnected from the server, because you logged on from a different location"
+#: src/protocols/napster/napster.c:412
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
 msgstr ""
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:437
+#: src/protocols/napster/napster.c:418
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:551
-#: src/gtkblist.c:1512
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1572
 msgid "Get Info"
 msgstr "הצג פרטים"
 
-#: src/protocols/napster/napster.c:565
-#: src/protocols/oscar/oscar.c:5124
-#: src/protocols/toc/toc.c:1195
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
+#: src/protocols/toc/toc.c:1201
 msgid "Join what group:"
 msgstr ""
 
@@ -2260,310 +2182,303 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:641
-#: src/protocols/napster/napster.c:643
+#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
 msgid "NAPSTER Protocol Plugin"
 msgstr "תוסף פרוטוקול Napster"
 
+#: src/protocols/oscar/oscar.c:174
+msgid "Invalid error"
+msgstr "מספר שגיאה לא תקף."
+
+#: src/protocols/oscar/oscar.c:175
+msgid "Invalid SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:176
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:177
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:179
+msgid "Service unavailable"
+msgstr "השירות אינו זמין"
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service not defined"
+msgstr "שירות אינו מוגדר"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:184
+msgid "Refused by client"
+msgstr "החיבור נדחה על ידי הלקוח."
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Reply too big"
+msgstr "המענה גדול מדיי"
+
+#: src/protocols/oscar/oscar.c:186
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:187
+msgid "Request denied"
+msgstr "הבקשה נדחית."
+
+#: src/protocols/oscar/oscar.c:188
+msgid "Busted SNAC payload"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:189
-msgid "Invalid error"
-msgstr "מספר שגיאה לא תקף."
+msgid "Insufficient rights"
+msgstr "אין די הרשאות"
 
 #: src/protocols/oscar/oscar.c:190
-msgid "Invalid SNAC"
+msgid "In local permit/deny"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:191
-msgid "Rate to host"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Rate to client"
-msgstr ""
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:193
+msgid "User temporarily unavailable"
+msgstr "המשתמש אינו זמין באופן זמני"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Service unavailable"
-msgstr "השירות אינו זמין"
+msgid "No match"
+msgstr "אין התאמה"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Service not defined"
-msgstr "שירות אינו מוגדר"
+msgid "List overflow"
+msgstr "גלישת מחסנית"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Obsolete SNAC"
+msgid "Request ambiguous"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Not supported by host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:198
-msgid "Not supported by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:199
-msgid "Refused by client"
-msgstr "החיבור נדחה על ידי הלקוח."
-
-#: src/protocols/oscar/oscar.c:200
-msgid "Reply too big"
-msgstr "המענה גדול מדיי"
-
-#: src/protocols/oscar/oscar.c:201
-msgid "Responses lost"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:202
-msgid "Request denied"
-msgstr "הבקשה נדחית."
-
-#: src/protocols/oscar/oscar.c:203
-msgid "Busted SNAC payload"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:204
-msgid "Insufficient rights"
-msgstr "אין די הרשאות"
-
-#: src/protocols/oscar/oscar.c:205
-msgid "In local permit/deny"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:206
-msgid "Too evil (sender)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:207
-msgid "Too evil (receiver)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:208
-msgid "User temporarily unavailable"
-msgstr "המשתמש אינו זמין באופן זמני"
-
-#: src/protocols/oscar/oscar.c:209
-msgid "No match"
-msgstr "אין התאמה"
-
-#: src/protocols/oscar/oscar.c:210
-msgid "List overflow"
-msgstr "גלישת מחסנית"
-
-#: src/protocols/oscar/oscar.c:211
-msgid "Request ambiguous"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:212
 msgid "Queue full"
 msgstr "הרשימה מלאה"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:198
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:486
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:542
-#: src/protocols/toc/toc.c:602
-#: src/protocols/toc/toc.c:615
-#: src/protocols/toc/toc.c:678
+#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
 msgid "Disconnected."
 msgstr "מנותק."
 
-#: src/protocols/oscar/oscar.c:554
-#: src/protocols/toc/toc.c:855
+#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:558
 msgid "Chat is currently unavailable"
 msgstr "השיחה אינה זמינה כעט."
 
-#: src/protocols/oscar/oscar.c:644
-#: src/protocols/oscar/oscar.c:701
+#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:686
+#: src/protocols/oscar/oscar.c:674
 msgid "Unable to login to AIM"
 msgstr "לאניתן להתחבר ל AIM"
 
-#: src/protocols/oscar/oscar.c:793
-#: src/protocols/oscar/oscar.c:1179
+#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
 msgid "Could Not Connect"
 msgstr "לא ניתן להתחבר"
 
-#: src/protocols/oscar/oscar.c:800
+#: src/protocols/oscar/oscar.c:790
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:880
-#: src/protocols/oscar/oscar.c:885
+#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
+#: src/protocols/oscar/oscar.c:875
 msgid "File Transfer Aborted"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:868
+#: src/protocols/oscar/oscar.c:858
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to create new connection."
 msgstr ""
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1069
-#: src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
 msgid "Incorrect nickname or password."
 msgstr "שם משתמש או סיסמה שגויים"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1073
+#: src/protocols/oscar/oscar.c:1062
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1077
+#: src/protocols/oscar/oscar.c:1066
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1081
-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:1070
+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 דקות ונסה שנית. אם תמשיך לנסות, "
+"תיאלץ להמתין אפילו יותר."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1085
+#: src/protocols/oscar/oscar.c:1074
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1089
-#: src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
 msgid "Authentication Failed"
 msgstr "האימות נכשל"
 
-#: src/protocols/oscar/oscar.c:1117
+#: src/protocols/oscar/oscar.c:1106
 msgid "Internal Error"
 msgstr "שגיאה פנימית"
 
-#: src/protocols/oscar/oscar.c:1218
-#: src/protocols/oscar/oscar.c:1248
-#: src/protocols/oscar/oscar.c:1336
-#, 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:1221
-#: src/protocols/oscar/oscar.c:1251
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1326
+#, 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:1211 src/protocols/oscar/oscar.c:1241
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:1329
 msgid "Gaim was Unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1896
-#: src/protocols/oscar/oscar.c:5442
+#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5556
 #, c-format
 msgid "Direct IM with %s established"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2225
-#: src/protocols/oscar/oscar.c:2247
+#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2393
+#: src/protocols/oscar/oscar.c:2395
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2396
-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:2428
+#: src/protocols/oscar/oscar.c:2398
+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:2430
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2436
+#: src/protocols/oscar/oscar.c:2438
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2437
+#: src/protocols/oscar/oscar.c:2439
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2465
-#, 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:2470
-#: src/protocols/oscar/oscar.c:2472
+#: src/protocols/oscar/oscar.c:2467
+#, 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:2472 src/protocols/oscar/oscar.c:2474
 msgid "Request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2508
-#: src/protocols/oscar/oscar.c:2510
-#: src/protocols/oscar/oscar.c:2517
-#: src/protocols/oscar/oscar.c:2588
-#: src/protocols/oscar/oscar.c:2608
-#: src/protocols/oscar/oscar.c:2983
-#: src/protocols/oscar/oscar.c:3035
-#: src/protocols/oscar/oscar.c:5045
-#: src/protocols/oscar/oscar.c:5091
+#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
+#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5135
 msgid "No reason given."
 msgstr "לא ניתנה סיבה."
 
-#: src/protocols/oscar/oscar.c:2516
+#: src/protocols/oscar/oscar.c:2518
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2588
+#: src/protocols/oscar/oscar.c:2591
 #, 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:2596
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the following reason:\n"
+"The user %u has denied your request to add them to your contact list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2612
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2616
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2624
+#: src/protocols/oscar/oscar.c:2627
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2572,7 +2487,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2632
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2581,7 +2496,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2640
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2590,174 +2505,206 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2661
+#: src/protocols/oscar/oscar.c:2664
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2667
+#: src/protocols/oscar/oscar.c:2670
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2671
+#: src/protocols/oscar/oscar.c:2674
 msgid "Decline"
 msgstr "דחה"
 
-#: src/protocols/oscar/oscar.c:2753
-#: src/protocols/oscar/oscar.c:2762
-#: src/protocols/oscar/oscar.c:2771
-#: src/protocols/oscar/oscar.c:2780
-#: src/protocols/oscar/oscar.c:2789
-#: src/protocols/oscar/oscar.c:2798
-#: src/protocols/oscar/oscar.c:2814
-#: src/protocols/oscar/oscar.c:4522
-#: src/protocols/oscar/oscar.c:5731
-#, c-format
+#: src/protocols/oscar/oscar.c:2756
+#, 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:2765
+#, 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:2774
+#, 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:2783
+#, 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:2792
+#, 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:2801
+#, 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:2817 src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:5845
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
-#: src/protocols/oscar/oscar.c:2818
-#: src/protocols/oscar/oscar.c:4516
-#: src/protocols/oscar/oscar.c:5729
+#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:5843
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: src/protocols/oscar/oscar.c:2820
-#: src/protocols/oscar/oscar.c:4519
-#: src/protocols/oscar/oscar.c:5730
+#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
+#: src/protocols/oscar/oscar.c:5844
 msgid "Occupied"
 msgstr "עסוק"
 
-#: src/protocols/oscar/oscar.c:2824
+#: src/protocols/oscar/oscar.c:2827
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2884
+#: src/protocols/oscar/oscar.c:2887
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2886
+#: src/protocols/oscar/oscar.c:2889
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2945
+#: src/protocols/oscar/oscar.c:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2946
+#: src/protocols/oscar/oscar.c:2949
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2981
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3033
+#: src/protocols/oscar/oscar.c:3036
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3067
+#: src/protocols/oscar/oscar.c:3070 src/gtkaccount.c:281
 msgid "Buddy Icon"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3073
 msgid "Voice"
 msgstr "קול"
 
-#: src/protocols/oscar/oscar.c:3073
-#: src/protocols/oscar/oscar.c:5755
+#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5874
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3076
-#: src/gtkblist.c:1521
+#: src/protocols/oscar/oscar.c:3079 src/gtkblist.c:1581
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/protocols/oscar/oscar.c:3079
-#: src/protocols/oscar/oscar.c:5767
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5890
 msgid "Get File"
 msgstr "קבל קובץ"
 
-#: src/protocols/oscar/oscar.c:3082
-#: src/protocols/oscar/oscar.c:5761
+#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5882
 msgid "Send File"
 msgstr "שלח קובץ"
 
-#: src/protocols/oscar/oscar.c:3086
+#: src/protocols/oscar/oscar.c:3089
 msgid "Games"
 msgstr "משחקים"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3092
 msgid "Add-Ins"
 msgstr "תוספות"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3095
 msgid "Send Buddy List"
 msgstr "שלח רשימת הידידים"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3098
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3098
-msgid "AP User"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:3101
-msgid "ICQ RTF"
+msgid "AP User"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:3104
-msgid "Nihilist"
+msgid "ICQ RTF"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:3107
-msgid "ICQ Server Relay"
+msgid "Nihilist"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:3110
-msgid "ICQ Unknown"
+msgid "ICQ Server Relay"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:3113
-msgid "Trillian Encryption"
+msgid "ICQ Unknown"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:3116
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3119
 msgid "ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3156
-msgid "<i>Unable to display information because it was sent in an unknown encoding.</i>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3163
+#: src/protocols/oscar/oscar.c:3159
+msgid ""
+"<i>Unable to display information because it was sent in an unknown encoding."
+"</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3166
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3174
-#, c-format
-msgid "Idle : <b>%s</b>"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:3177
+#, c-format
+msgid "Idle : <b>%s</b>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3180
 msgid "Idle: <b>Active</b>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3179
+#: src/protocols/oscar/oscar.c:3182
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2766,288 +2713,316 @@
 "<hr>\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3211
+#: src/protocols/oscar/oscar.c:3214
 msgid "<i>User has no away message</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3225
 msgid "Client Capabilities: "
 msgstr "יכולות הלקוח:"
 
-#: src/protocols/oscar/oscar.c:3228
+#: src/protocols/oscar/oscar.c:3231
 msgid "<i>No Information Provided</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3252
+#: src/protocols/oscar/oscar.c:3255
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3612
+#: src/protocols/oscar/oscar.c:3642
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3613
-msgid "The last message was not sent because you are over the rate limit.  Please wait 10 seconds and try again."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3673
-msgid "You have been disconnected because you have signed on with this screen name at another location."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3675
+#: src/protocols/oscar/oscar.c:3643
+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:3704
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3706
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3903
+#: src/protocols/oscar/oscar.c:3934
 msgid "UIN:"
 msgstr "מספר זיהוי"
 
-#: src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3939
 msgid "First Name:"
 msgstr "שם פרטי:"
 
-#: src/protocols/oscar/oscar.c:3911
+#: src/protocols/oscar/oscar.c:3942
 msgid "Last Name:"
 msgstr "שם משפחה:"
 
-#: src/protocols/oscar/oscar.c:3914
-#: src/protocols/oscar/oscar.c:3920
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
 msgid "Email Address:"
 msgstr "כתובת דוא\"ל"
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:3956
 msgid "Mobile Phone:"
 msgstr "מספר פלאפון:"
 
-#: src/protocols/oscar/oscar.c:3928
+#: src/protocols/oscar/oscar.c:3959
 msgid "Gender:"
 msgstr "מין"
 
-#: src/protocols/oscar/oscar.c:3928
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "נקבה"
 
-#: src/protocols/oscar/oscar.c:3928
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "זכר"
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:3968
 msgid "Birthday:"
 msgstr "תאריך לידה:"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3973
 msgid "Age:"
 msgstr "גיל:"
 
-#: src/protocols/oscar/oscar.c:3945
+#: src/protocols/oscar/oscar.c:3976
 msgid "Personal Web Page:"
 msgstr "כתובת אינטרנט:"
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3979
 msgid "Additional Information:"
 msgstr "מידע נוסף:"
 
-#: src/protocols/oscar/oscar.c:3952
+#: src/protocols/oscar/oscar.c:3983
 msgid "Home Address:"
 msgstr "כתובת:"
 
-#: src/protocols/oscar/oscar.c:3954
-#: src/protocols/oscar/oscar.c:3970
+#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
 msgid "Address:"
 msgstr "רחוב:"
 
-#: src/protocols/oscar/oscar.c:3957
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
 msgid "City:"
 msgstr "עיר:"
 
-#: src/protocols/oscar/oscar.c:3960
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
 msgid "State:"
 msgstr "אזור:"
 
-#: src/protocols/oscar/oscar.c:3963
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
 msgid "Zip Code:"
 msgstr "מיקוד:"
 
-#: src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:3999
 msgid "Work Address:"
 msgstr "כתובת בעבודה:"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4015
 msgid "Work Information:"
 msgstr "אודות העבודה"
 
-#: src/protocols/oscar/oscar.c:3986
+#: src/protocols/oscar/oscar.c:4017
 msgid "Company:"
 msgstr "חברה:"
 
-#: src/protocols/oscar/oscar.c:3989
+#: src/protocols/oscar/oscar.c:4020
 msgid "Division:"
 msgstr "מחלקה:"
 
-#: src/protocols/oscar/oscar.c:3992
+#: src/protocols/oscar/oscar.c:4023
 msgid "Position:"
 msgstr "תפקיד:"
 
-#: src/protocols/oscar/oscar.c:3995
+#: src/protocols/oscar/oscar.c:4026
 msgid "Web Page:"
 msgstr "אתר האינטרנט:"
 
-#: src/protocols/oscar/oscar.c:4063
+#: src/protocols/oscar/oscar.c:4094
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4081
+#: src/protocols/oscar/oscar.c:4112
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4102
+#: src/protocols/oscar/oscar.c:4133
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4104
-msgid "Account Confirmation Requested"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4132
-msgid "Error Changing Account Info"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:4135
-#, 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:4138
-#, 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:4141
-#, 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:4144
-#, 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:4147
-#, 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:4150
-#, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4153
-#, c-format
-msgid "Error 0x%04x: Unknown error."
+msgid "Account Confirmation Requested"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:4163
+msgid "Error Changing Account Info"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4166
+#, 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:4169
+#, 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:4172
+#, 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:4175
+#, 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:4178
+#, 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:4181
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4184
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4194
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4164
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4200
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4393
-msgid "Unable to set AIM profile."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4394
-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:4423
-#, c-format
-msgid "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:4425
+msgid "Unable to set AIM profile."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4426
+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:4456
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4441
+#: src/protocols/oscar/oscar.c:4477
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4442
-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:4481
-#, c-format
-msgid "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it and set you away."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4483
+#: src/protocols/oscar/oscar.c:4478
+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:4518
+#, c-format
+msgid ""
+"The maximum away message length of %d bytes has been exceeded.  Gaim has "
+"truncated it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4520
 msgid "Away message too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4696
-msgid "Unable To Retrive Buddy List"
+#: src/protocols/oscar/oscar.c:4740
+#, fuzzy
+msgid "Unable To Retrieve Buddy List"
 msgstr "לא ניתן לקבל רשימת הידידים"
 
-#: src/protocols/oscar/oscar.c:4697
-msgid "Gaim was temporarily unable to retrive 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:4788
-#: src/protocols/oscar/oscar.c:4789
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:4741
+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:4832 src/protocols/oscar/oscar.c:4833
+#: src/protocols/oscar/oscar.c:4838
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4958
-#, 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:4958
-#: src/protocols/oscar/oscar.c:4971
+#: src/protocols/oscar/oscar.c:5002
+#, 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:5002 src/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(ללא שם)"
 
-#: src/protocols/oscar/oscar.c:4959
-#: src/protocols/oscar/oscar.c:4972
+#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "לא ניתן להוסיף"
 
-#: src/protocols/oscar/oscar.c:4971
-#, 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:5006
-#, 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:5012
+#: src/protocols/oscar/oscar.c:5015
+#, 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:5050
+#, 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:5056
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5045
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3055,132 +3030,154 @@
 msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5131
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5132
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5091
+#: src/protocols/oscar/oscar.c:5135
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the following reason:\n"
+"The user %s has denied your request to add them to your contact list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5092
+#: src/protocols/oscar/oscar.c:5136
 msgid "Authorization Denied"
 msgstr "ההרשאה נדחית."
 
-#: src/protocols/oscar/oscar.c:5129
-#: src/protocols/toc/toc.c:1200
+#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
 msgid "Exchange:"
 msgstr "החלפה:"
 
-#: src/protocols/oscar/oscar.c:5349
+#: src/protocols/oscar/oscar.c:5393
 msgid "<b>Status:</b> "
 msgstr "<b>מצב:</b> "
 
-#: src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5402
 msgid "<b>Logged In:</b> "
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5365
+#: src/protocols/oscar/oscar.c:5409
 msgid "<b>Capabilities:</b> "
 msgstr "<b>יכולות</b> "
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5415
+#, fuzzy
+msgid "<b>Available:</b> "
+msgstr "<b>יכולות</b> "
+
+#: src/protocols/oscar/oscar.c:5423
 msgid "<b>Status:</b> Not Authorized"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5377
-#: src/gtkblist.c:856
+#: src/protocols/oscar/oscar.c:5427 src/gtkblist.c:895
 msgid "<b>Status:</b> Offline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5403
+#: src/protocols/oscar/oscar.c:5457
 msgid "Offline"
 msgstr "מנותק"
 
-#: src/protocols/oscar/oscar.c:5584
+#: src/protocols/oscar/oscar.c:5698
 msgid "Unable to open Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5597
+#: src/protocols/oscar/oscar.c:5711
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5600
-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:5745
+#: src/protocols/oscar/oscar.c:5714
+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:5859
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5779
+#: src/protocols/oscar/oscar.c:5903
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5800
+#: src/protocols/oscar/oscar.c:5924
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5801
+#: src/protocols/oscar/oscar.c:5925
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5807
+#: src/protocols/oscar/oscar.c:5931
 msgid "New screenname formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5856
-msgid "Change Address To:"
-msgstr "שנה כתובת ל:"
-
-#: src/protocols/oscar/oscar.c:5869
-msgid "You are awaiting authorization from the following buddies:<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5894
-msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5899
-#, c-format
-msgid "%s<BR><BR>You can re-request authorization from these buddies by right-clicking on them and clicking \"Re-request authorization.\""
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5934
-msgid "Change Password (URL)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5945
-msgid "Format Screenname"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5951
-msgid "Confirm Account"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5957
-msgid "Display Current Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5963
-msgid "Change Current Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5972
-msgid "Show Buddies Awaiting Authorization"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:5980
+msgid "Change Address To:"
+msgstr "שנה כתובת ל:"
+
+#: src/protocols/oscar/oscar.c:5994
+msgid "You are awaiting authorization from the following buddies:<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6019
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6024
+#, c-format
+msgid ""
+"%s<BR><BR>You can re-request authorization from these buddies by right-"
+"clicking on them and clicking \"Re-request authorization.\""
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6040
+#, fuzzy
+msgid "Available Message:"
+msgstr "זמין"
+
+#: src/protocols/oscar/oscar.c:6041
+msgid "Please talk to me, I'm lonely! (and single)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6103
+#, fuzzy
+msgid "Set Available Message"
+msgstr "לא זמין"
+
+#: src/protocols/oscar/oscar.c:6117
+msgid "Change Password (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6128
+msgid "Format Screenname"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6134
+msgid "Confirm Account"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6140
+msgid "Display Current Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6146
+msgid "Change Current Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6155
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6163
 msgid "Search for Buddy by Email"
 msgstr ""
 
@@ -3194,198 +3191,208 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6100
-#: src/protocols/oscar/oscar.c:6102
+#: src/protocols/oscar/oscar.c:6284 src/protocols/oscar/oscar.c:6286
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "תוסף פרוטוקולים Aim/ICQ"
 
-#: src/protocols/oscar/oscar.c:6120
-msgid "Auth Host:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6126
-msgid "Auth Port:"
-msgstr ""
-
-#: src/protocols/toc/toc.c:190
+#: src/protocols/oscar/oscar.c:6303
+msgid "Auth host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6308
+msgid "Auth port"
+msgstr ""
+
+#: src/protocols/toc/toc.c:174
 #, c-format
 msgid "Looking up %s"
 msgstr "מחפש את %s..."
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Unable to write file %s."
 msgstr "אין אפשרות לכתוב אל הקובץ %s"
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:497
 #, c-format
 msgid "Unable to read file %s."
 msgstr "אין אפשרות לקרוא את הקובץ %s."
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "%s not currently logged in."
 msgstr ""
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:509
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "אבדה הודעה; אתה עובר על הגבלת המהירות של השרת."
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "אתה שולח הודעות אל %s מהר מדיי."
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:524
 msgid "Failure."
 msgstr "כישלון."
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:527
 msgid "Too many matches."
 msgstr "יותר מידי תוצאות"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:530
 msgid "Need more qualifiers."
 msgstr "החיפוש זקוק ליותר מגדירים."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:533
 msgid "Dir service temporarily unavailable."
 msgstr "שירות המדריך אינו זמין זמנית."
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:536
 msgid "Email lookup restricted."
 msgstr "חיפוש הדוא\"ל מוגבל."
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:539
 msgid "Keyword ignored."
 msgstr "יתעלם ממילת המפתח."
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:542
 msgid "No keywords."
 msgstr "אין מילות מפתח."
 
-#: src/protocols/toc/toc.c:541
+#: src/protocols/toc/toc.c:545
 msgid "User has no directory information."
 msgstr ""
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:549
 msgid "Country not supported."
 msgstr "המדינה אינה נתמכת."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "כשל מוכר: %s"
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:558
 msgid "The service is temporarily unavailable."
 msgstr "השירות אינו זמין זמנית."
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:561
 msgid "Your warning level is currently too high to log in."
 msgstr "רמת האזהרה שלך גבוהה מדיי כרגע מכדי להיכנס למערכת."
 
-#: src/protocols/toc/toc.c:560
-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:562
+#: src/protocols/toc/toc.c:564
+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:566
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "ארעה שגיאה לא ידועה בזמן ניסיון לפתיחת %s"
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:569
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:589
 msgid "Connection Closed"
 msgstr "החיבור נסגר."
 
-#: src/protocols/toc/toc.c:620
+#: src/protocols/toc/toc.c:627
 msgid "Waiting for reply..."
 msgstr "ממתין לתשובה..."
 
-#: src/protocols/toc/toc.c:685
+#: src/protocols/toc/toc.c:692
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:874
+#: src/protocols/toc/toc.c:880
 msgid "Password Change Successful"
 msgstr "הסיסמה שלך שונתה בהצלחה."
 
-#: src/protocols/toc/toc.c:878
+#: src/protocols/toc/toc.c:884
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:879
-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:1323
+#: src/protocols/toc/toc.c:885
+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:1344
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1447
+#: src/protocols/toc/toc.c:1468
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1570
+#: src/protocols/toc/toc.c:1591
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "לא ניתן לפתוח %s לכתיבה"
 
-#: src/protocols/toc/toc.c:1606
+#: src/protocols/toc/toc.c:1627
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1651
-#: src/protocols/toc/toc.c:1691
-#: src/protocols/toc/toc.c:1903
+#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
+#: src/protocols/toc/toc.c:1924
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1836
 msgid "Could not connect for transfer!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1848
+#: src/protocols/toc/toc.c:1869
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1948
-#: src/gtkft.c:1059
+#: src/protocols/toc/toc.c:1969 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1982
-#: src/protocols/toc/toc.c:1989
+#: src/protocols/toc/toc.c:2003
+#, 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:2010
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -3400,69 +3407,186 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2064
-#: src/protocols/toc/toc.c:2066
+#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
 msgid "TOC Protocol Plugin"
 msgstr "תוסף פרוטוקול TOC"
 
-#: src/protocols/toc/toc.c:2084
-msgid "TOC Host:"
+#: src/protocols/toc/toc.c:2104
+#, fuzzy
+msgid "TOC host"
 msgstr "מארח TOC:"
 
-#: src/protocols/toc/toc.c:2090
-msgid "TOC Port:"
+#: src/protocols/toc/toc.c:2108
+#, fuzzy
+msgid "TOC port"
 msgstr "יציאה TOC:"
 
-#: src/protocols/yahoo/yahoo.c:602
+#. Basic Profile group.
+#: src/protocols/trepia/trepia.c:296
+msgid "Basic Profile"
+msgstr ""
+
+#. First Name
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1990 src/dialogs.c:2644
+msgid "First Name"
+msgstr "שם פרטי"
+
+#. Last Name
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:2013 src/dialogs.c:2664
+msgid "Last Name"
+msgstr "שם משפחה"
+
+#. Gender
+#: src/protocols/trepia/trepia.c:312
+#, fuzzy
+msgid "Gender"
+msgstr "מין"
+
+#. Age
+#: src/protocols/trepia/trepia.c:318
+#, fuzzy
+msgid "Age"
+msgstr "גיל:"
+
+#. Homepage
+#: src/protocols/trepia/trepia.c:322
+msgid "Homepage"
+msgstr ""
+
+#. E-Mail Address
+#: src/protocols/trepia/trepia.c:327
+#, fuzzy
+msgid "E-Mail Address"
+msgstr "כתובת דוא\"ל"
+
+#: src/protocols/trepia/trepia.c:333
+#, fuzzy
+msgid "Profile Information"
+msgstr "אודות העבודה"
+
+#. Instant Messagers
+#: src/protocols/trepia/trepia.c:339
+#, fuzzy
+msgid "Instant Messagers"
+msgstr "_רשום את כל ההודעות"
+
+#. AIM
+#: src/protocols/trepia/trepia.c:343
+#, fuzzy
+msgid "AIM"
+msgstr "הודעה"
+
+#. ICQ
+#: src/protocols/trepia/trepia.c:347
+msgid "ICQ UIN"
+msgstr ""
+
+#. MSN
+#: src/protocols/trepia/trepia.c:351
+msgid "MSN"
+msgstr ""
+
+#. Yahoo
+#: src/protocols/trepia/trepia.c:355
+msgid "Yahoo"
+msgstr ""
+
+#. I'm From
+#: src/protocols/trepia/trepia.c:360
+msgid "I'm From"
+msgstr ""
+
+#. State
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2046 src/dialogs.c:2693
+msgid "State"
+msgstr "מחוז"
+
+#. Call the dialog.
+#: src/protocols/trepia/trepia.c:377
+msgid "Set your Trepia profile data."
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2088 src/dialogs.c:2269
+#: src/dialogs.c:3435 src/dialogs.c:4240 src/dialogs.c:4878
+#: src/gtkrequest.c:177
+msgid "Save"
+msgstr "שמור"
+
+#: src/protocols/trepia/trepia.c:523
+#, fuzzy
+msgid "Set Profile"
+msgstr "בחר קובץ"
+
+#: src/protocols/trepia/trepia.c:559
+msgid "Visit Homepage"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:905 src/protocols/trepia/trepia.c:908
+msgid "Local Users"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:1004
+#, fuzzy
+msgid "Read error"
+msgstr "מספר שגיאה לא תקף."
+
+#: src/protocols/trepia/trepia.c:1105
+#, fuzzy
+msgid "Logging in"
+msgstr "רישום"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/trepia/trepia.c:1353 src/protocols/trepia/trepia.c:1355
+#, fuzzy
+msgid "Trepia Protocol Plugin"
+msgstr "תוסף פרוטוקול TOC"
+
+#: src/protocols/yahoo/yahoo.c:592
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1066
-#: src/protocols/yahoo/yahoo.c:1273
-#: src/protocols/yahoo/yahoo.c:1347
+#: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
+#: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
 msgstr "לא נמצא בבית"
 
-#: src/protocols/yahoo/yahoo.c:1068
-#: src/protocols/yahoo/yahoo.c:1275
-#: src/protocols/yahoo/yahoo.c:1348
+#: src/protocols/yahoo/yahoo.c:1059 src/protocols/yahoo/yahoo.c:1267
+#: src/protocols/yahoo/yahoo.c:1340
 msgid "Not At Desk"
 msgstr "לא ליד השולחן"
 
-#: src/protocols/yahoo/yahoo.c:1070
-#: src/protocols/yahoo/yahoo.c:1277
-#: src/protocols/yahoo/yahoo.c:1349
+#: src/protocols/yahoo/yahoo.c:1061 src/protocols/yahoo/yahoo.c:1269
+#: src/protocols/yahoo/yahoo.c:1341
 msgid "Not In Office"
 msgstr "לא נמצא במשרד"
 
-#: src/protocols/yahoo/yahoo.c:1074
-#: src/protocols/yahoo/yahoo.c:1281
-#: src/protocols/yahoo/yahoo.c:1351
+#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1273
+#: src/protocols/yahoo/yahoo.c:1343
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: src/protocols/yahoo/yahoo.c:1078
-#: src/protocols/yahoo/yahoo.c:1285
-#: src/protocols/yahoo/yahoo.c:1353
+#: src/protocols/yahoo/yahoo.c:1069 src/protocols/yahoo/yahoo.c:1277
+#: src/protocols/yahoo/yahoo.c:1345
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1194
+#: src/protocols/yahoo/yahoo.c:1185
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1205
+#: src/protocols/yahoo/yahoo.c:1196
 msgid "Activate ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1430
-msgid "Pager Host:"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1436
-msgid "Pager Port:"
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3473,56 +3597,64 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1522
-#: src/protocols/yahoo/yahoo.c:1524
+#: src/protocols/yahoo/yahoo.c:1465 src/protocols/yahoo/yahoo.c:1467
 msgid "Yahoo Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/yahoo/yahoo.c:1484
+msgid "Pager host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1489
+msgid "Pager port"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:337
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:339
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:341
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:345
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:573
-#: src/protocols/zephyr/zephyr.c:574
+#: src/protocols/zephyr/zephyr.c:574 src/protocols/zephyr/zephyr.c:575
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: src/protocols/zephyr/zephyr.c:598
-msgid "Already logged in with Zephyr"
-msgstr ""
-
 #: src/protocols/zephyr/zephyr.c:599
-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:847
+msgid "Already logged in with Zephyr"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:600
+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:848
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:887
+#: src/protocols/zephyr/zephyr.c:888
 msgid "Class:"
 msgstr "מחלקה:"
 
-#: src/protocols/zephyr/zephyr.c:892
+#: src/protocols/zephyr/zephyr.c:893
 msgid "Instance:"
 msgstr "תצורה:"
 
-#: src/protocols/zephyr/zephyr.c:897
+#: src/protocols/zephyr/zephyr.c:898
 msgid "Recipient:"
 msgstr "נמען:"
 
@@ -3536,42 +3668,57 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1029
-#: src/protocols/zephyr/zephyr.c:1031
+#: src/protocols/zephyr/zephyr.c:1030 src/protocols/zephyr/zephyr.c:1032
 msgid "Zephyr Protocol Plugin"
 msgstr "תוסף פרוטוקול Zephyr"
 
-#: src/about.c:74
+#: src/about.c:56
 #, c-format
 msgid "About Gaim v%s"
 msgstr "אודות Gaim גירסה %s"
 
-#: src/about.c:106
-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:116
+#: src/about.c:88
+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:98
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 
-#: src/about.c:120
+#: src/about.c:102
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr ""
 
-#: src/about.c:122
-msgid "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian 'ChipX86' Hammond (developer & webmaster)<BR>  Herman Bloggs (win32 port) &lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' Doliner (developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
-msgstr ""
-
-#: src/about.c:137
+#: src/about.c:104
+msgid ""
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:"
+"bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
+"'ChipX86' Hammond (developer & webmaster)<BR>  Herman Bloggs (win32 port) "
+"&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">hermanator12002@yahoo.com</"
+"A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' Doliner "
+"(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
+msgstr ""
+
+#: src/about.c:119
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr ""
 
-#: src/about.c:147
+#: src/about.c:129
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr ""
 
-#: src/about.c:149
-msgid "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
+#: src/about.c:131
+msgid ""
+"  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
+"lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
+"Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
+"&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
+"Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 msgstr ""
 
 #: src/away.c:222
@@ -3582,88 +3729,96 @@
 msgid "I'm Back!"
 msgstr "חזרתי"
 
-#: src/away.c:387
+#: src/away.c:384
 msgid "New Away Message"
 msgstr ""
 
-#: src/away.c:407
+#: src/away.c:404
 msgid "Remove Away Message"
 msgstr ""
 
-#: src/away.c:602
+#: src/away.c:599
 msgid "Set All Away"
 msgstr ""
 
-#: src/blist.c:367
-#: src/gtkprefs.c:2192
+#: src/blist.c:427 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "שיחות"
 
-#: src/blist.c:679
-#, c-format
-msgid "%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 ""
-
-#: src/blist.c:684
+#: src/blist.c:751
+#, c-format
+msgid ""
+"%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 ""
+
+#: src/blist.c:756
 msgid "Group not removed"
 msgstr "הקבוצה לא נמחקה"
 
-#: src/blist.c:857
+#: src/blist.c:947
 msgid "Invalid Groupname"
 msgstr ""
 
-#: src/blist.c:1579
-msgid "An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-
-#: src/blist.c:1581
+#: src/blist.c:1703
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded."
+msgstr ""
+
+#: src/blist.c:1705
 msgid "Buddy List Error"
 msgstr "שגיעה ברשימת הידידים"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1587
-#, c-format
-msgid "Gaim is converting your old buddy lists to a new format, which will now be located at %s"
-msgstr ""
-
-#: src/blist.c:1590
+#: src/blist.c:1713
+#, c-format
+msgid ""
+"Gaim is converting your old buddy lists to a new format, which will now be "
+"located at %s"
+msgstr ""
+
+#: src/blist.c:1716
 msgid "Converting Buddy List"
 msgstr "הופך רשימת הידידים"
 
-#: src/browser.c:430
-#: src/browser.c:458
-msgid "Communication with the browser failed. Please close all windows and try again."
-msgstr ""
-
-#: src/browser.c:592
-msgid "Unable to launch your browser because the 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-
-#: src/browser.c:609
+#: src/browser.c:407 src/browser.c:435
+msgid ""
+"Communication with the browser failed. Please close all windows and try "
+"again."
+msgstr ""
+
+#: src/browser.c:569
+msgid ""
+"Unable to launch your browser because the 'Manual' browser command has been "
+"chosen, but no command has been set."
+msgstr ""
+
+#: src/browser.c:586
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr ""
 
-#: src/buddy_chat.c:253
-#: src/dialogs.c:1376
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr ""
-
-#: src/buddy_chat.c:267
+#: src/buddy_chat.c:316 src/dialogs.c:1333
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: src/buddy_chat.c:330
 msgid "Join Chat"
 msgstr "הצטרף לשיחה"
 
-#: src/buddy_chat.c:273
+#: src/buddy_chat.c:336
 msgid "Buddy Chat"
 msgstr "שיחת ידידים"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:346
 msgid "Join Chat As:"
 msgstr ""
 
 #. Join button.
-#: src/buddy_chat.c:306
+#: src/buddy_chat.c:369
 msgid "Join"
 msgstr "הצטרף"
 
@@ -3675,505 +3830,475 @@
 msgid "Unable to send message."
 msgstr "לא ניתן לשלוח הודעה"
 
-#: src/conversation.c:1967
+#: src/conversation.c:1926
 #, c-format
 msgid "%s entered the room."
 msgstr "%s נכנס לחדר"
 
-#: src/conversation.c:1970
+#: src/conversation.c:1929
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:2019
+#: src/conversation.c:1979
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ידוע  כעט בשם %s"
 
-#: src/conversation.c:2062
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2064
+#: src/conversation.c:2023
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2250
+#: src/conversation.c:2224
 msgid "Last created window"
 msgstr "חלון אחרון שנוצר"
 
-#: src/conversation.c:2252
+#: src/conversation.c:2226
 msgid "New window"
 msgstr "חלון חדש"
 
-#: src/conversation.c:2254
+#: src/conversation.c:2228
 msgid "By group"
 msgstr "לפי קבוצות"
 
-#: src/conversation.c:2256
+#: src/conversation.c:2230
 msgid "By account"
 msgstr "לפי חשבון"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:345
 msgid "Warn User"
 msgstr "הזהר את המשתמש"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:348
 msgid "_Warn"
 msgstr "ה_זהר"
 
-#: src/dialogs.c:379
+#: src/dialogs.c:364
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
 "\n"
-"This will increase %s's warning level and he or she will be subject to harsher rate limiting.\n"
-msgstr ""
-
-#: src/dialogs.c:388
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/dialogs.c:373
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:395
+#: src/dialogs.c:380
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:466
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:468
-#: src/dialogs.c:469
+#: src/dialogs.c:455
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:457 src/dialogs.c:458
 msgid "Remove Buddy"
 msgstr "הסר ידיד"
 
-#: src/dialogs.c:477
-#, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: src/dialogs.c:479
-#: src/dialogs.c:480
+#: src/dialogs.c:467
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+
+#: src/dialogs.c:469 src/dialogs.c:470
 msgid "Remove Chat"
 msgstr "הסר שיחה"
 
-#: src/dialogs.c:488
-#, 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:491
-#: src/dialogs.c:492
+#: src/dialogs.c:479
+#, 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:482 src/dialogs.c:483
 msgid "Remove Group"
 msgstr "הסר קבוצה"
 
-#: src/dialogs.c:645
+#: src/dialogs.c:632
 msgid "New Message"
 msgstr "הודעה חדשה"
 
-#: src/dialogs.c:663
+#: src/dialogs.c:650
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 
-#: src/dialogs.c:679
-#: src/dialogs.c:785
-#: src/dialogs.c:3788
+#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
 msgid "_Screenname:"
 msgstr ""
 
-#: src/dialogs.c:694
-#: src/dialogs.c:801
-#: src/gtkpounce.c:519
+#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "חש_בון:"
 
-#: src/dialogs.c:754
+#: src/dialogs.c:712
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: src/dialogs.c:773
-msgid "Please enter the screenname of the person whose info you would like to view.\n"
-msgstr ""
-
-#: src/dialogs.c:956
+#: src/dialogs.c:731
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "הוסף קבוצה"
 
-#: src/dialogs.c:973
+#: src/dialogs.c:906
 msgid "Please enter the name of the group to be added.\n"
 msgstr ""
 
-#: src/dialogs.c:982
-#: src/dialogs.c:4339
+#: src/dialogs.c:915 src/dialogs.c:4319
 msgid "_Group:"
 msgstr "_קבוצה:"
 
-#: src/dialogs.c:1069
+#: src/dialogs.c:951
 msgid "Add Buddy"
 msgstr "הוספת חבר..."
 
-#: src/dialogs.c:1088
-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 ""
-
-#: src/dialogs.c:1107
+#: src/dialogs.c:970
+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 ""
+
+#: src/dialogs.c:989
 msgid "Screen Name"
 msgstr "שם לתצוגה:"
 
-#: src/dialogs.c:1120
+#: src/dialogs.c:1002
 msgid "Alias"
 msgstr "תיאור"
 
-#: src/dialogs.c:1130
+#: src/dialogs.c:1012
 msgid "Group"
 msgstr "קבוצה"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1139
+#: src/dialogs.c:1021
 msgid "Add To"
 msgstr "הוסף ל"
 
-#: src/dialogs.c:1383
+#: src/dialogs.c:1340
 msgid "Add Chat"
 msgstr ""
 
-#: src/dialogs.c:1406
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr ""
-
-#: src/dialogs.c:1415
+#: src/dialogs.c:1363
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+#: src/dialogs.c:1372
 msgid "Account:"
 msgstr "חשבון:"
 
-#: src/dialogs.c:1434
+#: src/dialogs.c:1391 src/gtkaccount.c:431
 msgid "Alias:"
 msgstr "תיאור:"
 
-#: src/dialogs.c:1445
+#: src/dialogs.c:1402
 msgid "Group:"
 msgstr "קבוצה:"
 
-#: src/dialogs.c:1782
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr "פרטיות"
 
-#: src/dialogs.c:1793
+#: src/dialogs.c:1764
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#: src/dialogs.c:1802
+#: src/dialogs.c:1773
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/dialogs.c:1819
+#: src/dialogs.c:1790
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/dialogs.c:1823
+#: src/dialogs.c:1794
 msgid "Allow only users on my buddy list"
 msgstr ""
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1798
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/dialogs.c:1865
+#: src/dialogs.c:1836
 msgid "Deny all users"
 msgstr ""
 
-#: src/dialogs.c:1869
+#: src/dialogs.c:1840
 msgid "Block the users below"
 msgstr ""
 
-#: src/dialogs.c:1986
+#: src/dialogs.c:1956
 msgid "Set Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:1964
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:1974
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr ""
 
-#: src/dialogs.c:2017
+#: src/dialogs.c:1987
 msgid "Allow Web Searches To Find Your Info"
 msgstr ""
 
-#. Line 1
-#: src/dialogs.c:2020
-#: src/dialogs.c:2669
-msgid "First Name"
-msgstr "שם פרטי"
-
 #. Line 2
-#: src/dialogs.c:2031
-#: src/dialogs.c:2679
+#: src/dialogs.c:2001 src/dialogs.c:2654
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
-#. Line 3
-#: src/dialogs.c:2043
-#: src/dialogs.c:2689
-msgid "Last Name"
-msgstr "שם משפחה"
-
 #. Line 4
-#: src/dialogs.c:2054
-#: src/dialogs.c:2699
+#: src/dialogs.c:2024 src/dialogs.c:2674
 msgid "Maiden Name"
 msgstr "שם מלפני הנישואין"
 
-#. Line 6
-#: src/dialogs.c:2076
-#: src/dialogs.c:2718
-msgid "State"
-msgstr "מחוז"
-
-#: src/dialogs.c:2118
-#: src/dialogs.c:2294
-#: src/dialogs.c:3457
-#: src/dialogs.c:4260
-#: src/dialogs.c:5010
-msgid "Save"
-msgstr "שמור"
-
-#: src/dialogs.c:2141
+#: src/dialogs.c:2111
 msgid "New passwords do not match."
 msgstr "הסיסמה החדשה ווידואה אינם תואמים."
 
-#: src/dialogs.c:2147
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2162
 #, c-format
 msgid "Changing password for %s:"
 msgstr ""
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2170
 msgid "Original Password"
 msgstr ""
 
-#: src/dialogs.c:2211
+#: src/dialogs.c:2181
 msgid "New Password"
 msgstr "סיסמא חדשה"
 
-#: src/dialogs.c:2222
+#: src/dialogs.c:2192
 msgid "New Password (again)"
 msgstr "סיסמא חדשה (שוב)"
 
-#: src/dialogs.c:2270
+#: src/dialogs.c:2241
 #, c-format
 msgid "Changing info for %s:"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2327
 msgid "Below are the results of your search: "
 msgstr ""
 
-#: src/dialogs.c:2463
+#: src/dialogs.c:2438
 msgid "Permit"
 msgstr "הרשה"
 
-#: src/dialogs.c:2495
+#: src/dialogs.c:2470
 msgid "Add Permit"
 msgstr ""
 
-#: src/dialogs.c:2497
+#: src/dialogs.c:2472
 msgid "Add Deny"
 msgstr ""
 
-#: src/dialogs.c:2564
+#: src/dialogs.c:2539
 msgid "Log Conversation"
 msgstr ""
 
-#: src/dialogs.c:2645
-#: src/dialogs.c:2778
+#: src/dialogs.c:2620 src/dialogs.c:2753
 msgid "Search for Buddy"
 msgstr ""
 
-#: src/dialogs.c:2745
+#: src/dialogs.c:2720
 msgid "Find Buddy By Info"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2747
 msgid "Find Buddy By Email"
 msgstr ""
 
-#: src/dialogs.c:2876
+#: src/dialogs.c:2851
 msgid "Insert Link"
 msgstr "הוספת קישור"
 
-#: src/dialogs.c:2878
+#: src/dialogs.c:2853
 msgid "Insert"
 msgstr "הכנס"
 
-#: src/dialogs.c:2897
-msgid "Please enter the URL and description of the link that you want to insert.  The description is optional.\n"
-msgstr ""
-
-#: src/dialogs.c:3066
-#: src/dialogs.c:3083
+#: src/dialogs.c:2872
+msgid ""
+"Please enter the URL and description of the link that you want to insert.  "
+"The description is optional.\n"
+msgstr ""
+
+#: src/dialogs.c:3041 src/dialogs.c:3058
 msgid "Select Text Color"
 msgstr "בחירת צבע טקסט"
 
-#: src/dialogs.c:3118
-#: src/dialogs.c:3135
+#: src/dialogs.c:3093 src/dialogs.c:3110
 msgid "Select Background Color"
 msgstr "בחירת צבע רקע"
 
-#: src/dialogs.c:3230
-#: src/dialogs.c:3256
+#: src/dialogs.c:3207 src/dialogs.c:3233
 msgid "Select Font"
 msgstr "בחירת גופן"
 
-#: src/dialogs.c:3321
+#: src/dialogs.c:3299
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:3323
-msgid "Please give the message a title, or choose \"Use\" to use without saving."
-msgstr ""
-
-#: src/dialogs.c:3333
+#: src/dialogs.c:3301
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr ""
+
+#: src/dialogs.c:3311
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3398
-#: src/dialogs.c:3406
+#: src/dialogs.c:3376 src/dialogs.c:3384
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:3416
+#: src/dialogs.c:3394
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:3461
+#: src/dialogs.c:3439
 msgid "Save & Use"
 msgstr "שמור והשתמש"
 
-#: src/dialogs.c:3465
+#: src/dialogs.c:3443
 msgid "Use"
 msgstr "השתמש"
 
 #. show everything
-#: src/dialogs.c:3613
+#: src/dialogs.c:3592
 msgid "Smile!"
 msgstr "חייך!"
 
-#: src/dialogs.c:3659
-#: src/dialogs.c:3737
+#: src/dialogs.c:3638
+#, fuzzy
+msgid "Alias Chat"
+msgstr "תיאור"
+
+#. Setup the label containing the description.
+#: src/dialogs.c:3667
+msgid "Please enter an aliased name for this chat.\n"
+msgstr ""
+
+#: src/dialogs.c:3679 src/dialogs.c:3782
+msgid "_Alias:"
+msgstr "תיאור:"
+
+#: src/dialogs.c:3716
 msgid "Alias Buddy"
 msgstr ""
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3688
-msgid "Please enter an aliased name for this chat.\n"
-msgstr ""
-
-#: src/dialogs.c:3700
-#: src/dialogs.c:3802
-msgid "_Alias:"
-msgstr "תיאור:"
-
-#. Setup the label containing the description.
-#: src/dialogs.c:3767
-msgid "Please enter an aliased name for the person below, or rename this contact in your buddy list.\n"
-msgstr ""
-
-#: src/dialogs.c:3856
-#: src/dialogs.c:3863
+#: src/dialogs.c:3746
+msgid ""
+"Please enter an aliased name for the person below, or rename this contact in "
+"your buddy list.\n"
+msgstr ""
+
+#: src/dialogs.c:3836 src/dialogs.c:3843
 #, c-format
 msgid "Couldn't write to %s."
 msgstr ""
 
-#: src/dialogs.c:3887
+#: src/dialogs.c:3867
 msgid "Save Log File"
 msgstr "שמור קובץ רישום"
 
-#: src/dialogs.c:3917
+#: src/dialogs.c:3897
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr ""
 
-#: src/dialogs.c:3936
+#: src/dialogs.c:3916
 msgid "Clear Log"
 msgstr "נקה רישום"
 
-#: src/dialogs.c:3945
+#: src/dialogs.c:3925
 msgid "Really clear log?"
 msgstr "באמת לרוקן את הרישום?"
 
-#: src/dialogs.c:3990
+#: src/dialogs.c:3970
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr ""
 
-#: src/dialogs.c:4132
+#: src/dialogs.c:4112
 #, c-format
 msgid "Conversations with %s"
 msgstr ""
 
-#: src/dialogs.c:4134
+#: src/dialogs.c:4114
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
-#: src/dialogs.c:4155
+#: src/dialogs.c:4135
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr ""
 
-#: src/dialogs.c:4176
+#: src/dialogs.c:4156
 msgid "Date"
 msgstr "תאריך"
 
-#: src/dialogs.c:4233
+#: src/dialogs.c:4213
 msgid "Log"
 msgstr "רישום"
 
-#: src/dialogs.c:4255
+#: src/dialogs.c:4235
 msgid "Clear"
 msgstr "נקה"
 
-#: src/dialogs.c:4313
+#: src/dialogs.c:4293
 msgid "Rename Group"
 msgstr "שנה את שם הקבוצה"
 
-#: src/dialogs.c:4330
+#: src/dialogs.c:4310
 msgid "Please enter a new name for the selected group.\n"
 msgstr ""
 
-#: src/dialogs.c:4406
-#: src/dialogs.c:4415
-msgid "Rename Buddy"
-msgstr ""
-
-#: src/dialogs.c:4422
-msgid "New name:"
-msgstr "שם חדש:"
+#: src/ft.c:121
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr ""
 
 #: src/ft.c:135
 #, c-format
-msgid "%s is not a valid filename.\n"
-msgstr ""
-
-#: src/ft.c:149
-#, c-format
 msgid "%s was not found.\n"
 msgstr ""
 
-#: src/ft.c:741
+#: src/ft.c:727
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr ""
 
-#: src/ft.c:743
+#: src/ft.c:729
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
@@ -4199,8 +4324,7 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:136
-#: src/gaim-remote.c:152
+#: src/gaim-remote.c:136 src/gaim-remote.c:152
 msgid "Gaim not running (on session 0)\n"
 msgstr ""
 
@@ -4234,717 +4358,997 @@
 msgstr ""
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:52
+#: src/gaimrc.c:42
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:367
-#: src/gaimrc.c:1258
+#: src/gaimrc.c:363 src/gaimrc.c:1506
 msgid "boring default"
 msgstr "ברירת המחדל (משעמם)"
 
-#: src/gaimrc.c:1355
+#: src/gaimrc.c:1604
 #, c-format
 msgid "Could not open config file %s."
 msgstr ""
 
-#: src/gtkblist.c:403
+#: src/gtkaccount.c:256
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+
+#. Build the login options frame.
+#: src/gtkaccount.c:331
+#, fuzzy
+msgid "Login Options"
+msgstr "הגדרות הצליל"
+
+#: src/gtkaccount.c:348
+msgid "Protocol:"
+msgstr ""
+
+#: src/gtkaccount.c:353
+#, fuzzy
+msgid "Screenname:"
+msgstr "שם לתצוגה:"
+
+#: src/gtkaccount.c:435
+#, fuzzy
+msgid "Remember password"
+msgstr "סיסמא חדשה"
+
+#. Build the user options frame.
+#: src/gtkaccount.c:489
+#, fuzzy
+msgid "User Options"
+msgstr "הגדרות הדפדפן"
+
+#: src/gtkaccount.c:502
+#, fuzzy
+msgid "New mail notifications"
+msgstr "התרעה על הודעה"
+
+#: src/gtkaccount.c:511
+#, fuzzy
+msgid "Buddy icon file:"
+msgstr "סמלי הידידים"
+
+#: src/gtkaccount.c:520
+#, fuzzy
+msgid "_Browse"
+msgstr "דפדפן"
+
+#: src/gtkaccount.c:526
+#, fuzzy
+msgid "_Reset"
+msgstr "אפס"
+
+#. Build the protocol options frame.
+#: src/gtkaccount.c:587
+#, fuzzy, c-format
+msgid "%s Options"
+msgstr "הגדרות כרטיסיה"
+
+#. Use Global Proxy Settings
+#: src/gtkaccount.c:708
+msgid "Use Global Proxy Settings"
+msgstr ""
+
+#. No Proxy
+#: src/gtkaccount.c:715
+#, fuzzy
+msgid "No Proxy"
+msgstr "ללא מתווך"
+
+#. SOCKS 4
+#: src/gtkaccount.c:722
+msgid "SOCKS 4"
+msgstr ""
+
+#. SOCKS 5
+#: src/gtkaccount.c:729
+msgid "SOCKS 5"
+msgstr ""
+
+#. HTTP
+#: src/gtkaccount.c:736
+msgid "HTTP"
+msgstr ""
+
+#: src/gtkaccount.c:768
+msgid "you can see the butterflies mating"
+msgstr ""
+
+#: src/gtkaccount.c:772
+msgid "If you look real closely"
+msgstr ""
+
+#: src/gtkaccount.c:788
+#, fuzzy
+msgid "Proxy Options"
+msgstr "הגדרות הדפדפן"
+
+#: src/gtkaccount.c:804 src/gtkprefs.c:1097
+msgid "Proxy _type:"
+msgstr "סוג ה_מתווך"
+
+#: src/gtkaccount.c:813
+#, fuzzy
+msgid "_Host:"
+msgstr "מ_ארח"
+
+#: src/gtkaccount.c:817
+#, fuzzy
+msgid "_Port:"
+msgstr "יציאה:"
+
+#: src/gtkaccount.c:825
+#, fuzzy
+msgid "_Username:"
+msgstr "_שנה שם"
+
+#: src/gtkaccount.c:830
+#, fuzzy
+msgid "Pa_ssword:"
+msgstr "סיסמא:"
+
+#: src/gtkaccount.c:1141
+#, fuzzy
+msgid "Add Account"
+msgstr "חשבון:"
+
+#: src/gtkaccount.c:1143
+#, fuzzy
+msgid "Modify Account"
+msgstr "לפי חשבון"
+
+#. Add the disclosure
+#: src/gtkaccount.c:1167
+#, fuzzy
+msgid "Show more options"
+msgstr "הגדרות הדפדפן"
+
+#: src/gtkaccount.c:1168
+#, fuzzy
+msgid "Show fewer options"
+msgstr "הגדרות הדפדפן"
+
+#. Register button
+#: src/gtkaccount.c:1196
+msgid "Register"
+msgstr "הרשם"
+
+#: src/gtkaccount.c:1483
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+#: src/gtkaccount.c:1487 src/gtkrequest.c:174
+#, fuzzy
+msgid "Delete"
+msgstr "הסר _קבוצה"
+
+#: src/gtkaccount.c:1565
+#, fuzzy
+msgid "Screenname"
+msgstr "שם לתצוגה:"
+
+#: src/gtkaccount.c:1606
+msgid "Protocol"
+msgstr ""
+
+#: src/gtkblist.c:409
 msgid "Add a _Buddy"
 msgstr ""
 
-#: src/gtkblist.c:404
+#: src/gtkblist.c:411
 msgid "Add a C_hat"
 msgstr ""
 
-#: src/gtkblist.c:405
+#: src/gtkblist.c:413
 msgid "_Delete Group"
 msgstr "הסר _קבוצה"
 
-#: src/gtkblist.c:406
+#: src/gtkblist.c:415
 msgid "_Rename"
 msgstr "_שנה שם"
 
-#: src/gtkblist.c:408
+#: src/gtkblist.c:423
 msgid "_Join"
 msgstr "הצ_טרף"
 
-#: src/gtkblist.c:409
-#: src/gtkblist.c:440
+#: src/gtkblist.c:425
+#, fuzzy
+msgid "Auto-Join"
+msgstr "כניסה אוטומתית"
+
+#: src/gtkblist.c:428 src/gtkblist.c:474
 msgid "_Alias"
 msgstr "תיאו_ר"
 
-#: src/gtkblist.c:410
-#: src/gtkblist.c:441
+#: src/gtkblist.c:430 src/gtkblist.c:476
 msgid "_Remove"
 msgstr "_הסר"
 
-#: src/gtkblist.c:419
+#: src/gtkblist.c:448
 msgid "_Get Info"
 msgstr "ה_צג פרטים"
 
-#: src/gtkblist.c:421
+#: src/gtkblist.c:451
 msgid "_IM"
 msgstr "הודעה מיידית"
 
-#: src/gtkblist.c:422
+#: src/gtkblist.c:453
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:423
+#: src/gtkblist.c:455
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
 #. Buddies menu
-#: src/gtkblist.c:744
+#: src/gtkblist.c:780
 msgid "/_Buddies"
 msgstr "/_ידידים"
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:781
 msgid "/Buddies/New _Instant Message..."
 msgstr "/ידידים/הו_דעה חדשה..."
 
-#: src/gtkblist.c:746
+#: src/gtkblist.c:782
 msgid "/Buddies/Join a _Chat..."
 msgstr ""
 
-#: src/gtkblist.c:747
+#: src/gtkblist.c:783
 msgid "/Buddies/Get _User Info..."
 msgstr ""
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:785
 msgid "/Buddies/Show _Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:786
 msgid "/Buddies/Show _Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:787
 msgid "/Buddies/_Add a Buddy..."
 msgstr ""
 
-#: src/gtkblist.c:752
+#: src/gtkblist.c:788
 msgid "/Buddies/Add a C_hat..."
 msgstr ""
 
-#: src/gtkblist.c:753
+#: src/gtkblist.c:789
 msgid "/Buddies/Add a _Group..."
 msgstr ""
 
-#: src/gtkblist.c:755
+#: src/gtkblist.c:791
 msgid "/Buddies/_Signoff"
 msgstr ""
 
-#: src/gtkblist.c:756
+#: src/gtkblist.c:792
 msgid "/Buddies/_Quit"
 msgstr "/ידידים/_יציאה"
 
 #. Tools
-#: src/gtkblist.c:759
+#: src/gtkblist.c:795
 msgid "/_Tools"
 msgstr "/_כלים"
 
-#: src/gtkblist.c:760
+#: src/gtkblist.c:796
 msgid "/Tools/_Away"
 msgstr ""
 
-#: src/gtkblist.c:761
+#: src/gtkblist.c:797
 msgid "/Tools/Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:762
+#: src/gtkblist.c:798
 msgid "/Tools/P_rotocol Actions"
 msgstr ""
 
-#: src/gtkblist.c:764
-msgid "/Tools/A_ccounts..."
+#: src/gtkblist.c:800
+#, fuzzy
+msgid "/Tools/A_ccounts"
 msgstr "/כלים/ח_שבונות..."
 
-#: src/gtkblist.c:765
+#: src/gtkblist.c:801
 msgid "/Tools/_File Transfers..."
 msgstr "/כלים/_משלוח קבצים..."
 
-#: src/gtkblist.c:766
-msgid "/Tools/Preferences..."
+#: src/gtkblist.c:802
+#, fuzzy
+msgid "/Tools/Preferences"
 msgstr "/כלים/העדפות..."
 
-#: src/gtkblist.c:767
-msgid "/Tools/Pr_ivacy..."
-msgstr ""
-
-#: src/gtkblist.c:769
-msgid "/Tools/View System _Log..."
-msgstr ""
+#: src/gtkblist.c:803
+#, fuzzy
+msgid "/Tools/Pr_ivacy"
+msgstr "פרטיות"
+
+#: src/gtkblist.c:805
+#, fuzzy
+msgid "/Tools/View System _Log"
+msgstr "דו\"ח מערכת"
 
 #. Help
-#: src/gtkblist.c:772
+#: src/gtkblist.c:808
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: src/gtkblist.c:773
+#: src/gtkblist.c:809
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
-#: src/gtkblist.c:774
-msgid "/Help/_Debug Window..."
+#: src/gtkblist.c:810
+#, fuzzy
+msgid "/Help/_Debug Window"
 msgstr "/עזרה/חלון המעקב אחרי שגיעות"
 
-#: src/gtkblist.c:775
-msgid "/Help/_About..."
+#: src/gtkblist.c:811
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/עזרה/אודות"
 
-#: src/gtkblist.c:809
+#: src/gtkblist.c:845
 #, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr ""
 
-#: src/gtkblist.c:868
+#: src/gtkblist.c:907
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:882
+#: src/gtkblist.c:921
 msgid ""
 "\n"
 "<b>Account:</b>"
 msgstr ""
 
-#: src/gtkblist.c:883
+#: src/gtkblist.c:922
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:884
+#: src/gtkblist.c:923
 msgid ""
 "\n"
 "<b>Nickname:</b>"
 msgstr ""
 
-#: src/gtkblist.c:885
+#: src/gtkblist.c:924
 msgid ""
 "\n"
 "<b>Idle:</b>"
 msgstr ""
 
-#: src/gtkblist.c:886
+#: src/gtkblist.c:925
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr ""
 
-#: src/gtkblist.c:888
+#: src/gtkblist.c:927
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:889
+#: src/gtkblist.c:928
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 
-#: src/gtkblist.c:890
+#: src/gtkblist.c:929
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 
-#: src/gtkblist.c:1186
+#: src/gtkblist.c:1226
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr ""
 
-#: src/gtkblist.c:1188
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dm) "
 msgstr ""
 
-#: src/gtkblist.c:1192
+#: src/gtkblist.c:1232
 #, c-format
 msgid "Warned (%d%%) "
 msgstr ""
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1235
 msgid "Offline "
 msgstr "לא מקוון"
 
-#: src/gtkblist.c:1341
-#: src/gtkblist.c:1345
-#: src/gtkblist.c:2169
-#: src/gtkprefs.c:900
-#: src/gtkprefs.c:1464
+#: src/gtkblist.c:1391 src/gtkprefs.c:842 src/gtkprefs.c:1516
 msgid "None"
 msgstr "ללא"
 
-#: src/gtkblist.c:1342
+#: src/gtkblist.c:1392
 msgid "Alphabetical"
 msgstr "אלפבתית"
 
-#: src/gtkblist.c:1343
+#: src/gtkblist.c:1393
 msgid "By status"
 msgstr "לפי מצב"
 
-#: src/gtkblist.c:1344
+#: src/gtkblist.c:1394
 msgid "By log size"
 msgstr "לפי גודל הרישום"
 
-#: src/gtkblist.c:1370
-#: src/gtkprefs.c:2189
+#: src/gtkblist.c:1430 src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "רשימת הידידים"
 
-#: src/gtkblist.c:1394
+#: src/gtkblist.c:1454
 msgid "/Tools/Away"
 msgstr ""
 
-#: src/gtkblist.c:1397
+#: src/gtkblist.c:1457
 msgid "/Tools/Buddy Pounce"
 msgstr ""
 
-#: src/gtkblist.c:1400
+#: src/gtkblist.c:1460
 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:1483
+#: src/gtkblist.c:1543
 msgid "/Buddies/Show Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:1503
-#: src/gtkconv.c:772
+#: src/gtkblist.c:1563 src/gtkconv.c:1072
 msgid "IM"
 msgstr "הודעה"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1569
 msgid "Send a message to the selected buddy"
 msgstr ""
 
-#: src/gtkblist.c:1518
+#: src/gtkblist.c:1578
 msgid "Get information on the selected buddy"
 msgstr "הצג פרטים על הידיד שנבחר"
 
-#: src/gtkblist.c:1526
+#: src/gtkblist.c:1586
 msgid "Join a chat room"
 msgstr ""
 
-#: src/gtkblist.c:1534
+#: src/gtkblist.c:1594
 msgid "Set an away message"
 msgstr ""
 
-#: src/gtkconv.c:220
+#: src/gtkblist.c:2584
+msgid "No actions available"
+msgstr "לא ניתן לבצע פעולות"
+
+#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
+msgid "Done."
+msgstr "מוכן."
+
+#: src/gtkconn.c:135
+msgid "Signon: "
+msgstr "מתחבר: "
+
+#: src/gtkconn.c:193
+msgid "Signon"
+msgstr "מתחבר"
+
+#: src/gtkconn.c:206
+msgid "Cancel All"
+msgstr "בטל הכל"
+
+#: src/gtkconv.c:183
+#, fuzzy
+msgid "That file already exists"
+msgstr "הקובץ כבר קיים"
+
+#: src/gtkconv.c:184 src/gtkft.c:1034
+msgid "Would you like to overwrite it?"
+msgstr "לשכתב?"
+
+#: src/gtkconv.c:279
 msgid "Gaim - Insert Image"
 msgstr ""
 
-#: src/gtkconv.c:780
-msgid "Un-Ignore"
-msgstr ""
-
-#: src/gtkconv.c:782
-#: src/gtkprefs.c:830
-msgid "Ignore"
-msgstr "התעלם"
-
-#. Info button
-#: src/gtkconv.c:791
-#: src/gtkconv.c:2679
-msgid "Info"
-msgstr "מידע"
-
-#: src/gtkconv.c:811
-#: src/gtkconv.c:2662
-#: src/gtkconv.c:3789
-msgid "Remove"
-msgstr "הסר"
-
-#: src/gtkconv.c:885
+#: src/gtkconv.c:581
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: src/gtkconv.c:913
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr ""
-
-#: src/gtkconv.c:934
+#: src/gtkconv.c:609
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#: src/gtkconv.c:630
 msgid "_Buddy:"
 msgstr "_ידיד:"
 
-#: src/gtkconv.c:954
+#: src/gtkconv.c:650
 msgid "_Message:"
 msgstr "ה_ודעה:"
 
-#: src/gtkconv.c:1983
+#: src/gtkconv.c:1080
+msgid "Un-Ignore"
+msgstr ""
+
+#: src/gtkconv.c:1082 src/gtkprefs.c:774
+msgid "Ignore"
+msgstr "התעלם"
+
+#. Info button
+#: src/gtkconv.c:1091 src/gtkconv.c:2987
+msgid "Info"
+msgstr "מידע"
+
+#: src/gtkconv.c:1111 src/gtkconv.c:2970 src/gtkconv.c:4109
+#: src/gtkrequest.c:176
+msgid "Remove"
+msgstr "הסר"
+
+#: src/gtkconv.c:2200
 msgid "User is typing..."
 msgstr "המשתמש כותב כרגע..."
 
-#: src/gtkconv.c:1991
+#: src/gtkconv.c:2208
 msgid "User has typed something and paused"
 msgstr "המשתמש כתב משהו והפסיק"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2098
+#: src/gtkconv.c:2310
 msgid "_Send As"
 msgstr "שלח בתור"
 
+#: src/gtkconv.c:2766
+msgid "Gaim - Save Conversation"
+msgstr ""
+
 #. Conversation menu
-#: src/gtkconv.c:2552
+#: src/gtkconv.c:2783
 msgid "/_Conversation"
 msgstr "/_שיחה"
 
-#: src/gtkconv.c:2553
+#: src/gtkconv.c:2785
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2787
 msgid "/Conversation/View _Log..."
 msgstr ""
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2791
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+#: src/gtkconv.c:2793
+#, fuzzy
+msgid "/Conversation/A_lias..."
+msgstr "שיחות"
+
+#: src/gtkconv.c:2795
+#, fuzzy
+msgid "/Conversation/_Get Info..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2797
+#, fuzzy
+msgid "/Conversation/In_vite..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2802
 msgid "/Conversation/Insert _URL..."
 msgstr ""
 
-#: src/gtkconv.c:2559
+#: src/gtkconv.c:2804
 msgid "/Conversation/Insert _Image..."
 msgstr ""
 
-#: src/gtkconv.c:2562
+#: src/gtkconv.c:2809
+#, fuzzy
+msgid "/Conversation/_Warn..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2811
+#, fuzzy
+msgid "/Conversation/_Block..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2813
+#, fuzzy
+msgid "/Conversation/_Add..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2815
+#, fuzzy
+msgid "/Conversation/_Remove..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2820
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: src/gtkconv.c:2566
+#: src/gtkconv.c:2824
 msgid "/_Options"
 msgstr "/_אפשרויות"
 
-#: src/gtkconv.c:2567
+#: src/gtkconv.c:2825
 msgid "/Options/Enable _Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: src/gtkconv.c:2568
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: src/gtkconv.c:2604
+#: src/gtkconv.c:2866
 msgid "/Conversation/View Log..."
 msgstr ""
 
-#: src/gtkconv.c:2606
+#: src/gtkconv.c:2871
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+#: src/gtkconv.c:2875
+#, fuzzy
+msgid "/Conversation/Alias..."
+msgstr "שיחות"
+
+#: src/gtkconv.c:2879
+#, fuzzy
+msgid "/Conversation/Get Info..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2883
+#, fuzzy
+msgid "/Conversation/Invite..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2889
 msgid "/Conversation/Insert URL..."
 msgstr ""
 
-#: src/gtkconv.c:2608
+#: src/gtkconv.c:2893
 msgid "/Conversation/Insert Image..."
 msgstr ""
 
-#: src/gtkconv.c:2610
+#: src/gtkconv.c:2899
+#, fuzzy
+msgid "/Conversation/Warn..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2903
+#, fuzzy
+msgid "/Conversation/Block..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2907
+#, fuzzy
+msgid "/Conversation/Add..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2911
+#, fuzzy
+msgid "/Conversation/Remove..."
+msgstr "/_שיחה"
+
+#: src/gtkconv.c:2917
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:2612
+#: src/gtkconv.c:2920
 msgid "/Options/Enable Sounds"
 msgstr ""
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2636
-#: src/gtkconv.c:2638
-#: src/gtkconv.c:2736
-#: src/gtkconv.c:2738
-#: src/gtkconv.c:5065
+#: src/gtkconv.c:2944 src/gtkconv.c:2946 src/gtkconv.c:3044 src/gtkconv.c:3046
+#: src/gtkconv.c:5683
 msgid "Send"
 msgstr "שלח"
 
-#: src/gtkconv.c:2659
-#: src/gtkconv.c:3801
+#: src/gtkconv.c:2967 src/gtkconv.c:4127
 msgid "Add the user to your buddy list"
 msgstr "הוסף את המשתמש לרשימת הידידים שלך"
 
-#: src/gtkconv.c:2665
-#: src/gtkconv.c:3792
+#: src/gtkconv.c:2973 src/gtkconv.c:4112
 msgid "Remove the user from your buddy list"
 msgstr "הסר את המשתמש מרשימץ הידידים שלך"
 
 #. Warn button
-#: src/gtkconv.c:2672
+#: src/gtkconv.c:2980
 msgid "Warn"
 msgstr "אזהר"
 
-#: src/gtkconv.c:2676
+#: src/gtkconv.c:2984
 msgid "Warn the user"
 msgstr ""
 
-#: src/gtkconv.c:2683
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:2991 src/gtkconv.c:3426
 msgid "Get the user's information"
 msgstr ""
 
 #. Block button
-#: src/gtkconv.c:2686
+#: src/gtkconv.c:2994
 msgid "Block"
 msgstr ""
 
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2998
 msgid "Block the user"
 msgstr ""
 
 #. Invite
-#: src/gtkconv.c:2748
-#: src/gtkconv.c:5068
+#: src/gtkconv.c:3056 src/gtkconv.c:5686
 msgid "Invite"
 msgstr "הזמן"
 
-#: src/gtkconv.c:2751
+#: src/gtkconv.c:3059
 msgid "Invite a user"
 msgstr "הזמן משתמש"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:3098
 msgid "Bold"
 msgstr "מודגש"
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:3109
 msgid "Italic"
 msgstr "נטוי"
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:3120
 msgid "Underline"
 msgstr "קו תחתון"
 
-#: src/gtkconv.c:2828
+#: src/gtkconv.c:3136
 msgid "Larger font size"
 msgstr "הגדל גודל גופן"
 
-#: src/gtkconv.c:2840
+#: src/gtkconv.c:3148
 msgid "Normal font size"
 msgstr "גודל גופן בינוני"
 
-#: src/gtkconv.c:2852
+#: src/gtkconv.c:3160
 msgid "Smaller font size"
 msgstr "הקטן גודל גופן"
 
-#: src/gtkconv.c:2869
+#: src/gtkconv.c:3177
 msgid "Font Face"
 msgstr ""
 
-#: src/gtkconv.c:2881
+#: src/gtkconv.c:3189
 msgid "Foreground font color"
 msgstr ""
 
-#: src/gtkconv.c:2893
+#: src/gtkconv.c:3201
 msgid "Background color"
 msgstr "צבע הרקע"
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:3216
 msgid "Insert image"
 msgstr "הכנס תמונה"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:3227
 msgid "Insert link"
 msgstr "הכנס קישור"
 
-#: src/gtkconv.c:2930
+#: src/gtkconv.c:3238
 msgid "Insert smiley"
 msgstr "הכנס חיוך"
 
-#: src/gtkconv.c:2987
+#: src/gtkconv.c:3295
 msgid "Topic:"
 msgstr "כותרת:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3346
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3403
 msgid "IM the user"
 msgstr ""
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3415
 msgid "Ignore the user"
 msgstr ""
 
-#: src/gtkconv.c:3636
+#: src/gtkconv.c:3911 src/server.c:1298
+#, c-format
+msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
+msgstr ""
+
+#: src/gtkconv.c:3915 src/server.c:1301
+#, c-format
+msgid "---- New Conversation @ %s ----\n"
+msgstr ""
+
+#: src/gtkconv.c:3947
 msgid "Close conversation"
 msgstr "סגור חלון"
 
-#: src/gtkconv.c:4269
-#: src/gtkconv.c:4391
-#: src/gtkconv.c:4751
-#, c-format
+#: src/gtkconv.c:4605 src/gtkconv.c:4727
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtkconv.c:5001
 msgid "Disable Animation"
 msgstr "אל תאפשר הנפשה"
 
-#: src/gtkconv.c:4760
+#: src/gtkconv.c:5010
 msgid "Enable Animation"
 msgstr "אפשר הנפשה"
 
-#: src/gtkconv.c:4767
+#: src/gtkconv.c:5017
 msgid "Hide Icon"
 msgstr "הסתר סמל"
 
-#: src/gtkconv.c:4773
+#: src/gtkconv.c:5023
 msgid "Save Icon As..."
 msgstr "שמירת סמל בשם..."
 
-#: src/gtkft.c:105
-msgid "Calculating..."
-msgstr "מחשב..."
-
-#: src/gtkft.c:108
-msgid "Unknown."
-msgstr "לא ידוע"
-
-#: src/gtkft.c:145
+#: src/gtkft.c:126
 #, c-format
 msgid "%.2f KB/s"
 msgstr ""
 
-#: src/gtkft.c:220
+#: src/gtkft.c:201
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: src/gtkft.c:223
+#: src/gtkft.c:204
 msgid "<b>Sending To:</b>"
 msgstr "<b>שולח אל:</b>"
 
-#: src/gtkft.c:447
+#: src/gtkft.c:436
 msgid "Progress"
 msgstr "התקדמות"
 
-#: src/gtkft.c:454
+#: src/gtkft.c:443
 msgid "Filename"
 msgstr "שם הקובץ"
 
-#: src/gtkft.c:461
+#: src/gtkft.c:450
 msgid "Size"
 msgstr "גודל"
 
-#: src/gtkft.c:468
+#: src/gtkft.c:457
 msgid "Remaining"
 msgstr "נשאר"
 
-#: src/gtkft.c:498
+#: src/gtkft.c:487
 msgid "Filename:"
 msgstr "שם הקובץ:"
 
-#: src/gtkft.c:499
+#: src/gtkft.c:488
 msgid "Status:"
 msgstr "מצב:"
 
-#: src/gtkft.c:500
+#: src/gtkft.c:489
 msgid "Speed:"
 msgstr "מהירות:"
 
-#: src/gtkft.c:501
+#: src/gtkft.c:490
 msgid "Time Elapsed:"
 msgstr "זמן:"
 
-#: src/gtkft.c:502
+#: src/gtkft.c:491
 msgid "Time Remaining:"
 msgstr "זמן שנותר:"
 
-#: src/gtkft.c:568
-msgid "File Transfers"
-msgstr "משלוח קבצים"
-
-#: src/gtkft.c:597
+#: src/gtkft.c:586
 msgid "_Keep the dialog open"
 msgstr ""
 
-#: src/gtkft.c:607
+#: src/gtkft.c:596
 msgid "_Clear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: src/gtkft.c:616
+#: src/gtkft.c:605
 msgid "Show download details"
 msgstr "הצג פרטי ההורדות"
 
-#: src/gtkft.c:617
+#: src/gtkft.c:606
 msgid "Hide download details"
 msgstr "הסתר פרטי ההורדות"
 
 #. Pause button
-#: src/gtkft.c:659
+#: src/gtkft.c:648 src/stock.c:86
 msgid "_Pause"
 msgstr "השהייה"
 
 #. Resume button
-#: src/gtkft.c:669
+#: src/gtkft.c:658
 msgid "_Resume"
 msgstr "ה_משך"
 
-#: src/gtkft.c:1012
+#: src/gtkft.c:1013
 msgid "That file does not exist."
 msgstr "הקובץ אינו קיים"
 
-#: src/gtkft.c:1019
+#: src/gtkft.c:1020
 msgid "Cannot send a file of 0 bytes."
 msgstr "לא יכול לשלוח קובץ בגןדל של 0 ביתים"
 
-#: src/gtkft.c:1032
+#: src/gtkft.c:1033
 msgid "That file already exists."
 msgstr "הקובץ כבר קיים"
 
-#: src/gtkft.c:1033
-msgid "Would you like to overwrite it?"
-msgstr "לשכתב?"
-
-#: src/gtkft.c:1057
+#: src/gtkft.c:1058
 msgid "Gaim - Open..."
 msgstr ""
 
-#: src/gtkft.c:1106
+#: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: src/gtkimhtml.c:346
+#: src/gtkimhtml.c:530
 msgid "_Copy Link Location"
 msgstr "ה_עתק מיקום הקישור"
 
-#: src/gtkimhtml.c:353
+#: src/gtkimhtml.c:537
 msgid "_Open Link in Browser"
 msgstr "_פתח את הקישור בדפדפן"
 
-#: src/gtkimhtml.c:1668
-msgid "Gaim was unable to guess the image type base on the file extension supplied.  Defaulting to PNG."
-msgstr ""
-
-#: src/gtkimhtml.c:1676
+#: src/gtkimhtml.c:1642
+msgid ""
+"Unable to guess the image type based on the file extension supplied.  "
+"Defaulting to PNG."
+msgstr ""
+
+#: src/gtkimhtml.c:1650
 #, c-format
 msgid "Error saving image: %s"
 msgstr ""
 
-#: src/gtkimhtml.c:1685
-msgid "Gaim - Save Image"
-msgstr ""
-
-#: src/gtkimhtml.c:1707
+#: src/gtkimhtml.c:1659
+#, fuzzy
+msgid "Save Image"
+msgstr "שמור קובץ רישום"
+
+#: src/gtkimhtml.c:1681
 msgid "_Save Image..."
 msgstr ""
 
-#: src/gtknotify.c:190
-#: src/gtknotify.c:198
+#: src/gtknotify.c:199
+#, 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:207
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:212
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:207
+#: src/gtknotify.c:216
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4952,7 +5356,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:231
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4960,673 +5364,675 @@
 "%s"
 msgstr ""
 
-#: src/gtkpounce.c:122
+#: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "בחר קובץ"
 
-#: src/gtkpounce.c:172
+#: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: src/gtkpounce.c:345
-#, c-format
-msgid "%s has started typing to you"
-msgstr ""
-
-#: src/gtkpounce.c:346
-#, c-format
-msgid "%s has signed on"
-msgstr ""
-
-#: src/gtkpounce.c:347
-#, c-format
-msgid "%s has returned from being idle"
-msgstr ""
-
-#: src/gtkpounce.c:348
-#, c-format
-msgid "%s has returned from being away"
-msgstr ""
-
-#: src/gtkpounce.c:349
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr ""
-
-#: src/gtkpounce.c:350
-#, c-format
-msgid "%s has signed off"
-msgstr ""
-
-#: src/gtkpounce.c:351
-#, c-format
-msgid "%s has become idle"
-msgstr ""
-
-#: src/gtkpounce.c:352
-#, c-format
-msgid "%s has gone away."
-msgstr "%s התרחק/ה מהמחשב"
-
-#: src/gtkpounce.c:353
-msgid "Unknown pounce event. Please report this!"
-msgstr ""
-
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:494
-#: src/gtkpounce.c:884
+#: src/gtkpounce.c:383 src/gtkpounce.c:787
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:494
+#: src/gtkpounce.c:383
 msgid "Edit Buddy Pounce"
 msgstr ""
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:512
+#: src/gtkpounce.c:401
 msgid "Pounce Who"
 msgstr ""
 
-#: src/gtkpounce.c:534
+#: src/gtkpounce.c:426
 msgid "_Buddy Name:"
 msgstr ""
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:553
+#: src/gtkpounce.c:448
 msgid "Pounce When"
 msgstr ""
 
-#: src/gtkpounce.c:561
+#: src/gtkpounce.c:456
 msgid "Sign on"
 msgstr "התחבר"
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:458
 msgid "Sign off"
 msgstr "נתק"
 
-#: src/gtkpounce.c:567
+#: src/gtkpounce.c:462
 msgid "Return from away"
 msgstr ""
 
-#: src/gtkpounce.c:571
+#: src/gtkpounce.c:466
 msgid "Return from idle"
 msgstr ""
 
-#: src/gtkpounce.c:573
+#: src/gtkpounce.c:468
 msgid "Buddy starts typing"
 msgstr ""
 
-#: src/gtkpounce.c:575
+#: src/gtkpounce.c:470
 msgid "Buddy stops typing"
 msgstr ""
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:604
+#: src/gtkpounce.c:499
 msgid "Pounce Action"
 msgstr ""
 
-#: src/gtkpounce.c:611
+#: src/gtkpounce.c:506
 msgid "Open an IM window"
 msgstr ""
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:507
 msgid "Popup notification"
 msgstr ""
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:508
 msgid "Send a message"
 msgstr "שלח הודעה"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:509
 msgid "Execute a command"
 msgstr "הפעל פקודה"
 
-#: src/gtkpounce.c:615
+#: src/gtkpounce.c:510
 msgid "Play a sound"
 msgstr "נגן צליל"
 
-#: src/gtkpounce.c:619
-#: src/gtkpounce.c:621
+#: src/gtkpounce.c:514 src/gtkpounce.c:516
 msgid "Browse"
 msgstr "עיון"
 
-#: src/gtkpounce.c:622
-#: src/gtkprefs.c:2016
+#: src/gtkpounce.c:517 src/gtkprefs.c:2097
 msgid "Test"
 msgstr "בדיקה"
 
-#: src/gtkpounce.c:705
+#: src/gtkpounce.c:600
 msgid "_Save this pounce after activation"
 msgstr ""
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:891
+#: src/gtkpounce.c:794
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/gtkprefs.c:435
+#: src/gtkpounce.c:835
+#, c-format
+msgid "%s has started typing to you"
+msgstr ""
+
+#: src/gtkpounce.c:836
+#, c-format
+msgid "%s has signed on"
+msgstr ""
+
+#: src/gtkpounce.c:837
+#, c-format
+msgid "%s has returned from being idle"
+msgstr ""
+
+#: src/gtkpounce.c:838
+#, c-format
+msgid "%s has returned from being away"
+msgstr ""
+
+#: src/gtkpounce.c:839
+#, c-format
+msgid "%s has stopped typing to you"
+msgstr ""
+
+#: src/gtkpounce.c:840
+#, c-format
+msgid "%s has signed off"
+msgstr ""
+
+#: src/gtkpounce.c:841
+#, c-format
+msgid "%s has become idle"
+msgstr ""
+
+#: src/gtkpounce.c:842
+#, c-format
+msgid "%s has gone away."
+msgstr "%s התרחק/ה מהמחשב"
+
+#: src/gtkpounce.c:843
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+#: src/gtkprefs.c:378
 msgid "Interface Options"
 msgstr "הגדרות ממשק המשתמש"
 
-#: src/gtkprefs.c:437
+#: src/gtkprefs.c:380
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:618
-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:651
+#: src/gtkprefs.c:561
+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:594
 msgid "Icon"
 msgstr "סמל"
 
-#: src/gtkprefs.c:724
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "סגנון"
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "_מודגש"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "_נתוי"
 
-#: src/gtkprefs.c:729
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "_קו תחתון"
 
-#: src/gtkprefs.c:731
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "ק_ו חוצה"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "סוג"
 
-#: src/gtkprefs.c:737
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "השתמש בגופן מותאם אישית"
 
-#: src/gtkprefs.c:754
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "השתמש בגודל מותאם אישית"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "צבע"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "צבע הטק_סט"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "צבע הרקע"
 
-#: src/gtkprefs.c:818
-#: src/gtkprefs.c:1036
-#: src/gtkprefs.c:1089
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "תצוגה"
 
-#: src/gtkprefs.c:819
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "הצג פרצופים מ_חייכים"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr ""
 
-#: src/gtkprefs.c:823
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr ""
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr ""
 
+#: src/gtkprefs.c:775
+msgid "Ignore c_olors"
+msgstr ""
+
+#: src/gtkprefs.c:777
+msgid "Ignore font _faces"
+msgstr ""
+
+#: src/gtkprefs.c:779
+msgid "Ignore font si_zes"
+msgstr ""
+
+#: src/gtkprefs.c:792
+msgid "Send Message"
+msgstr "שליחת הודעה"
+
+#: src/gtkprefs.c:793
+#, fuzzy
+msgid "Enter _sends message"
+msgstr "שלח הודעה בלחיצת \"Enter\""
+
+#: src/gtkprefs.c:795
+msgid "C_ontrol-Enter sends message"
+msgstr "שלח הודעה בלחיצת \"Ctrl+Enter\""
+
+#: src/gtkprefs.c:798
+msgid "Window Closing"
+msgstr "סגירת החלונות"
+
+#: src/gtkprefs.c:799
+#, fuzzy
+msgid "_Escape closes window"
+msgstr "לחצן \"ESC\" סוגר חלונות"
+
+#: src/gtkprefs.c:802
+msgid "Insertions"
+msgstr "הכנסות"
+
+#: src/gtkprefs.c:803
+msgid "Control-{B/I/U} inserts _HTML tags"
+msgstr ""
+
+#: src/gtkprefs.c:805
+#, fuzzy
+msgid "Control-(number) _inserts smileys"
+msgstr "שלח הודעה בלחיצת \"Ctrl+Enter\""
+
+#: src/gtkprefs.c:822
+msgid "Buddy List Sorting"
+msgstr "סידור רשימת הידידים"
+
 #: src/gtkprefs.c:831
-msgid "Ignore c_olors"
-msgstr ""
-
-#: src/gtkprefs.c:833
-msgid "Ignore font _faces"
-msgstr ""
-
-#: src/gtkprefs.c:835
-msgid "Ignore font si_zes"
-msgstr ""
-
-#: src/gtkprefs.c:848
-msgid "Send Message"
-msgstr "שליחת הודעה"
+msgid "Sorting:"
+msgstr "סדר:"
+
+#: src/gtkprefs.c:836
+msgid "Buddy List Toolbar"
+msgstr "סרגל כלים של רשימת הידידים"
+
+#: src/gtkprefs.c:837 src/gtkprefs.c:964 src/gtkprefs.c:1020
+msgid "Show _buttons as:"
+msgstr "הצג לחצים בתור:"
+
+#: src/gtkprefs.c:839 src/gtkprefs.c:966 src/gtkprefs.c:1022
+msgid "Pictures"
+msgstr "תמונות"
+
+#: src/gtkprefs.c:840 src/gtkprefs.c:967 src/gtkprefs.c:1023
+msgid "Text"
+msgstr "טקסט"
+
+#: src/gtkprefs.c:841 src/gtkprefs.c:968 src/gtkprefs.c:1024
+msgid "Pictures and text"
+msgstr "טקסט עם תמונות"
+
+#: src/gtkprefs.c:846
+msgid "_Raise window on events"
+msgstr ""
 
 #: src/gtkprefs.c:849
-msgid "_Enter sends message"
-msgstr "שלח הודעה בלחיצת \"Enter\""
-
-#: src/gtkprefs.c:851
-msgid "C_ontrol-Enter sends message"
-msgstr "שלח הודעה בלחיצת \"Ctrl+Enter\""
-
-#: src/gtkprefs.c:854
-msgid "Window Closing"
-msgstr "סגירת החלונות"
-
-#: src/gtkprefs.c:855
-msgid "E_scape closes window"
-msgstr "לחצן \"ESC\" סוגר חלונות"
-
-#: src/gtkprefs.c:857
-msgid "Control-_W closes window"
-msgstr "\"Ctrl+W\" סוגר חלונות"
-
-#: src/gtkprefs.c:860
-msgid "Insertions"
-msgstr "הכנסות"
-
-#: src/gtkprefs.c:861
-msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr ""
-
-#: src/gtkprefs.c:863
-msgid "Control-(number) inserts _smileys"
-msgstr ""
-
-#: src/gtkprefs.c:880
-msgid "Buddy List Sorting"
-msgstr "סידור רשימת הידידים"
-
-#: src/gtkprefs.c:889
-msgid "Sorting:"
-msgstr "סדר:"
-
-#: src/gtkprefs.c:894
-msgid "Buddy List Toolbar"
-msgstr "סרגל כלים של רשימת הידידים"
-
-#: src/gtkprefs.c:895
-#: src/gtkprefs.c:1006
-#: src/gtkprefs.c:1062
-msgid "Show _buttons as:"
-msgstr "הצג לחצים בתור:"
-
-#: src/gtkprefs.c:897
-#: src/gtkprefs.c:1008
-#: src/gtkprefs.c:1064
-msgid "Pictures"
-msgstr "תמונות"
-
-#: src/gtkprefs.c:898
-#: src/gtkprefs.c:1009
-#: src/gtkprefs.c:1065
-msgid "Text"
-msgstr "טקסט"
-
-#: src/gtkprefs.c:899
-#: src/gtkprefs.c:1010
-#: src/gtkprefs.c:1066
-msgid "Pictures and text"
-msgstr "טקסט עם תמונות"
-
-#: src/gtkprefs.c:904
-msgid "_Raise window on events"
-msgstr ""
-
-#: src/gtkprefs.c:907
 msgid "Group Display"
 msgstr ""
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr ""
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr ""
 
-#: src/gtkprefs.c:913
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:855 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr ""
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr ""
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr ""
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr ""
 
-#: src/gtkprefs.c:953
-#: src/gtkprefs.c:2190
+#: src/gtkprefs.c:894 src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "שיחות"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "מי_קום:"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:907
 msgid "Send _URLs as Links"
 msgstr ""
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:910
 msgid "Tab Options"
 msgstr "הגדרות כרטיסיה"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:913 src/gtkprefs.c:924
+#, fuzzy
+msgid "Top"
+msgstr "כותרת:"
+
+#: src/gtkprefs.c:915 src/gtkprefs.c:925
+msgid "Bottom"
+msgstr ""
+
+#: src/gtkprefs.c:917 src/gtkprefs.c:926
+msgid "Left"
+msgstr ""
+
+#: src/gtkprefs.c:919 src/gtkprefs.c:927
+msgid "Right"
+msgstr ""
+
+#: src/gtkprefs.c:922
+#, fuzzy
+msgid "_Tab Placement:"
+msgstr "מי_קום:"
+
+#: src/gtkprefs.c:933
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "הצג שיחות והודעות מיידיות בכרטיסיות"
 
-#: src/gtkprefs.c:978
+#: src/gtkprefs.c:936
 msgid "Show _close button on tabs."
 msgstr "הצג לחצן סגירה על גבי כרטיסייה"
 
-#: src/gtkprefs.c:1005
-#: src/gtkprefs.c:1061
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "חלון"
 
-#: src/gtkprefs.c:1015
-#: src/gtkprefs.c:1071
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "רוחב החלון:"
 
-#: src/gtkprefs.c:1018
-#: src/gtkprefs.c:1074
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "גובה החלון:"
 
-#: src/gtkprefs.c:1021
-#: src/gtkprefs.c:1077
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "גובה חלון הטקסט:"
 
-#: src/gtkprefs.c:1024
-#: src/gtkprefs.c:1080
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise windows on events"
 msgstr ""
 
-#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "הסתר חלון לאחר שליחת ההודעה"
 
-#: src/gtkprefs.c:1030
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "סמלי הידידים"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "אפשר אנימצית של סמלי הידידים"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "הצג חיבורים בחלון"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr ""
 
-#: src/gtkprefs.c:1043
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/gtkprefs.c:1083
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "השלמות"
 
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr ""
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr ""
 
-#: src/gtkprefs.c:1090
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr ""
 
-#: src/gtkprefs.c:1092
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr ""
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "השתמש בכינוים צבעונים"
 
-#: src/gtkprefs.c:1112
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "סוג המתווך"
 
-#: src/gtkprefs.c:1113
-msgid "Proxy _type:"
-msgstr "סוג ה_מתווך"
-
-#: src/gtkprefs.c:1115
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "ללא מתווך"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1105
 msgid "Proxy Server"
 msgstr "הגדרות המתווך"
 
-#: src/gtkprefs.c:1134
+#: src/gtkprefs.c:1125
 msgid "_Host"
 msgstr "מ_ארח"
 
-#: src/gtkprefs.c:1148
-msgid "Port"
-msgstr "י_ציאה"
-
-#: src/gtkprefs.c:1164
+#: src/gtkprefs.c:1160
 msgid "_User"
 msgstr "מ_שתמש"
 
-#: src/gtkprefs.c:1178
+#: src/gtkprefs.c:1177
 msgid "Pa_ssword"
 msgstr "סי_סמא"
 
-#: src/gtkprefs.c:1199
+#: src/gtkprefs.c:1233
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr ""
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1253
+msgid "Opera"
+msgstr ""
+
+#: src/gtkprefs.c:1254
+msgid "Netscape"
+msgstr ""
+
+#: src/gtkprefs.c:1255
+msgid "Mozilla"
+msgstr ""
+
+#: src/gtkprefs.c:1256
 msgid "Konqueror"
 msgstr ""
 
-#: src/gtkprefs.c:1221
-msgid "Opera"
-msgstr ""
-
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1257
 msgid "Galeon"
 msgstr ""
 
-#: src/gtkprefs.c:1223
-msgid "Netscape"
-msgstr ""
-
-#: src/gtkprefs.c:1224
-msgid "Mozilla"
-msgstr ""
-
-#: src/gtkprefs.c:1232
+#: src/gtkprefs.c:1266
 msgid "Manual"
 msgstr "מותאם אישית"
 
-#: src/gtkprefs.c:1267
+#: src/gtkprefs.c:1307
 msgid "Browser Selection"
 msgstr "בחירת הדפדפן"
 
-#: src/gtkprefs.c:1271
-msgid "_Browser"
+#: src/gtkprefs.c:1311
+#, fuzzy
+msgid "_Browser:"
 msgstr "דפדפן"
 
-#: src/gtkprefs.c:1281
-msgid "_Manual: "
-msgstr "_מותאם אישית: "
-
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1321
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+#: src/gtkprefs.c:1342
 msgid "Browser Options"
 msgstr "הגדרות הדפדפן"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1343
 msgid "Open new _window by default"
 msgstr "פתח קישור בחלון חדש"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1358
 msgid "Message Logs"
 msgstr "רישום ההודעות"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1359
 msgid "_Log all instant messages"
 msgstr "_רשום את כל ההודעות"
 
-#: src/gtkprefs.c:1322
+#: src/gtkprefs.c:1361
 msgid "Log all c_hats"
 msgstr "רשום את כל השי_חות"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1363
 msgid "Strip _HTML from logs"
 msgstr "הסר HTML מהרישומים"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1366
 msgid "System Logs"
 msgstr "רישומי מערכת"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1367
 msgid "Log when buddies _sign on/sign off"
 msgstr ""
 
-#: src/gtkprefs.c:1330
-msgid "Log when buddies become _idle/un-idle"
-msgstr ""
-
-#: src/gtkprefs.c:1332
-msgid "Log when buddies go away/come _back"
-msgstr ""
-
-#: src/gtkprefs.c:1334
-msgid "Log your _own signons/idleness/awayness"
-msgstr ""
-
-#: src/gtkprefs.c:1336
-msgid "I_ndividual log file for each buddy's signons"
-msgstr ""
-
 #: src/gtkprefs.c:1369
+msgid "Log when buddies become _idle/un-idle"
+msgstr ""
+
+#: src/gtkprefs.c:1371
+msgid "Log when buddies go away/come _back"
+msgstr ""
+
+#: src/gtkprefs.c:1373
+msgid "Log your _own signons/idleness/awayness"
+msgstr ""
+
+#: src/gtkprefs.c:1375
+msgid "I_ndividual log file for each buddy's signons"
+msgstr ""
+
+#: src/gtkprefs.c:1418
 msgid "Sound Options"
 msgstr "הגדרות הצליל"
 
-#: src/gtkprefs.c:1370
+#: src/gtkprefs.c:1419
 msgid "_No sounds when you log in"
 msgstr ""
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1421
 msgid "_Sounds while away"
 msgstr ""
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1425
 msgid "Sound Method"
 msgstr "יציאת הצליל"
 
-#: src/gtkprefs.c:1377
-msgid "_Method"
+#: src/gtkprefs.c:1426
+#, fuzzy
+msgid "_Method:"
 msgstr "דרך:"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1428
 msgid "Console beep"
 msgstr "&צפצף"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1430
 msgid "Automatic"
 msgstr "אוטומתי"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1437
 msgid "Command"
 msgstr "פקודה"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 #, c-format
 msgid ""
-"Sound c_ommand\n"
+"Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/gtkprefs.c:1440
+#: src/gtkprefs.c:1492
 msgid "_Sending messages removes away status"
 msgstr ""
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1494
 msgid "_Queue new messages when away"
 msgstr ""
 
-#: src/gtkprefs.c:1445
+#: src/gtkprefs.c:1497
 msgid "Auto-response"
 msgstr "תגובת מענה:"
 
-#: src/gtkprefs.c:1448
+#: src/gtkprefs.c:1500
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/gtkprefs.c:1451
+#: src/gtkprefs.c:1503
 msgid "_Send auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1505
 msgid "_Only send auto-response when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1507
 msgid "Send auto-response in active conversations"
 msgstr ""
 
-#: src/gtkprefs.c:1462
+#: src/gtkprefs.c:1514
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1517
 msgid "Gaim usage"
 msgstr ""
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1520
 msgid "X usage"
 msgstr ""
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1522
 msgid "Windows usage"
 msgstr ""
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1530
 msgid "Auto-away"
 msgstr ""
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1531
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1533
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1488
+#: src/gtkprefs.c:1540
 msgid "Away m_essage:"
 msgstr ""
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1602
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5636,7 +6042,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1607
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5646,491 +6052,173 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1730
+#: src/gtkprefs.c:1785
 msgid "Load"
 msgstr "טען"
 
-#: src/gtkprefs.c:1737
+#: src/gtkprefs.c:1792
 msgid "Name"
 msgstr "שם"
 
-#: src/gtkprefs.c:1784
+#: src/gtkprefs.c:1839
 msgid "Details"
 msgstr "פרטים"
 
-#: src/gtkprefs.c:1899
+#: src/gtkprefs.c:1964
 msgid "Sound Selection"
 msgstr "בחירת הצליל"
 
-#: src/gtkprefs.c:1993
+#: src/gtkprefs.c:2071
 msgid "Play"
 msgstr "נגן"
 
-#: src/gtkprefs.c:2000
+#: src/gtkprefs.c:2078
 msgid "Event"
 msgstr ""
 
-#: src/gtkprefs.c:2020
+#: src/gtkprefs.c:2101
 msgid "Reset"
 msgstr "אפס"
 
-#: src/gtkprefs.c:2024
+#: src/gtkprefs.c:2105
 msgid "Choose..."
 msgstr "בחר..."
 
-#: src/gtkprefs.c:2148
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "_ערוך"
 
-#: src/gtkprefs.c:2184
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "ממשק המשתמש"
 
-#: src/gtkprefs.c:2185
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "ערכות החיוכים"
 
-#: src/gtkprefs.c:2186
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "גופנים"
 
-#: src/gtkprefs.c:2187
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "טקסט ההודעות"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "קיצורי מקשים"
 
-#: src/gtkprefs.c:2191
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "הודעות מיידיות"
 
-#: src/gtkprefs.c:2193
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "מתווך"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2196
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "דפדפן"
 
-#: src/gtkprefs.c:2198
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr "רישום"
 
-#: src/gtkprefs.c:2199
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "צלילים"
 
-#: src/gtkprefs.c:2200
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "ארועי צליל"
 
-#: src/gtkprefs.c:2201
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr ""
 
-#: src/gtkprefs.c:2202
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "הודעות מרוחק"
 
-#: src/gtkprefs.c:2205
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "תוספים"
 
-#: src/gtkprefs.c:2255
-#: src/main.c:383
-#: src/win32/systray.c:355
-msgid "Preferences"
-msgstr "העדפות"
-
-#: src/gtkutils.c:285
-msgid "Can't save icon file to disk."
-msgstr "לא ניתן לשמור את הסמל לדיסק"
-
-#: src/gtkutils.c:320
-msgid "Gaim - Save Icon"
-msgstr ""
-
-#: src/html.c:322
-msgid "g003: Error opening connection.\n"
-msgstr ""
-
-#: src/log.c:35
-msgid "Error in specifying buddy conversation."
-msgstr ""
-
-#: src/log.c:41
-msgid "Unable to find conversation log"
-msgstr ""
-
-#: src/log.c:128
-msgid "Gaim - Save Conversation"
-msgstr ""
-
-#: src/log.c:169
-#: src/log.c:190
-#: src/log.c:203
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr ""
-
-#: src/log.c:257
-#: src/log.c:273
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr ""
-
-#: src/log.c:260
-#: src/log.c:276
-#, c-format
-msgid "IM Sessions with %s"
-msgstr ""
-
-#: src/log.c:313
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:318
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:323
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr ""
-
-#: src/log.c:328
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:333
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:338
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:343
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr ""
-
-#: src/log.c:350
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:355
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
-
-#: src/log.c:365
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:370
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:376
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:388
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr ""
-
-#: src/log.c:393
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr ""
-
-#: src/log.c:398
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr ""
-
-#: src/log.c:403
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr ""
-
-#: src/log.c:408
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr ""
-
-#: src/log.c:414
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr ""
-
-#: src/main.c:189
-msgid "Please enter your login."
-msgstr ""
-
-#: src/main.c:281
-msgid "<New User>"
-msgstr "<משתמש חדש>"
-
-#: src/main.c:323
-msgid "Login"
-msgstr "כניסה"
-
-#: src/main.c:339
-msgid "Screen Name:"
-msgstr "שם לתצוגה:"
-
-#. And now for the buttons
-#: src/main.c:373
-msgid "Accounts"
-msgstr "חשבונות"
-
-#: src/main.c:389
-#: src/win32/systray.c:191
-msgid "Sign On"
-msgstr "כניסה"
-
-#: src/multi.c:91
-msgid "Done."
-msgstr "מוכן."
-
-#: src/multi.c:167
-msgid "Signon: "
-msgstr "מתחבר: "
-
-#: src/multi.c:225
-msgid "Signon"
-msgstr "מתחבר"
-
-#: src/multi.c:237
-msgid "Cancel All"
-msgstr "בטל הכל"
-
-#: src/multi.c:292
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-
-#: src/multi.c:314
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "לא ניתן להתחבר ל %s"
-
-#: src/multi.c:316
-msgid "Signon Error"
-msgstr "שגיעה בהתחברות"
-
-#: src/multi.c:329
-msgid "Notice"
-msgstr "הודעה"
-
-#: src/multi.c:343
-#, c-format
-msgid "%s has been signed off"
-msgstr "התנתק מ %s"
-
-#: src/multi.c:345
-msgid "Connection Error"
-msgstr "שגיעת התחברות"
-
-#: src/prpl.c:108
-msgid "No actions available"
-msgstr "לא ניתן לבצע פעולות"
-
-#: src/prpl.c:394
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s הפך %s לחבר שלו/שלה %s%s%s"
-
-#: src/prpl.c:406
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"להוסים לרשימת ידידים?"
-
-#: src/prpl.c:409
-msgid "Gaim - Information"
-msgstr "גיים - מידע"
-
-#: src/prpl.c:412
-msgid "Add buddy to your list?"
-msgstr "להוסיף ידיד לרשימה שלך?"
-
-#: src/prpl.c:456
-msgid "You do not currently have any protocols available that are able to register new accounts."
-msgstr ""
-
-#: src/prpl.c:493
-msgid "Gaim - Registration"
-msgstr "גיים - הרשמה"
-
-#: src/prpl.c:506
-msgid "Registration Information"
-msgstr "פרטי הרשמה"
-
-#: src/prpl.c:520
-msgid "Register"
-msgstr "הרשם"
-
-#: src/server.c:57
-msgid "Please enter your password"
-msgstr "הכנס סיסמא:"
-
-#: src/server.c:884
-#, c-format
-msgid "(%d messages)"
-msgstr "(%d הודעות)"
-
-#: src/server.c:896
-msgid "(1 message)"
-msgstr "הודעה 1)"
-
-#: src/server.c:1094
-#: src/server.c:1104
-#, c-format
-msgid "%s logged in."
-msgstr "%s התחבר"
-
-#: src/server.c:1122
-#: src/server.c:1130
-#, c-format
-msgid "%s logged out."
-msgstr "%s התנתק"
-
-#: src/server.c:1164
-#, c-format
-msgid ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-msgstr ""
-
-#: src/server.c:1167
-msgid "an anonymous person"
-msgstr "אלמוני"
-
-#: src/server.c:1257
-#, c-format
-msgid ""
-"User '%s' invites %s to buddy chat room: '%s'\n"
-"%s"
-msgstr ""
-"משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
-"%s"
-
-#: src/server.c:1261
-#, c-format
-msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
-
-#: src/server.c:1267
-msgid "Accept chat invitation?"
-msgstr "לקבל הזמנה לשיחה?"
-
-#: src/server.c:1440
-msgid "Gaim - Popup"
-msgstr ""
-
-#: src/server.c:1467
-msgid "More Info"
-msgstr "פרטים"
-
-#: src/sound.c:80
+#: src/gtkrequest.c:172
+#, fuzzy
+msgid "Apply"
+msgstr "_התחל"
+
+#: src/gtksound.c:60
 msgid "Buddy logs in"
 msgstr ""
 
-#: src/sound.c:81
+#: src/gtksound.c:61
 msgid "Buddy logs out"
 msgstr ""
 
-#: src/sound.c:82
+#: src/gtksound.c:62
 msgid "Message received"
 msgstr "הודעה התקבלה"
 
-#: src/sound.c:83
+#: src/gtksound.c:63
 msgid "Message received begins conversation"
 msgstr "הודעה התקבלה, מתחיל בדו-שיח"
 
-#: src/sound.c:84
+#: src/gtksound.c:64
 msgid "Message sent"
 msgstr "הודעה נשלחה"
 
-#: src/sound.c:85
+#: src/gtksound.c:65
 msgid "Person enters chat"
 msgstr ""
 
-#: src/sound.c:86
+#: src/gtksound.c:66
 msgid "Person leaves chat"
 msgstr ""
 
-#: src/sound.c:87
+#: src/gtksound.c:67
 msgid "You talk in chat"
 msgstr "אתה מדבר בשיחה"
 
-#: src/sound.c:88
+#: src/gtksound.c:68
 msgid "Others talk in chat"
 msgstr "אחרים מדברים בשיחה"
 
-#: src/sound.c:91
+#: src/gtksound.c:71
 msgid "Someone says your name in chat"
 msgstr "מישהו מזכיר את שמך בשיחה"
 
-#: src/sound.c:188
+#: src/gtksound.c:150
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "לא ניתן להשמיע צליל, מכוון שקובץ \"%s\" לא קיים."
 
-#: src/sound.c:204
-msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
-msgstr "לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
-
-#: src/sound.c:213
-#, c-format
-msgid "Unable to play sound because the configured sound command could not be launched: %s"
-msgstr ""
-
-#: src/stock.c:88
-msgid "_Modify"
-msgstr "_ערוך"
-
-#: src/stock.c:89
-msgid "_Open Mail"
-msgstr "_פתח דואר"
+#: src/gtksound.c:166
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr ""
+"לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
+
+#: src/gtksound.c:175
+#, c-format
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
+msgstr ""
+
+#: src/gtkutils.c:283
+msgid "Can't save icon file to disk."
+msgstr "לא ניתן לשמור את הסמל לדיסק"
+
+#: src/gtkutils.c:318
+msgid "Gaim - Save Icon"
+msgstr ""
 
 #. full help text
-#: src/util.c:110
-#: src/util.c:115
-#: src/util.c:120
-#: src/util.c:123
-#: src/util.c:111
-#: src/util.c:129
-#: src/util.c:131
-#: src/util.c:134
-#: src/util.c:726
+#: src/gtkutils.c:908
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6150,82 +6238,348 @@
 msgstr ""
 
 #. short message
-#: src/util.c:741
+#: src/gtkutils.c:923
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#: src/util.c:1037
-msgid "Not connected to AIM"
-msgstr "לא מחובר ל AIM"
-
-#: src/util.c:1046
-#: src/util.c:1085
-msgid "No screenname given."
-msgstr "אין ניתן שם תצוגה."
-
-#: src/util.c:1122
-msgid "No roomname given."
-msgstr "לא ניתן שם החדר."
-
-#: src/util.c:1141
-msgid "Invalid AIM URI"
-msgstr ""
-
-#.
-#. *  DEFINES, MACROS & DATA TYPES
+#: src/html.c:305
+msgid "g003: Error opening connection.\n"
+msgstr ""
+
+#: src/log.c:29
+msgid "Error in specifying buddy conversation."
+msgstr ""
+
+#: src/log.c:35
+msgid "Unable to find conversation log"
+msgstr ""
+
+#: src/log.c:118 src/log.c:139 src/log.c:152
+#, c-format
+msgid "Unable to make directory %s for logging"
+msgstr ""
+
+#: src/log.c:206 src/log.c:222
+#, c-format
+msgid "IM Sessions with %s\n"
+msgstr ""
+
+#: src/log.c:209 src/log.c:225
+#, c-format
+msgid "IM Sessions with %s"
+msgstr ""
+
+#: src/log.c:269
+#, c-format
+msgid "+++ %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:274
+#, c-format
+msgid "+++ %s (%s) signed off @ %s"
+msgstr ""
+
+#: src/log.c:279
+#, c-format
+msgid "+++ %s (%s) changed away state @ %s"
+msgstr ""
+
+#: src/log.c:284
+#, c-format
+msgid "+++ %s (%s) came back @ %s"
+msgstr ""
+
+#: src/log.c:289
+#, c-format
+msgid "+++ %s (%s) became idle @ %s"
+msgstr ""
+
+#: src/log.c:294
+#, c-format
+msgid "+++ %s (%s) returned from idle @ %s"
+msgstr ""
+
+#: src/log.c:299
+#, c-format
+msgid "+++ Program exit @ %s"
+msgstr ""
+
+#: src/log.c:306
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:311
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed off @ %s"
+msgstr ""
+
+#: src/log.c:316
+#, c-format
+msgid "%s (%s) reported that %s (%s) went away @ %s"
+msgstr ""
+
+#: src/log.c:321
+#, c-format
+msgid "%s (%s) reported that %s (%s) came back @ %s"
+msgstr ""
+
+#: src/log.c:326
+#, c-format
+msgid "%s (%s) reported that %s (%s) became idle @ %s"
+msgstr ""
+
+#: src/log.c:332
+#, c-format
+msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+msgstr ""
+
+#: src/log.c:344
+#, c-format
+msgid "%s (%s) reported that %s signed on @ %s"
+msgstr ""
+
+#: src/log.c:349
+#, c-format
+msgid "%s (%s) reported that %s signed off @ %s"
+msgstr ""
+
+#: src/log.c:354
+#, c-format
+msgid "%s (%s) reported that %s went away @ %s"
+msgstr ""
+
+#: src/log.c:359
+#, c-format
+msgid "%s (%s) reported that %s came back @ %s"
+msgstr ""
+
+#: src/log.c:364
+#, c-format
+msgid "%s (%s) reported that %s became idle @ %s"
+msgstr ""
+
+#: src/log.c:370
+#, c-format
+msgid "%s (%s) reported that %s returned from idle @ %s"
+msgstr ""
+
+#: src/main.c:235
+msgid "Please enter your login."
+msgstr ""
+
+#: src/main.c:323
+msgid "<New User>"
+msgstr "<משתמש חדש>"
+
+#: src/main.c:365
+msgid "Login"
+msgstr "כניסה"
+
+#: src/main.c:381
+msgid "Screen Name:"
+msgstr "שם לתצוגה:"
+
+#: src/main.c:431
+msgid "Sign On"
+msgstr "כניסה"
+
+#: src/prpl.c:292
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s הפך %s לחבר שלו/שלה %s%s%s"
+
+#: src/prpl.c:304
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"להוסים לרשימת ידידים?"
+
+#: src/prpl.c:307
+msgid "Gaim - Information"
+msgstr "גיים - מידע"
+
+#: src/prpl.c:310
+msgid "Add buddy to your list?"
+msgstr "להוסיף ידיד לרשימה שלך?"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/win32/systray.c:36
-msgid "Gaim Instant Messenger"
-msgstr ""
-
-#: src/win32/systray.c:37
-msgid "Gaim Instant Messenger - Signed off"
-msgstr ""
-
-#: src/win32/systray.c:38
-msgid "Gaim Instant Messenger - Away"
-msgstr ""
-
-#: src/win32/systray.c:134
-msgid "New"
-msgstr "חדש"
-
-#: src/win32/systray.c:167
-msgid "Set Away Message"
-msgstr ""
-
-#: src/win32/systray.c:176
-msgid "I'm Back"
-msgstr "חזרתי"
-
-#: src/win32/systray.c:365
-msgid "Exit"
-msgstr "יציאה"
-
-#: src/plugin.c:232
+#: src/request.h:823
+msgid "Accept"
+msgstr ""
+
+#: src/server.c:56
+msgid "Please enter your password"
+msgstr "הכנס סיסמא:"
+
+#: src/server.c:874
+#, c-format
+msgid "(%d messages)"
+msgstr "(%d הודעות)"
+
+#: src/server.c:886
+msgid "(1 message)"
+msgstr "הודעה 1)"
+
+#: src/server.c:1084 src/server.c:1094
+#, c-format
+msgid "%s logged in."
+msgstr "%s התחבר"
+
+#: src/server.c:1112 src/server.c:1120
+#, c-format
+msgid "%s logged out."
+msgstr "%s התנתק"
+
+#: src/server.c:1161
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+
+#: src/server.c:1164
+msgid "an anonymous person"
+msgstr "אלמוני"
+
+#: src/server.c:1254
+#, c-format
+msgid ""
+"User '%s' invites %s to buddy chat room: '%s'\n"
+"%s"
+msgstr ""
+"משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
+"%s"
+
+#: src/server.c:1258
+#, c-format
+msgid "User '%s' invites %s to buddy chat room: '%s'\n"
+msgstr "משתמש \"%s\" מזמין את \"%s\" לחדר שיחות \"%s\" \n"
+
+#: src/server.c:1264
+msgid "Accept chat invitation?"
+msgstr "לקבל הזמנה לשיחה?"
+
+#: src/server.c:1436
+msgid "Gaim - Popup"
+msgstr ""
+
+#: src/server.c:1463
+msgid "More Info"
+msgstr "פרטים"
+
+#: src/stock.c:84
+msgid "_Modify"
+msgstr "_ערוך"
+
+#: src/stock.c:85
+msgid "_Open Mail"
+msgstr "_פתח דואר"
+
+#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#, fuzzy
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] " דקות"
+msgstr[1] " דקות"
+
+#: src/util.c:933
+msgid "Calculating..."
+msgstr "מחשב..."
+
+#: src/util.c:936
+msgid "Unknown."
+msgstr "לא ידוע"
+
+#: src/plugin.c:222
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr ""
 
-#: src/plugin.c:237
+#: src/plugin.c:227
 msgid "Gaim was unable to load your plugin."
 msgstr "גיים לא מצליח לטעון את התוסף שלך."
 
 #. * Custom away message.
-#: src/prpl.h:172
+#: src/prpl.h:175
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: src/gtkdebug.c:111
+#: src/gtkdebug.c:142
 msgid "Debug Window"
 msgstr ""
 
-#: src/gtkdebug.c:150
+#: src/gtkdebug.c:182
 msgid "Pause"
 msgstr "השהייה"
 
-#: src/gtkdebug.c:156
+#: src/gtkdebug.c:188
 msgid "Timestamps"
 msgstr ""
 
+#~ msgid "File Transfers..."
+#~ msgstr "משלוח קבצים..."
+
+#~ msgid "Accounts..."
+#~ msgstr "חשבונות..."
+
+#~ msgid "Preferences..."
+#~ msgstr "העדפות..."
+
+#~ msgid "New name:"
+#~ msgstr "שם חדש:"
+
+#~ msgid "Control-_W closes window"
+#~ msgstr "\"Ctrl+W\" סוגר חלונות"
+
+#~ msgid "_Manual: "
+#~ msgstr "_מותאם אישית: "
+
+#~ msgid "%s was unable to sign on"
+#~ msgstr "לא ניתן להתחבר ל %s"
+
+#~ msgid "Signon Error"
+#~ msgstr "שגיעה בהתחברות"
+
+#~ msgid "Notice"
+#~ msgstr "הודעה"
+
+#~ msgid "%s has been signed off"
+#~ msgstr "התנתק מ %s"
+
+#~ msgid "Connection Error"
+#~ msgstr "שגיעת התחברות"
+
+#~ msgid "Gaim - Registration"
+#~ msgstr "גיים - הרשמה"
+
+#~ msgid "Registration Information"
+#~ msgstr "פרטי הרשמה"
+
+#~ msgid "New"
+#~ msgstr "חדש"
+
+#~ msgid "I'm Back"
+#~ msgstr "חזרתי"
+
+#~ msgid "Exit"
+#~ msgstr "יציאה"