diff po/am.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 8655d83e1e1e
children 25b26e3ecf60
line wrap: on
line diff
--- a/po/am.po	Mon Jul 14 06:08:18 2003 +0000
+++ b/po/am.po	Mon Jul 14 06:11:31 2003 +0000
@@ -7,162 +7,203 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60 \n"
-"POT-Creation-Date: 2002-10-31 05:39+0100\n"
-"PO-Revision-Date: 2003-04-08 09:23:11+EDT\n" 
+"POT-Creation-Date: 2003-07-13 22:05-0700\n"
+"PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/docklet/docklet.c:95 src/multi.c:284 src/win32/systray.c:295
+#: plugins/docklet/docklet.c:110 src/gtkaccount.c:444 src/gtkaccount.c:1599
 msgid "Auto-login"
 msgstr ""
 
-#: plugins/docklet/docklet.c:98
+#: plugins/docklet/docklet.c:113
 msgid "New Message.."
 msgstr "አዲስ መልእክት..."
 
-#: plugins/docklet/docklet.c:99
+#: plugins/docklet/docklet.c:114
 msgid "Join A Chat..."
 msgstr "ውሪ አገጣጥም..."
 
-#: plugins/docklet/docklet.c:130
+#: plugins/docklet/docklet.c:145
 msgid "New..."
 msgstr "አዲስ.."
 
-#: plugins/docklet/docklet.c:134 src/protocols/gg/gg.c:71
-#: src/protocols/jabber/jabber.c:1157 src/protocols/jabber/jabber.c:3324
-#: src/protocols/jabber/jabber.c:3371 src/protocols/oscar/oscar.c:2713
-#: src/protocols/oscar/oscar.c:4394 src/protocols/oscar/oscar.c:5489
-#: src/buddy.c:1288 src/prefs.c:1053
+#: 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:140 src/away.c:511
+#: plugins/docklet/docklet.c:155 src/away.c:531
 msgid "Back"
 msgstr "ወደኋላ"
 
-#: plugins/docklet/docklet.c:148
+#: plugins/docklet/docklet.c:163
 msgid "Mute Sounds"
 msgstr ""
 
-#: plugins/docklet/docklet.c:153
-msgid "File Transfers..."
-msgstr ""
-
-#: plugins/docklet/docklet.c:154
-msgid "Accounts..."
-msgstr ""
-
-#: plugins/docklet/docklet.c:155
-msgid "Preferences..."
-msgstr "ምርጫዎች..."
-
-#: plugins/docklet/docklet.c:164 src/win32/systray.c:118
+#: 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:168
+#: plugins/docklet/docklet.c:183
 msgid "Quit"
 msgstr "ውጣ"
 
-#: plugins/docklet/docklet.c:443
+#: plugins/docklet/docklet.c:412
 msgid "Tray Icon Configuration"
 msgstr ""
 
-#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
-#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
-#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
-#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:452
+#: plugins/docklet/docklet.c:416
 msgid "_Hide new messages until tray icon is clicked"
 msgstr ""
 
-#: plugins/docklet/docklet.c:464 plugins/docklet/docklet.c:473
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:440
 msgid "System Tray Icon"
 msgstr ""
 
-#: plugins/docklet/docklet.c:466 plugins/docklet/docklet.c:477
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:443
+msgid "Displays an icon for Gaim in the system tray."
+msgstr ""
+
+#. *  description
+#: plugins/docklet/docklet.c:445
 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."
-msgstr ""
-
-#: plugins/ticker/ticker.c:95
-msgid "Gaim - Buddy Ticker"
-msgstr ""
-
-#: plugins/ticker/ticker.c:411 plugins/ticker/ticker.c:437
-msgid "Buddy Ticker"
-msgstr ""
-
-#: plugins/ticker/ticker.c:415 plugins/ticker/ticker.c:439
-msgid "A horizontal scrolling version of the buddy list."
-msgstr ""
-
-#: plugins/autorecon.c:58
-msgid "Autoreconnect"
-msgstr ""
-
-#: plugins/autorecon.c:60 plugins/autorecon.c:71
+"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
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/autorecon.c:103
+msgid "Auto-Reconnect"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/autorecon.c:106 plugins/autorecon.c:108
 msgid "When you are kicked offline, this reconnects you."
 msgstr ""
 
-#: plugins/autorecon.c:67
-msgid "Auto Reconnect"
-msgstr ""
-
-#: plugins/chatlist.c:74 src/buddy_chat.c:268
-msgid "Buddy Chat"
-msgstr ""
-
-#: plugins/chatlist.c:162 plugins/chatlist.c:164 plugins/chatlist.c:347
-#: plugins/chatlist.c:349
-msgid "Gaim Chat"
-msgstr "የጌም ማውሪያ"
-
-#: plugins/chatlist.c:305
-msgid "Chat Rooms"
-msgstr "የውሪ ቤቶች"
-
-#: plugins/chatlist.c:316
-msgid "Refresh"
-msgstr "በድጋሚ ጀምር"
-
-#: plugins/chatlist.c:317 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2556 src/dialogs.c:2168 src/gtkconv.c:774
-#: src/gtkconv.c:2594 src/gtkconv.c:3724 src/prpl.c:737
-msgid "Add"
-msgstr "ጨምር"
-
-#: plugins/chatlist.c:318 src/gtkconv.c:772 src/gtkconv.c:2600
-#: src/gtkconv.c:3715
-msgid "Remove"
-msgstr "አስወግድ"
-
-#: plugins/chatlist.c:330
-msgid "List of available chats"
-msgstr ""
-
-#: plugins/chatlist.c:339
-msgid "List of subscribed chats"
-msgstr ""
-
-#: plugins/chatlist.c:400 plugins/chatlist.c:410
-msgid "Chat List"
-msgstr "የውሪ ዝርዝር"
-
-#: plugins/chatlist.c:402
-msgid "Allows you to add chat rooms to your buddy list."
-msgstr ""
-
-#: plugins/chatlist.c:415
+#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
+#, fuzzy
+msgid "Mail Server"
+msgstr "ሰርቨር፦"
+
+#: plugins/chkmail.c:131
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr ""
+
+#: plugins/chkmail.c:203
+#, fuzzy
+msgid "Check Mail"
+msgstr "እሜይልን ክፈት"
+
+#: plugins/chkmail.c:207
+msgid "Check email every X seconds.\n"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/events.c:236
+#, fuzzy
+msgid "Event Test"
+msgstr "ኩነት"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/events.c:239 plugins/events.c:241
+msgid "Test to see that all events are working properly."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/filectl.c:203
+msgid "Gaim File Control"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/filectl.c:206 plugins/filectl.c:208
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaiminc.c:72
+msgid "Gaim Demonstration Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaiminc.c:75
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+
+#. *  description
+#: plugins/gaiminc.c:77
 msgid ""
-"Allows you to add chat rooms to your buddy list. Click the configure button "
-"to choose which rooms."
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
 #: plugins/gtik.c:719
@@ -194,199 +235,342 @@
 msgid "Change"
 msgstr "ለውጥ"
 
-#: plugins/history.c:76
+#: plugins/history.c:87
 msgid "History"
 msgstr "ታሪክ"
 
-#: plugins/history.c:78
-msgid "Shows recently logged conversations in new conversations "
-msgstr ""
-
-#: plugins/iconaway.c:68 plugins/iconaway.c:77
-msgid "Iconify on away"
-msgstr ""
-
-#: plugins/iconaway.c:70 plugins/iconaway.c:81
-msgid "Iconifies the away box and the buddy list when you go away."
-msgstr ""
-
-#: plugins/idle.c:19 plugins/idle.c:81
-msgid "I'dle Mak'er"
-msgstr ""
-
-#: plugins/idle.c:23 plugins/idle.c:83
-msgid "Allows you to hand-configure how long you've been idle for"
-msgstr ""
-
-#: plugins/idle.c:99
+#: plugins/history.c:89
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+
+#: 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
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/iconaway.c:74
+msgid "Iconify on Away"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: 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:107
+#: plugins/idle.c:78
 msgid "Set"
 msgstr "አድርግ"
 
-#: plugins/idle.c:112
+#: plugins/idle.c:83
 msgid "idle for"
 msgstr ""
 
-#: plugins/idle.c:119 plugins/timestamp.c:86
+#: plugins/idle.c:90 plugins/timestamp.c:88
 msgid "minutes."
 msgstr "ደቂቃዎች።"
 
-#: plugins/idle.c:125
+#: plugins/idle.c:96
 msgid "_Set"
 msgstr "አድርግ (_S)"
 
-#: plugins/notify.c:440
+#: plugins/idle.c:119
+msgid "I'dle Mak'er"
+msgstr ""
+
+#: plugins/idle.c:121 plugins/idle.c:122
+msgid "Allows you to hand-configure how long you've been idle for"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/mailchk.c:149
+msgid "Mail Checker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/mailchk.c:152 plugins/mailchk.c:154
+msgid "Checks for new local mail."
+msgstr ""
+
+#: plugins/notify.c:442
 msgid "Unable to write to config file"
 msgstr ""
 
-#: plugins/notify.c:440
+#: plugins/notify.c:443
 msgid "Notify plugin"
 msgstr ""
 
-#: plugins/notify.c:598 plugins/notify.c:607
-msgid "Message Notification"
-msgstr ""
-
-#: plugins/notify.c:600 plugins/notify.c:611
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-
-#: plugins/notify.c:621
+#: plugins/notify.c:573
 msgid "Notify For"
 msgstr ""
 
-#: plugins/notify.c:622
+#: plugins/notify.c:574
 msgid "_IM windows"
 msgstr ""
 
-#: plugins/notify.c:627
+#: plugins/notify.c:579
 msgid "_Chat windows"
 msgstr ""
 
 #. --------------
-#: plugins/notify.c:633
+#: plugins/notify.c:585
 msgid "Notification Methods"
 msgstr ""
 
-#: plugins/notify.c:636
+#: plugins/notify.c:588
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr ""
 
-#: plugins/notify.c:647
+#: plugins/notify.c:599
 msgid "_Quote window title"
 msgstr ""
 
-#: plugins/notify.c:652
+#: plugins/notify.c:604
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr ""
 
-#: plugins/notify.c:657
+#: plugins/notify.c:609
 msgid "Insert c_ount of new messages into window title"
 msgstr ""
 
-#: plugins/notify.c:662
+#: plugins/notify.c:614
 msgid "_Notify even if conversation is in focus"
 msgstr ""
 
 #. --------------
-#: plugins/notify.c:668
+#: plugins/notify.c:620
 msgid "Notification Removal"
 msgstr ""
 
-#: plugins/notify.c:669
+#: plugins/notify.c:621
 msgid "Remove when conversation window gains _focus"
 msgstr ""
 
-#: plugins/notify.c:674
+#: plugins/notify.c:626
 msgid "Remove when conversation window _receives click"
 msgstr ""
 
-#: plugins/notify.c:679
+#: plugins/notify.c:631
 msgid "Remove when _typing in conversation window"
 msgstr ""
 
-#: plugins/notify.c:684
+#: plugins/notify.c:636
 msgid "Appl_y"
 msgstr "ተጠቀም (_Y)"
 
-#: plugins/spellchk.c:399 plugins/spellchk.c:408
-msgid "Text replacement"
-msgstr ""
-
-#: plugins/spellchk.c:401 plugins/spellchk.c:412
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-
-#: plugins/spellchk.c:429
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/notify.c:699
+msgid "Message Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/notify.c:702 plugins/notify.c:704
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+
+#: plugins/raw.c:152
+msgid "Raw"
+msgstr ""
+
+#: plugins/raw.c:154
+msgid "Lets you send raw input to text-based protocols."
+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."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/simple.c:30
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/simple.c:33 plugins/simple.c:35
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#: plugins/spellchk.c:394
 msgid "Text Replacements"
 msgstr ""
 
-#: plugins/spellchk.c:453
+#: plugins/spellchk.c:418
 msgid "You type"
 msgstr ""
 
-#: plugins/spellchk.c:465
+#: plugins/spellchk.c:430
 msgid "You send"
 msgstr ""
 
-#: plugins/spellchk.c:491
+#: plugins/spellchk.c:456
 msgid "Add a new text replacement"
 msgstr ""
 
-#: plugins/spellchk.c:498
+#: plugins/spellchk.c:463
 msgid "You _type:"
 msgstr ""
 
-#: plugins/spellchk.c:512
+#: plugins/spellchk.c:477
 msgid "You _send:"
 msgstr ""
 
-#: plugins/timestamp.c:72
+#: plugins/spellchk.c:517
+msgid "Text replacement"
+msgstr ""
+
+#: plugins/spellchk.c:519 plugins/spellchk.c:520
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+#: 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 "ተጠቀም (_A)"
 
-#: plugins/timestamp.c:129
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/timestamp.c:148
 msgid "Timestamp"
 msgstr ""
 
-#: plugins/timestamp.c:131
+#. *< name
+#. *< version
+#. *  summary
+#: 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 ""
+
+#: 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 "መድረክን አስወግድ"
+
+#. *< 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:213
+#: plugins/gestures/gestures.c:222
 msgid "Mouse Gestures Configuration"
 msgstr ""
 
-#: plugins/gestures/gestures.c:220
+#: plugins/gestures/gestures.c:229
 msgid "Middle mouse button"
 msgstr ""
 
-#: plugins/gestures/gestures.c:225
+#: plugins/gestures/gestures.c:234
 msgid "Right mouse button"
 msgstr ""
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:237
+#: plugins/gestures/gestures.c:246
 msgid "_Visual gesture display"
 msgstr ""
 
-#: plugins/gestures/gestures.c:253 plugins/gestures/gestures.c:272
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gestures/gestures.c:273
 msgid "Mouse Gestures"
 msgstr ""
 
-#: plugins/gestures/gestures.c:256 plugins/gestures/gestures.c:278
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gestures/gestures.c:276
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+#: 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"
@@ -396,19 +580,72 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:123
-#: plugins/win32/transparency/win2ktrans.c:432
-#: plugins/win32/transparency/win2ktrans.c:466
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ticker/ticker.c:68 plugins/ticker/ticker.c:280
+msgid "Buddy Ticker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: 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:133
+#: plugins/win32/transparency/win2ktrans.c:359
+#: plugins/win32/transparency/win2ktrans.c:393
 msgid "Opacity:"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:385
-#: plugins/win32/transparency/win2ktrans.c:394
+#. IM Convo trans options
+#: plugins/win32/transparency/win2ktrans.c:340
+msgid "IM Conversation Windows"
+msgstr ""
+
+#: plugins/win32/transparency/win2ktrans.c:341
+msgid "_IM window transparency"
+msgstr ""
+
+#: plugins/win32/transparency/win2ktrans.c:351
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+#. Buddy List trans options
+#: plugins/win32/transparency/win2ktrans.c:376 src/gtkprefs.c:845
+msgid "Buddy List Window"
+msgstr ""
+
+#: plugins/win32/transparency/win2ktrans.c:377
+msgid "_Keep Buddy List window on top"
+msgstr ""
+
+#: plugins/win32/transparency/win2ktrans.c:380
+msgid "_Buddy List window transparency"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/win32/transparency/win2ktrans.c:436
 msgid "Transparency"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:387
-#: plugins/win32/transparency/win2ktrans.c:398
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/win32/transparency/win2ktrans.c:439
+#: plugins/win32/transparency/win2ktrans.c:441
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows.\n"
 "\n"
@@ -416,357 +653,395 @@
 msgstr ""
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:413
-msgid "IM Conversation Windows"
-msgstr ""
-
-#: plugins/win32/transparency/win2ktrans.c:414
-msgid "_IM window transparency"
-msgstr ""
-
-#: plugins/win32/transparency/win2ktrans.c:424
-msgid "_Show slider bar in IM window"
-msgstr ""
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:449 src/prefs.c:568
-msgid "Buddy List Window"
-msgstr ""
-
-#: plugins/win32/transparency/win2ktrans.c:450
-msgid "_Keep Buddy List window on top"
-msgstr ""
-
-#: plugins/win32/transparency/win2ktrans.c:453
-msgid "_Buddy List window transparency"
-msgstr ""
-
-#: plugins/win32/winprefs/winprefs.c:144 plugins/win32/winprefs/winprefs.c:153
+#: plugins/win32/winprefs/winprefs.c:124
+msgid "Startup"
+msgstr ""
+
+#: plugins/win32/winprefs/winprefs.c:125
+msgid "_Start Gaim on Windows startup"
+msgstr ""
+
+#: plugins/win32/winprefs/winprefs.c:152
 msgid "WinGaim Options"
 msgstr "የWinGaim ምርጫዎች"
 
-#: plugins/win32/winprefs/winprefs.c:146 plugins/win32/winprefs/winprefs.c:157
+#: plugins/win32/winprefs/winprefs.c:154 plugins/win32/winprefs/winprefs.c:155
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#. IM Convo trans options
-#: plugins/win32/winprefs/winprefs.c:170
-msgid "Startup"
-msgstr ""
-
-#: plugins/win32/winprefs/winprefs.c:171
-msgid "_Start Gaim on Windows startup"
-msgstr ""
-
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1165
-#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1620
-#: src/protocols/yahoo/yahoo.c:1245 src/protocols/yahoo/yahoo.c:1324
+#: plugins/perl/perl.c:405
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/perl/perl.c:1392
+msgid "Perl Plugin Loader"
+msgstr ""
+
+#. *< name
+#. *< version
+#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
+msgid "Provides support for loading perl plugins."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/statenotify.c:72
+msgid "Buddy State Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: 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:3327
-#: src/protocols/jabber/jabber.c:3383 src/protocols/oscar/oscar.c:2717
-#: src/protocols/oscar/oscar.c:4382 src/protocols/oscar/oscar.c:4409
-#: src/protocols/oscar/oscar.c:5494 src/protocols/yahoo/yahoo.c:1062
-#: src/protocols/yahoo/yahoo.c:1267 src/protocols/yahoo/yahoo.c:1334
+#: 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:139
+msgid "Unable to resolve hostname."
+msgstr ""
+
+#: src/protocols/gg/gg.c:142
+msgid "Unable to connect to server."
+msgstr ""
+
+#: src/protocols/gg/gg.c:145
+msgid "Invalid response from server."
+msgstr ""
+
+#: src/protocols/gg/gg.c:148
+msgid "Error while reading from socket."
+msgstr ""
+
+#: src/protocols/gg/gg.c:151
+msgid "Error while writing to socket."
+msgstr ""
+
+#: src/protocols/gg/gg.c:154
+msgid "Authentication failed."
+msgstr ""
+
 #: src/protocols/gg/gg.c:157
-msgid "Unable to resolve hostname."
-msgstr ""
-
-#: src/protocols/gg/gg.c:160
-msgid "Unable to connect to server."
-msgstr ""
-
-#: src/protocols/gg/gg.c:163
-msgid "Invalid response from server."
-msgstr ""
-
-#: src/protocols/gg/gg.c:166
-msgid "Error while reading from socket."
-msgstr ""
-
-#: src/protocols/gg/gg.c:169
-msgid "Error while writing to socket."
-msgstr ""
-
-#: src/protocols/gg/gg.c:172
-msgid "Authentication failed."
-msgstr ""
-
-#: src/protocols/gg/gg.c:175
 msgid "Unknown Error Code."
 msgstr "ያልታወቀ የስህተት ኮድ።"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:262
 #, c-format
 msgid "Status: %s"
 msgstr "ሁኔታ፦ %s"
 
-#: src/protocols/gg/gg.c:301
+#: src/protocols/gg/gg.c:283
 msgid "Could not connect"
 msgstr ""
 
-#: src/protocols/gg/gg.c:308
+#: src/protocols/gg/gg.c:290
 msgid "Unable to read socket"
 msgstr ""
 
+#: src/protocols/gg/gg.c:402
+msgid "Unable to connect."
+msgstr ""
+
 #: src/protocols/gg/gg.c:418
-msgid "Unable to connect."
-msgstr ""
-
-#: src/protocols/gg/gg.c:434
 msgid "Reading data"
 msgstr ""
 
+#: src/protocols/gg/gg.c:421
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:424
+msgid "Reading server key"
+msgstr ""
+
+#: src/protocols/gg/gg.c:427
+msgid "Exchanging key hash"
+msgstr ""
+
 #: src/protocols/gg/gg.c:437
-msgid "Balancer handshake"
-msgstr ""
-
-#: src/protocols/gg/gg.c:440
-msgid "Reading server key"
-msgstr ""
-
-#: src/protocols/gg/gg.c:443
-msgid "Exchanging key hash"
-msgstr ""
-
-#: src/protocols/gg/gg.c:452
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:471 src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
+#: src/protocols/gg/gg.c:503
+msgid "Unable to ping server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:515
+msgid "Send as message"
+msgstr ""
+
 #: src/protocols/gg/gg.c:520
-msgid "Unable to ping server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:532
-msgid "Send as message"
-msgstr ""
-
-#: src/protocols/gg/gg.c:540
 msgid "Looking up GG server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:591
+#: 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:654
+#: src/protocols/gg/gg.c:633
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:638
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:684
+#: src/protocols/gg/gg.c:663
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4886 src/gtkft.c:1004
+#. *
+#. * 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:685 src/protocols/oscar/oscar.c:4886 src/gtkft.c:1005
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:169 src/request.h:804
 msgid "No"
 msgstr "አይ"
 
-#: src/protocols/gg/gg.c:689
+#: src/protocols/gg/gg.c:668
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:693
+#: src/protocols/gg/gg.c:672
 msgid "First name"
 msgstr "ስም"
 
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:677
 msgid "Second Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:681 src/protocols/gg/gg.c:1380
 msgid "Nick"
 msgstr "ቅጽል"
 
-#: src/protocols/gg/gg.c:709 src/protocols/gg/gg.c:712
+#: src/protocols/gg/gg.c:688 src/protocols/gg/gg.c:691
 msgid "Birth year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:718 src/protocols/gg/gg.c:720
-#: src/protocols/gg/gg.c:722
+#: 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:726 src/dialogs.c:1767 src/dialogs.c:2401
+#. 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:758
+#: src/protocols/gg/gg.c:738
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:764
+#: src/protocols/gg/gg.c:746
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:809
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:829
+#: src/protocols/gg/gg.c:817
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:825
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:833
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:846
+#: src/protocols/gg/gg.c:841
 msgid "Password changed successfully"
 msgstr ""
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:848
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:962
+#: src/protocols/gg/gg.c:965
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:963
+#: 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:990
+#: src/protocols/gg/gg.c:994
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:991
+#: 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:1059
+#: src/protocols/gg/gg.c:1064
 msgid "Couldn't export buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
+#: 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:1081
+#: src/protocols/gg/gg.c:1087
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1136
 msgid "Unable to access directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1130
+#: 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:1162
+#: src/protocols/gg/gg.c:1170
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1163
+#: 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:1177
+#: src/protocols/gg/gg.c:1187
 msgid "Directory Search"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4199
-#: src/protocols/oscar/oscar.c:5682 src/protocols/toc/toc.c:1446
-#: src/dialogs.c:1874 src/dialogs.c:1883
+#: 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:1193
+#: src/protocols/gg/gg.c:1203
 msgid "Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1199
+#: src/protocols/gg/gg.c:1209
 msgid "Export Buddy List to Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1215
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1237
+#: src/protocols/gg/gg.c:1248
 msgid "Unable to access user profile."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1238
+#: 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 ""
 
-#: src/protocols/gg/gg.c:1323 src/protocols/icq/gaim_icq.c:497
-#: src/protocols/oscar/oscar.c:3820
-msgid "Nick:"
-msgstr "ቅጽል፦"
-
-#: src/protocols/gg/gg.c:1324
-msgid "Gadu-Gadu User"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/gg/gg.c:1361 src/protocols/gg/gg.c:1363
+msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
 #: src/protocols/icq/gaim_icq.c:224
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
+#: 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:1362
-#: src/protocols/oscar/oscar.c:2322 src/protocols/oscar/oscar.c:2382
-#: src/protocols/oscar/oscar.c:5369 src/protocols/toc/toc.c:2041
-#: src/buddy_chat.c:307 src/dialogs.c:463 src/dialogs.c:471 src/dialogs.c:1824
-#: src/dialogs.c:1935 src/dialogs.c:1995 src/dialogs.c:2157 src/dialogs.c:2343
-#: src/dialogs.c:2492 src/dialogs.c:3135 src/dialogs.c:3330 src/dialogs.c:3487
-#: src/dialogs.c:3991 src/dialogs.c:4563 src/gtkft.c:1098 src/multi.c:1468
-#: src/multi.c:1850 src/prpl.c:320 src/prpl.c:737 src/server.c:1050
+#: 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 "ተወው"
 
@@ -775,15 +1050,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:1654
-#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2494
-#: src/protocols/oscar/oscar.c:4920
+#: 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:1654
-#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2494
-#: src/protocols/oscar/oscar.c:4920 src/dialogs.c:2156
+#: 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 ""
 
@@ -791,10 +1067,11 @@
 msgid "Send message through server"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2271
-#: src/protocols/jabber/jabber.c:2303 src/protocols/jabber/jabber.c:4117
-#: src/protocols/jabber/jabber.c:4163 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1208
+#: 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 ""
 
@@ -802,172 +1079,225 @@
 msgid "Connecting..."
 msgstr ""
 
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
+msgid "Nick:"
+msgstr "ቅጽል፦"
+
 #: src/protocols/icq/gaim_icq.c:498
 msgid "Gaim User"
 msgstr "የጌም ተጠቃሚ"
 
-#: src/protocols/irc/irc.c:200
+#: 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:500 src/protocols/irc/irc.c:2504
+#: 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:2513
+#: 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:687
+#: src/protocols/irc/irc.c:675
 msgid "No topic is set"
 msgstr ""
 
-#: src/protocols/irc/irc.c:708 src/protocols/irc/irc.c:1645
+#: 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:753
+#: src/protocols/irc/irc.c:741
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr ""
 
+#: src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:931
+#, fuzzy
+msgid "User"
+msgstr "ተጠቃሚ (_U)"
+
+#. 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
+#, fuzzy
+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
+#, fuzzy
+msgid "Channels"
+msgstr "ጣቢያ፦"
+
+#: src/protocols/irc/irc.c:945
+#, c-format
+msgid "%s is an Identified User"
+msgstr ""
+
+#: src/protocols/irc/irc.c:960
+#, c-format
+msgid "%ld seconds [signon: %s]"
+msgstr ""
+
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1086
+#: src/protocols/irc/irc.c:1081
 msgid "Rehashing server"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1086 src/protocols/irc/irc.c:1538
-msgid "IRC Operator"
-msgstr ""
-
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1089
+#: src/protocols/irc/irc.c:1084
 msgid "No such nick/channel"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1092
-#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
-#: src/protocols/irc/irc.c:1496
+#: 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 "የIRC ስህተት"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1092
+#: 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:1097
+#: src/protocols/irc/irc.c:1092
 msgid "No nickname given"
 msgstr ""
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1095
 msgid "You're not an IRC operator!"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1103
+#: src/protocols/irc/irc.c:1099
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1325 src/protocols/irc/irc.c:1331
-#: src/protocols/irc/irc.c:1337 src/protocols/irc/irc.c:1351
+#. Build OK Button
+#: 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:1389 src/protocols/irc/irc.c:1395
+#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1415
 msgid "IRC CTCP info"
 msgstr "የIRC CTCP መረጃ"
 
-#: src/protocols/irc/irc.c:1361
+#: src/protocols/irc/irc.c:1425
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1362
+#: 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:1362 src/protocols/oscar/oscar.c:2322
-#: src/protocols/oscar/oscar.c:5369
+#: 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:1435 src/protocols/msn/msn.c:151
-#: src/protocols/msn/msn.c:523 src/protocols/msn/msn.c:1029
+#: src/protocols/irc/irc.c:1459
+#, c-format
+msgid "Received an invalid file send request from %s."
+msgstr ""
+
+#: 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:1494
+#: src/protocols/irc/irc.c:1602
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1499
+#: src/protocols/irc/irc.c:1607
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1555 src/protocols/irc/irc.c:2810
+#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2917
 msgid "CTCP ClientInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1561 src/protocols/irc/irc.c:2816
+#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2923
 msgid "CTCP UserInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1567 src/protocols/irc/irc.c:2822
+#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2929
 msgid "CTCP Version"
 msgstr "የCTCP ዝርያ"
 
-#: src/protocols/irc/irc.c:1594 src/protocols/irc/irc.c:2828
+#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2935
 msgid "CTCP Ping"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1847 src/protocols/oscar/oscar.c:596
-#: 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 ""
 
-#: src/protocols/irc/irc.c:2103
+#: src/protocols/irc/irc.c:1962 src/protocols/trepia/trepia.c:1148
+msgid "Unable to create socket"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2203
 #, c-format
 msgid "Topic for %s is %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2200
+#: src/protocols/irc/irc.c:2299
 #, c-format
 msgid "You have left %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2201
+#: src/protocols/irc/irc.c:2300
 msgid "IRC Part"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2256
+#: src/protocols/irc/irc.c:2355
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2273
+#: src/protocols/irc/irc.c:2372
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2278
+#: 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:2286
+#: src/protocols/irc/irc.c:2385
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2291
+#: src/protocols/irc/irc.c:2390
 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 "
@@ -975,946 +1305,1189 @@
 "CTCP commands<BR>Type /HELP DCC for DCC commands"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2314
+#: src/protocols/irc/irc.c:2413
 msgid "<B>Unknown command</B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2374
+#: src/protocols/irc/irc.c:2473
 msgid "Channel:"
 msgstr "ጣቢያ፦"
 
-#: src/protocols/irc/irc.c:2378 src/main.c:341 src/multi.c:766
+#: src/protocols/irc/irc.c:2478 src/gtkaccount.c:426 src/main.c:399
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/protocols/irc/irc.c:2797
+#: src/protocols/irc/irc.c:2904
 msgid "DCC Chat"
 msgstr "የDCC ውሪ"
 
-#: src/protocols/irc/irc.c:2871 src/protocols/jabber/jabber.c:2870
-#: src/protocols/jabber/jabber.c:4261 src/protocols/msn/msn.c:2047
-#: src/protocols/napster/napster.c:617
-msgid "Server:"
-msgstr "ሰርቨር፦"
-
-#: src/protocols/irc/irc.c:2876 src/protocols/jabber/jabber.c:4272
-#: src/protocols/msn/msn.c:2059 src/protocols/napster/napster.c:623
-#: src/multi.c:1081
-msgid "Port:"
-msgstr "ፖርት፦"
-
-#: src/protocols/irc/irc.c:2882
-msgid "Encoding:"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/irc/irc.c:3010 src/protocols/irc/irc.c:3012
+msgid "IRC Protocol Plugin"
+msgstr ""
+
+#. 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:985
+#: 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:986
+#: 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:991
+#: src/protocols/jabber/jabber.c:988
 msgid "Unable to change password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:992
+#: src/protocols/jabber/jabber.c:989
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1150 src/list.c:404 src/pounce.c:338
+#: 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:1159 src/protocols/jabber/jabber.c:3323
-#: src/protocols/jabber/jabber.c:3367
+#: 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:1161 src/protocols/jabber/jabber.c:3325
-#: src/protocols/jabber/jabber.c:3375
+#: 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:1163 src/protocols/jabber/jabber.c:3326
-#: src/protocols/jabber/jabber.c:3379 src/protocols/oscar/oscar.c:2707
-#: src/protocols/oscar/oscar.c:4397 src/protocols/oscar/oscar.c:5490
+#: 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:1360
+#: src/protocols/jabber/jabber.c:1421
 #, c-format
 msgid "Jabber Error %s"
 msgstr "የJabber ስህተት %s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1528
 #, c-format
 msgid "Error %s: %s"
 msgstr "ስህተት %s፦ %s"
 
-#: src/protocols/jabber/jabber.c:1472
+#: src/protocols/jabber/jabber.c:1531
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1649
+#: 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:1674
+#: 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:1677
+#: src/protocols/jabber/jabber.c:1740
 msgid "No such user."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1768 src/protocols/msn/msn.c:541
-#: src/protocols/msn/msn.c:543 src/dialogs.c:945 src/list.c:218
+#. Should never happen.
+#: 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:1844
+#: src/protocols/jabber/jabber.c:1904
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1878
+#: src/protocols/jabber/jabber.c:1938
 msgid "Unknown login error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2225
+#: src/protocols/jabber/jabber.c:2288
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2269 src/protocols/jabber/jabber.c:4115
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
 msgid "Connection lost"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2277
+#: src/protocols/jabber/jabber.c:2340
 msgid "Connected"
 msgstr "ተገናኝቷል"
 
-#: src/protocols/jabber/jabber.c:2280
+#: src/protocols/jabber/jabber.c:2343
 msgid "Requesting Authentication Method"
 msgstr ""
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2298 src/protocols/msn/msn.c:1199
-#: src/protocols/yahoo/yahoo.c:965
+#: 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:2598
+#: 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:2600
+#: src/protocols/jabber/jabber.c:2691
+msgid "Unable to add buddy."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2692
 msgid "Jabber Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2866
+#: src/protocols/jabber/jabber.c:2951
 msgid "Room:"
 msgstr "ቤት፦"
 
-#: src/protocols/jabber/jabber.c:2875
+#: src/protocols/jabber/jabber.c:2956
+msgid "Server:"
+msgstr "ሰርቨር፦"
+
+#: src/protocols/jabber/jabber.c:2962
 msgid "Handle:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2899
+#: src/protocols/jabber/jabber.c:2992
 msgid "Unable to join chat"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3242
-#, c-format
-msgid "<b>Status:</b> %s%s%s"
-msgstr "<b>ሁኔታ፦</b> %s%s%s"
-
-#: src/protocols/jabber/jabber.c:3281
+#: 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:3229
+#, fuzzy
+msgid "Error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
+#, fuzzy
+msgid "Status"
+msgstr "ሁኔታ፦"
+
+#: 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:3385
 msgid "View Error Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3293 src/gtkconv.c:761
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1100
 msgid "Get Away Msg"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3404
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3303
+#: src/protocols/jabber/jabber.c:3407
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3310
+#: src/protocols/jabber/jabber.c:3414
 msgid "Cancel Presence Notification"
 msgstr ""
 
+#: 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:3322 src/protocols/jabber/jabber.c:3365
-#: src/protocols/oscar/oscar.c:2719 src/protocols/oscar/oscar.c:4392
-#: src/protocols/oscar/oscar.c:5488 src/protocols/yahoo/yahoo.c:1066
-#: src/multi.c:274
+#: 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:3504
+#: src/protocols/jabber/jabber.c:3625
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
-#: src/protocols/jabber/jabber.c:3505
+#: src/protocols/jabber/jabber.c:3626
 msgid "Family Name"
 msgstr "የቤተሰብ ስም"
 
-#: src/protocols/jabber/jabber.c:3506
+#: src/protocols/jabber/jabber.c:3627
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3507
+#: src/protocols/jabber/jabber.c:3628
 msgid "Nickname"
 msgstr "ቅጽል ስም"
 
-#: src/protocols/jabber/jabber.c:3508 src/dialogs.c:2613
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2896
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3509
+#: src/protocols/jabber/jabber.c:3630
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3510
+#: src/protocols/jabber/jabber.c:3631
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3511
+#: src/protocols/jabber/jabber.c:3632
 msgid "Locality"
 msgstr "አካባቢ"
 
-#: src/protocols/jabber/jabber.c:3512
+#: src/protocols/jabber/jabber.c:3633
 msgid "Region"
 msgstr "አካባቢ"
 
-#: src/protocols/jabber/jabber.c:3513
+#: src/protocols/jabber/jabber.c:3634
 msgid "Postal Code"
 msgstr ""
 
-#. Line 7
-#: src/protocols/jabber/jabber.c:3514 src/dialogs.c:1789 src/dialogs.c:2419
+#. 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:3515
+#: src/protocols/jabber/jabber.c:3636
 msgid "Telephone"
 msgstr "ስልክ"
 
-#: src/protocols/jabber/jabber.c:3516 src/dialogs.c:2477
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2760
 msgid "Email"
 msgstr "ኢሜይል"
 
-#: src/protocols/jabber/jabber.c:3517
+#: src/protocols/jabber/jabber.c:3638
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3518
+#: src/protocols/jabber/jabber.c:3639
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3519
+#: src/protocols/jabber/jabber.c:3640
 msgid "Title"
 msgstr "አርእስት"
 
-#: src/protocols/jabber/jabber.c:3520
+#: src/protocols/jabber/jabber.c:3641
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3521
+#: src/protocols/jabber/jabber.c:3642
 msgid "Birthday"
 msgstr "የልደት በዓል"
 
-#: src/protocols/jabber/jabber.c:3522 src/dialogs.c:2623 src/prefs.c:410
-#: src/prefs.c:1308
+#: 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:3547
+#: 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:3548
+#: src/protocols/jabber/jabber.c:3669
 msgid "User Identity"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3972
+#: src/protocols/jabber/jabber.c:4098
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:4045
+#: src/protocols/jabber/jabber.c:4173
 msgid "Server Registration successful!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:4072
+#: src/protocols/jabber/jabber.c:4194
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:4185 src/protocols/oscar/oscar.c:5675
-#: src/protocols/toc/toc.c:1434 src/dialogs.c:1959
+#: 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 ""
 
-#: src/protocols/jabber/jabber.c:4267
-msgid "Resource:"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:4278
-msgid "Connect Server:"
-msgstr ""
-
-#: src/protocols/msn/msn.c:66
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
+msgid "Jabber Protocol Plugin"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:4421
+#, fuzzy
+msgid "Resource"
+msgstr "ቀጥል (_R)"
+
+#: src/protocols/jabber/jabber.c:4429
+#, fuzzy
+msgid "Connect server"
+msgstr "ተገናኝቷል"
+
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
+msgid "Protocol not supported"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:51
+msgid "Unable to request INF\n"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:252
+msgid "Unable to login using MD5"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:77
+msgid "Unable to send USR\n"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:82 src/protocols/msn/notification.c:266
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:99
+msgid "Got invalid XFR\n"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:126
+msgid "Unable to transfer"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:147
+msgid "Unable to parse message."
+msgstr ""
+
+#: 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:1392
+msgid "Syncing with server"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
+msgid "Error reading from server"
+msgstr ""
+
+#: src/protocols/msn/error.c:33
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:69
+#: src/protocols/msn/error.c:37
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/error.c:40
 msgid "Invalid User"
 msgstr ""
 
-#: src/protocols/msn/msn.c:75
+#: src/protocols/msn/error.c:44
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:78
+#: src/protocols/msn/error.c:47
 msgid "Already Login"
 msgstr ""
 
-#: src/protocols/msn/msn.c:81
+#: src/protocols/msn/error.c:50
 msgid "Invalid Username"
 msgstr ""
 
-#: src/protocols/msn/msn.c:84
+#: src/protocols/msn/error.c:53
 msgid "Invalid Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:87
+#: src/protocols/msn/error.c:56
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/msn.c:90
+#: src/protocols/msn/error.c:59
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/msn.c:93
+#: src/protocols/msn/error.c:62
 msgid "Not on list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:96
+#: src/protocols/msn/error.c:65
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/msn.c:99
+#: src/protocols/msn/error.c:68
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/msn.c:102
+#: src/protocols/msn/error.c:71
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:105
+#: src/protocols/msn/error.c:75
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr ""
+
+#: src/protocols/msn/error.c:79
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:108
+#: src/protocols/msn/error.c:82
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/msn.c:112
+#: src/protocols/msn/error.c:86
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/msn.c:115 src/protocols/oscar/oscar.c:364
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
 msgid "Not logged in"
 msgstr ""
 
-#: src/protocols/msn/msn.c:119
+#: src/protocols/msn/error.c:93
 msgid "Internal server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:122
+#: src/protocols/msn/error.c:96
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:125
+#: src/protocols/msn/error.c:99
 msgid "File operation error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:128
+#: src/protocols/msn/error.c:102
 msgid "Memory allocation error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:132
+#: src/protocols/msn/error.c:105
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#: src/protocols/msn/error.c:109
 msgid "Server busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:135
+#: src/protocols/msn/error.c:112
 msgid "Server unavailable"
 msgstr ""
 
-#: src/protocols/msn/msn.c:138
+#: src/protocols/msn/error.c:115
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/msn.c:141
+#: src/protocols/msn/error.c:118
 msgid "Database connect error"
 msgstr ""
 
-#: src/protocols/msn/msn.c:144
+#: src/protocols/msn/error.c:122
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/msn.c:148
+#: src/protocols/msn/error.c:126
 msgid "Error creating connection"
 msgstr ""
 
-#: src/protocols/msn/msn.c:154
+#: src/protocols/msn/error.c:130
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:157
+#: src/protocols/msn/error.c:139
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/msn.c:160
+#: src/protocols/msn/error.c:142
 msgid "Too many sessions"
 msgstr ""
 
-#: src/protocols/msn/msn.c:163
+#: src/protocols/msn/error.c:145
 msgid "Not expected"
 msgstr ""
 
+#: src/protocols/msn/error.c:148
+msgid "Bad friend file"
+msgstr ""
+
+#: src/protocols/msn/error.c:152
+msgid "Authentication failed"
+msgstr ""
+
+#: src/protocols/msn/error.c:155
+msgid "Not allowed when offline"
+msgstr ""
+
+#: src/protocols/msn/error.c:158
+msgid "Not accepting new users"
+msgstr ""
+
+#: src/protocols/msn/error.c:162
+msgid "Passport account not yet verified"
+msgstr ""
+
+#: src/protocols/msn/error.c:166
+#, fuzzy, c-format
+msgid "Unknown Error Code %d"
+msgstr "ያልታወቀ የስህተት ኮድ"
+
+#: src/protocols/msn/msn.c:60
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
 #: src/protocols/msn/msn.c:166
-msgid "Bad friend file"
-msgstr ""
-
-#: src/protocols/msn/msn.c:170
-msgid "Authentication failed"
-msgstr ""
-
-#: src/protocols/msn/msn.c:173
-msgid "Not allowed when offline"
-msgstr ""
-
-#: src/protocols/msn/msn.c:176
-msgid "Not accepting new users"
+msgid "Set your friendly name."
+msgstr ""
+
+#: 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:179
-msgid "User unverified"
-msgstr ""
-
-#: src/protocols/msn/msn.c:182
-msgid "Unknown Error Code"
-msgstr "ያልታወቀ የስህተት ኮድ"
-
-#: src/protocols/msn/msn.c:291 src/protocols/msn/msn.c:313
-#: src/protocols/msn/msn.c:1445 src/protocols/msn/msn.c:1567
-#: src/protocols/msn/msn.c:1583 src/protocols/msn/msn.c:1701
-#: src/protocols/msn/msn.c:1714 src/protocols/msn/msn.c:1740
-#: src/protocols/msn/msn.c:1787 src/protocols/msn/msn.c:1805
-#: src/protocols/msn/msn.c:1839 src/protocols/msn/msn.c:1870
-#: src/protocols/msn/msn.c:1906 src/protocols/msn/msn.c:1913
-#: src/protocols/msn/msn.c:1926 src/protocols/msn/msn.c:1934
-#: src/protocols/msn/msn.c:1960 src/protocols/msn/msn.c:1969
-#: src/protocols/msn/msn.c:1982 src/protocols/msn/msn.c:1990
-msgid "Write error"
-msgstr ""
-
-#: src/protocols/msn/msn.c:362
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:412 src/protocols/msn/msn.c:1185
-msgid "Unable to write to server"
-msgstr ""
-
-#: src/protocols/msn/msn.c:513
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list"
-msgstr ""
-
-#: src/protocols/msn/msn.c:605
-msgid "You have been disconnected. You have signed on from another location."
-msgstr ""
-
-#: src/protocols/msn/msn.c:757 src/protocols/msn/msn.c:1070
-msgid "Got invalid XFR\n"
-msgstr ""
-
-#: src/protocols/msn/msn.c:794
-msgid "Error transferring"
-msgstr ""
-
-#: src/protocols/msn/msn.c:878 src/protocols/msn/msn.c:1116
-msgid "Error reading from server"
-msgstr ""
-
-#: src/protocols/msn/msn.c:962
-msgid "Unable to connect to Notification Server"
-msgstr ""
-
-#: src/protocols/msn/msn.c:969
-msgid "Unable to talk to Notification Server"
-msgstr ""
-
-#: src/protocols/msn/msn.c:985
-msgid "Protocol not supported"
-msgstr ""
-
-#: src/protocols/msn/msn.c:992
-msgid "Unable to request INF\n"
-msgstr ""
-
-#: src/protocols/msn/msn.c:999
-msgid "Unable to login using MD5"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1006
-msgid "Unable to send USR\n"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1011
-msgid "Requesting to send password"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1057
-msgid "Unable to send password"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1062
-msgid "Password sent"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1090
-msgid "Unable to transfer"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1098
-msgid "Unable to parse message"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1191
-msgid "Synching with server"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1516 src/protocols/msn/msn.c:1543
-#: src/protocols/msn/msn.c:1612
-msgid "Away From Computer"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1517 src/protocols/msn/msn.c:1545
-#: src/protocols/msn/msn.c:1610 src/protocols/yahoo/yahoo.c:1044
-#: src/protocols/yahoo/yahoo.c:1249 src/protocols/yahoo/yahoo.c:1325
-msgid "Be Right Back"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1518 src/protocols/msn/msn.c:1547
-#: src/protocols/msn/msn.c:1608 src/protocols/yahoo/yahoo.c:1046
-#: src/protocols/yahoo/yahoo.c:1251 src/protocols/yahoo/yahoo.c:1326
-msgid "Busy"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1519 src/protocols/msn/msn.c:1549
-#: src/protocols/msn/msn.c:1614 src/protocols/yahoo/yahoo.c:1054
-#: src/protocols/yahoo/yahoo.c:1259 src/protocols/yahoo/yahoo.c:1330
-msgid "On The Phone"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1520 src/protocols/msn/msn.c:1551
-#: src/protocols/msn/msn.c:1616 src/protocols/yahoo/yahoo.c:1058
-#: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1332
-msgid "Out To Lunch"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1521 src/protocols/msn/msn.c:1553
-msgid "Hidden"
-msgstr "የተደበቀ"
-
-#: src/protocols/msn/msn.c:1618 src/protocols/yahoo/yahoo.c:1064
-#: src/prefs.c:1069
-msgid "Idle"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1647 src/protocols/yahoo/yahoo.c:1117
+msgid "Set your home phone number."
+msgstr ""
+
+#: src/protocols/msn/msn.c:190
+msgid "Set your work phone number."
+msgstr ""
+
+#: src/protocols/msn/msn.c:201
+msgid "Set your mobile phone number."
+msgstr ""
+
+#: src/protocols/msn/msn.c:210
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+#: 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:216
+msgid "Disallow"
+msgstr ""
+
+#: src/protocols/msn/msn.c:233
+msgid "Send a mobile message."
+msgstr ""
+
+#: src/protocols/msn/msn.c:235
+#, fuzzy
+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:299 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/protocols/msn/msn.c:1661 src/protocols/oscar/oscar.c:2964
-#: src/protocols/oscar/oscar.c:5523
-msgid "Send File"
+#: 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: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: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: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: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: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:329
+msgid "Set Friendly Name"
+msgstr ""
+
+#: src/protocols/msn/msn.c:337
+msgid "Set Home Phone Number"
+msgstr ""
+
+#: src/protocols/msn/msn.c:343
+msgid "Set Work Phone Number"
+msgstr ""
+
+#: src/protocols/msn/msn.c:349
+#, fuzzy
+msgid "Set Mobile Phone Number"
+msgstr "የሞቢል ስልክ፦"
+
+#: src/protocols/msn/msn.c:358
+msgid "Enable/Disable Mobile Devices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:365
+msgid "Allow/Disallow Mobile Pages"
+msgstr ""
+
+#: src/protocols/msn/msn.c:387
+#, fuzzy
+msgid "Send to Mobile"
 msgstr "ፋይልን ላክ"
 
-#: src/protocols/msn/msn.c:1733
-msgid "New MSN friendly name too long."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1748
-msgid "Set Friendly Name:"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1757
-msgid "Set Friendly Name"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1893
+#: 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:1896 src/protocols/msn/msn.c:1950
+"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:1947
+#: 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
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/msn/msn.c:1199 src/protocols/msn/msn.c:1201
+msgid "MSN Protocol Plugin"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1218 src/protocols/trepia/trepia.c:1372
+#, fuzzy
+msgid "Login server"
+msgstr "ሰርቨርን የለም"
+
+#: src/protocols/msn/notification.c:235
+msgid "Unable to request INF"
+msgstr ""
+
+#: src/protocols/msn/notification.c:261
+msgid "Unable to send USR"
+msgstr ""
+
+#: src/protocols/msn/notification.c:297 src/protocols/trepia/trepia.c:719
+msgid "Retrieving buddy list"
+msgstr ""
+
+#: src/protocols/msn/notification.c:323
+msgid "Unable to send password"
+msgstr ""
+
+#: src/protocols/msn/notification.c:328
+msgid "Password sent"
+msgstr ""
+
+#: src/protocols/msn/notification.c:346
+msgid "You have been disconnected. You have signed on from another location."
+msgstr ""
+
+#: src/protocols/msn/notification.c:351
+msgid "You have been disconnected. The MSN servers are going down temporarily."
+msgstr ""
+
+#: 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:741
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list."
+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:1346
 #, 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 ""
-
-#: src/protocols/msn/msn.c:2053
-msgid "Login Server:"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:104
-#, c-format
-msgid "%s has closed the conversation window"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:181
+"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:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1513
+msgid "Idle"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:121
+msgid "The conversation has become inactive and timed out."
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:128
+#, c-format
+msgid "%s has closed the conversation window."
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:250
 msgid "An MSN message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:411
-msgid "Gaim was unable to send an MSN message"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:412
+#: src/protocols/napster/napster.c:232
+msgid "Unable to read header from server"
+msgstr ""
+
+#: 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:318
+#, c-format
+msgid "Unable to add \"%s\" to your Napster hotlist"
+msgstr ""
+
+#: src/protocols/napster/napster.c:326
+msgid "You were disconnected from the server."
+msgstr ""
+
+#. MSG_CLIENT_WHOIS
+#: src/protocols/napster/napster.c:382
+#, c-format
+msgid "%s requested your information"
+msgstr ""
+
+#: src/protocols/napster/napster.c:412
 msgid ""
-"Gaim encountered an error communicating with the MSN switchboard server.  "
-"Please try again later."
-msgstr ""
-
-#: src/protocols/napster/napster.c:459 src/protocols/oscar/oscar.c:4988
-#: src/protocols/toc/toc.c:1187
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr ""
+
+#. MSG_CLIENT_PING
+#: src/protocols/napster/napster.c:418
+#, c-format
+msgid "%s requested a PING"
+msgstr ""
+
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1572
+msgid "Get Info"
+msgstr "መረጃ አግኝ"
+
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
+#: src/protocols/toc/toc.c:1201
 msgid "Join what group:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:360
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+msgid "NAPSTER Protocol Plugin"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:174
 msgid "Invalid error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:361
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid SNAC"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:362
+#: src/protocols/oscar/oscar.c:176
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:363
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:365
+#: src/protocols/oscar/oscar.c:179
 msgid "Service unavailable"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:366
+#: src/protocols/oscar/oscar.c:180
 msgid "Service not defined"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:367
+#: src/protocols/oscar/oscar.c:181
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:368
+#: src/protocols/oscar/oscar.c:182
 msgid "Not supported by host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:369
+#: src/protocols/oscar/oscar.c:183
 msgid "Not supported by client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:370
+#: src/protocols/oscar/oscar.c:184
 msgid "Refused by client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:371
+#: src/protocols/oscar/oscar.c:185
 msgid "Reply too big"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:372
+#: src/protocols/oscar/oscar.c:186
 msgid "Responses lost"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:187
 msgid "Request denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:374
+#: src/protocols/oscar/oscar.c:188
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:375
+#: src/protocols/oscar/oscar.c:189
 msgid "Insufficient rights"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:376
+#: src/protocols/oscar/oscar.c:190
 msgid "In local permit/deny"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:377
+#: src/protocols/oscar/oscar.c:191
 msgid "Too evil (sender)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:378
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (receiver)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:379
+#: src/protocols/oscar/oscar.c:193
 msgid "User temporarily unavailable"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:380
+#: src/protocols/oscar/oscar.c:194
 msgid "No match"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:381
+#: src/protocols/oscar/oscar.c:195
 msgid "List overflow"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:382
+#: src/protocols/oscar/oscar.c:196
 msgid "Request ambiguous"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:383
+#: src/protocols/oscar/oscar.c:197
 msgid "Queue full"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:384
+#: src/protocols/oscar/oscar.c:198
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:457 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:469 src/protocols/toc/toc.c:850
+#: 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:482
+#: src/protocols/oscar/oscar.c:558
 msgid "Chat is currently unavailable"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:551 src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:591
+#: src/protocols/oscar/oscar.c:674
 msgid "Unable to login to AIM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:1156
+#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:709
+#: src/protocols/oscar/oscar.c:790
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:792 src/protocols/oscar/oscar.c:803
-#: src/protocols/oscar/oscar.c:807
+#: 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:792
+#: src/protocols/oscar/oscar.c:858
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:803
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:807
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to create new connection."
 msgstr ""
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1052 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:1056
+#: src/protocols/oscar/oscar.c:1062
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1066
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1064
+#: 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 ""
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1068
+#: 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:1072 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:1094
+#: src/protocols/oscar/oscar.c:1106
 msgid "Internal Error"
 msgstr "የውስጥ ብልሽት"
 
-#: src/protocols/oscar/oscar.c:1195 src/protocols/oscar/oscar.c:1224
-#: src/protocols/oscar/oscar.c:1306
+#: 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:1197 src/protocols/oscar/oscar.c:1226
+#: 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:1308
+#: src/protocols/oscar/oscar.c:1329
 msgid "Gaim was Unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1842 src/protocols/oscar/oscar.c:5220
+#: 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:2160 src/protocols/oscar/oscar.c:2180
+#: 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:2321
+#: src/protocols/oscar/oscar.c:2395
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2322
+#: 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:2345
+#: 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:2353
+#: src/protocols/oscar/oscar.c:2438
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2353
+#: src/protocols/oscar/oscar.c:2439
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2378
+#: 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:2382
+#: src/protocols/oscar/oscar.c:2472 src/protocols/oscar/oscar.c:2474
 msgid "Request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:2418
-#: src/protocols/oscar/oscar.c:2424 src/protocols/oscar/oscar.c:2489
-#: src/protocols/oscar/oscar.c:2501 src/protocols/oscar/oscar.c:2866
-#: src/protocols/oscar/oscar.c:2917 src/protocols/oscar/oscar.c:4915
-#: src/protocols/oscar/oscar.c:4956
+#: 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:2424
+#: src/protocols/oscar/oscar.c:2518
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2591
 #, c-format
 msgid ""
-"The user %lu wants to add you to their buddy list for the following reason:\n"
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2494 src/protocols/oscar/oscar.c:4920
+#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2501
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
-"The user %lu 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:2502
+#: src/protocols/oscar/oscar.c:2612
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2508
-#, c-format
-msgid "The user %lu has granted your request to add them to your contact list."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2515
+#: 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:2627
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -1923,7 +2496,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2523
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1932,7 +2505,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -1941,208 +2514,206 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2552
-#, c-format
-msgid "ICQ user %lu has sent you a contact: %s (%s)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2556
+#: 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:2670
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2556
+#: src/protocols/oscar/oscar.c:2674
 msgid "Decline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2756
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2647
+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."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2658
+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."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2669
+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."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2680
+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."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2690
+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."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2705 src/protocols/oscar/oscar.c:4406
-#: src/protocols/oscar/oscar.c:5493
+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:2709 src/protocols/oscar/oscar.c:4400
-#: src/protocols/oscar/oscar.c:5491
+#: 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:2711 src/protocols/oscar/oscar.c:4403
-#: src/protocols/oscar/oscar.c:5492
+#: 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:2715
+#: src/protocols/oscar/oscar.c:2827
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2887
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>ሁኔታ:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2774
+#: src/protocols/oscar/oscar.c:2889
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>ሁኔታ፦</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2830
+#: src/protocols/oscar/oscar.c:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2831
+#: src/protocols/oscar/oscar.c:2949
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2865
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2916
+#: src/protocols/oscar/oscar.c:3036
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:3070 src/gtkaccount.c:281
 msgid "Buddy Icon"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2952
+#: src/protocols/oscar/oscar.c:3073
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2955 src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5874
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2958 src/buddy.c:1280
+#: src/protocols/oscar/oscar.c:3079 src/gtkblist.c:1581
 msgid "Chat"
 msgstr "ውሪ"
 
-#: src/protocols/oscar/oscar.c:2961 src/protocols/oscar/oscar.c:5529
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5890
 msgid "Get File"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2968
+#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5882
+msgid "Send File"
+msgstr "ፋይልን ላክ"
+
+#: src/protocols/oscar/oscar.c:3089
 msgid "Games"
 msgstr "ጨዋታዎች"
 
-#: src/protocols/oscar/oscar.c:2971
+#: src/protocols/oscar/oscar.c:3092
 msgid "Add-Ins"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3095
 msgid "Send Buddy List"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2977
+#: src/protocols/oscar/oscar.c:3098
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2980
+#: src/protocols/oscar/oscar.c:3101
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2983
+#: src/protocols/oscar/oscar.c:3104
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3107
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:2989
+#: src/protocols/oscar/oscar.c:3110
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2992
+#: src/protocols/oscar/oscar.c:3113
 msgid "ICQ Unknown"
 msgstr "ICQ ያልታወቀ"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3116
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2998
+#: src/protocols/oscar/oscar.c:3119
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3024
-#, c-format
-msgid "<b>Logged In:</b> %s%s%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3025
-msgid ""
-"\n"
-"<b>Capabilities:</b> "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3031
-msgid ""
-"\n"
-"<b>Status:</b> "
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:3077
+#: 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:3083
+#: src/protocols/oscar/oscar.c:3166
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3088
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3094
+#: src/protocols/oscar/oscar.c:3177
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3097
+#: src/protocols/oscar/oscar.c:3180
 msgid "Idle: <b>Active</b>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3100
+#: src/protocols/oscar/oscar.c:3182
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2151,290 +2722,315 @@
 "<hr>\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3214
 msgid "<i>User has no away message</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3143
+#: src/protocols/oscar/oscar.c:3225
 msgid "Client Capabilities: "
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3150
+#: src/protocols/oscar/oscar.c:3231
 msgid "<i>No Information Provided</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3255
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3519
+#: src/protocols/oscar/oscar.c:3642
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3520
+#: src/protocols/oscar/oscar.c:3643
 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:3578
+"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:3580
+#: src/protocols/oscar/oscar.c:3706
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3818
+#: src/protocols/oscar/oscar.c:3934
 msgid "UIN:"
 msgstr "UIN፦"
 
-#: src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:3939
 msgid "First Name:"
 msgstr "ስም፦"
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3942
 msgid "Last Name:"
 msgstr "የአባት ስም፦"
 
-#: src/protocols/oscar/oscar.c:3829 src/protocols/oscar/oscar.c:3835
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
 msgid "Email Address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3956
 msgid "Mobile Phone:"
 msgstr "የሞቢል ስልክ፦"
 
-#: src/protocols/oscar/oscar.c:3843
+#: src/protocols/oscar/oscar.c:3959
 msgid "Gender:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3843
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "ሴት"
 
-#: src/protocols/oscar/oscar.c:3843
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "ወንድ"
 
-#: src/protocols/oscar/oscar.c:3852
+#: src/protocols/oscar/oscar.c:3968
 msgid "Birthday:"
 msgstr "የልደት በዓል፦"
 
-#: src/protocols/oscar/oscar.c:3857
+#: src/protocols/oscar/oscar.c:3973
 msgid "Age:"
 msgstr "ዕድሜ፦"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:3976
 msgid "Personal Web Page:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3863
+#: src/protocols/oscar/oscar.c:3979
 msgid "Additional Information:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3867
+#: src/protocols/oscar/oscar.c:3983
 msgid "Home Address:"
 msgstr "የቤት አድራሻ፦"
 
-#: src/protocols/oscar/oscar.c:3869 src/protocols/oscar/oscar.c:3885
+#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
 msgid "Address:"
 msgstr "አድራሻ፦"
 
-#: src/protocols/oscar/oscar.c:3872 src/protocols/oscar/oscar.c:3888
+#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
 msgid "City:"
 msgstr "ከተማ፦"
 
-#: src/protocols/oscar/oscar.c:3875 src/protocols/oscar/oscar.c:3891
+#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
 msgid "State:"
 msgstr "ሁኔታ፦"
 
-#: src/protocols/oscar/oscar.c:3878 src/protocols/oscar/oscar.c:3894
+#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
 msgid "Zip Code:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3883
+#: src/protocols/oscar/oscar.c:3999
 msgid "Work Address:"
 msgstr "የቢሮ አድራሻ፦"
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:4015
 msgid "Work Information:"
 msgstr "የቢሮ መረጃ፦"
 
-#: src/protocols/oscar/oscar.c:3901
+#: src/protocols/oscar/oscar.c:4017
 msgid "Company:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:4020
 msgid "Division:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3907
+#: src/protocols/oscar/oscar.c:4023
 msgid "Position:"
 msgstr "ቦታ፦"
 
-#: src/protocols/oscar/oscar.c:3910
+#: src/protocols/oscar/oscar.c:4026
 msgid "Web Page:"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4094
+#, c-format
+msgid "<B>%s has the following screen names:</B><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4112
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4133
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4135
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4163
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4049
+#: 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:4052
+#: 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:4055
+#: 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:4058
+#: 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:4061
+#: 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:4064
+#: 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:4067
+#: src/protocols/oscar/oscar.c:4184
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4077
+#: 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:4078 src/protocols/oscar/oscar.c:4084
+#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4083
+#: src/protocols/oscar/oscar.c:4200
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4425
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4292
+#: 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:4298
+#: src/protocols/oscar/oscar.c:4456
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated and set it."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4335
+"truncated it for you."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4458
+msgid "Profile too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4477
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4336
+#: 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:4352
+#: src/protocols/oscar/oscar.c:4518
 #, c-format
 msgid ""
-"The away message length of %d bytes has been exceeded.  Gaim has truncated "
-"it and set you away."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4572
-msgid "Unable To Retrive Buddy List"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4572
+"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:4740
+msgid "Unable To Retrieve Buddy List"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4741
 msgid ""
-"Gaim was temporarily unable to retrive your buddy list from the AIM "
+"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:4657 src/protocols/oscar/oscar.c:4658
+#: 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:4797
-#, c-format
-msgid ""
-"The maximum number of buddies allowed in your buddy list is %d, and you have "
-"%d.  Until you are below the limit, some buddies will not show up as online."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4800
-msgid "Maximum buddy list length exceeded."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4838
+#: 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:4838
+#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(ስም የለም)"
 
-#: src/protocols/oscar/oscar.c:4881
+#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
+msgid "Unable To Add"
+msgstr ""
+
+#: 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:4886
+#: src/protocols/oscar/oscar.c:5056
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4915
+#: 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"
@@ -2442,17 +3038,17 @@
 msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:4952
+#: 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:4953
+#: src/protocols/oscar/oscar.c:5132
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:4956
+#: 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 "
@@ -2460,376 +3056,660 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4957
+#: src/protocols/oscar/oscar.c:5136
 msgid "Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4992 src/protocols/toc/toc.c:1191
+#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
 msgid "Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5356
+#: src/protocols/oscar/oscar.c:5393
+#, fuzzy
+msgid "<b>Status:</b> "
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:5402
+msgid "<b>Logged In:</b> "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5409
+#, fuzzy
+msgid "<b>Capabilities:</b> "
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:5415
+#, fuzzy
+msgid "<b>Available:</b> "
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+#: src/protocols/oscar/oscar.c:5423
+#, fuzzy
+msgid "<b>Status:</b> Not Authorized"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:5427 src/gtkblist.c:895
+#, fuzzy
+msgid "<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:5457
+#, fuzzy
+msgid "Offline"
+msgstr "ኦንላይን"
+
+#: src/protocols/oscar/oscar.c:5698
 msgid "Unable to open Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5368
+#: 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:5369
+#: 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:5507
+#: src/protocols/oscar/oscar.c:5859
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5540
+#: src/protocols/oscar/oscar.c:5903
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:5924
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5564
+#: src/protocols/oscar/oscar.c:5925
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:5931
 msgid "New screenname formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5615
-msgid "Change Address To: "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5625
+#: src/protocols/oscar/oscar.c:5980
+#, fuzzy
+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:5650
+#: src/protocols/oscar/oscar.c:6019
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5655
+#: 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:5690
+#: 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
+msgid "Set Available Message"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6117
 msgid "Change Password (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5701
+#: src/protocols/oscar/oscar.c:6128
 msgid "Format Screenname"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5707
+#: src/protocols/oscar/oscar.c:6134
 msgid "Confirm Account"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5713
+#: src/protocols/oscar/oscar.c:6140
 msgid "Display Current Registered Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5719
+#: src/protocols/oscar/oscar.c:6146
 msgid "Change Current Registered Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5728
+#: src/protocols/oscar/oscar.c:6155
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5736
+#: src/protocols/oscar/oscar.c:6163
 msgid "Search for Buddy by Email"
 msgstr ""
 
-#: src/protocols/toc/toc.c:190
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/oscar/oscar.c:6284 src/protocols/oscar/oscar.c:6286
+msgid "AIM/ICQ Protocol Plugin"
+msgstr ""
+
+#: 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 ""
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Unable to write file %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:497
 #, c-format
 msgid "Unable to read file %s."
 msgstr ""
 
-#: 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 ""
 
-#: 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
-msgid "User has no directory information."
-msgstr ""
-
 #: src/protocols/toc/toc.c:545
+msgid "User has no directory information."
+msgstr ""
+
+#: 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 ""
 
-#: 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
+#: 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 ""
 
-#: src/protocols/toc/toc.c:562
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr ""
 
-#: 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:684
+#: 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:869
+#: src/protocols/toc/toc.c:880
 msgid "Password Change Successful"
 msgstr ""
 
-#: src/protocols/toc/toc.c:872
+#: src/protocols/toc/toc.c:884
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:872
+#: 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:1316
+#: src/protocols/toc/toc.c:1344
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1440
+#: src/protocols/toc/toc.c:1468
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1495
-msgid "TOC Host:"
-msgstr "የTOC እንግዳ ተቀባይ"
-
-#: src/protocols/toc/toc.c:1501
-msgid "TOC Port:"
-msgstr "የTOC ፖርት፦"
-
-#: src/protocols/toc/toc.c:1628
+#: src/protocols/toc/toc.c:1591
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1706 src/protocols/toc/toc.c:1745
-#: src/protocols/toc/toc.c:1953
+#: src/protocols/toc/toc.c:1627
+msgid "File transfer failed; other side probably canceled."
+msgstr ""
+
+#: 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:1868
+#: src/protocols/toc/toc.c:1836
 msgid "Could not connect for transfer!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1900
+#: src/protocols/toc/toc.c:1869
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1998 src/gtkft.c:1044
+#: src/protocols/toc/toc.c:1969 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2032
+#: src/protocols/toc/toc.c:2003
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr ""
-
-#: src/protocols/toc/toc.c:2039
+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 ""
 
-#: src/protocols/toc/toc.c:2041 src/gtkft.c:1097 src/server.c:1050
-msgid "Accept"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:586
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
+msgid "TOC Protocol Plugin"
+msgstr ""
+
+#: src/protocols/toc/toc.c:2104
+#, fuzzy
+msgid "TOC host"
+msgstr "የTOC እንግዳ ተቀባይ"
+
+#: src/protocols/toc/toc.c:2108
+#, fuzzy
+msgid "TOC port"
+msgstr "የTOC ፖርት፦"
+
+#. 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
+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
+msgid "Instant Messagers"
+msgstr ""
+
+#. AIM
+#: src/protocols/trepia/trepia.c:343
+msgid "AIM"
+msgstr ""
+
+#. ICQ
+#: src/protocols/trepia/trepia.c:347
+#, fuzzy
+msgid "ICQ UIN"
+msgstr "ICQ UTF8"
+
+#. 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
+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 "የIRC ስህተት"
+
+#: 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
+msgid "Trepia Protocol Plugin"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:592
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1048 src/protocols/yahoo/yahoo.c:1253
-#: src/protocols/yahoo/yahoo.c:1327
+#: 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:1050 src/protocols/yahoo/yahoo.c:1255
-#: src/protocols/yahoo/yahoo.c:1328
+#: 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:1052 src/protocols/yahoo/yahoo.c:1257
-#: src/protocols/yahoo/yahoo.c:1329
+#: 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:1056 src/protocols/yahoo/yahoo.c:1261
-#: src/protocols/yahoo/yahoo.c:1331
+#: 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:1060 src/protocols/yahoo/yahoo.c:1265
-#: src/protocols/yahoo/yahoo.c:1333
+#: 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:1185
+msgid "Active which ID?"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1196
 msgid "Activate ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1409
-msgid "Pager Host:"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1415
-msgid "Pager Port:"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/yahoo/yahoo.c:1465 src/protocols/yahoo/yahoo.c:1467
+msgid "Yahoo Protocol Plugin"
+msgstr ""
+
+#: 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
+#, fuzzy, c-format
+msgid "<b>User:</b> %s<br>"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: src/protocols/zephyr/zephyr.c:339
+#, fuzzy, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: src/protocols/zephyr/zephyr.c:341
+msgid "<br>Hidden or not logged-in"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:345
+#, c-format
+msgid "<br>At %s since %s"
 msgstr ""
 
 #: src/protocols/zephyr/zephyr.c:574 src/protocols/zephyr/zephyr.c:575
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:846
+#: src/protocols/zephyr/zephyr.c:599
+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:886
+#: src/protocols/zephyr/zephyr.c:888
 msgid "Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:890
+#: src/protocols/zephyr/zephyr.c:893
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:894
+#: src/protocols/zephyr/zephyr.c:898
 msgid "Recipient:"
 msgstr ""
 
-#: src/about.c:74
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/zephyr/zephyr.c:1030 src/protocols/zephyr/zephyr.c:1032
+msgid "Zephyr Protocol Plugin"
+msgstr ""
+
+#: src/about.c:56
 #, c-format
 msgid "About Gaim v%s"
 msgstr ""
 
-#: src/about.c:106
+#: 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:116
+#: 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
+#: 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:"
@@ -2840,15 +3720,15 @@
 "(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
 msgstr ""
 
-#: src/about.c:137
+#: 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
+#: src/about.c:131
 msgid ""
 "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
 "lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
@@ -2858,373 +3738,165 @@
 "Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 msgstr ""
 
-#: src/about.c:169 src/dialogs.c:3774 src/prpl.c:536 src/prpl.c:834
-#: src/server.c:1238
-msgid "Close"
-msgstr "ዝጋ"
-
-#: src/away.c:219
+#: src/away.c:222
 msgid "Gaim - Away!"
 msgstr ""
 
-#: src/away.c:279
+#: src/away.c:282
 msgid "I'm Back!"
 msgstr ""
 
-#: src/away.c:378
+#: src/away.c:384
 msgid "New Away Message"
 msgstr ""
 
-#: src/away.c:398
+#: src/away.c:404
 msgid "Remove Away Message"
 msgstr ""
 
-#: src/away.c:587
+#: src/away.c:599
 msgid "Set All Away"
 msgstr ""
 
-#: src/browser.c:413 src/browser.c:439
+#: src/blist.c:427 src/gtkprefs.c:2273
+msgid "Chats"
+msgstr ""
+
+#: 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:947
+msgid "Invalid Groupname"
+msgstr ""
+
+#: src/blist.c:1703
 msgid ""
-"Communication with the browser failed.  Please close all windows and try "
+"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: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:407 src/browser.c:435
+msgid ""
+"Communication with the browser failed. Please close all windows and try "
 "again."
 msgstr ""
 
-#: src/browser.c:567
+#: 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:582
+#: src/browser.c:586
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr ""
 
-#: src/buddy.c:306
-msgid "_Add a Buddy"
-msgstr ""
-
-#: src/buddy.c:312
-msgid "_Delete Group"
-msgstr "መድረክ አጥፉ (_D)"
-
-#: src/buddy.c:318
-msgid "_Rename"
-msgstr "እንደገና ሰይም (_R)"
-
-#: src/buddy.c:326
-msgid "_Get Info"
-msgstr ""
-
-#: src/buddy.c:331
-msgid "_IM"
-msgstr ""
-
-#: src/buddy.c:337
-msgid "Add Buddy _Pounce"
-msgstr ""
-
-#: src/buddy.c:341
-msgid "View _Log"
-msgstr ""
-
-#: src/buddy.c:360
-msgid "_Alias"
-msgstr ""
-
-#: src/buddy.c:366
-msgid "_Remove"
-msgstr "አስወግድ (_R)"
-
-#. Buddies menu
-#: src/buddy.c:652
-msgid "/_Buddies"
-msgstr ""
-
-#: src/buddy.c:653
-msgid "/Buddies/New _Instant Message..."
-msgstr ""
-
-#: src/buddy.c:654
-msgid "/Buddies/Join a _Chat..."
-msgstr ""
-
-#: src/buddy.c:655
-msgid "/Buddies/Get _User Info..."
-msgstr ""
-
-#: src/buddy.c:657
-msgid "/Buddies/_Show Offline Buddies"
-msgstr ""
-
-#: src/buddy.c:658
-msgid "/Buddies/Show _Empty Groups"
-msgstr ""
-
-#: src/buddy.c:659
-msgid "/Buddies/_Add a Buddy..."
-msgstr ""
-
-#: src/buddy.c:660
-msgid "/Buddies/Add a _Group..."
-msgstr ""
-
-#: src/buddy.c:662
-msgid "/Buddies/_Signoff"
-msgstr ""
-
-#: src/buddy.c:663
-msgid "/Buddies/_Quit"
-msgstr ""
-
-#. Tools
-#: src/buddy.c:666
-msgid "/_Tools"
-msgstr "/መሣሪያዎች (_T)"
-
-#: src/buddy.c:667
-msgid "/Tools/_Away"
-msgstr ""
-
-#: src/buddy.c:668
-msgid "/Tools/Buddy _Pounce"
-msgstr ""
-
-#: src/buddy.c:669
-msgid "/Tools/P_rotocol Actions"
-msgstr ""
-
-#: src/buddy.c:671
-msgid "/Tools/_File Transfers..."
-msgstr ""
-
-#: src/buddy.c:672
-msgid "/Tools/A_ccounts..."
-msgstr ""
-
-#: src/buddy.c:673
-msgid "/Tools/Preferences..."
-msgstr ""
-
-#: src/buddy.c:674
-msgid "/Tools/Pr_ivacy..."
-msgstr ""
-
-#: src/buddy.c:676
-msgid "/Tools/View System _Log..."
-msgstr ""
-
-#. Help
-#: src/buddy.c:679
-msgid "/_Help"
-msgstr "/መረጃ (_H)"
-
-#: src/buddy.c:680
-msgid "/Help/Online _Help"
-msgstr ""
-
-#: src/buddy.c:681
-msgid "/Help/_Debug Window..."
-msgstr ""
-
-#: src/buddy.c:682
-msgid "/Help/_About..."
-msgstr "/መረጃ/ስለ... (_A)"
-
-#: src/buddy.c:716
-#, c-format
-msgid "%dh%02dm"
-msgstr "%dh%02dm"
-
-#: src/buddy.c:718
-#, c-format
-msgid "%dm"
-msgstr "%dm"
-
-#: src/buddy.c:728
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/buddy.c:739
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-
-#: src/buddy.c:740
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#: src/buddy.c:741
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-
-#: src/buddy.c:742
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-
-#: src/buddy.c:743
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-
-#: src/buddy.c:1012
-#, c-format
-msgid "Idle (%dh%02dm) "
-msgstr ""
-
-#: src/buddy.c:1014
-#, c-format
-msgid "Idle (%dm) "
-msgstr ""
-
-#: src/buddy.c:1018
-#, c-format
-msgid "Warned (%d%%) "
-msgstr ""
-
-#: src/buddy.c:1027 src/buddy.c:1037
-msgid "Offline "
-msgstr ""
-
-#: src/buddy.c:1148 src/prefs.c:1711
-msgid "Buddy List"
-msgstr ""
-
-#: src/buddy.c:1167
-msgid "/Tools/Away"
-msgstr ""
-
-#: src/buddy.c:1170
-msgid "/Tools/Buddy Pounce"
-msgstr ""
-
-#: src/buddy.c:1173
-msgid "/Tools/Protocol Actions"
-msgstr ""
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: src/buddy.c:1242
-msgid "/Buddies/Show Offline Buddies"
-msgstr ""
-
-#: src/buddy.c:1244
-msgid "/Buddies/Show Empty Groups"
-msgstr ""
-
-#: src/buddy.c:1262 src/gtkconv.c:733
-msgid "IM"
-msgstr ""
-
-#: src/buddy.c:1268
-msgid "Send a message to the selected buddy"
-msgstr ""
-
-#: src/buddy.c:1271
-msgid "Get Info"
-msgstr "መረጃ አግኝ"
-
-#: src/buddy.c:1277
-msgid "Get information on the selected buddy"
-msgstr ""
-
-#: src/buddy.c:1285
-msgid "Join a chat room"
-msgstr "የውሪ ቤትን አገጣጥም"
-
-#: src/buddy.c:1293
-msgid "Set an away message"
-msgstr ""
-
-#: src/buddy_chat.c:249
+#: 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:262
+#: src/buddy_chat.c:330
 msgid "Join Chat"
 msgstr "ውሪን አገጣጥም"
 
-#: src/buddy_chat.c:278
+#: src/buddy_chat.c:336
+msgid "Buddy Chat"
+msgstr ""
+
+#: src/buddy_chat.c:346
 msgid "Join Chat As:"
 msgstr ""
 
 #. Join button.
-#: src/buddy_chat.c:301
+#: src/buddy_chat.c:369
 msgid "Join"
 msgstr ""
 
-#: src/conversation.c:399
-msgid "Unable to send message. The message is too large."
-msgstr ""
-
 #: src/conversation.c:405
+msgid "Unable to send message. The message is too large."
+msgstr ""
+
+#: src/conversation.c:413
 msgid "Unable to send message."
 msgstr ""
 
-#: src/conversation.c:1958
+#: src/conversation.c:1926
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/conversation.c:1961
+#: src/conversation.c:1929
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:2010
+#: src/conversation.c:1979
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: src/conversation.c:2053
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2055
+#: src/conversation.c:2023
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2239
+#: src/conversation.c:2224
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2241
+#: src/conversation.c:2226
 msgid "New window"
 msgstr "አዲስ መስኮት"
 
-#: src/conversation.c:2243
+#: src/conversation.c:2228
 msgid "By group"
 msgstr "በመድረክ"
 
-#: src/conversation.c:2245
+#: src/conversation.c:2230
 msgid "By account"
 msgstr ""
 
-#: src/dialogs.c:368
+#: src/dialogs.c:345
 msgid "Warn User"
 msgstr ""
 
-#: src/dialogs.c:368
+#: src/dialogs.c:348
 msgid "_Warn"
 msgstr ""
 
-#: src/dialogs.c:384
+#: src/dialogs.c:364
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3233,416 +3905,434 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:393
+#: src/dialogs.c:373
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:400
+#: src/dialogs.c:380
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#. b->name is null after remove_buddy
-#: src/dialogs.c:423
-#, c-format
-msgid "Removing '%s' from buddy list.\n"
-msgstr ""
-
-#: src/dialogs.c:462
+#: 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:463
+#: src/dialogs.c:457 src/dialogs.c:458
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:469
+#: 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
+#, fuzzy
+msgid "Remove Chat"
+msgstr "አስወግድ"
+
+#: 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:471
+#: src/dialogs.c:482 src/dialogs.c:483
 msgid "Remove Group"
 msgstr "መድረክን አስወግድ"
 
-#: src/dialogs.c:681
+#: src/dialogs.c:632
 msgid "New Message"
 msgstr "አዲስ መልእክት"
 
-#: src/dialogs.c:699
+#: src/dialogs.c:650
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 
-#: src/dialogs.c:715 src/dialogs.c:814
+#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
 msgid "_Screenname:"
 msgstr "እስክሪን ስም፦ (_S)"
 
-#: src/dialogs.c:730 src/dialogs.c:830
+#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr ""
 
-#: src/dialogs.c:783
+#: src/dialogs.c:712
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:802
+#: src/dialogs.c:731
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr ""
 
-#: src/dialogs.c:979
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "መድረክ ጨምር"
 
-#: src/dialogs.c:996
+#: src/dialogs.c:906
 msgid "Please enter the name of the group to be added.\n"
 msgstr ""
 
-#: src/dialogs.c:1005 src/dialogs.c:3888
+#: src/dialogs.c:915 src/dialogs.c:4319
 msgid "_Group:"
 msgstr "መድረክ፦ (_G)"
 
-#: src/dialogs.c:1087
+#: src/dialogs.c:951
 msgid "Add Buddy"
 msgstr ""
 
-#: src/dialogs.c:1106
+#: 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:1125
+#: src/dialogs.c:989
 msgid "Screen Name"
 msgstr "እስክሪን ስም"
 
-#: src/dialogs.c:1138 src/dialogs.c:3317 src/dialogs.c:3329
+#: src/dialogs.c:1002
 msgid "Alias"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1012
 msgid "Group"
 msgstr "መድረክ"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1157
+#: src/dialogs.c:1021
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1487
+#: src/dialogs.c:1340
+#, fuzzy
+msgid "Add Chat"
+msgstr "ውሪ"
+
+#: 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:1391 src/gtkaccount.c:431
+msgid "Alias:"
+msgstr ""
+
+#: src/dialogs.c:1402
+#, fuzzy
+msgid "Group:"
+msgstr "መድረክ፦ (_G)"
+
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr ""
 
-#: src/dialogs.c:1498
+#: src/dialogs.c:1764
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#: src/dialogs.c:1507
+#: src/dialogs.c:1773
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/dialogs.c:1524
+#: src/dialogs.c:1790
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/dialogs.c:1528
+#: src/dialogs.c:1794
 msgid "Allow only users on my buddy list"
 msgstr ""
 
-#: src/dialogs.c:1532
+#: src/dialogs.c:1798
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/dialogs.c:1570
+#: src/dialogs.c:1836
 msgid "Deny all users"
 msgstr ""
 
-#: src/dialogs.c:1574
+#: src/dialogs.c:1840
 msgid "Block the users below"
 msgstr ""
 
-#: src/dialogs.c:1689
+#: src/dialogs.c:1956
 msgid "Set Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1697
+#: src/dialogs.c:1964
 msgid "Directory Info"
 msgstr ""
 
-#: src/dialogs.c:1707
+#: src/dialogs.c:1974
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr ""
 
-#: src/dialogs.c:1719
+#: src/dialogs.c:1987
 msgid "Allow Web Searches To Find Your Info"
 msgstr ""
 
-#. Line 1
-#: src/dialogs.c:1722 src/dialogs.c:2361
-msgid "First Name"
-msgstr "ስም፦"
-
 #. Line 2
-#: src/dialogs.c:1733 src/dialogs.c:2371
+#: src/dialogs.c:2001 src/dialogs.c:2654
 msgid "Middle Name"
 msgstr ""
 
-#. Line 3
-#: src/dialogs.c:1745 src/dialogs.c:2381
-msgid "Last Name"
-msgstr "የአባት ስም"
-
 #. Line 4
-#: src/dialogs.c:1756 src/dialogs.c:2391
+#: src/dialogs.c:2024 src/dialogs.c:2674
 msgid "Maiden Name"
 msgstr ""
 
-#. Line 6
-#: src/dialogs.c:1778 src/dialogs.c:2410
-msgid "State"
-msgstr "ሁኔታ"
-
-#: src/dialogs.c:1820 src/dialogs.c:1991 src/dialogs.c:3123 src/dialogs.c:3783
-#: src/dialogs.c:4558
-msgid "Save"
-msgstr "አስቀምጥ"
-
-#: src/dialogs.c:1842
-msgid "New Passwords Do Not Match"
-msgstr ""
-
-#: src/dialogs.c:1847
-msgid "Fill out all fields completely"
-msgstr ""
-
-#: src/dialogs.c:1890
+#: src/dialogs.c:2111
+msgid "New passwords do not match."
+msgstr ""
+
+#: src/dialogs.c:2117
+msgid "Fill out all fields completely."
+msgstr ""
+
+#: src/dialogs.c:2162
 #, c-format
 msgid "Changing password for %s:"
 msgstr ""
 
-#: src/dialogs.c:1898
+#: src/dialogs.c:2170
 msgid "Original Password"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-#: src/dialogs.c:1909
+#: src/dialogs.c:2181
 msgid "New Password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#: src/dialogs.c:1920
+#: src/dialogs.c:2192
 msgid "New Password (again)"
 msgstr ""
 
-#. Build OK Button
-#: src/dialogs.c:1931 src/dialogs.c:2063 src/dialogs.c:2342 src/dialogs.c:2488
-#: src/dialogs.c:3480 src/dialogs.c:3985 src/prpl.c:316
-msgid "OK"
-msgstr "እሺ"
-
-#: src/dialogs.c:1968
+#: src/dialogs.c:2241
 #, c-format
 msgid "Changing info for %s:"
 msgstr ""
 
-#: src/dialogs.c:2049
+#: src/dialogs.c:2327
 msgid "Below are the results of your search: "
 msgstr ""
 
-#: src/dialogs.c:2154
+#: src/dialogs.c:2438
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2470
 msgid "Add Permit"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2472
 msgid "Add Deny"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2539
 msgid "Log Conversation"
 msgstr ""
 
-#: src/dialogs.c:2337 src/dialogs.c:2470
+#: src/dialogs.c:2620 src/dialogs.c:2753
 msgid "Search for Buddy"
 msgstr ""
 
-#: src/dialogs.c:2437
+#: src/dialogs.c:2720
 msgid "Find Buddy By Info"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2747
 msgid "Find Buddy By Email"
 msgstr ""
 
-#: src/dialogs.c:2568
+#: src/dialogs.c:2851
 msgid "Insert Link"
 msgstr "አያያዝ አስገባ"
 
-#: src/dialogs.c:2570
+#: src/dialogs.c:2853
 msgid "Insert"
 msgstr "አስገባ"
 
-#: src/dialogs.c:2589
+#: 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:2752 src/dialogs.c:2769
+#: src/dialogs.c:3041 src/dialogs.c:3058
 msgid "Select Text Color"
 msgstr ""
 
-#: src/dialogs.c:2800 src/dialogs.c:2817
+#: src/dialogs.c:3093 src/dialogs.c:3110
 msgid "Select Background Color"
 msgstr ""
 
-#: src/dialogs.c:2901 src/dialogs.c:2924
+#: src/dialogs.c:3207 src/dialogs.c:3233
 msgid "Select Font"
 msgstr "የፊደል ቅርጽ ምረጡ"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:2989
+#: src/dialogs.c:3299
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:2990
+#: src/dialogs.c:3301
 msgid ""
-"Please give the message a title, or choose \"Make Away\" to use without "
-"saving."
-msgstr ""
-
-#. We shouldn't allow a blank message
-#: src/dialogs.c:2999
+"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:3064 src/dialogs.c:3072
+#: src/dialogs.c:3376 src/dialogs.c:3384
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3394
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3439
 msgid "Save & Use"
 msgstr "አስቀምጥ እና ተጠቀም"
 
-#: src/dialogs.c:3131
+#: src/dialogs.c:3443
 msgid "Use"
 msgstr "ተጠቀም"
 
 #. show everything
-#: src/dialogs.c:3266
+#: src/dialogs.c:3592
 msgid "Smile!"
 msgstr ""
 
-#: src/dialogs.c:3309 src/pounce.c:419
-msgid "Buddy"
-msgstr ""
-
-#. Finish up
-#: src/dialogs.c:3344
+#: 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 ""
 
-#: src/dialogs.c:3382 src/dialogs.c:3389
+#. Setup the label containing the description.
+#: 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:3413
+#: src/dialogs.c:3867
 msgid "Save Log File"
 msgstr ""
 
-#: src/dialogs.c:3443
+#: src/dialogs.c:3897
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr ""
 
-#: src/dialogs.c:3462
+#: src/dialogs.c:3916
 msgid "Clear Log"
 msgstr ""
 
-#: src/dialogs.c:3471
+#: src/dialogs.c:3925
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3970
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr ""
 
-#: src/dialogs.c:3655
+#: src/dialogs.c:4112
 #, c-format
 msgid "Conversations with %s"
 msgstr ""
 
-#: src/dialogs.c:3657
+#: src/dialogs.c:4114
 msgid "System Log"
 msgstr ""
 
-#: src/dialogs.c:3678
+#: src/dialogs.c:4135
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr ""
 
-#: src/dialogs.c:3699
+#: src/dialogs.c:4156
 msgid "Date"
 msgstr "ቀን"
 
-#: src/dialogs.c:3756
-msgid "Conversation"
-msgstr ""
-
-#: src/dialogs.c:3778
+#: src/dialogs.c:4213
+#, fuzzy
+msgid "Log"
+msgstr "ዝምብለህ ይግባ"
+
+#: src/dialogs.c:4235
 msgid "Clear"
 msgstr "ሰርዝ"
 
-#: src/dialogs.c:3862
+#: src/dialogs.c:4293
 msgid "Rename Group"
 msgstr "መድረክን እንደገና ሰይም"
 
-#: src/dialogs.c:3879
+#: src/dialogs.c:4310
 msgid "Please enter a new name for the selected group.\n"
 msgstr ""
 
-#: src/dialogs.c:3955 src/dialogs.c:3964
-msgid "Rename Buddy"
-msgstr ""
-
-#: src/dialogs.c:3971
-msgid "New name:"
-msgstr "አዲስ ስም፦"
-
-#: src/ft.c:126
+#: src/ft.c:121
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: src/ft.c:140
+#: src/ft.c:135
 #, c-format
 msgid "%s was not found.\n"
 msgstr ""
 
-#: src/ft.c:732
+#: src/ft.c:727
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr ""
 
-#: src/ft.c:734
+#: src/ft.c:729
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
 
-#: src/gaim-remote.c:32
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr ""
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: src/gaim-remote.c:33
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -3655,1331 +4345,1688 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
+#: src/gaim-remote.c:136 src/gaim-remote.c:152
+msgid "Gaim not running (on session 0)\n"
+msgstr ""
+
+#: src/gaim-remote.c:164
+msgid ""
+"\n"
+"Using AIM: URIs:\n"
+"Sending an IM to a screenname:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"is the message to be sent.  '+' must be used in place of spaces.\n"
+"Please note the quoting used above - if you run this from a shell the '&'\n"
+"needs to be escaped, or the command will stop at that point.\n"
+"Also,the following will just open a conversation window to a screenname,\n"
+"with no message:\n"
+"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\n"
+"Joining a chat:\n"
+"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"...joins the 'PenguinLounge' chat room.\n"
+"\n"
+"Adding a buddy to your buddy list:\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"...prompts you to add 'Penguin' to your buddy list.\n"
+msgstr ""
+
+#: src/gaim-remote.c:184
+msgid ""
+"\n"
+"Close running copy of Gaim\n"
+msgstr ""
+
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:48
+#: src/gaimrc.c:42
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:265 src/gaimrc.c:298 src/gaimrc.c:1296
+#: src/gaimrc.c:363 src/gaimrc.c:1506
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1389
+#: src/gaimrc.c:1604
 #, c-format
 msgid "Could not open config file %s."
 msgstr ""
 
-#: src/gtkconv.c:205
+#: 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
+msgid "Login Options"
+msgstr "የዝምብለህ ይግባ መርጫዎች"
+
+#: src/gtkaccount.c:348
+msgid "Protocol:"
+msgstr ""
+
+#: src/gtkaccount.c:353
+msgid "Screenname:"
+msgstr "እስክሪን ስም፦"
+
+#: src/gtkaccount.c:435
+#, fuzzy
+msgid "Remember password"
+msgstr "ሚስጢራዊ ቃልን አስታውስ"
+
+#. Build the user options frame.
+#: src/gtkaccount.c:489
+msgid "User Options"
+msgstr "ተጠቃሚ መርጫዎች"
+
+#: src/gtkaccount.c:502
+msgid "New mail notifications"
+msgstr ""
+
+#: src/gtkaccount.c:511
+msgid "Buddy icon file:"
+msgstr ""
+
+#: src/gtkaccount.c:520
+#, fuzzy
+msgid "_Browse"
+msgstr "መቃኛ (_B)"
+
+#: src/gtkaccount.c:526
+#, fuzzy
+msgid "_Reset"
+msgstr "እንደነበረ አድረግ"
+
+#. Build the protocol options frame.
+#: src/gtkaccount.c:587
+#, c-format
+msgid "%s Options"
+msgstr "%s ምርጫዎች"
+
+#. Use Global Proxy Settings
+#: src/gtkaccount.c:708
+msgid "Use Global Proxy Settings"
+msgstr ""
+
+#. No Proxy
+#: src/gtkaccount.c:715
+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
+msgid "Proxy Options"
+msgstr ""
+
+#: src/gtkaccount.c:804 src/gtkprefs.c:1097
+msgid "Proxy _type:"
+msgstr ""
+
+#: src/gtkaccount.c:813
+msgid "_Host:"
+msgstr "እንግዳ ተቀባይ፦ (_H)"
+
+#: src/gtkaccount.c:817
+#, fuzzy
+msgid "_Port:"
+msgstr "ፖርት፦"
+
+#: src/gtkaccount.c:825
+#, fuzzy
+msgid "_Username:"
+msgstr "ተጠቃሚ፦ (_U)"
+
+#: src/gtkaccount.c:830
+msgid "Pa_ssword:"
+msgstr "ሚስጢራዊ ቃል፦ (_S)"
+
+#: src/gtkaccount.c:1141
+msgid "Add Account"
+msgstr ""
+
+#: src/gtkaccount.c:1143
+msgid "Modify Account"
+msgstr ""
+
+#. Add the disclosure
+#: src/gtkaccount.c:1167
+msgid "Show more options"
+msgstr "ተጨማሪ ምርጫዎች አሳይ"
+
+#: src/gtkaccount.c:1168
+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
+msgid "Delete"
+msgstr "አጥፉ"
+
+#: src/gtkaccount.c:1565
+msgid "Screenname"
+msgstr "እስክሪን ስም"
+
+#: src/gtkaccount.c:1606
+msgid "Protocol"
+msgstr ""
+
+#: src/gtkblist.c:409
+msgid "Add a _Buddy"
+msgstr ""
+
+#: src/gtkblist.c:411
+msgid "Add a C_hat"
+msgstr ""
+
+#: src/gtkblist.c:413
+msgid "_Delete Group"
+msgstr "መድረክ አጥፉ (_D)"
+
+#: src/gtkblist.c:415
+msgid "_Rename"
+msgstr "እንደገና ሰይም (_R)"
+
+#: src/gtkblist.c:423
+#, fuzzy
+msgid "_Join"
+msgstr "ዝምብለህ ይግባ (_L)"
+
+#: src/gtkblist.c:425
+msgid "Auto-Join"
+msgstr ""
+
+#: src/gtkblist.c:428 src/gtkblist.c:474
+msgid "_Alias"
+msgstr ""
+
+#: src/gtkblist.c:430 src/gtkblist.c:476
+msgid "_Remove"
+msgstr "አስወግድ (_R)"
+
+#: src/gtkblist.c:448
+msgid "_Get Info"
+msgstr ""
+
+#: src/gtkblist.c:451
+msgid "_IM"
+msgstr ""
+
+#: src/gtkblist.c:453
+msgid "Add Buddy _Pounce"
+msgstr ""
+
+#: src/gtkblist.c:455
+msgid "View _Log"
+msgstr ""
+
+#. Buddies menu
+#: src/gtkblist.c:780
+msgid "/_Buddies"
+msgstr ""
+
+#: src/gtkblist.c:781
+msgid "/Buddies/New _Instant Message..."
+msgstr ""
+
+#: src/gtkblist.c:782
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+#: src/gtkblist.c:783
+msgid "/Buddies/Get _User Info..."
+msgstr ""
+
+#: src/gtkblist.c:785
+msgid "/Buddies/Show _Offline Buddies"
+msgstr ""
+
+#: src/gtkblist.c:786
+msgid "/Buddies/Show _Empty Groups"
+msgstr ""
+
+#: src/gtkblist.c:787
+msgid "/Buddies/_Add a Buddy..."
+msgstr ""
+
+#: src/gtkblist.c:788
+msgid "/Buddies/Add a C_hat..."
+msgstr ""
+
+#: src/gtkblist.c:789
+msgid "/Buddies/Add a _Group..."
+msgstr ""
+
+#: src/gtkblist.c:791
+msgid "/Buddies/_Signoff"
+msgstr ""
+
+#: src/gtkblist.c:792
+msgid "/Buddies/_Quit"
+msgstr ""
+
+#. Tools
+#: src/gtkblist.c:795
+msgid "/_Tools"
+msgstr "/መሣሪያዎች (_T)"
+
+#: src/gtkblist.c:796
+msgid "/Tools/_Away"
+msgstr ""
+
+#: src/gtkblist.c:797
+msgid "/Tools/Buddy _Pounce"
+msgstr ""
+
+#: src/gtkblist.c:798
+msgid "/Tools/P_rotocol Actions"
+msgstr ""
+
+#: src/gtkblist.c:800
+msgid "/Tools/A_ccounts"
+msgstr ""
+
+#: src/gtkblist.c:801
+msgid "/Tools/_File Transfers..."
+msgstr ""
+
+#: src/gtkblist.c:802
+#, fuzzy
+msgid "/Tools/Preferences"
+msgstr "ምርጫዎች"
+
+#: src/gtkblist.c:803
+msgid "/Tools/Pr_ivacy"
+msgstr ""
+
+#: src/gtkblist.c:805
+msgid "/Tools/View System _Log"
+msgstr ""
+
+#. Help
+#: src/gtkblist.c:808
+msgid "/_Help"
+msgstr "/መረጃ (_H)"
+
+#: src/gtkblist.c:809
+msgid "/Help/Online _Help"
+msgstr ""
+
+#: src/gtkblist.c:810
+msgid "/Help/_Debug Window"
+msgstr ""
+
+#: src/gtkblist.c:811
+#, fuzzy
+msgid "/Help/_About"
+msgstr "/መረጃ/ስለ... (_A)"
+
+#: src/gtkblist.c:845
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: src/gtkblist.c:907
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:921
+#, fuzzy
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+#: src/gtkblist.c:922
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+
+#: src/gtkblist.c:923
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+#: src/gtkblist.c:924
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+
+#: src/gtkblist.c:925
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+
+#: src/gtkblist.c:927
+msgid ""
+"\n"
+"<b>Description:</b> Spooky"
+msgstr ""
+
+#: src/gtkblist.c:928
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/gtkblist.c:929
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status</b>: Rockin'"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/gtkblist.c:1226
+#, c-format
+msgid "Idle (%dh%02dm) "
+msgstr ""
+
+#: src/gtkblist.c:1228
+#, c-format
+msgid "Idle (%dm) "
+msgstr ""
+
+#: src/gtkblist.c:1232
+#, c-format
+msgid "Warned (%d%%) "
+msgstr ""
+
+#: src/gtkblist.c:1235
+msgid "Offline "
+msgstr ""
+
+#: src/gtkblist.c:1391 src/gtkprefs.c:842 src/gtkprefs.c:1516
+msgid "None"
+msgstr "ምንም"
+
+#: src/gtkblist.c:1392
+msgid "Alphabetical"
+msgstr ""
+
+#: src/gtkblist.c:1393
+#, fuzzy
+msgid "By status"
+msgstr "ሁኔታ፦"
+
+#: src/gtkblist.c:1394
+msgid "By log size"
+msgstr ""
+
+#: src/gtkblist.c:1430 src/gtkprefs.c:2270
+msgid "Buddy List"
+msgstr ""
+
+#: src/gtkblist.c:1454
+msgid "/Tools/Away"
+msgstr ""
+
+#: src/gtkblist.c:1457
+msgid "/Tools/Buddy Pounce"
+msgstr ""
+
+#: 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:1543
+msgid "/Buddies/Show Offline Buddies"
+msgstr ""
+
+#: src/gtkblist.c:1545
+msgid "/Buddies/Show Empty Groups"
+msgstr ""
+
+#: src/gtkblist.c:1563 src/gtkconv.c:1072
+msgid "IM"
+msgstr ""
+
+#: src/gtkblist.c:1569
+msgid "Send a message to the selected buddy"
+msgstr ""
+
+#: src/gtkblist.c:1578
+msgid "Get information on the selected buddy"
+msgstr ""
+
+#: src/gtkblist.c:1586
+msgid "Join a chat room"
+msgstr "የውሪ ቤትን አገጣጥም"
+
+#: src/gtkblist.c:1594
+msgid "Set an away message"
+msgstr ""
+
+#: 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
+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:741
+#: src/gtkconv.c:581
+msgid "Gaim - Invite Buddy Into Chat Room"
+msgstr ""
+
+#. Put our happy label in it.
+#: 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:650
+msgid "_Message:"
+msgstr "መልእክት፦ (_M)"
+
+#: src/gtkconv.c:1080
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/gtkconv.c:743 src/prefs.c:522
+#: src/gtkconv.c:1082 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "ተዉት"
 
 #. Info button
-#: src/gtkconv.c:752 src/gtkconv.c:2617
+#: src/gtkconv.c:1091 src/gtkconv.c:2987
 msgid "Info"
 msgstr "መረጃ"
 
-#: src/gtkconv.c:846
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr ""
-
-#. Put our happy label in it.
-#: src/gtkconv.c:874
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
-#: src/gtkconv.c:895
-msgid "_Buddy:"
-msgstr ""
-
-#: src/gtkconv.c:915
-msgid "_Message:"
-msgstr "መልእክት፦ (_M)"
-
-#: src/gtkconv.c:1930
+#: 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:1938
+#: src/gtkconv.c:2208
 msgid "User has typed something and paused"
 msgstr ""
 
 #. Build the Send As menu
-#: src/gtkconv.c:2045
+#: src/gtkconv.c:2310
 msgid "_Send As"
 msgstr ""
 
+#: src/gtkconv.c:2766
+msgid "Gaim - Save Conversation"
+msgstr ""
+
 #. Conversation menu
-#: src/gtkconv.c:2495
+#: src/gtkconv.c:2783
 msgid "/_Conversation"
 msgstr ""
 
-#: src/gtkconv.c:2496
+#: src/gtkconv.c:2785
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: src/gtkconv.c:2498
-msgid "/Conversation/View _History..."
-msgstr ""
-
-#: src/gtkconv.c:2500
+#: src/gtkconv.c:2787
+msgid "/Conversation/View _Log..."
+msgstr ""
+
+#: src/gtkconv.c:2791
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+#: src/gtkconv.c:2793
+msgid "/Conversation/A_lias..."
+msgstr ""
+
+#: src/gtkconv.c:2795
+msgid "/Conversation/_Get Info..."
+msgstr ""
+
+#: src/gtkconv.c:2797
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+#: src/gtkconv.c:2802
 msgid "/Conversation/Insert _URL..."
 msgstr ""
 
-#: src/gtkconv.c:2502
+#: src/gtkconv.c:2804
 msgid "/Conversation/Insert _Image..."
 msgstr ""
 
-#: src/gtkconv.c:2505
+#: src/gtkconv.c:2809
+msgid "/Conversation/_Warn..."
+msgstr ""
+
+#: src/gtkconv.c:2811
+msgid "/Conversation/_Block..."
+msgstr ""
+
+#: src/gtkconv.c:2813
+msgid "/Conversation/_Add..."
+msgstr ""
+
+#: src/gtkconv.c:2815
+msgid "/Conversation/_Remove..."
+msgstr ""
+
+#: src/gtkconv.c:2820
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: src/gtkconv.c:2509
+#: src/gtkconv.c:2824
 msgid "/_Options"
 msgstr "/ምርጫዎች (_O)"
 
-#: src/gtkconv.c:2510
+#: src/gtkconv.c:2825
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: src/gtkconv.c:2511
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: src/gtkconv.c:2542
-msgid "/Conversation/View History..."
-msgstr ""
-
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2866
+msgid "/Conversation/View Log..."
+msgstr ""
+
+#: src/gtkconv.c:2871
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+#: src/gtkconv.c:2875
+msgid "/Conversation/Alias..."
+msgstr ""
+
+#: src/gtkconv.c:2879
+msgid "/Conversation/Get Info..."
+msgstr ""
+
+#: src/gtkconv.c:2883
+msgid "/Conversation/Invite..."
+msgstr ""
+
+#: src/gtkconv.c:2889
 msgid "/Conversation/Insert URL..."
 msgstr ""
 
-#: src/gtkconv.c:2546
+#: src/gtkconv.c:2893
 msgid "/Conversation/Insert Image..."
 msgstr ""
 
-#: src/gtkconv.c:2548
+#: src/gtkconv.c:2899
+msgid "/Conversation/Warn..."
+msgstr ""
+
+#: src/gtkconv.c:2903
+msgid "/Conversation/Block..."
+msgstr ""
+
+#: src/gtkconv.c:2907
+msgid "/Conversation/Add..."
+msgstr ""
+
+#: src/gtkconv.c:2911
+msgid "/Conversation/Remove..."
+msgstr ""
+
+#: src/gtkconv.c:2917
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:2550
+#: src/gtkconv.c:2920
 msgid "/Options/Enable Sounds"
 msgstr ""
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2574 src/gtkconv.c:2576 src/gtkconv.c:2674 src/gtkconv.c:2676
-#: src/gtkconv.c:4948
+#: 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:2597 src/gtkconv.c:3727
+#: src/gtkconv.c:2967 src/gtkconv.c:4127
 msgid "Add the user to your buddy list"
 msgstr ""
 
-#: src/gtkconv.c:2603 src/gtkconv.c:3718
+#: src/gtkconv.c:2973 src/gtkconv.c:4112
 msgid "Remove the user from your buddy list"
 msgstr ""
 
 #. Warn button
-#: src/gtkconv.c:2610
+#: src/gtkconv.c:2980
 msgid "Warn"
 msgstr ""
 
-#: src/gtkconv.c:2614
+#: src/gtkconv.c:2984
 msgid "Warn the user"
 msgstr ""
 
-#: src/gtkconv.c:2621 src/gtkconv.c:3044
+#: src/gtkconv.c:2991 src/gtkconv.c:3426
 msgid "Get the user's information"
 msgstr ""
 
 #. Block button
-#: src/gtkconv.c:2624
+#: src/gtkconv.c:2994
 msgid "Block"
 msgstr ""
 
-#: src/gtkconv.c:2628
+#: src/gtkconv.c:2998
 msgid "Block the user"
 msgstr ""
 
 #. Invite
-#: src/gtkconv.c:2686 src/gtkconv.c:4951
+#: src/gtkconv.c:3056 src/gtkconv.c:5686
 msgid "Invite"
 msgstr ""
 
-#: src/gtkconv.c:2689
+#: src/gtkconv.c:3059
 msgid "Invite a user"
 msgstr ""
 
-#: src/gtkconv.c:2728
+#: src/gtkconv.c:3098
 msgid "Bold"
 msgstr "ደማቅ"
 
-#: src/gtkconv.c:2739
+#: src/gtkconv.c:3109
 msgid "Italic"
 msgstr "አይታሊክ ማድረጊያ"
 
-#: src/gtkconv.c:2750
+#: src/gtkconv.c:3120
 msgid "Underline"
 msgstr "የስር መስመር"
 
-#: src/gtkconv.c:2766
+#: src/gtkconv.c:3136
 msgid "Larger font size"
 msgstr ""
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:3148
 msgid "Normal font size"
 msgstr ""
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:3160
 msgid "Smaller font size"
 msgstr ""
 
-#: src/gtkconv.c:2803
+#: src/gtkconv.c:3177
 msgid "Font Face"
 msgstr "የፊደል ቅርጽ ዘይቤ"
 
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:3189
 msgid "Foreground font color"
 msgstr ""
 
-#: src/gtkconv.c:2827
+#: src/gtkconv.c:3201
 msgid "Background color"
 msgstr "የመደቡ ቀለም"
 
-#: src/gtkconv.c:2842
+#: src/gtkconv.c:3216
 msgid "Insert image"
 msgstr "ምስል አስገባ"
 
-#: src/gtkconv.c:2853
+#: src/gtkconv.c:3227
 msgid "Insert link"
 msgstr "አያያዝ አስገባ"
 
-#: src/gtkconv.c:2864
+#: src/gtkconv.c:3238
 msgid "Insert smiley"
 msgstr ""
 
-#: src/gtkconv.c:2917
+#: src/gtkconv.c:3295
 msgid "Topic:"
 msgstr "ጉዳዩ፦"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:3346
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:3021
+#: src/gtkconv.c:3403
 msgid "IM the user"
 msgstr ""
 
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:3415
 msgid "Ignore the user"
 msgstr ""
 
-#: src/gtkconv.c:3561
+#: 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:4156 src/gtkconv.c:4278
+#: src/gtkconv.c:4605 src/gtkconv.c:4727
 #, c-format
 msgid "%d person in room"
-msgstr ""
-
-#: src/gtkconv.c:4637
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtkconv.c:5001
 msgid "Disable Animation"
 msgstr ""
 
-#: src/gtkconv.c:4646
+#: src/gtkconv.c:5010
 msgid "Enable Animation"
 msgstr ""
 
-#: src/gtkconv.c:4653
+#: src/gtkconv.c:5017
 msgid "Hide Icon"
 msgstr "ምልክትን ደብቅ"
 
-#: src/gtkconv.c:4659
+#: src/gtkconv.c:5023
 msgid "Save Icon As..."
 msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 
-#: src/gtkft.c:103
-msgid "Calculating..."
-msgstr ""
-
-#: src/gtkft.c:106
-msgid "Unknown."
-msgstr "ያልታወቀ።"
-
-#: src/gtkft.c:143
+#: src/gtkft.c:126
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:201
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: src/gtkft.c:221
+#: src/gtkft.c:204
 msgid "<b>Sending To:</b>"
 msgstr ""
 
-#: src/gtkft.c:445
+#: src/gtkft.c:436
 msgid "Progress"
 msgstr "ይሻሻል"
 
-#: src/gtkft.c:452
+#: src/gtkft.c:443
 msgid "Filename"
 msgstr "የፋይል ስም"
 
-#: src/gtkft.c:459
+#: src/gtkft.c:450
 msgid "Size"
 msgstr "መጠን"
 
-#: src/gtkft.c:466
+#: src/gtkft.c:457
 msgid "Remaining"
 msgstr ""
 
-#: src/gtkft.c:496
+#: src/gtkft.c:487
 msgid "Filename:"
 msgstr "የፋይል ስም፦"
 
-#: src/gtkft.c:497
+#: src/gtkft.c:488
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: src/gtkft.c:498
+#: src/gtkft.c:489
 msgid "Speed:"
 msgstr "ፍጥነት፦"
 
-#: src/gtkft.c:499
+#: src/gtkft.c:490
 msgid "Time Elapsed:"
 msgstr ""
 
-#: src/gtkft.c:500
+#: src/gtkft.c:491
 msgid "Time Remaining:"
 msgstr ""
 
-#: src/gtkft.c:566
-msgid "File Transfers"
-msgstr ""
-
-#: src/gtkft.c:595
+#: src/gtkft.c:586
 msgid "_Keep the dialog open"
 msgstr ""
 
-#: src/gtkft.c:605
+#: src/gtkft.c:596
 msgid "_Clear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: src/gtkft.c:614
+#: src/gtkft.c:605
 msgid "Show download details"
 msgstr ""
 
-#: src/gtkft.c:615
+#: src/gtkft.c:606
 msgid "Hide download details"
 msgstr ""
 
 #. Pause button
-#: src/gtkft.c:657
+#: src/gtkft.c:648 src/stock.c:86
 msgid "_Pause"
 msgstr "ለአጭር ጊዜ አሳርፍ (_P)"
 
 #. Resume button
-#: src/gtkft.c:667
+#: src/gtkft.c:658
 msgid "_Resume"
 msgstr "ቀጥል (_R)"
 
-#: src/gtkft.c:1001
-msgid "That file already exists. Would you like to overwrite it?"
-msgstr ""
-
-#: src/gtkft.c:1018
+#: src/gtkft.c:1013
 msgid "That file does not exist."
 msgstr ""
 
-#: src/gtkft.c:1042
+#: src/gtkft.c:1020
+msgid "Cannot send a file of 0 bytes."
+msgstr ""
+
+#: src/gtkft.c:1033
+msgid "That file already exists."
+msgstr ""
+
+#: src/gtkft.c:1058
 msgid "Gaim - Open..."
 msgstr "ጌም - ክፈት..."
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: src/gtkimhtml.c:327
+#: src/gtkimhtml.c:530
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: src/gtkimhtml.c:334
+#: src/gtkimhtml.c:537
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: src/gtkimhtml.c:1586
+#: src/gtkimhtml.c:1642
 msgid ""
-"Gaim was unable to guess the image type base on the file extension "
-"supplied.  Defaulting to PNG."
-msgstr ""
-
-#: src/gtkimhtml.c:1594
+"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:1603
-msgid "Gaim - Save Image"
-msgstr "ጌም - ምስሉን አስቀምት"
-
-#: src/gtkimhtml.c:1625
+#: src/gtkimhtml.c:1659
+#, fuzzy
+msgid "Save Image"
+msgstr "ምስሉን አስቀምጥ... (_S)"
+
+#: src/gtkimhtml.c:1681
 msgid "_Save Image..."
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#: src/gtkutils.c:318
-msgid "Gaim - Save Icon"
-msgstr "ጌም -  ምልክትን አስቀምጥ"
-
-#: src/html.c:284
-#, c-format
-msgid "Received: '%s'\n"
-msgstr ""
-
-#: src/html.c:322
-msgid "g003: Error opening connection.\n"
-msgstr ""
-
-#: src/list.c:369
+#: src/gtknotify.c:199
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtknotify.c:207
+#, c-format
+msgid "<span weight=\"bold\">From:</span> %s\n"
+msgstr ""
+
+#: src/gtknotify.c:212
+#, c-format
+msgid "<span weight=\"bold\">Subject:</span> %s\n"
+msgstr ""
+
+#: src/gtknotify.c:216
 #, 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/list.c:373
-msgid "Group Not Removed"
-msgstr ""
-
-#: src/list.c:508
-msgid "Invalid Groupname"
-msgstr ""
-
-#: src/list.c:1137
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-
-#: src/list.c:1139
-msgid "Buddy List Error"
-msgstr ""
-
-#. rob wants to inform the user that their buddy lists are
-#. * being converted
-#: src/list.c:1145
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s%s%s%s"
+msgstr ""
+
+#: src/gtknotify.c:231
 #, c-format
 msgid ""
-"Gaim is converting your old buddy lists to a new format, which will now be "
-"located at %s"
-msgstr ""
-
-#: src/list.c:1148
-msgid "Converting Buddy List"
-msgstr ""
-
-#: src/log.c:118
-msgid "Gaim - Save Conversation"
-msgstr ""
-
-#: src/log.c:159 src/log.c:180 src/log.c:193
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr ""
-
-#: src/log.c:247 src/log.c:263
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr ""
-
-#: src/log.c:250 src/log.c:266
-#, c-format
-msgid "IM Sessions with %s"
-msgstr ""
-
-#: src/log.c:297
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:302
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:307
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr ""
-
-#: src/log.c:312
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:317
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:322
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:327
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr ""
-
-#: src/log.c:334
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:339
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:344
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
-
-#: src/log.c:349
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:354
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:372
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr ""
-
-#: src/log.c:377
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr ""
-
-#: src/log.c:382
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr ""
-
-#: src/log.c:387
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr ""
-
-#: src/log.c:392
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr ""
-
-#: src/log.c:398
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr ""
-
-#: src/main.c:178
-msgid "Please enter your login."
-msgstr ""
-
-#: src/main.c:265
-msgid "<New User>"
-msgstr "<አዲስ ተጠቃሚ>"
-
-#: src/main.c:307
-msgid "Login"
-msgstr "ዝምብለህ ይግባ"
-
-#: src/main.c:323
-msgid "Screen Name:"
-msgstr "እስክሪን ስም፦"
-
-#. And now for the buttons
-#: src/main.c:357
-msgid "Accounts"
-msgstr ""
-
-#: src/main.c:367 src/prefs.c:1766 src/win32/systray.c:293
-msgid "Preferences"
-msgstr "ምርጫዎች"
-
-#: src/main.c:373 src/win32/systray.c:145
-msgid "Sign On"
-msgstr ""
-
-#: src/multi.c:264
-msgid "Screenname"
-msgstr "እስክሪን ስም"
-
-#: src/multi.c:292
-msgid "Protocol"
-msgstr ""
-
-#: src/multi.c:618
-msgid "Load Buddy Icon"
-msgstr ""
-
-#: src/multi.c:661
-msgid "Buddy Icon File:"
-msgstr ""
-
-#: src/multi.c:674
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/gtkpounce.c:140
+msgid "Select a file"
+msgstr ""
+
+#: src/gtkpounce.c:189
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+#. "New Buddy Pounce"
+#: src/gtkpounce.c:383 src/gtkpounce.c:787
+msgid "New Buddy Pounce"
+msgstr ""
+
+#: src/gtkpounce.c:383
+msgid "Edit Buddy Pounce"
+msgstr ""
+
+#. Create the "Pounce Who" frame.
+#: src/gtkpounce.c:401
+msgid "Pounce Who"
+msgstr ""
+
+#: src/gtkpounce.c:426
+msgid "_Buddy Name:"
+msgstr ""
+
+#. Create the "Pounce When" frame.
+#: src/gtkpounce.c:448
+msgid "Pounce When"
+msgstr ""
+
+#: src/gtkpounce.c:456
+msgid "Sign on"
+msgstr ""
+
+#: src/gtkpounce.c:458
+msgid "Sign off"
+msgstr ""
+
+#: src/gtkpounce.c:462
+msgid "Return from away"
+msgstr ""
+
+#: src/gtkpounce.c:466
+msgid "Return from idle"
+msgstr ""
+
+#: src/gtkpounce.c:468
+msgid "Buddy starts typing"
+msgstr ""
+
+#: src/gtkpounce.c:470
+msgid "Buddy stops typing"
+msgstr ""
+
+#. Create the "Pounce Action" frame.
+#: src/gtkpounce.c:499
+msgid "Pounce Action"
+msgstr ""
+
+#: src/gtkpounce.c:506
+msgid "Open an IM window"
+msgstr ""
+
+#: src/gtkpounce.c:507
+msgid "Popup notification"
+msgstr ""
+
+#: src/gtkpounce.c:508
+#, fuzzy
+msgid "Send a message"
+msgstr "[መልዕክት የለም]"
+
+#: src/gtkpounce.c:509
+msgid "Execute a command"
+msgstr ""
+
+#: src/gtkpounce.c:510
+msgid "Play a sound"
+msgstr ""
+
+#: src/gtkpounce.c:514 src/gtkpounce.c:516
 msgid "Browse"
 msgstr "ቃኝ"
 
-#: src/multi.c:679 src/prefs.c:1542
-msgid "Reset"
-msgstr "እንደነበረ አድረግ"
-
-#: src/multi.c:705
-msgid "Login Options"
-msgstr "የዝምብለህ ይግባ መርጫዎች"
-
-#: src/multi.c:717
-msgid "Protocol:"
-msgstr ""
-
-#: src/multi.c:731
-msgid "Screenname:"
-msgstr "እስክሪን ስም፦"
-
-#: src/multi.c:778
-msgid "Alias:"
-msgstr ""
-
-#: src/multi.c:786
-msgid "Remember Password"
-msgstr "ሚስጢራዊ ቃልን አስታውስ"
-
-#: src/multi.c:787
-msgid "Auto-Login"
-msgstr ""
-
-#: src/multi.c:843
-msgid "User Options"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#: src/multi.c:853
-msgid "New Mail Notifications"
-msgstr ""
-
-#: src/multi.c:905
-#, c-format
-msgid "%s Options"
-msgstr "%s ምርጫዎች"
-
-#: src/multi.c:948
-msgid "Register with server"
-msgstr ""
-
-#: src/multi.c:981
-msgid "Proxy Options"
-msgstr ""
-
-#: src/multi.c:995
-msgid "Proxy _Type"
-msgstr ""
-
-#: src/multi.c:1004
-msgid "Use Global Proxy Settings"
-msgstr ""
-
-#: src/multi.c:1013
-msgid "No Proxy"
-msgstr ""
-
-#: src/multi.c:1065
-msgid "_Host:"
-msgstr "እንግዳ ተቀባይ፦ (_H)"
-
-#: src/multi.c:1101
-msgid "_User:"
-msgstr "ተጠቃሚ፦ (_U)"
-
-#: src/multi.c:1117
-msgid "Pa_ssword:"
-msgstr "ሚስጢራዊ ቃል፦ (_S)"
-
-#: src/multi.c:1188
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:1206
-msgid "Show more options"
-msgstr "ተጨማሪ ምርጫዎች አሳይ"
-
-#: src/multi.c:1206
-msgid "Show fewer options"
-msgstr ""
-
-#: src/multi.c:1315
-msgid "_Login"
-msgstr "ዝምብለህ ይግባ (_L)"
-
-#: src/multi.c:1333
-#, c-format
-msgid ""
-"Please enter your password for %s.\n"
-"\n"
-msgstr ""
-
-#: src/multi.c:1344
-msgid "_Password"
-msgstr "ሚስጢራዊ ቃል (_P)"
-
-#: src/multi.c:1383
-msgid "TOC not found."
-msgstr ""
-
-#: src/multi.c:1384
-msgid ""
-"You have attempted to login an IM account using the TOC protocol.  Because "
-"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
-"default.  To login, edit this account to use OSCAR or load the TOC plugin."
-msgstr ""
-
-#: src/multi.c:1390
-msgid "Protocol not found."
-msgstr ""
-
-#: src/multi.c:1391
-msgid ""
-"You cannot log this account in; you do not have the protocol it uses loaded, "
-"or the protocol does not have a login function."
-msgstr ""
-
-#: src/multi.c:1467
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr ""
-
-#: src/multi.c:1468
-msgid "Delete"
-msgstr "አጥፉ"
-
-#: src/multi.c:1497
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:1562
-msgid "_Modify"
-msgstr "ለውጡ (_M)"
-
-#: src/multi.c:1610
-msgid "Done."
-msgstr "ጨርሷል።"
-
-#: src/multi.c:1840
-msgid "Signon: "
-msgstr ""
-
-#: src/multi.c:1898
-msgid "Signon"
-msgstr ""
-
-#: src/multi.c:1910
-msgid "Cancel All"
-msgstr ""
-
-#: src/multi.c:1963
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-"%s\n"
-"%s፦ %s"
-
-#: src/multi.c:1984
-#, c-format
-msgid "%s was unable to sign on"
-msgstr ""
-
-#: src/multi.c:1985
-msgid "Signon Error"
-msgstr ""
-
-#: src/multi.c:1996
-msgid "Notice"
-msgstr ""
-
-#: src/multi.c:2008
-#, c-format
-msgid "%s has been signed off"
-msgstr ""
-
-#: src/multi.c:2009
-msgid "Connection Error"
-msgstr ""
-
-#: src/perl.c:386
-msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
-msgstr ""
-
-#: src/prefs.c:191
+#: src/gtkpounce.c:517 src/gtkprefs.c:2097
+msgid "Test"
+msgstr "ፈተና"
+
+#: src/gtkpounce.c:600
+msgid "_Save this pounce after activation"
+msgstr ""
+
+#. "Remove Buddy Pounce"
+#: src/gtkpounce.c:794
+msgid "Remove Buddy Pounce"
+msgstr ""
+
+#: 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 ""
+
+#: src/gtkpounce.c:843
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+#: src/gtkprefs.c:378
 msgid "Interface Options"
 msgstr ""
 
-#: src/prefs.c:193
+#: src/gtkprefs.c:380
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/prefs.c:370
+#: 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/prefs.c:403
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "ምልክት"
 
-#: src/prefs.c:437
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "ዓይነት"
 
-#: src/prefs.c:438
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "ደማቅ (_B)"
 
-#: src/prefs.c:439
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "አይታሊክ ማድረጊያ (_I)"
 
-#: src/prefs.c:440
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "የስር መስመር (_U)"
 
-#: src/prefs.c:441
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "ስርዝ (_S)"
 
-#: src/prefs.c:443
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "የፊደል ቅርጽ ዘይቤ"
 
-#: src/prefs.c:446
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr ""
 
-#: src/prefs.c:460
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr ""
 
-#: src/prefs.c:468
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "ቀለም"
 
-#: src/prefs.c:473
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "የጽሑፍ ቀለም (_T)"
 
-#: src/prefs.c:490
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "የመደቡ ቀለም (_K)"
 
-#: src/prefs.c:515 src/prefs.c:658 src/prefs.c:699
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "አሳይ"
 
-#: src/prefs.c:516
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr ""
 
-#: src/prefs.c:517
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr ""
 
-#: src/prefs.c:518
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr ""
 
-#: src/prefs.c:520
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr ""
 
-#: src/prefs.c:523
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr ""
 
-#: src/prefs.c:524
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr ""
 
-#: src/prefs.c:525
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr ""
 
-#: src/prefs.c:538 src/pounce.c:512
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr ""
 
-#: src/prefs.c:539
-msgid "_Enter sends message"
-msgstr ""
-
-#: src/prefs.c:540
+#: src/gtkprefs.c:793
+msgid "Enter _sends message"
+msgstr ""
+
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr ""
 
-#: src/prefs.c:542
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr ""
 
-#: src/prefs.c:543
-msgid "E_scape closes window"
-msgstr ""
-
-#: src/prefs.c:544
-msgid "Control-_W closes window"
-msgstr ""
-
-#: src/prefs.c:547
-msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr ""
-
-#: src/prefs.c:548
-msgid "Control-(number) inserts _smileys"
-msgstr ""
-
-#: src/prefs.c:561
+#: src/gtkprefs.c:799
+msgid "_Escape closes window"
+msgstr ""
+
+#: src/gtkprefs.c:802
+#, fuzzy
+msgid "Insertions"
+msgstr "አያያዝ አስገባ"
+
+#: src/gtkprefs.c:803
+msgid "Control-{B/I/U} inserts _HTML tags"
+msgstr ""
+
+#: src/gtkprefs.c:805
+msgid "Control-(number) _inserts smileys"
+msgstr ""
+
+#: src/gtkprefs.c:822
+msgid "Buddy List Sorting"
+msgstr ""
+
+#: src/gtkprefs.c:831
+#, fuzzy
+msgid "Sorting:"
+msgstr "ፖርት፦"
+
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr ""
 
-#: src/prefs.c:562 src/prefs.c:641 src/prefs.c:684
+#: src/gtkprefs.c:837 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:642 src/prefs.c:685
+#: src/gtkprefs.c:839 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "ሥዕሎች"
 
-#: src/prefs.c:564 src/prefs.c:643 src/prefs.c:686
+#: src/gtkprefs.c:840 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "ጽሑፍ"
 
-#: src/prefs.c:565 src/prefs.c:644 src/prefs.c:687
+#: src/gtkprefs.c:841 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr ""
 
-#: src/prefs.c:566 src/prefs.c:1071
-msgid "None"
-msgstr "ምንም"
-
-#: src/prefs.c:569
+#: src/gtkprefs.c:846
 msgid "_Raise window on events"
 msgstr ""
 
-#: src/prefs.c:571
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr ""
 
-#. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:573
+#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr ""
 
-#: src/prefs.c:575
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr ""
 
-#: src/prefs.c:576
+#: src/gtkprefs.c:855 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr ""
 
-#: src/prefs.c:577
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr ""
 
-#: src/prefs.c:582
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr ""
 
-#: src/prefs.c:587
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr ""
 
-#: src/prefs.c:605 src/prefs.c:1712
+#: src/gtkprefs.c:894 src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr ""
 
-#: src/prefs.c:613
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr ""
 
-#: src/prefs.c:621
-msgid "Show IMs and chats in _same tabbed window."
-msgstr ""
-
-#: src/prefs.c:640 src/prefs.c:683
+#: src/gtkprefs.c:907
+msgid "Send _URLs as Links"
+msgstr ""
+
+#: src/gtkprefs.c:910
+msgid "Tab Options"
+msgstr "የመክፈቻዎች ምርጫዎች"
+
+#: src/gtkprefs.c:913 src/gtkprefs.c:924
+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
+msgid "_Tab Placement:"
+msgstr ""
+
+#: src/gtkprefs.c:933
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+#: src/gtkprefs.c:936
+msgid "Show _close button on tabs."
+msgstr ""
+
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "መስኮት"
 
-#: src/prefs.c:647 src/prefs.c:690
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr ""
 
-#: src/prefs.c:648 src/prefs.c:691
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr ""
 
-#: src/prefs.c:649 src/prefs.c:692
-msgid "_Entry widget height:"
-msgstr ""
-
-#: src/prefs.c:650 src/prefs.c:693
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
+msgid "_Entry field height:"
+msgstr ""
+
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise windows on events"
 msgstr ""
 
-#: src/prefs.c:651
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr ""
 
-#: src/prefs.c:654
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr ""
 
-#: src/prefs.c:655
-msgid "Hide buddy _icons"
-msgstr ""
-
-#: src/prefs.c:656
-msgid "Disable buddy icon a_nimation"
-msgstr ""
-
-#: src/prefs.c:659
+#: src/gtkprefs.c:991
+msgid "Enable buddy icon a_nimation"
+msgstr ""
+
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr ""
 
-#: src/prefs.c:660
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr ""
 
-#: src/prefs.c:662
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr ""
 
-#: src/prefs.c:663
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/prefs.c:695
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:696
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr ""
 
-#: src/prefs.c:697
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr ""
 
-#: src/prefs.c:700
-msgid "_Show people joining/leaving in window"
-msgstr ""
-
-#: src/prefs.c:701
+#: src/gtkprefs.c:1048
+msgid "_Show people joining in window"
+msgstr ""
+
+#: src/gtkprefs.c:1050
+msgid "_Show people leaving in window"
+msgstr ""
+
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr ""
 
-#: src/prefs.c:718
-msgid "IM Tabs"
-msgstr "የIM መክፈቻዎች"
-
-#: src/prefs.c:719 src/prefs.c:729
-msgid "Tab _placement:"
-msgstr ""
-
-#: src/prefs.c:720 src/prefs.c:730
-msgid "Top"
-msgstr "ወደ ላይ"
-
-#: src/prefs.c:721 src/prefs.c:731
-msgid "Bottom"
-msgstr "ወደ ታች"
-
-#: src/prefs.c:722 src/prefs.c:732
-msgid "Left"
-msgstr "ግራ"
-
-#: src/prefs.c:723 src/prefs.c:733
-msgid "Right"
-msgstr "ቀኝ"
-
-#: src/prefs.c:725
-msgid ""
-"Show all _instant messages in one tabbed\n"
-"window"
-msgstr ""
-
-#: src/prefs.c:728
-msgid "Chat Tabs"
-msgstr "የማውሪያ መክፈቻዎች"
-
-#: src/prefs.c:735
-msgid "Show all c_hats in one tabbed window"
-msgstr ""
-
-#: src/prefs.c:738
-msgid "Tab Options"
-msgstr "የመክፈቻዎች ምርጫዎች"
-
-#: src/prefs.c:739
-msgid "Show _close button on tabs."
-msgstr ""
-
-#: src/prefs.c:759
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr ""
 
-#: src/prefs.c:760
-msgid "Proxy _type:"
-msgstr ""
-
-#: src/prefs.c:761
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr ""
 
-#: src/prefs.c:766
+#: src/gtkprefs.c:1105
 msgid "Proxy Server"
 msgstr ""
 
-#: src/prefs.c:779
+#: src/gtkprefs.c:1125
 msgid "_Host"
 msgstr "እንግዳ ተቀባይ (_H)"
 
-#: src/prefs.c:793
-msgid "Port"
-msgstr "ፖርት"
-
-#: src/prefs.c:809
+#: src/gtkprefs.c:1160
 msgid "_User"
 msgstr "ተጠቃሚ (_U)"
 
-#: src/prefs.c:823
+#: src/gtkprefs.c:1177
 msgid "Pa_ssword"
 msgstr "ሚስጢራዊ ቃል (_S)"
 
-#: src/prefs.c:844
+#: src/gtkprefs.c:1233
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr ""
 
-#: src/prefs.c:865
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:866
+#: src/gtkprefs.c:1253
 msgid "Opera"
 msgstr "ኦፔራ"
 
-#: src/prefs.c:867
-msgid "Galeon"
-msgstr "ጋልዮን"
-
-#: src/prefs.c:868
+#: src/gtkprefs.c:1254
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:869
+#: src/gtkprefs.c:1255
 msgid "Mozilla"
 msgstr "ሞዚላ"
 
-#: src/prefs.c:877
+#: src/gtkprefs.c:1256
+msgid "Konqueror"
+msgstr ""
+
+#: src/gtkprefs.c:1257
+msgid "Galeon"
+msgstr "ጋልዮን"
+
+#: src/gtkprefs.c:1266
 msgid "Manual"
 msgstr ""
 
-#: src/prefs.c:901
+#: src/gtkprefs.c:1307
 msgid "Browser Selection"
 msgstr ""
 
-#: src/prefs.c:905
-msgid "_Browser"
+#: src/gtkprefs.c:1311
+#, fuzzy
+msgid "_Browser:"
 msgstr "መቃኛ (_B)"
 
-#: src/prefs.c:913
-msgid "_Manual: "
-msgstr ""
-
-#: src/prefs.c:928
+#: src/gtkprefs.c:1321
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+#: src/gtkprefs.c:1342
 msgid "Browser Options"
 msgstr "የመቃኛ ምርጫዎች"
 
-#: src/prefs.c:929
+#: src/gtkprefs.c:1343
 msgid "Open new _window by default"
 msgstr ""
 
-#: src/prefs.c:943
+#: src/gtkprefs.c:1358
 msgid "Message Logs"
 msgstr ""
 
-#: src/prefs.c:944
+#: src/gtkprefs.c:1359
 msgid "_Log all instant messages"
 msgstr ""
 
-#: src/prefs.c:945
+#: src/gtkprefs.c:1361
 msgid "Log all c_hats"
 msgstr ""
 
-#: src/prefs.c:946
+#: src/gtkprefs.c:1363
 msgid "Strip _HTML from logs"
 msgstr ""
 
-#: src/prefs.c:948
+#: src/gtkprefs.c:1366
 msgid "System Logs"
 msgstr ""
 
-#: src/prefs.c:949
+#: src/gtkprefs.c:1367
 msgid "Log when buddies _sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:951
+#: src/gtkprefs.c:1369
 msgid "Log when buddies become _idle/un-idle"
 msgstr ""
 
-#: src/prefs.c:953
+#: src/gtkprefs.c:1371
 msgid "Log when buddies go away/come _back"
 msgstr ""
 
-#: src/prefs.c:954
+#: src/gtkprefs.c:1373
 msgid "Log your _own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:956
+#: src/gtkprefs.c:1375
 msgid "I_ndividual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:989
+#: src/gtkprefs.c:1418
 msgid "Sound Options"
 msgstr "የድምፅ ምርጫዎች"
 
-#: src/prefs.c:990
+#: src/gtkprefs.c:1419
 msgid "_No sounds when you log in"
 msgstr ""
 
-#: src/prefs.c:991
+#: src/gtkprefs.c:1421
 msgid "_Sounds while away"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/gtkprefs.c:1425
 msgid "Sound Method"
 msgstr ""
 
-#: src/prefs.c:995
-msgid "_Method"
-msgstr ""
-
-#: src/prefs.c:998
+#: src/gtkprefs.c:1426
+msgid "_Method:"
+msgstr ""
+
+#: src/gtkprefs.c:1428
 msgid "Console beep"
 msgstr ""
 
-#: src/prefs.c:1000
+#: src/gtkprefs.c:1430
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: src/prefs.c:1007
+#: src/gtkprefs.c:1437
 msgid "Command"
 msgstr "ትእዛዝ"
 
-#: src/prefs.c:1016
+#: src/gtkprefs.c:1447
 #, c-format
 msgid ""
-"Sound c_ommand\n"
+"Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/prefs.c:1054
+#: src/gtkprefs.c:1492
 msgid "_Sending messages removes away status"
 msgstr ""
 
-#: src/prefs.c:1055
+#: src/gtkprefs.c:1494
 msgid "_Queue new messages when away"
 msgstr ""
 
-#: src/prefs.c:1057
+#: src/gtkprefs.c:1497
 msgid "Auto-response"
 msgstr ""
 
-#: src/prefs.c:1060
+#: src/gtkprefs.c:1500
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1062
-msgid "_Don't send auto-response"
-msgstr ""
-
-#: src/prefs.c:1063
+#: src/gtkprefs.c:1503
+msgid "_Send auto-response"
+msgstr ""
+
+#: src/gtkprefs.c:1505
 msgid "_Only send auto-response when idle"
 msgstr ""
 
-#: src/prefs.c:1064
-msgid "Do_n't send auto-response in active conversations"
-msgstr ""
-
-#: src/prefs.c:1070
+#: src/gtkprefs.c:1507
+msgid "Send auto-response in active conversations"
+msgstr ""
+
+#: src/gtkprefs.c:1514
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/prefs.c:1072
+#: src/gtkprefs.c:1517
 msgid "Gaim usage"
 msgstr "የጌም አጠቃቀም"
 
-#: src/prefs.c:1075
+#: src/gtkprefs.c:1520
 msgid "X usage"
 msgstr "የX አጠቃቀም"
 
-#: src/prefs.c:1077
+#: src/gtkprefs.c:1522
 msgid "Windows usage"
 msgstr "የWindows አጠቃቀም"
 
-#: src/prefs.c:1084
+#: src/gtkprefs.c:1530
 msgid "Auto-away"
 msgstr ""
 
-#: src/prefs.c:1085
+#: src/gtkprefs.c:1531
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1086
+#: src/gtkprefs.c:1533
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/prefs.c:1092
+#: src/gtkprefs.c:1540
 msgid "Away m_essage:"
 msgstr ""
 
-#: src/prefs.c:1136
+#: src/gtkprefs.c:1602
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4989,7 +6036,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/prefs.c:1141
+#: src/gtkprefs.c:1607
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4999,488 +6046,546 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/prefs.c:1272
+#: src/gtkprefs.c:1785
 msgid "Load"
 msgstr "ጫን"
 
-#: src/prefs.c:1279
+#: src/gtkprefs.c:1792
 msgid "Name"
 msgstr "ስም"
 
-#: src/prefs.c:1326
+#: src/gtkprefs.c:1839
 msgid "Details"
 msgstr "ዝርዝሮች"
 
-#: src/prefs.c:1424
+#: src/gtkprefs.c:1964
 msgid "Sound Selection"
 msgstr ""
 
-#: src/prefs.c:1515
+#: src/gtkprefs.c:2071
 msgid "Play"
 msgstr "አጫውት"
 
-#: src/prefs.c:1522
+#: src/gtkprefs.c:2078
 msgid "Event"
 msgstr "ኩነት"
 
-#: src/prefs.c:1538
-msgid "Test"
-msgstr "ፈተና"
-
-#: src/prefs.c:1546
+#: src/gtkprefs.c:2101
+msgid "Reset"
+msgstr "እንደነበረ አድረግ"
+
+#: src/gtkprefs.c:2105
 msgid "Choose..."
 msgstr "ምረጡ..."
 
-#: src/prefs.c:1668
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "አስተካክል (_E)"
 
-#: src/prefs.c:1706
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr ""
 
-#: src/prefs.c:1707
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr ""
 
-#: src/prefs.c:1708
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "የፊደል ቅርጾች"
 
-#: src/prefs.c:1709
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr ""
 
-#: src/prefs.c:1710
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "አቋራጮች"
 
-#: src/prefs.c:1713
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr ""
 
-#: src/prefs.c:1714
-msgid "Chats"
-msgstr ""
-
-#: src/prefs.c:1715
-msgid "Tabs"
-msgstr "መክፈቻዎች"
-
-#: src/prefs.c:1716
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr ""
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1719
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "መቃኛ"
 
-#: src/prefs.c:1721
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr ""
 
-#: src/prefs.c:1722
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "ድምፆች"
 
-#: src/prefs.c:1723
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr ""
 
-#: src/prefs.c:1724
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr ""
 
-#: src/prefs.c:1725
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr ""
 
-#: src/prefs.c:1727
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-#: src/prefs.c:1886
-msgid "Debug Window"
-msgstr ""
-
-#: src/prpl.c:99
-msgid "ICQ Protocol detected."
-msgstr ""
-
-#: src/prpl.c:100
+#: src/gtkrequest.c:172
+#, fuzzy
+msgid "Apply"
+msgstr "ተጠቀም (_Y)"
+
+#: src/gtksound.c:60
+msgid "Buddy logs in"
+msgstr ""
+
+#: src/gtksound.c:61
+msgid "Buddy logs out"
+msgstr ""
+
+#: src/gtksound.c:62
+msgid "Message received"
+msgstr ""
+
+#: src/gtksound.c:63
+msgid "Message received begins conversation"
+msgstr ""
+
+#: src/gtksound.c:64
+msgid "Message sent"
+msgstr ""
+
+#: src/gtksound.c:65
+msgid "Person enters chat"
+msgstr ""
+
+#: src/gtksound.c:66
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/gtksound.c:67
+msgid "You talk in chat"
+msgstr ""
+
+#: src/gtksound.c:68
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/gtksound.c:71
+msgid "Someone says your name in chat"
+msgstr ""
+
+#: src/gtksound.c:150
+#, c-format
+msgid "Unable to play sound because the chosen file (%s) does not exist."
+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/gtkutils.c:908
+#, c-format
 msgid ""
-"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
-"it was probably not compiled from the same version of the source as this "
-"application was, and cannot be guaranteed to work.  It is recommended that "
-"you use the AIM/ICQ protocol to connect to ICQ"
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+
+#. short message
+#: src/gtkutils.c:923
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#: 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
-msgid "Gaim - Prompt"
-msgstr ""
-
-#: src/prpl.c:366
-msgid "No actions available"
-msgstr ""
-
-#: src/prpl.c:491
-#, c-format
-msgid "%s has mail from %s: %s"
-msgstr ""
-
-#: src/prpl.c:491
-msgid "No Subject"
-msgstr "ጉዳዩ የለም"
-
-#: src/prpl.c:493
-#, c-format
-msgid "%s has new mail."
-msgstr ""
-
-#: src/prpl.c:496
-#, c-format
-msgid "%s has %d new message."
-msgstr ""
-
-#: src/prpl.c:512
-msgid "Gaim - New Mail"
-msgstr "ጌም - አዲስ እሜይል"
-
-#: src/prpl.c:530
-msgid "Open Mail"
-msgstr "እሜይልን ክፈት"
-
-#: src/prpl.c:725
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/prpl.c:733
+#: src/prpl.c:304
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:735
+#: src/prpl.c:307
 msgid "Gaim - Information"
 msgstr "ጌም - መረጃ"
 
-#: src/prpl.c:737
-msgid "Gaim - Confirm"
-msgstr ""
-
-#: src/prpl.c:776
-msgid ""
-"You do not currently have any protocols available that are able to register "
-"new accounts."
-msgstr ""
-
-#: src/prpl.c:813
-msgid "Gaim - Registration"
-msgstr ""
-
-#: src/prpl.c:825
-msgid "Registration Information"
-msgstr ""
-
-#: src/prpl.c:838
-msgid "Register"
-msgstr ""
-
-#: src/server.c:54
+#: src/prpl.c:310
+msgid "Add buddy to your list?"
+msgstr ""
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: src/request.h:823
+msgid "Accept"
+msgstr ""
+
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr ""
 
-#: src/server.c:704
+#: src/server.c:874
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d መልዕክቶች)"
 
-#: src/server.c:716
+#: src/server.c:886
 msgid "(1 message)"
 msgstr "(1 መልዕክት)"
 
-#: src/server.c:893 src/server.c:900
+#: src/server.c:1084 src/server.c:1094
 #, c-format
 msgid "%s logged in."
 msgstr ""
 
-#: src/server.c:917 src/server.c:924
+#: src/server.c:1112 src/server.c:1120
 #, c-format
 msgid "%s logged out."
 msgstr ""
 
-#: src/server.c:957
+#: 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:960
+#: src/server.c:1164
 msgid "an anonymous person"
 msgstr ""
 
-#: src/server.c:1040
+#: src/server.c:1254
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1044
+#: src/server.c:1258
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr ""
 
-#: src/server.c:1050
-msgid "Buddy Chat Invite"
-msgstr ""
-
-#: src/server.c:1242
+#: src/server.c:1264
+msgid "Accept chat invitation?"
+msgstr ""
+
+#: src/server.c:1436
+#, fuzzy
+msgid "Gaim - Popup"
+msgstr "ጌም - ክፈት..."
+
+#: src/server.c:1463
 msgid "More Info"
 msgstr "ተጨማሪ ማብራሪያ"
 
-#: src/sound.c:78
-msgid "Buddy logs in"
-msgstr ""
-
-#: src/sound.c:79
-msgid "Buddy logs out"
-msgstr ""
-
-#: src/sound.c:80
-msgid "Message received"
-msgstr ""
-
-#: src/sound.c:81
-msgid "Message received begins conversation"
-msgstr ""
-
-#: src/sound.c:82
-msgid "Message sent"
-msgstr ""
-
-#: src/sound.c:83
-msgid "Person enters chat"
-msgstr ""
-
-#: src/sound.c:84
-msgid "Person leaves chat"
-msgstr ""
-
-#: src/sound.c:85
-msgid "You talk in chat"
-msgstr ""
-
-#: src/sound.c:86
-msgid "Others talk in chat"
-msgstr ""
-
-#: src/sound.c:89
-msgid "Someone says your name in chat"
-msgstr ""
-
-#: src/sound.c:180
-#, c-format
-msgid "Unable to play sound because the chosen filename (%s) does not exist."
-msgstr ""
-
-#: src/sound.c:192
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-
-#: src/sound.c:199
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-
-#: src/util.c:109 src/util.c:114 src/util.c:119 src/util.c:122
+#: src/stock.c:84
+msgid "_Modify"
+msgstr "ለውጡ (_M)"
+
+#: src/stock.c:85
+#, fuzzy
+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:110 src/util.c:114 src/util.c:128 src/util.c:130
+#: 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:110 src/util.c:119 src/util.c:128 src/util.c:133
+#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ደቂቃ"
 msgstr[1] "ደቂቃ"
 
-#: src/util.c:1007
-msgid "Not connected to AIM"
-msgstr ""
-
-#: src/util.c:1016 src/util.c:1055
-msgid "No screenname given."
-msgstr ""
-
-#: src/util.c:1091
-msgid "No roomname given."
-msgstr ""
-
-#: src/util.c:1107
-msgid "Invalid AIM URI"
+#: 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:227
+msgid "Gaim was unable to load your plugin."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:162
+#: src/prpl.h:175
 msgid "Custom"
 msgstr "የተለየ"
 
-#: src/gaim-disclosure.c:253
-msgid "Expander Size"
-msgstr ""
-
-#: src/gaim-disclosure.c:254
-msgid "Size of the expander arrow"
-msgstr ""
-
-#. 
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: src/win32/systray.c:19
-msgid "Gaim Instant Messenger"
-msgstr ""
-
-#: src/win32/systray.c:20
-msgid "Gaim Instant Messenger - Signed off"
-msgstr ""
-
-#: src/win32/systray.c:21
-msgid "Gaim Instant Messenger - Away"
-msgstr ""
-
-#: src/win32/systray.c:103
-msgid "New"
-msgstr "አዲስ"
-
-#: src/win32/systray.c:127
-msgid "Set Away Message"
-msgstr ""
-
-#: src/win32/systray.c:134
-msgid "I'm Back"
-msgstr ""
-
-#: src/win32/systray.c:299
-msgid "Exit"
-msgstr "ውጣ"
-
-#: src/pounce.c:83
-#, c-format
-msgid "%s has started typing to you"
-msgstr ""
-
-#: src/pounce.c:84
-#, c-format
-msgid "%s has signed on"
-msgstr ""
-
-#: src/pounce.c:85
-#, c-format
-msgid "%s has returned from being idle"
-msgstr ""
-
-#: src/pounce.c:86
-#, c-format
-msgid "%s has returned from being away"
-msgstr ""
-
-#: src/pounce.c:183 src/pounce.c:389
-msgid "New Buddy Pounce"
-msgstr ""
-
-#: src/pounce.c:201
-msgid "Remove Buddy Pounce"
-msgstr ""
-
-#: src/pounce.c:230
-msgid "[no message]"
-msgstr "[መልዕክት የለም]"
-
-#: src/pounce.c:232
-msgid "[Click to edit]"
-msgstr ""
-
-#: src/pounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr ""
-
-#. <pounce type="who">
-#: src/pounce.c:399
-msgid "Pounce Who"
-msgstr ""
-
-#: src/pounce.c:410
-msgid "Account"
-msgstr ""
-
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/pounce.c:436
-msgid "Pounce When"
-msgstr ""
-
-#: src/pounce.c:446
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/pounce.c:455
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/pounce.c:464
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/pounce.c:473
-msgid "Pounce when buddy is typing to you"
-msgstr ""
-
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/pounce.c:483
-msgid "Pounce Action"
-msgstr ""
-
-#: src/pounce.c:494
-msgid "Open IM Window"
-msgstr ""
-
-#: src/pounce.c:503
-msgid "Popup Notification"
-msgstr ""
-
-#: src/pounce.c:534
-msgid "Execute command on pounce"
-msgstr ""
-
-#: src/pounce.c:557
-msgid "Play sound on pounce"
-msgstr ""
-
-#. </pounce type="action">
-#: src/pounce.c:580
-msgid "Save this pounce after activation"
-msgstr ""
-
-#: src/pounce.c:600
-msgid "_Save"
-msgstr "አስቀምጥ (_S)"
-
-#: src/pounce.c:606
-msgid "C_ancel"
-msgstr "ተወው (_A)"
+#: src/gtkdebug.c:142
+msgid "Debug Window"
+msgstr ""
+
+#: src/gtkdebug.c:182
+#, fuzzy
+msgid "Pause"
+msgstr "ለአጭር ጊዜ አሳርፍ (_P)"
+
+#: src/gtkdebug.c:188
+msgid "Timestamps"
+msgstr ""
+
+#~ msgid "Preferences..."
+#~ msgstr "ምርጫዎች..."
+
+#~ msgid "Chat Rooms"
+#~ msgstr "የውሪ ቤቶች"
+
+#~ msgid "Refresh"
+#~ msgstr "በድጋሚ ጀምር"
+
+#~ msgid "Chat List"
+#~ msgstr "የውሪ ዝርዝር"
+
+#~ msgid "<b>Status:</b> %s%s%s"
+#~ msgstr "<b>ሁኔታ፦</b> %s%s%s"
+
+#~ msgid "%dh%02dm"
+#~ msgstr "%dh%02dm"
+
+#~ msgid "%dm"
+#~ msgstr "%dm"
+
+#~ msgid "New name:"
+#~ msgstr "አዲስ ስም፦"
+
+#~ msgid "Gaim - Save Image"
+#~ msgstr "ጌም - ምስሉን አስቀምት"
+
+#~ msgid "_Password"
+#~ msgstr "ሚስጢራዊ ቃል (_P)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "%s: %s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s፦ %s"
+
+#~ msgid "IM Tabs"
+#~ msgstr "የIM መክፈቻዎች"
+
+#~ msgid "Chat Tabs"
+#~ msgstr "የማውሪያ መክፈቻዎች"
+
+#~ msgid "Tabs"
+#~ msgstr "መክፈቻዎች"
+
+#~ msgid "No Subject"
+#~ msgstr "ጉዳዩ የለም"
+
+#~ msgid "Gaim - New Mail"
+#~ msgstr "ጌም - አዲስ እሜይል"
+
+#~ msgid "New"
+#~ msgstr "አዲስ"
+
+#~ msgid "Exit"
+#~ msgstr "ውጣ"
+
+#~ msgid "_Save"
+#~ msgstr "አስቀምጥ (_S)"
+
+#~ msgid "C_ancel"
+#~ msgstr "ተወው (_A)"