diff po/am.po @ 8460:03b9ce930f0d

[gaim-migrate @ 9190] undo the changes makedist produces committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 16 Mar 2004 20:48:21 +0000
parents 3afd1761da09
children 075f2e7cec73
line wrap: on
line diff
--- a/po/am.po	Tue Mar 16 20:35:22 2004 +0000
+++ b/po/am.po	Tue Mar 16 20:48:21 2004 +0000
@@ -6,8 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60 \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-16 15:37-0500\n"
+"POT-Creation-Date: 2003-10-09 15:23-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"
@@ -22,15 +21,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr ""
 
@@ -53,66 +51,6 @@
 msgid "Check email every X seconds.\n"
 msgstr ""
 
-#: plugins/contact_priority.c:82
-msgid "Point values to use when..."
-msgstr ""
-
-#: plugins/contact_priority.c:91
-msgid "Buddy is offline:"
-msgstr ""
-
-#: plugins/contact_priority.c:105
-msgid "Buddy is away:"
-msgstr ""
-
-#: plugins/contact_priority.c:119
-msgid "Buddy is idle:"
-msgstr ""
-
-#: plugins/contact_priority.c:133
-msgid "Use last matching buddy"
-msgstr ""
-
-#. Explanation
-#: plugins/contact_priority.c:139
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4,away = 2, and idle = 1)\n"
-"will use what used to be the built-in order active->idle->away->away+idle-"
-">offline."
-msgstr ""
-
-#: plugins/contact_priority.c:142
-msgid "Point values to use for Account..."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/contact_priority.c:191
-msgid "Contact Priority"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *< summary
-#: plugins/contact_priority.c:194
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-
-#. *< description
-#: plugins/contact_priority.c:196
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -131,7 +69,7 @@
 msgid "Gaim - Away"
 msgstr "ጌም - አዲስ እሜይል"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1765
 msgid "Auto-login"
 msgstr ""
 
@@ -148,16 +86,16 @@
 msgid "New..."
 msgstr "አዲስ.."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1576 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
-#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:58
-#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2939
-#: src/protocols/oscar/oscar.c:4748 src/protocols/oscar/oscar.c:5792
-#: src/protocols/oscar/oscar.c:6410
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
+#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6064
 msgid "Away"
 msgstr ""
 
-#: plugins/docklet/docklet.c:159 src/away.c:522
+#: plugins/docklet/docklet.c:159 src/away.c:515
 msgid "Back"
 msgstr "ወደኋላ"
 
@@ -165,16 +103,16 @@
 msgid "Mute Sounds"
 msgstr ""
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:559
 msgid "File Transfers"
 msgstr ""
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1924 src/main.c:323
 msgid "Accounts"
 msgstr ""
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:333
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
@@ -228,15 +166,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:223
+#: plugins/filectl.c:201
 msgid "Gaim File Control"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/filectl.c:226 plugins/filectl.c:228
+#: plugins/filectl.c:204 plugins/filectl.c:206
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
 
@@ -263,7 +200,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:715
+#: plugins/gaim-remote/remote.c:714
 #, fuzzy
 msgid "Remote Control"
 msgstr "መድረክን አስወግድ"
@@ -271,12 +208,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:718
+#: plugins/gaim-remote/remote.c:717
 msgid "Provides remote control for gaim applications."
 msgstr ""
 
 #. *  description
-#: plugins/gaim-remote/remote.c:720
+#: plugins/gaim-remote/remote.c:719
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -289,19 +226,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:87
+#: plugins/gaiminc.c:81
 msgid "Gaim Demonstration Plugin"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:84
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 
 #. *  description
-#: plugins/gaiminc.c:92
+#: plugins/gaiminc.c:86
 msgid ""
 "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"
@@ -356,185 +293,47 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:76
-#, fuzzy
-msgid "Local Addressbook"
-msgstr "ኢሜያል አድራሻ"
-
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
-#: src/gtkblist.c:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
-#: src/protocols/jabber/jabber.c:916
-msgid "None"
-msgstr "ምንም"
-
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "ስም"
-
-#: plugins/gevolution/add_buddy_dialog.c:201
-msgid "Instant Messaging"
-msgstr ""
-
-#. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-
-#. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6680
-msgid "Search"
-msgstr ""
-
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
-#: src/gtkblist.c:4225
-#, fuzzy
-msgid "Group:"
-msgstr "መድረክ፦ (_G)"
-
-#. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:488
-#, fuzzy
-msgid "New Person"
-msgstr "<አዲስ ተጠቃሚ>"
-
-#. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
-#, fuzzy
-msgid "Select Buddy"
-msgstr "የፊደል ቅርጽ ምረጡ"
-
-#. Add the label.
-#: plugins/gevolution/assoc-buddy.c:372
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-
-#. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:451
-msgid "Show user details"
-msgstr ""
-
-#: plugins/gevolution/assoc-buddy.c:452
-msgid "Hide user details"
-msgstr ""
-
-#. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:505
-msgid "_Associate Buddy"
-msgstr ""
-
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3722
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
-msgid "Buddies"
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:214
-msgid "Add to Address Book"
-msgstr ""
-
-#. Configuration frame
-#: plugins/gevolution/gevolution.c:347
-msgid "Evolution Integration Configuration"
-msgstr ""
-
-#. Label
-#: plugins/gevolution/gevolution.c:350
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
-#, fuzzy
-msgid "Account"
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gevolution/gevolution.c:461
-#, fuzzy
-msgid "Evolution Integration"
-msgstr "የቢሮ መረጃ፦"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
-msgid "Provides integration with Ximian Evolution."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the person's information below."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:274
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Account type:"
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:298
-msgid "Screenname:"
-msgstr "እስክሪን ስም፦"
-
-#. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
-#, fuzzy
-msgid "Optional information:"
-msgstr "የቢሮ መረጃ፦"
-
-#. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
-#: src/protocols/oscar/oscar.c:3174
-msgid "Buddy Icon"
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:353
-#, fuzzy
-msgid "First name:"
-msgstr "ስም"
-
-#: plugins/gevolution/new_person_dialog.c:365
-#, fuzzy
-msgid "Last name:"
-msgstr "የአባት ስም፦"
-
-#: plugins/gevolution/new_person_dialog.c:385
-#, fuzzy
-msgid "E-mail:"
-msgstr "ኢሜይል"
-
-#: plugins/history.c:74
+#: plugins/gtik.c:719
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:731
+msgid "Update Frequency in min"
+msgstr ""
+
+#: plugins/gtik.c:747
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr ""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:757
+msgid "Check this box to display only symbols and price:"
+msgstr ""
+
+#: plugins/gtik.c:758
+msgid "Check this box to scroll left to right:"
+msgstr ""
+
+#: plugins/gtik.c:994
+msgid "(No"
+msgstr "(አይ"
+
+#: plugins/gtik.c:995
+msgid "Change"
+msgstr "ለውጥ"
+
+#: plugins/history.c:98
 msgid "History"
 msgstr "ታሪክ"
 
-#: plugins/history.c:76
+#: plugins/history.c:100
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: plugins/history.c:77
+#: plugins/history.c:101
 msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+"When a new conversation is opened this plugin will insert the last XXX of "
+"the last conversation into the current conversation."
 msgstr ""
 
 #. *< api_version
@@ -551,7 +350,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
@@ -568,7 +366,7 @@
 msgid "idle for"
 msgstr ""
 
-#: plugins/idle.c:90 plugins/timestamp.c:109
+#: plugins/idle.c:90 plugins/timestamp.c:88
 msgid "minutes."
 msgstr "ደቂቃዎች።"
 
@@ -723,7 +521,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
@@ -735,14 +532,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:530
+#: plugins/perl/perl.c:524
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
-#. *< summary
-#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
+#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -760,29 +556,6 @@
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 
-#: plugins/relnot.c:62
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr ""
-
-#: plugins/relnot.c:68
-#, fuzzy, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr "<b>ሁኔታ፦</b> %s"
-
-#: plugins/relnot.c:73
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-
-#: plugins/relnot.c:77 plugins/relnot.c:78
-msgid "New Version Available"
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -790,40 +563,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:134
-msgid "Release Notification"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/relnot.c:137
-msgid "Checks periodically for new releases."
-msgstr ""
-
-#. *  description
-#: plugins/relnot.c:139
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:502
 msgid "Signals Test"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:505 plugins/signals-test.c:507
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -841,7 +588,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr ""
@@ -885,15 +631,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:223
+#: plugins/ssl/ssl-gnutls.c:190
 msgid "GNUTLS"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -904,15 +649,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:287
 msgid "NSS"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -930,12 +674,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
 msgstr ""
@@ -969,18 +712,17 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
 
-#: plugins/tcl/tcl.c:349
+#: plugins/tcl/tcl.c:344
 msgid "Tcl Plugin Loader"
 msgstr ""
 
-#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
+#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
@@ -991,27 +733,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
 msgid "Buddy Ticker"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
+#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: plugins/timestamp.c:95
+#: plugins/timestamp.c:74
 msgid "iChat Timestamp"
 msgstr ""
 
-#: plugins/timestamp.c:102
+#: plugins/timestamp.c:81
 msgid "Delay"
 msgstr ""
 
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:94
 msgid "_Apply"
 msgstr "ተጠቀም (_A)"
 
@@ -1022,15 +763,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:150
 msgid "Timestamp"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:153 plugins/timestamp.c:155
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
@@ -1054,7 +794,7 @@
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr ""
 
@@ -1076,7 +816,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -1099,8 +838,8 @@
 msgstr ""
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
-#: src/gtkprefs.c:2480
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
+#: src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr ""
 
@@ -1119,8 +858,8 @@
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
-#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
+#: src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr ""
 
@@ -1136,332 +875,320 @@
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#: src/about.c:59
-msgid "About Gaim"
-msgstr ""
-
-#: src/about.c:74
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr ""
-
-#: src/about.c:94
+#: src/about.c:57
+#, c-format
+msgid "About Gaim v%s"
+msgstr ""
+
+#: src/about.c:89
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
-#: src/about.c:104
+#: src/about.c:99
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 
-#: src/about.c:109
+#: src/about.c:104
 msgid "Active Developers"
 msgstr ""
 
-#: src/about.c:110
+#: src/about.c:105
 #, fuzzy
 msgid "maintainer"
 msgstr "ደቂቃ"
 
-#: src/about.c:112
+#: src/about.c:107
 msgid "lead developer"
 msgstr ""
 
-#: src/about.c:115
+#: src/about.c:110
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/about.c:116
+#: src/about.c:111
 msgid "win32 port"
 msgstr ""
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:114 src/about.c:115 src/about.c:116
 msgid "developer"
 msgstr ""
 
-#: src/about.c:122
+#: src/about.c:117
 msgid "support"
 msgstr ""
 
-#: src/about.c:129
+#: src/about.c:124
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: src/about.c:143
-msgid "Retired Developers"
-msgstr ""
-
 #: src/about.c:144
-msgid "former libfaim maintainer"
+msgid "Retired Developers"
 msgstr ""
 
 #: src/about.c:145
+msgid "former libfaim maintainer"
+msgstr ""
+
+#: src/about.c:146
 msgid "former lead developer"
 msgstr ""
 
-#: src/about.c:148
-msgid "former maintainer"
-msgstr ""
-
 #: src/about.c:149
-msgid "former Jabber developer"
+msgid "former maintainer"
 msgstr ""
 
 #: src/about.c:150
+msgid "former Jabber developer"
+msgstr ""
+
+#: src/about.c:151
 #, fuzzy
 msgid "original author"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:161
+#: src/about.c:162
 msgid "Current Translators"
 msgstr ""
 
-#: src/about.c:162 src/about.c:195
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr ""
 
-#: src/about.c:163 src/about.c:196
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr ""
 
-#: src/about.c:164
+#: src/about.c:165
 #, fuzzy
 msgid "Danish"
 msgstr "ዝርዝሮች"
 
-#: src/about.c:165
-msgid "British English"
-msgstr ""
-
-#: src/about.c:166 src/about.c:197
+#: src/about.c:166 src/about.c:194
 msgid "German"
 msgstr ""
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:167 src/about.c:195
 msgid "Spanish"
 msgstr ""
 
-#: src/about.c:168 src/about.c:199
-#, fuzzy
-msgid "Finnish"
-msgstr "ዝርዝሮች"
-
-#: src/about.c:169 src/about.c:200
+#: src/about.c:168 src/about.c:196
 msgid "French"
 msgstr ""
 
+#: src/about.c:169
+msgid "Hindi"
+msgstr ""
+
 #: src/about.c:170
-msgid "Hindi"
-msgstr ""
-
-#: src/about.c:171
 msgid "Hungarian"
 msgstr ""
 
-#: src/about.c:172 src/about.c:202
+#: src/about.c:171 src/about.c:198
 #, fuzzy
 msgid "Italian"
 msgstr "አይታሊክ ማድረጊያ"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:172 src/about.c:200
 msgid "Korean"
 msgstr ""
 
-#: src/about.c:174
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr ""
 
-#: src/about.c:175
-msgid "Norwegian"
-msgstr ""
-
-#: src/about.c:176 src/about.c:205
+#: src/about.c:174 src/about.c:202
 #, fuzzy
 msgid "Polish"
 msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
+#: src/about.c:175
+msgid "Portuguese-Brazil"
+msgstr ""
+
+#: src/about.c:176
+msgid "Portuguese-Portugal"
+msgstr ""
+
 #: src/about.c:177
-msgid "Portuguese"
-msgstr ""
-
-#: src/about.c:178
-msgid "Portuguese-Brazil"
+msgid "Romanian"
+msgstr ""
+
+#: src/about.c:178 src/about.c:203
+msgid "Russian"
 msgstr ""
 
 #: src/about.c:179
-msgid "Romanian"
-msgstr ""
-
-#: src/about.c:180 src/about.c:206
-msgid "Russian"
+msgid "Serbian"
+msgstr ""
+
+#: src/about.c:180 src/about.c:205
+msgid "Swedish"
 msgstr ""
 
 #: src/about.c:181
-msgid "Serbian"
-msgstr ""
-
-#: src/about.c:182 src/about.c:208
-msgid "Swedish"
-msgstr ""
-
-#: src/about.c:183
-#, fuzzy
-msgid "Vietnamese"
-msgstr "የፋይል ስም"
-
-#: src/about.c:183
-msgid "Gnome Vi Team"
-msgstr ""
-
-#: src/about.c:184
 msgid "Simplified Chinese"
 msgstr ""
 
-#: src/about.c:185
+#: src/about.c:182
 msgid "Traditional Chinese"
 msgstr ""
 
-#: src/about.c:192
+#: src/about.c:189
 msgid "Past Translators"
 msgstr ""
 
-#: src/about.c:193
+#: src/about.c:190
 #, fuzzy
 msgid "Amharic"
 msgstr "አውቶማቲክ"
 
-#: src/about.c:194
+#: src/about.c:191
 msgid "Bulgarian"
 msgstr ""
 
+#: src/about.c:197
+msgid "Hebrew"
+msgstr ""
+
+#: src/about.c:199
+msgid "Japanese"
+msgstr ""
+
 #: src/about.c:201
-msgid "Hebrew"
-msgstr ""
-
-#: src/about.c:203
-msgid "Japanese"
-msgstr ""
-
-#: src/about.c:207
+msgid "Norwegian"
+msgstr ""
+
+#: src/about.c:204
 msgid "Slovak"
 msgstr ""
 
-#: src/about.c:209
+#: src/about.c:206
 #, fuzzy
 msgid "Chinese"
 msgstr "ጣቢያ፦"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:1001
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
+#: src/protocols/msn/msn.c:247
+msgid "Close"
+msgstr "ዝጋ"
+
+#: src/account.c:265 src/protocols/jabber/jabber.c:918
 msgid "New passwords do not match."
 msgstr ""
 
-#: src/account.c:283
+#: src/account.c:273
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: src/account.c:308
+#: src/account.c:298
 #, fuzzy
 msgid "Original password"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-#: src/account.c:314
+#: src/account.c:304
 #, fuzzy
 msgid "New password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#: src/account.c:320
+#: src/account.c:310
 #, fuzzy
 msgid "New password (again)"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#: src/account.c:325
+#: src/account.c:315
 #, fuzzy, c-format
 msgid "Change password for %s"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
-#: src/account.c:333
+#: src/account.c:321
 msgid "Please enter your current password and your new password."
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:336 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
-#: src/gtkblist.c:2278 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:215 src/protocols/oscar/oscar.c:2549
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:6470
-#: src/protocols/oscar/oscar.c:6566 src/protocols/oscar/oscar.c:6615
-#: src/protocols/oscar/oscar.c:6697 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2508 src/request.h:1237
+#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
+#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
 msgid "OK"
 msgstr "እሺ"
 
-#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:306
-#: src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352 src/dialogs.c:473
-#: src/dialogs.c:529 src/dialogs.c:837 src/dialogs.c:858 src/dialogs.c:875
-#: src/dialogs.c:894 src/gtkaccount.c:1673 src/gtkaccount.c:2164
-#: src/gtkblist.c:2279 src/gtkblist.c:4264 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:366 src/gtkprivacy.c:561 src/gtkprivacy.c:574
-#: src/gtkprivacy.c:599 src/gtkprivacy.c:610 src/gtkrequest.c:226
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:691 src/protocols/jabber/jabber.c:659
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
-#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2513
-#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2586
-#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:6289
-#: src/protocols/oscar/oscar.c:6471 src/protocols/oscar/oscar.c:6567
-#: src/protocols/oscar/oscar.c:6616 src/protocols/oscar/oscar.c:6681
-#: src/protocols/oscar/oscar.c:6698 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2501 src/protocols/yahoo/yahoo.c:2509
-#: src/request.h:1237 src/request.h:1247
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1619
+#: src/gtkaccount.c:2087 src/gtkblist.c:1139 src/gtkblist.c:3038
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
+#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
+#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
+#: src/protocols/yahoo/yahoo.c:2233 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "ተወው"
 
-#: src/account.c:363
+#: src/account.c:351
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: src/account.c:370 src/dialogs.c:825 src/gtkrequest.c:232
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
 msgid "Save"
 msgstr "አስቀምጥ"
 
-#: src/away.c:210
-msgid "Away!"
-msgstr ""
-
-#: src/away.c:275
+#: src/away.c:208
+msgid "Gaim - Away!"
+msgstr ""
+
+#: src/away.c:269
 msgid "I'm Back!"
 msgstr ""
 
-#: src/away.c:375
+#: src/away.c:368
 msgid "New Away Message"
 msgstr ""
 
-#: src/away.c:395
+#: src/away.c:388
 msgid "Remove Away Message"
 msgstr ""
 
-#: src/away.c:590
+#: src/away.c:583
 msgid "Set All Away"
 msgstr ""
 
-#: src/blist.c:579 src/gtkprefs.c:2483
+#: src/blist.c:548 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr ""
 
-#: src/blist.c:1181
+#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1146
+msgid "Buddies"
+msgstr ""
+
+#: src/blist.c:1103
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1472,116 +1199,139 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1190
+#: src/blist.c:1112
 msgid "Group not removed"
 msgstr ""
 
-#: src/blist.c:1240 src/gtkaccount.c:162 src/gtkft.c:153 src/gtkutils.c:860
-#: src/protocols/jabber/buddy.c:569
+#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
+#: src/protocols/jabber/buddy.c:571
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
-#: src/blist.c:1567
+#: src/blist.c:1491
 msgid "Invalid Groupname"
 msgstr ""
 
-#: src/blist.c:2209
+#: src/blist.c:2135
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 
-#: src/blist.c:2211
+#: src/blist.c:2137
 msgid "Buddy List Error"
 msgstr ""
 
-#: src/connection.c:119 src/connection.c:170
+#: src/buddy_chat.c:316 src/gtkblist.c:2931
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: src/buddy_chat.c:330
+msgid "Join Chat"
+msgstr "ውሪን አገጣጥም"
+
+#: src/buddy_chat.c:336
+msgid "Buddy Chat"
+msgstr ""
+
+#: src/buddy_chat.c:346
+msgid "Join Chat As:"
+msgstr ""
+
+#. Join button.
+#: src/buddy_chat.c:369
+msgid "Join"
+msgstr ""
+
+#: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr ""
 
-#: src/connection.c:124
+#: src/connection.c:122
 msgid "Registration Error"
 msgstr ""
 
-#: src/connection.c:175
+#: src/connection.c:170 src/gtkconn.c:278
 #, fuzzy
 msgid "Connection Error"
 msgstr "ተገናኝቷል"
 
-#: src/connection.c:196
+#: src/connection.c:191
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: src/conversation.c:296
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr ""
 
-#: src/conversation.c:304
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr ""
 
-#: src/conversation.c:1968
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/conversation.c:1971
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:2063
-#, c-format
-msgid "You are now known as %s"
-msgstr ""
-
-#: src/conversation.c:2066
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: src/conversation.c:2109
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2111
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2184
+#: src/conversation.c:2093
 #, fuzzy, c-format
 msgid "(+%d more)"
 msgstr "(%d መልዕክቶች)"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2466
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2468 src/gtkprefs.c:1380
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "አዲስ መስኮት"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "በመድረክ"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2383
 msgid "By account"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr ""
 
-#: src/dialogs.c:174
+#: src/dialogs.c:317
+msgid "_Warn"
+msgstr ""
+
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1590,175 +1340,271 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:183
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:190
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:302
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:304 src/dialogs.c:305
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:314
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:316 src/dialogs.c:317
+#: src/dialogs.c:476 src/dialogs.c:477
 #, fuzzy
 msgid "Remove Chat"
 msgstr "አስወግድ"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:486
 #, 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:329 src/dialogs.c:330
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "መድረክን አስወግድ"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:350 src/dialogs.c:351
+#: src/dialogs.c:510 src/dialogs.c:511
 #, fuzzy
 msgid "Remove Contact"
 msgstr "አስወግድ"
 
-#: src/dialogs.c:454 src/dialogs.c:510
-#, fuzzy
-msgid "_Screen name"
-msgstr "እስክሪን ስም፦ (_S)"
-
-#: src/dialogs.c:460 src/dialogs.c:516
-msgid "_Account"
-msgstr ""
-
-#: src/dialogs.c:467
-#, fuzzy
-msgid "New Instant Message"
+#: src/dialogs.c:659
+msgid "New Message"
 msgstr "አዲስ መልእክት"
 
-#: src/dialogs.c:469
-msgid "Please enter the screen name of the person you would like to IM."
-msgstr ""
-
-#: src/dialogs.c:523
+#: src/dialogs.c:677
+msgid "Please enter the screenname of the person you would like to IM.\n"
+msgstr ""
+
+#: src/dialogs.c:693 src/dialogs.c:770
+msgid "_Screenname:"
+msgstr "እስክሪን ስም፦ (_S)"
+
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
+msgid "_Account:"
+msgstr ""
+
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:525
+#: src/dialogs.c:758
 msgid ""
-"Please enter the screen name of the person whose info you would like to view."
-msgstr ""
-
-#: src/dialogs.c:553 src/gtkimhtmltoolbar.c:209
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr ""
+
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
+#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
+msgid "Set User Info"
+msgstr ""
+
+#: src/dialogs.c:861
+#, c-format
+msgid "Changing info for %s:"
+msgstr ""
+
+#: src/dialogs.c:963
+msgid "Log Conversation"
+msgstr ""
+
+#: src/dialogs.c:1059
+msgid "Insert Link"
+msgstr "አያያዝ አስገባ"
+
+#: src/dialogs.c:1061
+msgid "Insert"
+msgstr "አስገባ"
+
+#: src/dialogs.c:1083
+msgid ""
+"Please enter the URL and description of the link that you want to insert.  "
+"The description is optional.\n"
+msgstr ""
+
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:594
+msgid "URL"
+msgstr "URL"
+
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
+msgid "Description"
+msgstr "መግለጫ"
+
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr ""
 
-#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr ""
 
-#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "የፊደል ቅርጽ ምረጡ"
 
-#: src/dialogs.c:682
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:684
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:694
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:756
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:777
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:829
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "አስቀምጥ እና ተጠቀም"
 
-#: src/dialogs.c:833
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "ተጠቀም"
 
-#: src/dialogs.c:854
+#. show everything
+#: src/dialogs.c:1791
+msgid "Smile!"
+msgstr ""
+
+#: src/dialogs.c:1809
 #, fuzzy
 msgid "Alias Chat"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:855
-msgid "Enter an alias for this chat."
-msgstr ""
-
-#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
-#, fuzzy
-msgid "Alias"
-msgstr "የጌም ማውሪያ"
-
-#: src/dialogs.c:871
-#, fuzzy
-msgid "Alias Contact"
+#: src/dialogs.c:1809
+#, fuzzy
+msgid "Alias chat"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:872
-msgid "Enter an alias for this contact."
-msgstr ""
-
-#: src/dialogs.c:889
-#, c-format
-msgid "Enter an alias for %s."
-msgstr ""
-
-#: src/dialogs.c:891
+#: src/dialogs.c:1810
+msgid "Please enter an aliased name for this chat."
+msgstr ""
+
+#: src/dialogs.c:1841
+#, fuzzy
+msgid "_Screenname"
+msgstr "እስክሪን ስም፦ (_S)"
+
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
+msgid "_Alias"
+msgstr ""
+
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/ft.c:139
+#: src/dialogs.c:1851
+msgid "Alias buddy"
+msgstr ""
+
+#: src/dialogs.c:1852
+msgid ""
+"Please enter an aliased name for the person below, or rename this contact in "
+"your buddy list."
+msgstr ""
+
+#: src/dialogs.c:1888 src/dialogs.c:1895
+#, c-format
+msgid "Couldn't write to %s."
+msgstr ""
+
+#: src/dialogs.c:1919
+msgid "Save Log File"
+msgstr ""
+
+#: src/dialogs.c:1949
+#, c-format
+msgid "Couldn't remove file %s."
+msgstr ""
+
+#: src/dialogs.c:1968
+msgid "Clear Log"
+msgstr ""
+
+#: src/dialogs.c:1977
+msgid "Really clear log?"
+msgstr ""
+
+#: src/dialogs.c:2022 src/dialogs.c:2193
+#, c-format
+msgid "Couldn't open log file %s."
+msgstr ""
+
+#: src/dialogs.c:2170
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+#: src/dialogs.c:2172
+msgid "System Log"
+msgstr ""
+
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
+msgid "Date"
+msgstr "ቀን"
+
+#: src/dialogs.c:2271
+#, fuzzy
+msgid "Log"
+msgstr "ዝምብለህ ይግባ"
+
+#: src/dialogs.c:2294
+msgid "Clear"
+msgstr "ሰርዝ"
+
+#: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: src/ft.c:152
+#: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
 msgstr ""
 
-#: src/ft.c:769
+#: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr ""
 
-#: src/ft.c:771
+#: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
@@ -1771,7 +1617,7 @@
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: src/gaim-remote.c:66
+#: src/gaim-remote.c:33
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1784,62 +1630,62 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:175 src/gaim-remote.c:191
+#: src/gaim-remote.c:139 src/gaim-remote.c:155
 msgid "Gaim not running (on session 0)\n"
 msgstr ""
 
-#: src/gaim-remote.c:204
+#: src/gaim-remote.c:167
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screen name:\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 screen name we wish to IM, and '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 screen name,\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"
+"\tgaim-remote uri aim:goim?screenname=Penguin\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\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"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:223
+#: src/gaim-remote.c:187
 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:46
+#: src/gaimrc.c:44
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:369 src/gaimrc.c:1460
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2881
+#: src/gaimrc.c:1267 src/gtkblist.c:1717
 msgid "Alphabetical"
 msgstr ""
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2882
+#: src/gaimrc.c:1269 src/gtkblist.c:1718
 #, fuzzy
 msgid "By status"
 msgstr "ሁኔታ፦"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2883
+#: src/gaimrc.c:1271 src/gtkblist.c:1719
 msgid "By log size"
 msgstr ""
 
-#: src/gaimrc.c:1549
+#: src/gaimrc.c:1558
 #, c-format
 msgid "Could not open config file %s."
 msgstr ""
@@ -1852,426 +1698,389 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
+msgid "Buddy Icon"
+msgstr ""
+
 #. Build the login options frame.
-#: src/gtkaccount.c:382
+#: src/gtkaccount.c:369
 msgid "Login Options"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
 
-#: src/gtkaccount.c:399
+#: src/gtkaccount.c:386
 msgid "Protocol:"
 msgstr ""
 
-#: src/gtkaccount.c:404 src/gtkblist.c:3869
-msgid "Screen Name:"
+#: src/gtkaccount.c:391
+msgid "Screenname:"
 msgstr "እስክሪን ስም፦"
 
-#: src/gtkaccount.c:477
+#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
+#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
 msgid "Alias:"
 msgstr ""
 
-#: src/gtkaccount.c:486
+#: src/gtkaccount.c:473
 #, fuzzy
 msgid "Remember password"
 msgstr "ሚስጢራዊ ቃልን አስታውስ"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:527
 msgid "User Options"
 msgstr "ተጠቃሚ መርጫዎች"
 
-#: src/gtkaccount.c:553
+#: src/gtkaccount.c:540
 msgid "New mail notifications"
 msgstr ""
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:549
 msgid "Buddy icon file:"
 msgstr ""
 
-#: src/gtkaccount.c:572
+#: src/gtkaccount.c:558
 #, fuzzy
 msgid "_Browse"
 msgstr "መቃኛ (_B)"
 
-#: src/gtkaccount.c:578
+#: src/gtkaccount.c:564
 #, fuzzy
 msgid "_Reset"
 msgstr "እንደነበረ አድረግ"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:640
+#: src/gtkaccount.c:626
 #, c-format
 msgid "%s Options"
 msgstr "%s ምርጫዎች"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:772
+#: src/gtkaccount.c:747
 msgid "Use Global Proxy Settings"
 msgstr ""
 
 #. No Proxy
-#: src/gtkaccount.c:779
+#: src/gtkaccount.c:754
 msgid "No Proxy"
 msgstr ""
 
 #. HTTP
-#: src/gtkaccount.c:786
+#: src/gtkaccount.c:761
 msgid "HTTP"
 msgstr ""
 
 #. SOCKS 4
-#: src/gtkaccount.c:793
+#: src/gtkaccount.c:768
 msgid "SOCKS 4"
 msgstr ""
 
 #. SOCKS 5
-#: src/gtkaccount.c:800
+#: src/gtkaccount.c:775
 msgid "SOCKS 5"
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:807 src/gtkprefs.c:1181
+#: src/gtkaccount.c:782 src/gtkprefs.c:1112
 msgid "Use Environmental Settings"
 msgstr ""
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:815
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:819
 msgid "If you look real closely"
 msgstr ""
 
+#: src/gtkaccount.c:835
+msgid "Proxy Options"
+msgstr ""
+
+#: src/gtkaccount.c:851 src/gtkprefs.c:1106
+msgid "Proxy _type:"
+msgstr ""
+
 #: src/gtkaccount.c:860
-msgid "Proxy Options"
-msgstr ""
-
-#: src/gtkaccount.c:876 src/gtkprefs.c:1175
-msgid "Proxy _type:"
-msgstr ""
-
-#: src/gtkaccount.c:885 src/gtkprefs.c:1205
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ፦ (_H)"
 
-#: src/gtkaccount.c:889 src/gtkprefs.c:1223
+#: src/gtkaccount.c:864
 #, fuzzy
 msgid "_Port:"
 msgstr "ፖርት፦"
 
-#: src/gtkaccount.c:897
+#: src/gtkaccount.c:872
 #, fuzzy
 msgid "_Username:"
 msgstr "ተጠቃሚ፦ (_U)"
 
-#: src/gtkaccount.c:902 src/gtkprefs.c:1260
+#: src/gtkaccount.c:877
 msgid "Pa_ssword:"
 msgstr "ሚስጢራዊ ቃል፦ (_S)"
 
-#: src/gtkaccount.c:1260
+#: src/gtkaccount.c:1215
 msgid "Add Account"
 msgstr ""
 
-#: src/gtkaccount.c:1262
+#: src/gtkaccount.c:1217
 msgid "Modify Account"
 msgstr ""
 
 #. Add the disclosure
-#: src/gtkaccount.c:1286
+#: src/gtkaccount.c:1241
 msgid "Show more options"
 msgstr "ተጨማሪ ምርጫዎች አሳይ"
 
-#: src/gtkaccount.c:1287
+#: src/gtkaccount.c:1242
 msgid "Show fewer options"
 msgstr ""
 
 #. Register button
-#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1269 src/protocols/jabber/jabber.c:612
 msgid "Register"
 msgstr ""
 
-#: src/gtkaccount.c:1668
+#: src/gtkaccount.c:1614
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: src/gtkaccount.c:1672 src/gtkrequest.c:229
+#: src/gtkaccount.c:1618 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: src/gtkaccount.c:1786
+#: src/gtkaccount.c:1731
 msgid "Screen Name"
 msgstr "እስክሪን ስም"
 
-#: src/gtkaccount.c:1809 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4746
-#: src/protocols/oscar/oscar.c:6409 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/zephyr/zephyr.c:1176 src/protocols/zephyr/zephyr.c:1186
+#: src/gtkaccount.c:1754 src/protocols/jabber/jabber.c:866
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "ኦንላይን"
 
-#: src/gtkaccount.c:1827
+#: src/gtkaccount.c:1772
 msgid "Protocol"
 msgstr ""
 
-#: src/gtkaccount.c:2139
+#: src/gtkaccount.c:2062
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2153
+#: src/gtkaccount.c:2076
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/gtkaccount.c:2157
-#, fuzzy
-msgid "Information"
-msgstr "የቢሮ መረጃ፦"
-
-#: src/gtkaccount.c:2161
+#: src/gtkaccount.c:2080
+msgid "Gaim - Information"
+msgstr "ጌም - መረጃ"
+
+#: src/gtkaccount.c:2084
 msgid "Add buddy to your list?"
 msgstr ""
 
-#. Add button
-#: src/gtkaccount.c:2163 src/gtkblist.c:4263 src/gtkconv.c:1072
-#: src/gtkconv.c:3289 src/gtkconv.c:3380 src/gtkrequest.c:230
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2787
+#: src/gtkaccount.c:2086 src/gtkblist.c:3037 src/gtkconv.c:1137
+#: src/gtkconv.c:3017 src/gtkconv.c:4191 src/gtkrequest.c:207
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
 msgid "Add"
 msgstr "ጨምር"
 
-#: src/gtkblist.c:803 src/gtkblist.c:4151
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-
-#: src/gtkblist.c:816
-#, fuzzy
-msgid "Join a Chat"
-msgstr "ውሪን አገጣጥም"
-
-#: src/gtkblist.c:837
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-
-#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:365
-msgid "_Account:"
-msgstr ""
-
-#: src/gtkblist.c:1088 src/gtkblist.c:3070
-#, fuzzy
-msgid "Get _Info"
-msgstr "መረጃ አግኝ"
-
-#: src/gtkblist.c:1091 src/gtkblist.c:3061
-msgid "I_M"
+#: src/gtkblist.c:496
+msgid "_Get Info"
+msgstr ""
+
+#: src/gtkblist.c:499
+msgid "_IM"
+msgstr ""
+
+#: src/gtkblist.c:501
+msgid "Add Buddy _Pounce"
+msgstr ""
+
+#: src/gtkblist.c:503
+msgid "View _Log"
+msgstr ""
+
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
+msgid "_Remove"
+msgstr "አስወግድ (_R)"
+
+#: src/gtkblist.c:597
+msgid "Add a _Buddy"
+msgstr ""
+
+#: src/gtkblist.c:599
+msgid "Add a C_hat"
+msgstr ""
+
+#: src/gtkblist.c:601
+msgid "_Delete Group"
+msgstr "መድረክ አጥፉ (_D)"
+
+#: src/gtkblist.c:603
+msgid "_Rename"
+msgstr "እንደገና ሰይም (_R)"
+
+#: src/gtkblist.c:611
+#, fuzzy
+msgid "_Join"
+msgstr "ዝምብለህ ይግባ (_L)"
+
+#: src/gtkblist.c:613
+msgid "Auto-Join"
+msgstr ""
+
+#: src/gtkblist.c:622 src/gtkblist.c:653
+msgid "_Collapse"
+msgstr ""
+
+#: src/gtkblist.c:658
+msgid "_Expand"
+msgstr ""
+
+#. Buddies menu
+#: src/gtkblist.c:1088
+msgid "/_Buddies"
+msgstr ""
+
+#: src/gtkblist.c:1089
+msgid "/Buddies/New _Instant Message..."
+msgstr ""
+
+#: src/gtkblist.c:1090
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+#: src/gtkblist.c:1091
+msgid "/Buddies/Get _User Info..."
 msgstr ""
 
 #: src/gtkblist.c:1093
-msgid "Add Buddy _Pounce"
+msgid "/Buddies/Show _Offline Buddies"
+msgstr ""
+
+#: src/gtkblist.c:1094
+msgid "/Buddies/Show _Empty Groups"
 msgstr ""
 
 #: src/gtkblist.c:1095
-msgid "View _Log"
-msgstr ""
-
-#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
-msgid "_Alias..."
-msgstr ""
-
-#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
-#: src/gtkconn.c:361
-msgid "_Remove"
-msgstr "አስወግድ (_R)"
-
-#: src/gtkblist.c:1162
-msgid "Add a _Buddy"
-msgstr ""
-
-#: src/gtkblist.c:1164
-msgid "Add a C_hat"
-msgstr ""
-
-#: src/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "መድረክ አጥፉ (_D)"
-
-#: src/gtkblist.c:1168
-msgid "_Rename"
-msgstr "እንደገና ሰይም (_R)"
-
-#. join button
-#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
-#: src/stock.c:87
-#, fuzzy
-msgid "_Join"
-msgstr "ዝምብለህ ይግባ (_L)"
-
-#: src/gtkblist.c:1184
-msgid "Auto-Join"
-msgstr ""
-
-#: src/gtkblist.c:1202 src/gtkblist.c:1228
-msgid "_Collapse"
-msgstr ""
-
-#: src/gtkblist.c:1233
-msgid "_Expand"
-msgstr ""
-
-#: src/gtkblist.c:1884 src/gtkconv.c:3864
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-
-#. Buddies menu
-#: src/gtkblist.c:2225
-msgid "/_Buddies"
-msgstr ""
-
-#: src/gtkblist.c:2226
-#, fuzzy
-msgid "/Buddies/New Instant _Message..."
-msgstr "አዲስ መልእክት..."
-
-#: src/gtkblist.c:2227
-msgid "/Buddies/Join a _Chat..."
-msgstr ""
-
-#: src/gtkblist.c:2228
-msgid "/Buddies/Get User _Info..."
-msgstr ""
-
-#: src/gtkblist.c:2230
-msgid "/Buddies/Show _Offline Buddies"
-msgstr ""
-
-#: src/gtkblist.c:2231
-msgid "/Buddies/Show _Empty Groups"
-msgstr ""
-
-#: src/gtkblist.c:2232
-msgid "/Buddies/_Add Buddy..."
-msgstr ""
-
-#: src/gtkblist.c:2233
-msgid "/Buddies/Add C_hat..."
-msgstr ""
-
-#: src/gtkblist.c:2234
-msgid "/Buddies/Add _Group..."
-msgstr ""
-
-#: src/gtkblist.c:2236
+msgid "/Buddies/_Add a Buddy..."
+msgstr ""
+
+#: src/gtkblist.c:1096
+msgid "/Buddies/Add a C_hat..."
+msgstr ""
+
+#: src/gtkblist.c:1097
+msgid "/Buddies/Add a _Group..."
+msgstr ""
+
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr ""
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr ""
 
 #. Tools
-#: src/gtkblist.c:2240
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/መሣሪያዎች (_T)"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr ""
 
-#: src/gtkblist.c:2242
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:2243
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr ""
 
-#: src/gtkblist.c:2245
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr ""
 
-#: src/gtkblist.c:2246
-#, fuzzy
-msgid "/Tools/_File Transfers"
+#: src/gtkblist.c:1109
+msgid "/Tools/_File Transfers..."
+msgstr ""
+
+#: src/gtkblist.c:1110
+#, fuzzy
+msgid "/Tools/Preferences"
 msgstr "ምርጫዎች"
 
-#: src/gtkblist.c:2247
-msgid "/Tools/R_oom List"
-msgstr ""
-
-#: src/gtkblist.c:2248
-#, fuzzy
-msgid "/Tools/Pr_eferences"
-msgstr "ምርጫዎች"
-
-#: src/gtkblist.c:2249
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-#: src/gtkblist.c:2252
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr ""
 
 #. Help
-#: src/gtkblist.c:2256
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/መረጃ (_H)"
 
-#: src/gtkblist.c:2257
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr ""
 
-#: src/gtkblist.c:2258
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#: src/gtkblist.c:2259
+#: src/gtkblist.c:1119
 #, fuzzy
 msgid "/Help/_About"
 msgstr "/መረጃ/ስለ... (_A)"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:1135
 msgid "Rename Group"
 msgstr "መድረክን እንደገና ሰይም"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:1135
 #, fuzzy
 msgid "New group name"
 msgstr "አዲስ ስም፦"
 
-#: src/gtkblist.c:2276
+#: src/gtkblist.c:1136
 msgid "Please enter a new name for the selected group."
 msgstr ""
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:1165
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5772
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
 #, fuzzy
 msgid "<b>Status:</b> Offline"
 msgstr ""
 "\n"
 "<b>ሁኔታ፦</b>"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:1250
 #, fuzzy
 msgid ""
 "\n"
@@ -2280,22 +2089,13 @@
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
-#: src/gtkblist.c:2400
-#, fuzzy
-msgid ""
-"\n"
-"<b>Contact Alias:</b>"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/gtkblist.c:2401
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2402
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2303,34 +2103,25 @@
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
-#: src/gtkblist.c:2403
-#, fuzzy
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#: src/gtkblist.c:2404
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2405
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:1257
 #, fuzzy
 msgid ""
 "\n"
@@ -2339,7 +2130,7 @@
 "\n"
 "<b>ሁኔታ፦</b>"
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:1258
 #, fuzzy
 msgid ""
 "\n"
@@ -2348,750 +2139,673 @@
 "\n"
 "<b>ሁኔታ፦</b>"
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:1514
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr ""
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:1516
 #, c-format
 msgid "Idle (%dm) "
 msgstr ""
 
-#: src/gtkblist.c:2686
+#: src/gtkblist.c:1520
 #, c-format
 msgid "Warned (%d%%) "
 msgstr ""
 
-#: src/gtkblist.c:2689
+#: src/gtkblist.c:1523
 msgid "Offline "
 msgstr ""
 
-#: src/gtkblist.c:2947
+#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
+msgid "None"
+msgstr "ምንም"
+
+#: src/gtkblist.c:1780
 msgid "/Tools/Away"
 msgstr ""
 
-#: src/gtkblist.c:2950
+#: src/gtkblist.c:1783
 msgid "/Tools/Buddy Pounce"
 msgstr ""
 
-#: src/gtkblist.c:2953
+#: src/gtkblist.c:1786
 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:3041
+#: src/gtkblist.c:1870
 msgid "/Buddies/Show Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:3043
+#: src/gtkblist.c:1872
 msgid "/Buddies/Show Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:3067
+#: src/gtkblist.c:1890 src/gtkconv.c:1096
+msgid "IM"
+msgstr ""
+
+#: src/gtkblist.c:1896
 msgid "Send a message to the selected buddy"
 msgstr ""
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "መረጃ አግኝ"
+
+#: src/gtkblist.c:1905
 msgid "Get information on the selected buddy"
 msgstr ""
 
-#: src/gtkblist.c:3079
-#, fuzzy
-msgid "_Chat"
+#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
+msgid "Chat"
 msgstr "ውሪ"
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:1913
 msgid "Join a chat room"
 msgstr "የውሪ ቤትን አገጣጥም"
 
-#: src/gtkblist.c:3087
-msgid "_Away"
-msgstr ""
-
-#: src/gtkblist.c:3092
+#: src/gtkblist.c:1921
 msgid "Set an away message"
 msgstr ""
 
-#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
+#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2166
 msgid "Add Buddy"
 msgstr ""
 
-#: src/gtkblist.c:3847
+#: src/gtkblist.c:2645
 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/gtkblist.c:2667 src/main.c:289
+msgid "Screen Name:"
+msgstr "እስክሪን ስም፦"
+
+#: src/gtkblist.c:2693 src/gtkblist.c:3000
+#, fuzzy
+msgid "Group:"
+msgstr "መድረክ፦ (_G)"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:3907 src/gtkblist.c:4191
+#: src/gtkblist.c:2702 src/gtkblist.c:2971
 msgid "Account:"
 msgstr ""
 
-#: src/gtkblist.c:4158
+#: src/gtkblist.c:2938
 #, fuzzy
 msgid "Add Chat"
 msgstr "ውሪ"
 
-#: src/gtkblist.c:4181
+#: src/gtkblist.c:2961
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: src/gtkblist.c:4260
+#: src/gtkblist.c:3034
 msgid "Add Group"
 msgstr "መድረክ ጨምር"
 
-#: src/gtkblist.c:4261
+#: src/gtkblist.c:3034
+#, fuzzy
+msgid "Add a new group"
+msgstr "መድረክ ጨምር"
+
+#: src/gtkblist.c:3035
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:4780
+#: src/gtkblist.c:3547
 msgid "No actions available"
 msgstr ""
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:57 src/gtkconn.c:241 src/gtkconn.c:252
 msgid "Done."
 msgstr "ጨርሷል።"
 
-#: src/gtkconn.c:157
+#: src/gtkconn.c:136
 msgid "Signon: "
 msgstr ""
 
-#: src/gtkconn.c:203
+#: src/gtkconn.c:194
 msgid "Signon"
 msgstr ""
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:207
 msgid "Cancel All"
 msgstr ""
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
-#, fuzzy
-msgid "_Reconnect"
-msgstr "አገናኝ"
-
-#: src/gtkconn.c:557
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-"\n"
-"%s\n"
-"%s"
-msgstr ""
-
-#: src/gtkconn.c:559
+#: src/gtkconn.c:274
+#, c-format
+msgid "%s has been disconnected"
+msgstr ""
+
+#: src/gtkconn.c:277
 #, fuzzy
 msgid "Reason Unknown."
 msgstr "ያልታወቀ።"
 
-#: src/gtkconn.c:598
-msgid "Reconnect _All"
-msgstr ""
-
-#: src/gtkconn.c:628
-#, fuzzy
-msgid "Time"
-msgstr "አርእስት"
-
-#: src/gtkconv.c:183
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr ""
 
-#: src/gtkconv.c:184 src/gtkft.c:1106
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: src/gtkconv.c:470
-msgid "Invite Buddy Into Chat Room"
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+#: src/gtkconv.c:303
+msgid "Gaim - Insert Image"
+msgstr "ጌም - ምስል አስገባ"
+
+#: src/gtkconv.c:607
+msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: src/gtkconv.c:498
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: src/gtkconv.c:519
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr ""
 
-#: src/gtkconv.c:539
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "መልእክት፦ (_M)"
 
-#: src/gtkconv.c:632
-#, fuzzy
-msgid "Find"
-msgstr "መስኮት"
-
-#: src/gtkconv.c:658
-msgid "_Search for:"
-msgstr ""
-
-#: src/gtkconv.c:1030
-msgid "IM"
-msgstr ""
-
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/gtkconv.c:1040 src/gtkprefs.c:784
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "ተዉት"
 
 #. Info button
-#: src/gtkconv.c:1049 src/gtkconv.c:3303
+#: src/gtkconv.c:1115 src/gtkconv.c:3040
 msgid "Info"
 msgstr "መረጃ"
 
-#: src/gtkconv.c:1058
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr ""
 
-#. Remove button
-#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
-#: src/gtkrequest.c:231
+#: src/gtkconv.c:1135 src/gtkconv.c:3023 src/gtkconv.c:4176
+#: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "አስወግድ"
 
-#: src/gtkconv.c:2162
-msgid "Animate"
-msgstr ""
-
-#: src/gtkconv.c:2167
-msgid "Hide Icon"
-msgstr "ምልክትን ደብቅ"
-
-#: src/gtkconv.c:2173
-msgid "Save Icon As..."
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
-
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2248
 msgid "User is typing..."
 msgstr ""
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2256
 msgid "User has typed something and paused"
 msgstr ""
 
 #. Build the Send As menu
-#: src/gtkconv.c:2647
+#: src/gtkconv.c:2359
 msgid "_Send As"
 msgstr ""
 
-#: src/gtkconv.c:3067
-msgid "Save Conversation"
+#: src/gtkconv.c:2819
+msgid "Gaim - Save Conversation"
 msgstr ""
 
 #. Conversation menu
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:2836
 msgid "/_Conversation"
 msgstr ""
 
-#: src/gtkconv.c:3086
-msgid "/Conversation/New Instant _Message..."
-msgstr ""
-
-#: src/gtkconv.c:3091
-msgid "/Conversation/_Find..."
-msgstr ""
-
-#: src/gtkconv.c:3093
-msgid "/Conversation/View _Log"
-msgstr ""
-
-#: src/gtkconv.c:3094
+#: src/gtkconv.c:2838
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:2840
+msgid "/Conversation/View _Log..."
+msgstr ""
+
+#: src/gtkconv.c:2844
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
-#: src/gtkconv.c:3101
-msgid "/Conversation/_Get Info"
-msgstr ""
-
-#: src/gtkconv.c:3103
+#: src/gtkconv.c:2846
+msgid "/Conversation/A_lias..."
+msgstr ""
+
+#: src/gtkconv.c:2848
+msgid "/Conversation/_Get Info..."
+msgstr ""
+
+#: src/gtkconv.c:2850
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+#: src/gtkconv.c:2855
+msgid "/Conversation/Insert _URL..."
+msgstr ""
+
+#: src/gtkconv.c:2857
+msgid "/Conversation/Insert _Image..."
+msgstr ""
+
+#: src/gtkconv.c:2862
 msgid "/Conversation/_Warn..."
 msgstr ""
 
-#: src/gtkconv.c:3105
-msgid "/Conversation/In_vite..."
-msgstr ""
-
-#: src/gtkconv.c:3110
-msgid "/Conversation/A_lias..."
-msgstr ""
-
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:2864
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: src/gtkconv.c:3114
+#: src/gtkconv.c:2866
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:2868
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: src/gtkconv.c:3121
-msgid "/Conversation/Insert Lin_k..."
-msgstr ""
-
-#: src/gtkconv.c:3123
-msgid "/Conversation/Insert Imag_e..."
-msgstr ""
-
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:2873
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:2877
 msgid "/_Options"
 msgstr "/ምርጫዎች (_O)"
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:2878
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:2879
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: src/gtkconv.c:3135
-msgid "/Options/Show Formatting _Toolbar"
-msgstr ""
-
-#: src/gtkconv.c:3177
-msgid "/Conversation/View Log"
-msgstr ""
-
-#: src/gtkconv.c:3182
+#: src/gtkconv.c:2919
+msgid "/Conversation/View Log..."
+msgstr ""
+
+#: src/gtkconv.c:2924
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: src/gtkconv.c:3188
-msgid "/Conversation/Get Info"
-msgstr ""
-
-#: src/gtkconv.c:3192
-msgid "/Conversation/Warn..."
-msgstr ""
-
-#: src/gtkconv.c:3196
+#: src/gtkconv.c:2928
+msgid "/Conversation/Alias..."
+msgstr ""
+
+#: src/gtkconv.c:2932
+msgid "/Conversation/Get Info..."
+msgstr ""
+
+#: src/gtkconv.c:2936
 msgid "/Conversation/Invite..."
 msgstr ""
 
-#: src/gtkconv.c:3202
-msgid "/Conversation/Alias..."
-msgstr ""
-
-#: src/gtkconv.c:3206
+#: src/gtkconv.c:2942
+msgid "/Conversation/Insert URL..."
+msgstr ""
+
+#: src/gtkconv.c:2946
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+#: src/gtkconv.c:2952
+msgid "/Conversation/Warn..."
+msgstr ""
+
+#: src/gtkconv.c:2956
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: src/gtkconv.c:3210
+#: src/gtkconv.c:2960
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: src/gtkconv.c:3214
+#: src/gtkconv.c:2964
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: src/gtkconv.c:3220
-msgid "/Conversation/Insert Link..."
-msgstr ""
-
-#: src/gtkconv.c:3224
-msgid "/Conversation/Insert Image..."
-msgstr ""
-
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:2970
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:3233
+#: src/gtkconv.c:2973
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: src/gtkconv.c:3236
-msgid "/Options/Show Formatting Toolbar"
-msgstr ""
-
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
+#: src/gtkconv.c:2997 src/gtkconv.c:2999 src/gtkconv.c:3097 src/gtkconv.c:3099
+#: src/gtkconv.c:5958
 msgid "Send"
 msgstr "ላክ"
 
-#. Now, um, just kind of all over the place. Huh?
+#: src/gtkconv.c:3020 src/gtkconv.c:4194
+msgid "Add the user to your buddy list"
+msgstr ""
+
+#: src/gtkconv.c:3026 src/gtkconv.c:4179
+msgid "Remove the user from your buddy list"
+msgstr ""
+
 #. Warn button
-#: src/gtkconv.c:3275
+#: src/gtkconv.c:3033
 msgid "Warn"
 msgstr ""
 
-#: src/gtkconv.c:3278
+#: src/gtkconv.c:3037
 msgid "Warn the user"
 msgstr ""
 
+#: src/gtkconv.c:3044 src/gtkconv.c:3479
+msgid "Get the user's information"
+msgstr ""
+
 #. Block button
-#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
+#: src/gtkconv.c:3047 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr ""
 
-#: src/gtkconv.c:3285
+#: src/gtkconv.c:3051
 msgid "Block the user"
 msgstr ""
 
-#: src/gtkconv.c:3292
-msgid "Add the user to your buddy list"
-msgstr ""
-
-#: src/gtkconv.c:3299
-msgid "Remove the user from your buddy list"
-msgstr ""
-
-#: src/gtkconv.c:3306 src/gtkconv.c:3628
-msgid "Get the user's information"
-msgstr ""
-
 #. Invite
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3109 src/gtkconv.c:5961
 msgid "Invite"
 msgstr ""
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3112
 msgid "Invite a user"
 msgstr ""
 
-#: src/gtkconv.c:3383
-msgid "Add the chat to your buddy list"
-msgstr ""
-
-#: src/gtkconv.c:3390
-msgid "Remove the chat from your buddy list"
-msgstr ""
-
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3151
+msgid "Bold"
+msgstr "ደማቅ"
+
+#: src/gtkconv.c:3162
+msgid "Italic"
+msgstr "አይታሊክ ማድረጊያ"
+
+#: src/gtkconv.c:3173
+msgid "Underline"
+msgstr "የስር መስመር"
+
+#: src/gtkconv.c:3189
+msgid "Larger font size"
+msgstr ""
+
+#: src/gtkconv.c:3201
+msgid "Normal font size"
+msgstr ""
+
+#: src/gtkconv.c:3213
+msgid "Smaller font size"
+msgstr ""
+
+#: src/gtkconv.c:3230
+msgid "Font Face"
+msgstr "የፊደል ቅርጽ ዘይቤ"
+
+#: src/gtkconv.c:3242
+msgid "Foreground font color"
+msgstr ""
+
+#: src/gtkconv.c:3254
+msgid "Background color"
+msgstr "የመደቡ ቀለም"
+
+#: src/gtkconv.c:3269
+msgid "Insert image"
+msgstr "ምስል አስገባ"
+
+#: src/gtkconv.c:3280
+msgid "Insert link"
+msgstr "አያያዝ አስገባ"
+
+#: src/gtkconv.c:3291
+msgid "Insert smiley"
+msgstr ""
+
+#: src/gtkconv.c:3348
 msgid "Topic:"
 msgstr "ጉዳዩ፦"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3399
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3456
 msgid "IM the user"
 msgstr ""
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3468
 msgid "Ignore the user"
 msgstr ""
 
-#: src/gtkconv.c:4155
+#: src/gtkconv.c:3962 src/server.c:1380
+#, c-format
+msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
+msgstr ""
+
+#: src/gtkconv.c:3966 src/server.c:1383
+#, c-format
+msgid "---- New Conversation @ %s ----\n"
+msgstr ""
+
+#: src/gtkconv.c:3999
 msgid "Close conversation"
 msgstr ""
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4683 src/gtkconv.c:4715 src/gtkconv.c:4836 src/gtkconv.c:4903
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkconv.c:5404 src/gtkconv.c:5407
+#: src/gtkconv.c:5225
+msgid "Disable Animation"
+msgstr ""
+
+#: src/gtkconv.c:5234
+msgid "Enable Animation"
+msgstr ""
+
+#: src/gtkconv.c:5241
+msgid "Hide Icon"
+msgstr "ምልክትን ደብቅ"
+
+#: src/gtkconv.c:5247
+msgid "Save Icon As..."
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#: src/gtkconv.c:5728 src/gtkconv.c:5731
 msgid "<main>/Conversation/Close"
 msgstr ""
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr ""
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:173
 #, fuzzy
 msgid "Pause"
 msgstr "ለአጭር ጊዜ አሳርፍ (_P)"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr ""
 
-#: src/gtkft.c:135
+#: src/gtkft.c:126
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
-msgid "Finished"
-msgstr ""
-
-#: src/gtkft.c:209
+#: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: src/gtkft.c:212
+#: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
 msgstr ""
 
-#: src/gtkft.c:386
-msgid "There is no application configured to open this type of file."
-msgstr ""
-
-#: src/gtkft.c:391
-msgid "An error occurred while opening the file."
-msgstr ""
-
-#: src/gtkft.c:482
+#: src/gtkft.c:436
 msgid "Progress"
 msgstr "ይሻሻል"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:443
 msgid "Filename"
 msgstr "የፋይል ስም"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:450
 msgid "Size"
 msgstr "መጠን"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:457
 msgid "Remaining"
 msgstr ""
 
-#: src/gtkft.c:533
+#: src/gtkft.c:487
 msgid "Filename:"
 msgstr "የፋይል ስም፦"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:488
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:489
 msgid "Speed:"
 msgstr "ፍጥነት፦"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:490
 msgid "Time Elapsed:"
 msgstr ""
 
-#: src/gtkft.c:537
+#: src/gtkft.c:491
 msgid "Time Remaining:"
 msgstr ""
 
-#: src/gtkft.c:634
+#: src/gtkft.c:588
 msgid "_Keep the dialog open"
 msgstr ""
 
-#: src/gtkft.c:644
+#: src/gtkft.c:598
 msgid "_Clear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
-msgid "Show transfer details"
-msgstr ""
-
-#: src/gtkft.c:654
-msgid "Hide transfer details"
+#: src/gtkft.c:607
+msgid "Show download details"
+msgstr ""
+
+#: src/gtkft.c:608
+msgid "Hide download details"
 msgstr ""
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
 msgstr "ለአጭር ጊዜ አሳርፍ (_P)"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:660
 msgid "_Resume"
 msgstr "ቀጥል (_R)"
 
-#: src/gtkft.c:908
-#, fuzzy
-msgid "Canceled"
-msgstr "ተወው"
-
-#: src/gtkft.c:910
-#, fuzzy
-msgid "Failed"
-msgstr "ሴት"
-
-#: src/gtkft.c:1082
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr ""
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1020
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1033
 msgid "That file already exists."
 msgstr ""
 
-#: src/gtkft.c:1131
-#, fuzzy
-msgid "Open..."
+#: src/gtkft.c:1058
+msgid "Gaim - Open..."
 msgstr "ጌም - ክፈት..."
 
-#: src/gtkft.c:1133
-#, fuzzy
-msgid "Save As..."
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
-
-#: src/gtkft.c:1181
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
+msgid "Gaim - Save As..."
+msgstr ""
+
+#: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: src/gtkimhtml.c:829
+#: src/gtkimhtml.c:535
 #, fuzzy
 msgid "_Copy E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: src/gtkimhtml.c:841
+#: src/gtkimhtml.c:547
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: src/gtkimhtml.c:851
+#: src/gtkimhtml.c:557
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: src/gtkimhtml.c:2262
+#: src/gtkimhtml.c:1639
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2270
+#: src/gtkimhtml.c:1647
 #, c-format
 msgid "Error saving image: %s"
 msgstr ""
 
-#: src/gtkimhtml.c:2279
+#: src/gtkimhtml.c:1656
 #, fuzzy
 msgid "Save Image"
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#: src/gtkimhtml.c:2302
+#: src/gtkimhtml.c:1679
 msgid "_Save Image..."
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#: src/gtkimhtmltoolbar.c:350
-#, fuzzy
-msgid "_URL"
-msgstr "URL"
-
-#: src/gtkimhtmltoolbar.c:354
-#, fuzzy
-msgid "_Description"
-msgstr "መግለጫ"
-
-#: src/gtkimhtmltoolbar.c:359
-msgid "Insert Link"
-msgstr "አያያዝ አስገባ"
-
-#: src/gtkimhtmltoolbar.c:361
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:365
-#, fuzzy
-msgid "_Insert"
-msgstr "አስገባ"
-
-#: src/gtkimhtmltoolbar.c:422
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:448
-#, fuzzy
-msgid "Insert Image"
-msgstr "ምስል አስገባ"
-
-#. show everything
-#: src/gtkimhtmltoolbar.c:592
-msgid "Smile!"
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:722
-msgid "Bold"
-msgstr "ደማቅ"
-
-#: src/gtkimhtmltoolbar.c:733
-msgid "Italic"
-msgstr "አይታሊክ ማድረጊያ"
-
-#: src/gtkimhtmltoolbar.c:744
-msgid "Underline"
-msgstr "የስር መስመር"
-
-#: src/gtkimhtmltoolbar.c:760
-msgid "Larger font size"
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:772
-msgid "Smaller font size"
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:789
-msgid "Font Face"
-msgstr "የፊደል ቅርጽ ዘይቤ"
-
-#: src/gtkimhtmltoolbar.c:801
-msgid "Foreground font color"
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:813
-msgid "Background color"
-msgstr "የመደቡ ቀለም"
-
-#: src/gtkimhtmltoolbar.c:828
-msgid "Insert link"
-msgstr "አያያዝ አስገባ"
-
-#: src/gtkimhtmltoolbar.c:838
-msgid "Insert image"
-msgstr "ምስል አስገባ"
-
-#: src/gtkimhtmltoolbar.c:849
-msgid "Insert smiley"
-msgstr ""
-
-#: src/gtklog.c:257
-msgid "Conversations with"
-msgstr ""
-
-#. Descriptive label
-#: src/gtknotify.c:215
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtknotify.c:227
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:233
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:237
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3099,7 +2813,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:253
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3107,745 +2821,689 @@
 "%s"
 msgstr ""
 
-#: src/gtknotify.c:439
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr ""
-
-#: src/gtknotify.c:442 src/gtknotify.c:456 src/gtknotify.c:471
-#: src/gtknotify.c:579
+#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:453 src/gtknotify.c:468
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr ""
-
-#: src/gtknotify.c:580
+#: src/gtknotify.c:413
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: src/gtkpounce.c:143
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr ""
+
+#: src/gtknotify.c:437
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr ""
+
+#: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr ""
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:383 src/gtkpounce.c:788
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:383
 msgid "Edit Buddy Pounce"
 msgstr ""
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:401
 msgid "Pounce Who"
 msgstr ""
 
-#: src/gtkpounce.c:381
+#: src/gtkpounce.c:427
 msgid "_Buddy Name:"
 msgstr ""
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:449
 msgid "Pounce When"
 msgstr ""
 
-#: src/gtkpounce.c:412
-msgid "_Sign on"
-msgstr ""
-
-#: src/gtkpounce.c:414
-#, fuzzy
-msgid "Sign _off"
-msgstr "ጌም -  ምልክትን አስቀምጥ"
-
-#: src/gtkpounce.c:416
-msgid "A_way"
-msgstr ""
-
-#: src/gtkpounce.c:418
-msgid "Re_turn from away"
-msgstr ""
-
-#: src/gtkpounce.c:420
-msgid "_Idle"
-msgstr ""
-
-#: src/gtkpounce.c:422
-msgid "Retur_n from idle"
-msgstr ""
-
-#: src/gtkpounce.c:424
-msgid "Buddy starts _typing"
-msgstr ""
-
-#: src/gtkpounce.c:426
-msgid "Buddy stops t_yping"
+#: src/gtkpounce.c:457 src/main.c:339
+msgid "Sign on"
+msgstr ""
+
+#: src/gtkpounce.c:459
+msgid "Sign off"
+msgstr ""
+
+#: src/gtkpounce.c:463
+msgid "Return from away"
+msgstr ""
+
+#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2028
+msgid "Idle"
+msgstr ""
+
+#: src/gtkpounce.c:467
+msgid "Return from idle"
+msgstr ""
+
+#: src/gtkpounce.c:469
+msgid "Buddy starts typing"
+msgstr ""
+
+#: src/gtkpounce.c:471
+msgid "Buddy stops typing"
 msgstr ""
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:500
 msgid "Pounce Action"
 msgstr ""
 
-#: src/gtkpounce.c:462
-msgid "Op_en an IM window"
-msgstr ""
-
-#: src/gtkpounce.c:463
-#, fuzzy
-msgid "_Popup notification"
-msgstr "አያያዝ ቦታ ቅጂ"
-
-#: src/gtkpounce.c:464
-#, fuzzy
-msgid "Send a _message"
+#: src/gtkpounce.c:507
+msgid "Open an IM window"
+msgstr ""
+
+#: src/gtkpounce.c:508
+msgid "Popup notification"
+msgstr ""
+
+#: src/gtkpounce.c:509
+#, fuzzy
+msgid "Send a message"
 msgstr "[መልዕክት የለም]"
 
-#: src/gtkpounce.c:465
-msgid "E_xecute a command"
-msgstr ""
-
-#: src/gtkpounce.c:466
-msgid "P_lay a sound"
-msgstr ""
-
-#: src/gtkpounce.c:470
-#, fuzzy
-msgid "B_rowse..."
+#: src/gtkpounce.c:510
+msgid "Execute a command"
+msgstr ""
+
+#: src/gtkpounce.c:511
+msgid "Play a sound"
+msgstr ""
+
+#: src/gtkpounce.c:515 src/gtkpounce.c:517
+msgid "Browse"
 msgstr "ቃኝ"
 
-#: src/gtkpounce.c:472
-#, fuzzy
-msgid "Bro_wse..."
-msgstr "ቃኝ"
-
-#: src/gtkpounce.c:473
-msgid "Pre_view"
-msgstr ""
-
-#: src/gtkpounce.c:556
-msgid "Sav_e this pounce after activation"
+#: src/gtkpounce.c:518 src/gtkprefs.c:2087
+msgid "Test"
+msgstr "ፈተና"
+
+#: src/gtkpounce.c:601
+msgid "_Save this pounce after activation"
 msgstr ""
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:795
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:836
 #, c-format
 msgid "%s has started typing to you"
 msgstr ""
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:837
 #, c-format
 msgid "%s has signed on"
 msgstr ""
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:838
 #, c-format
 msgid "%s has returned from being idle"
 msgstr ""
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:839
 #, c-format
 msgid "%s has returned from being away"
 msgstr ""
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:840
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr ""
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:841
 #, c-format
 msgid "%s has signed off"
 msgstr ""
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:842
 #, c-format
 msgid "%s has become idle"
 msgstr ""
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:844
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:374
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr ""
 
-#: src/gtkprefs.c:376
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:562
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "ምልክት"
 
-#: src/gtkprefs.c:604 src/gtkprefs.c:2018 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:683
-msgid "Description"
-msgstr "መግለጫ"
+#: src/gtkprefs.c:668
+msgid "Style"
+msgstr "ዓይነት"
+
+#: src/gtkprefs.c:669
+msgid "_Bold"
+msgstr "ደማቅ (_B)"
 
 #: src/gtkprefs.c:671
-msgid "Style"
-msgstr "ዓይነት"
-
-#: src/gtkprefs.c:672
-msgid "_Bold"
-msgstr "ደማቅ (_B)"
-
-#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "አይታሊክ ማድረጊያ (_I)"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "የስር መስመር (_U)"
 
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:686
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "ስርዝ (_S)"
 
-#: src/gtkprefs.c:689
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "የፊደል ቅርጽ ዘይቤ"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr ""
 
-#: src/gtkprefs.c:709
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr ""
 
-#: src/gtkprefs.c:721
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "ቀለም"
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "የጽሑፍ ቀለም (_T)"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "የመደቡ ቀለም (_K)"
 
-#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
+#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
 msgid "Display"
 msgstr "አሳይ"
 
-#: src/gtkprefs.c:773
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr ""
 
+#: src/gtkprefs.c:765
+msgid "Show _timestamp on messages"
+msgstr ""
+
+#: src/gtkprefs.c:767
+msgid "Show _URLs as links"
+msgstr ""
+
+#: src/gtkprefs.c:771
+msgid "_Highlight misspelled words"
+msgstr ""
+
 #: src/gtkprefs.c:775
-msgid "Show _timestamp on messages"
+msgid "Ignore c_olors"
 msgstr ""
 
 #: src/gtkprefs.c:777
-msgid "Show _URLs as links"
-msgstr ""
-
-#: src/gtkprefs.c:781
-msgid "_Highlight misspelled words"
-msgstr ""
-
-#: src/gtkprefs.c:785
-msgid "Ignore c_olors"
-msgstr ""
-
-#: src/gtkprefs.c:787
 msgid "Ignore font _faces"
 msgstr ""
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr ""
 
+#: src/gtkprefs.c:792
+msgid "Send Message"
+msgstr ""
+
+#: src/gtkprefs.c:793
+msgid "Enter _sends message"
+msgstr ""
+
+#: src/gtkprefs.c:795
+msgid "C_ontrol-Enter sends message"
+msgstr ""
+
+#: src/gtkprefs.c:798
+msgid "Window Closing"
+msgstr ""
+
+#: src/gtkprefs.c:799
+msgid "_Escape closes window"
+msgstr ""
+
 #: src/gtkprefs.c:802
-msgid "Send Message"
-msgstr ""
+#, fuzzy
+msgid "Insertions"
+msgstr "አያያዝ አስገባ"
 
 #: src/gtkprefs.c:803
-msgid "Enter _sends message"
+msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr ""
 
 #: src/gtkprefs.c:805
-msgid "C_ontrol-Enter sends message"
-msgstr ""
-
-#: src/gtkprefs.c:808
-msgid "Window Closing"
-msgstr ""
-
-#: src/gtkprefs.c:809
-msgid "_Escape closes window"
-msgstr ""
-
-#: src/gtkprefs.c:812
-#, fuzzy
-msgid "Insertions"
-msgstr "አያያዝ አስገባ"
-
-#: src/gtkprefs.c:813
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr ""
-
-#: src/gtkprefs.c:815
 msgid "Control-(number) _inserts smileys"
 msgstr ""
 
+#: src/gtkprefs.c:822
+msgid "Buddy List Sorting"
+msgstr ""
+
 #: src/gtkprefs.c:831
-msgid "Buddy List Sorting"
-msgstr ""
-
-#: src/gtkprefs.c:840
-#, fuzzy
-msgid "_Sorting:"
+#, fuzzy
+msgid "Sorting:"
 msgstr "ፖርት፦"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr ""
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
+#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Show _buttons as:"
 msgstr ""
 
-#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
+#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
 msgid "Pictures"
 msgstr "ሥዕሎች"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
+#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Text"
 msgstr "ጽሑፍ"
 
-#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
+#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Pictures and text"
 msgstr ""
 
-#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
+#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
 msgid "_Raise window on events"
 msgstr ""
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr ""
 
+#: src/gtkprefs.c:850
+msgid "Show _numbers in groups"
+msgstr ""
+
+#: src/gtkprefs.c:853
+msgid "Buddy Display"
+msgstr ""
+
+#: src/gtkprefs.c:854 src/gtkprefs.c:998
+msgid "Show buddy _icons"
+msgstr ""
+
+#: src/gtkprefs.c:856
+msgid "Show _warning levels"
+msgstr ""
+
 #: src/gtkprefs.c:859
-msgid "Show _numbers in groups"
-msgstr ""
-
-#: src/gtkprefs.c:862
-msgid "Buddy Display"
-msgstr ""
-
-#: src/gtkprefs.c:863 src/gtkprefs.c:999
-msgid "Show buddy _icons"
-msgstr ""
-
-#: src/gtkprefs.c:865
-msgid "Show _warning levels"
-msgstr ""
-
-#: src/gtkprefs.c:867
 msgid "Show idle _times"
 msgstr ""
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:873
 msgid "Dim i_dle buddies"
 msgstr ""
 
-#: src/gtkprefs.c:871
-msgid "_Automatically expand contacts"
-msgstr ""
-
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr ""
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:905
 msgid "Send _URLs as Links"
 msgstr ""
 
-#: src/gtkprefs.c:906
-msgid "Show _Formatting Toolbar"
-msgstr ""
-
-#: src/gtkprefs.c:909
-msgid "Show a_liases in tabs/titles"
+#: src/gtkprefs.c:908
+msgid "Tab Options"
+msgstr "የመክፈቻዎች ምርጫዎች"
+
+#: src/gtkprefs.c:910
+msgid "_Tab Placement:"
 msgstr ""
 
 #: src/gtkprefs.c:912
-msgid "Tab Options"
-msgstr "የመክፈቻዎች ምርጫዎች"
-
-#: src/gtkprefs.c:914
-msgid "_Tab Placement:"
-msgstr ""
-
-#: src/gtkprefs.c:916
 msgid "Top"
 msgstr "ወደ ላይ"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:913
 msgid "Bottom"
 msgstr "ወደ ታች"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:914
 msgid "Left"
 msgstr "ግራ"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:915
 msgid "Right"
 msgstr "ቀኝ"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:921
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:924
 msgid "Show IMs and chats in _same tabbed window"
 msgstr ""
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:934
 msgid "Show _close button on tabs"
 msgstr ""
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:945
 msgid "Show status _icons on tabs"
 msgstr ""
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1027
+#: src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Window"
 msgstr "መስኮት"
 
-#: src/gtkprefs.c:986 src/gtkprefs.c:1037
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "New window _width:"
 msgstr ""
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1039
+#: src/gtkprefs.c:985 src/gtkprefs.c:1041
 msgid "New window _height:"
 msgstr ""
 
-#: src/gtkprefs.c:990 src/gtkprefs.c:1041
+#: src/gtkprefs.c:988 src/gtkprefs.c:1044
 msgid "_Entry field height:"
 msgstr ""
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:993
 msgid "Hide window on _send"
 msgstr ""
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:997
 msgid "Buddy Icons"
 msgstr ""
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1000
 msgid "Enable buddy icon a_nimation"
 msgstr ""
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1004
 msgid "Show _logins in window"
 msgstr ""
 
-#: src/gtkprefs.c:1008
-msgid "Typing Notification"
+#: src/gtkprefs.c:1006
+msgid "Show a_liases in tabs/titles"
 msgstr ""
 
 #: src/gtkprefs.c:1009
+msgid "Typing Notification"
+msgstr ""
+
+#: src/gtkprefs.c:1010
 msgid "Notify buddies that you are _typing to them"
 msgstr ""
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1050
 msgid "Tab Completion"
 msgstr ""
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:1051
 msgid "_Tab-complete nicks"
 msgstr ""
 
-#: src/gtkprefs.c:1049
-msgid "_Old-style tab completion"
-msgstr ""
-
 #: src/gtkprefs.c:1053
-msgid "_Show people joining in window"
-msgstr ""
-
-#: src/gtkprefs.c:1055
-msgid "_Show people leaving in window"
+msgid "_Old-style tab completion"
 msgstr ""
 
 #: src/gtkprefs.c:1057
-#, fuzzy
-msgid "Co_lorize screen names"
-msgstr "እስክሪን ስም፦ (_S)"
-
-#: src/gtkprefs.c:1078
-#, fuzzy
-msgid "IP Address"
-msgstr "አድራሻ፦"
-
-#: src/gtkprefs.c:1080
-msgid "_Autodetect IP Address"
-msgstr ""
-
-#: src/gtkprefs.c:1089
-msgid "Public _IP:"
-msgstr ""
-
-#: src/gtkprefs.c:1113
-#, fuzzy
-msgid "Ports"
+msgid "_Show people joining in window"
+msgstr ""
+
+#: src/gtkprefs.c:1059
+msgid "_Show people leaving in window"
+msgstr ""
+
+#: src/gtkprefs.c:1061
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/gtkprefs.c:1105
+msgid "Proxy Type"
+msgstr ""
+
+#: src/gtkprefs.c:1108
+msgid "No proxy"
+msgstr ""
+
+#: src/gtkprefs.c:1115
+msgid "Proxy Server"
+msgstr ""
+
+#: src/gtkprefs.c:1136
+msgid "_Host"
+msgstr "እንግዳ ተቀባይ (_H)"
+
+#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
+#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1617
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
+msgid "Port"
 msgstr "ፖርት"
 
-#: src/gtkprefs.c:1116
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: src/gtkprefs.c:1119
-#, fuzzy
-msgid "_Start Port:"
-msgstr "ፖርት፦"
-
-#: src/gtkprefs.c:1126
-#, fuzzy
-msgid "_End Port:"
-msgstr "ፖርት፦"
-
-#: src/gtkprefs.c:1174
-msgid "Proxy Type"
-msgstr ""
-
-#: src/gtkprefs.c:1177
-msgid "No proxy"
-msgstr ""
-
-#: src/gtkprefs.c:1184
-msgid "Proxy Server"
-msgstr ""
-
-#: src/gtkprefs.c:1242
-#, fuzzy
-msgid "_User:"
+#: src/gtkprefs.c:1171
+msgid "_User"
 msgstr "ተጠቃሚ (_U)"
 
-#: src/gtkprefs.c:1298
+#: src/gtkprefs.c:1188
+msgid "Pa_ssword"
+msgstr "ሚስጢራዊ ቃል (_S)"
+
+#: src/gtkprefs.c:1225
 msgid "Opera"
 msgstr "ኦፔራ"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1226
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1227
 msgid "Mozilla"
 msgstr "ሞዚላ"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1228
 msgid "Konqueror"
 msgstr ""
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1229
 msgid "Galeon"
 msgstr "ጋልዮን"
 
-#: src/gtkprefs.c:1303
-msgid "Firebird"
-msgstr ""
-
-#: src/gtkprefs.c:1304
-msgid "Firefox"
-msgstr ""
-
-#: src/gtkprefs.c:1305
-msgid "Gnome Default"
-msgstr ""
-
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1238
 msgid "Manual"
 msgstr ""
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1279
 msgid "Browser Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1283
 #, fuzzy
 msgid "_Browser:"
 msgstr "መቃኛ (_B)"
 
-#: src/gtkprefs.c:1376
-#, fuzzy
-msgid "_Open link in:"
-msgstr "ኦንላይን"
-
-#: src/gtkprefs.c:1378
-#, fuzzy
-msgid "Browser default"
-msgstr "መቃኛ"
-
-#: src/gtkprefs.c:1379
-msgid "Existing window"
-msgstr ""
-
-#: src/gtkprefs.c:1381
-#, fuzzy
-msgid "New tab"
-msgstr "አዲስ"
-
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1293
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1314
+msgid "Browser Options"
+msgstr "የመቃኛ ምርጫዎች"
+
+#: src/gtkprefs.c:1315
+msgid "Open new _window by default"
+msgstr ""
+
+#: src/gtkprefs.c:1330
 msgid "Message Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1431
-msgid "Log _Format:"
-msgstr ""
-
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1331
 msgid "_Log all instant messages"
 msgstr ""
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1333
 msgid "Log all c_hats"
 msgstr ""
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1335
+msgid "Strip _HTML from logs"
+msgstr ""
+
+#: src/gtkprefs.c:1338
+msgid "System Logs"
+msgstr ""
+
+#: src/gtkprefs.c:1339
+msgid "Log when buddies _sign on/sign off"
+msgstr ""
+
+#: src/gtkprefs.c:1341
+msgid "Log when buddies become _idle/un-idle"
+msgstr ""
+
+#: src/gtkprefs.c:1343
+msgid "Log when buddies go away/come _back"
+msgstr ""
+
+#: src/gtkprefs.c:1345
+msgid "Log your _own signons/idleness/awayness"
+msgstr ""
+
+#: src/gtkprefs.c:1347
+msgid "I_ndividual log file for each buddy's signons"
+msgstr ""
+
+#: src/gtkprefs.c:1390
 msgid "Sound Options"
 msgstr "የድምፅ ምርጫዎች"
 
-#: src/gtkprefs.c:1492
+#: src/gtkprefs.c:1391
 msgid "_No sounds when you log in"
 msgstr ""
 
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1393
 msgid "_Sounds while away"
 msgstr ""
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1397
 msgid "Sound Method"
 msgstr ""
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1398
 msgid "_Method:"
 msgstr ""
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1400
 msgid "Console beep"
 msgstr ""
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1402
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1409
 msgid "Command"
 msgstr "ትእዛዝ"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1419
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1474
 msgid "_Sending messages removes away status"
 msgstr ""
 
-#: src/gtkprefs.c:1579
+#: src/gtkprefs.c:1476
 msgid "_Queue new messages when away"
 msgstr ""
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1479
 msgid "Auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1482
 msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/gtkprefs.c:1588
+#: src/gtkprefs.c:1485
 msgid "_Send auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1487
 msgid "_Only send auto-response when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1489
 msgid "Send auto-response in _active conversations"
 msgstr ""
 
-#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2291
-msgid "Idle"
-msgstr ""
-
-#: src/gtkprefs.c:1602
+#: src/gtkprefs.c:1499
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/gtkprefs.c:1605
+#: src/gtkprefs.c:1502
 msgid "Gaim usage"
 msgstr "የጌም አጠቃቀም"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1505
 msgid "X usage"
 msgstr "የX አጠቃቀም"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1507
 msgid "Windows usage"
 msgstr "የWindows አጠቃቀም"
 
-#: src/gtkprefs.c:1618
+#: src/gtkprefs.c:1515
 msgid "Auto-away"
 msgstr ""
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1516
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1518
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1525
 msgid "Away m_essage:"
 msgstr ""
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1587
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3855,7 +3513,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1791
+#: src/gtkprefs.c:1592
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3865,189 +3523,177 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1974
+#: src/gtkprefs.c:1773
 msgid "Load"
 msgstr "ጫን"
 
-#: src/gtkprefs.c:1988
-msgid "Summary"
-msgstr ""
-
-#: src/gtkprefs.c:2036
+#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
+#: src/protocols/msn/msn.c:1303 src/protocols/trepia/trepia.c:392
+msgid "Name"
+msgstr "ስም"
+
+#: src/gtkprefs.c:1827
 msgid "Details"
 msgstr "ዝርዝሮች"
 
-#: src/gtkprefs.c:2163
+#: src/gtkprefs.c:1954
 msgid "Sound Selection"
 msgstr ""
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2061
 msgid "Play"
 msgstr "አጫውት"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2068
 msgid "Event"
 msgstr "ኩነት"
 
-#: src/gtkprefs.c:2296
-msgid "Test"
-msgstr "ፈተና"
-
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2091
 msgid "Reset"
 msgstr "እንደነበረ አድረግ"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2095
 msgid "Choose..."
 msgstr "ምረጡ..."
 
-#: src/gtkprefs.c:2439
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "አስተካክል (_E)"
 
-#: src/gtkprefs.c:2475
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr ""
 
-#: src/gtkprefs.c:2476
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr ""
 
-#: src/gtkprefs.c:2477
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "የፊደል ቅርጾች"
 
-#: src/gtkprefs.c:2478
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr ""
 
-#: src/gtkprefs.c:2479
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "አቋራጮች"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr ""
 
-#: src/gtkprefs.c:2484
-#, fuzzy
-msgid "Network"
-msgstr "አዲስ"
-
-#: src/gtkprefs.c:2485
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr ""
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "መቃኛ"
 
-#: src/gtkprefs.c:2490
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr ""
 
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "ድምፆች"
 
-#: src/gtkprefs.c:2492
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr ""
 
-#: src/gtkprefs.c:2493
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr ""
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr ""
 
-#: src/gtkprefs.c:2496
-msgid "Protocols"
-msgstr ""
-
-#: src/gtkprefs.c:2512
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-#: src/gtkprivacy.c:77
+#: src/gtkprivacy.c:86
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:87
 msgid "Allow only the users on my buddy list"
 msgstr ""
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:88
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:89
 msgid "Block all users"
 msgstr ""
 
-#: src/gtkprivacy.c:81
-msgid "Block only the users below"
-msgstr ""
-
-#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
+#: src/gtkprivacy.c:90
+msgid "Block the users below"
+msgstr ""
+
+#: src/gtkprivacy.c:368
 msgid "Privacy"
 msgstr ""
 
-#: src/gtkprivacy.c:375
+#: src/gtkprivacy.c:383
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:387
+#: src/gtkprivacy.c:395
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
+#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr ""
 
-#: src/gtkprivacy.c:556
+#: src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:557
+#: src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
+#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
 msgid "Permit"
 msgstr ""
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:567
+#: src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
 msgid "Block User"
 msgstr ""
 
-#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:596
-msgid "Please enter the name of the user you wish to block."
-msgstr ""
-
 #: src/gtkprivacy.c:603
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#: src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
-#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
@@ -4055,173 +3701,217 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "አዎ"
 
-#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "አይ"
 
-#: src/gtkrequest.c:227
+#: src/gtkrequest.c:204
 #, fuzzy
 msgid "Apply"
 msgstr "ተጠቀም (_Y)"
 
-#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
-msgid "Close"
-msgstr "ዝጋ"
-
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-
-#: src/gtkroomlist.c:335
-msgid "Room List"
-msgstr ""
-
-#. list button
-#: src/gtkroomlist.c:410
-msgid "_Get List"
+#: src/gtksound.c:60
+msgid "Buddy logs in"
+msgstr ""
+
+#: src/gtksound.c:61
+msgid "Buddy logs out"
 msgstr ""
 
 #: src/gtksound.c:62
-msgid "Buddy logs in"
+msgid "Message received"
 msgstr ""
 
 #: src/gtksound.c:63
-msgid "Buddy logs out"
+msgid "Message received begins conversation"
 msgstr ""
 
 #: src/gtksound.c:64
-msgid "Message received"
+msgid "Message sent"
 msgstr ""
 
 #: src/gtksound.c:65
-msgid "Message received begins conversation"
+msgid "Person enters chat"
 msgstr ""
 
 #: src/gtksound.c:66
-msgid "Message sent"
+msgid "Person leaves chat"
 msgstr ""
 
 #: src/gtksound.c:67
-msgid "Person enters chat"
+msgid "You talk in chat"
 msgstr ""
 
 #: src/gtksound.c:68
-msgid "Person leaves chat"
-msgstr ""
-
-#: src/gtksound.c:69
-msgid "You talk in chat"
-msgstr ""
-
-#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr ""
 
-#: src/gtksound.c:73
+#: src/gtksound.c:71
 msgid "Someone says your name in chat"
 msgstr ""
 
-#: src/gtksound.c:157
+#: src/gtksound.c:153
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 
-#: src/gtksound.c:173
+#: src/gtksound.c:169
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:185
+#: src/gtksound.c:178
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/gtkutils.c:297
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr ""
 
-#: src/gtkutils.c:332
-#, fuzzy
-msgid "Save Icon"
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
-
-#: src/log.c:88
-msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
-
-#: src/log.c:433
-msgid "XML"
-msgstr ""
-
-#: src/log.c:514
-#, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:516
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:560 src/log.c:696
-msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
-
-#: src/log.c:570 src/log.c:706
-#, c-format
-msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr ""
-
-#: src/log.c:574
-msgid "HTML"
-msgstr ""
-
-#: src/log.c:649
-#, c-format
-msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr ""
-
-#: src/log.c:710
-msgid "Plain text"
-msgstr ""
-
-#: src/main.c:157
-msgid "Please create an account."
-msgstr ""
-
-#: src/main.c:239
+#: src/gtkutils.c:321
+msgid "Gaim - Save Icon"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#: src/log.c:30
+msgid "Error in specifying buddy conversation."
+msgstr ""
+
+#: src/log.c:36
+msgid "Unable to find conversation log"
+msgstr ""
+
+#: src/log.c:119 src/log.c:140 src/log.c:153
+#, c-format
+msgid "Unable to make directory %s for logging"
+msgstr ""
+
+#: src/log.c:207 src/log.c:223
+#, c-format
+msgid "IM Sessions with %s\n"
+msgstr ""
+
+#: src/log.c:210 src/log.c:226
+#, c-format
+msgid "IM Sessions with %s"
+msgstr ""
+
+#: src/log.c:270
+#, c-format
+msgid "+++ %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:275
+#, c-format
+msgid "+++ %s (%s) signed off @ %s"
+msgstr ""
+
+#: src/log.c:280
+#, c-format
+msgid "+++ %s (%s) changed away state @ %s"
+msgstr ""
+
+#: src/log.c:285
+#, c-format
+msgid "+++ %s (%s) came back @ %s"
+msgstr ""
+
+#: src/log.c:290
+#, c-format
+msgid "+++ %s (%s) became idle @ %s"
+msgstr ""
+
+#: src/log.c:295
+#, c-format
+msgid "+++ %s (%s) returned from idle @ %s"
+msgstr ""
+
+#: src/log.c:300
+#, c-format
+msgid "+++ Program exit @ %s"
+msgstr ""
+
+#: src/log.c:307
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:312
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed off @ %s"
+msgstr ""
+
+#: src/log.c:317
+#, c-format
+msgid "%s (%s) reported that %s (%s) went away @ %s"
+msgstr ""
+
+#: src/log.c:322
+#, c-format
+msgid "%s (%s) reported that %s (%s) came back @ %s"
+msgstr ""
+
+#: src/log.c:327
+#, c-format
+msgid "%s (%s) reported that %s (%s) became idle @ %s"
+msgstr ""
+
+#: src/log.c:333
+#, c-format
+msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+msgstr ""
+
+#: src/log.c:345
+#, c-format
+msgid "%s (%s) reported that %s signed on @ %s"
+msgstr ""
+
+#: src/log.c:350
+#, c-format
+msgid "%s (%s) reported that %s signed off @ %s"
+msgstr ""
+
+#: src/log.c:355
+#, c-format
+msgid "%s (%s) reported that %s went away @ %s"
+msgstr ""
+
+#: src/log.c:360
+#, c-format
+msgid "%s (%s) reported that %s came back @ %s"
+msgstr ""
+
+#: src/log.c:365
+#, c-format
+msgid "%s (%s) reported that %s became idle @ %s"
+msgstr ""
+
+#: src/log.c:371
+#, c-format
+msgid "%s (%s) reported that %s returned from idle @ %s"
+msgstr ""
+
+#: src/main.c:148
+msgid "Please enter your login."
+msgstr ""
+
+#: src/main.c:231
+msgid "<New User>"
+msgstr "<አዲስ ተጠቃሚ>"
+
+#: src/main.c:273
 msgid "Login"
 msgstr "ዝምብለህ ይግባ"
 
-#: src/main.c:257
-#, fuzzy
-msgid "<b>Screen Name:</b>"
-msgstr "እስክሪን ስም፦"
-
-#: src/main.c:271
-#, fuzzy
-msgid "<b>Password:</b>"
-msgstr "ሚስጢራዊ ቃል፦"
-
-#: src/main.c:300
-msgid "Sign on"
-msgstr ""
-
 #. full help text
-#: src/main.c:524
+#: src/main.c:550
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4241,36 +3931,36 @@
 msgstr ""
 
 #. short message
-#: src/main.c:539
+#: src/main.c:565
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#: src/plugin.c:269
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:274 src/plugin.c:302
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: src/plugin.c:298
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/prefs.c:113 src/status.c:271
+#: src/prefs.c:111 src/status.c:270
 msgid "Slightly less boring default"
 msgstr ""
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
-#: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/msn/msn.c:344 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:2594
-#: src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
+#: src/protocols/yahoo/yahoo.c:2405
 msgid "Available"
 msgstr ""
 
@@ -4282,12 +3972,11 @@
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2943
-#: src/protocols/oscar/oscar.c:4668 src/protocols/oscar/oscar.c:4739
-#: src/protocols/oscar/oscar.c:4763 src/protocols/oscar/oscar.c:6415
-#: src/protocols/oscar/oscar.c:6419 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
+#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2026
+#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
 msgid "Invisible"
 msgstr ""
 
@@ -4307,10 +3996,7 @@
 msgid "Unable to connect to server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:103
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr ""
 
@@ -4344,235 +4030,226 @@
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:496
-#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1954 src/protocols/yahoo/yahoo.c:1985
-#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr ""
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr ""
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
+msgid "Balancer handshake"
 msgstr ""
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
+msgid "Reading server key"
 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
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr ""
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr ""
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
 msgid "UIN"
 msgstr "UIN"
 
-#. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
-msgid "First Name"
-msgstr "ስም፦"
+#: src/protocols/gg/gg.c:668
+msgid "First name"
+msgstr "ስም"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
+#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
 msgid "Last Name"
 msgstr "የአባት ስም"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4108
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
 msgid "Nick"
 msgstr "ቅጽል"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
-#, fuzzy
-msgid "Birth Year"
-msgstr "የልደት በዓል"
-
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
+msgid "Birth year"
+msgstr ""
+
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "ጾታ"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
-#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4176
-#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:574
+#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
 msgid "City"
 msgstr "ከተማ"
 
 #. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1303
-#: src/protocols/msn/msn.c:1547 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2985 src/protocols/oscar/oscar.c:3311
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2887
-#: src/protocols/yahoo/yahoo.c:2909 src/protocols/yahoo/yahoo.c:2932
-#: src/protocols/yahoo/yahoo.c:3090 src/protocols/zephyr/zephyr.c:536
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1241
+#: src/protocols/msn/msn.c:1483 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
+#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
 #, fuzzy
 msgid "Buddy Information"
 msgstr "የቢሮ መረጃ፦"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr ""
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:981
+#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
 msgid "Change Password"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4588,8 +4265,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
@@ -4602,17 +4278,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:224
-#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
-#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2715
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
+#: src/protocols/msn/notification.c:935 src/protocols/msn/notification.c:1256
+#: src/protocols/msn/notification.c:1422 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5080
 msgid "Authorize"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:225
-#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
-#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2717
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
+#: src/protocols/msn/notification.c:936 src/protocols/msn/notification.c:1258
+#: src/protocols/msn/notification.c:1424 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5081
 msgid "Deny"
 msgstr ""
 
@@ -4650,90 +4326,54 @@
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:466 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:459
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:461
 msgid "No topic is set"
 msgstr ""
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
-msgid "File Transfer Aborted"
-msgstr ""
-
-#: src/protocols/irc/dcc_send.c:273
-msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:64
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:64
 msgid "No MOTD available"
 msgstr ""
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:65
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:68
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:137
 msgid "View MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:6515
-#: src/protocols/yahoo/yahoo.c:2452
-msgid "Send File"
-msgstr "ፋይልን ላክ"
-
-#: src/protocols/irc/irc.c:168
-#, fuzzy
-msgid "_Channel:"
+#: src/protocols/irc/irc.c:156
+msgid "Channel:"
 msgstr "ጣቢያ፦"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
-#, fuzzy
-msgid "_Password:"
-msgstr "ሚስጢራዊ ቃል (_P)"
-
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:220
+#: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr ""
 
-#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
-#, fuzzy
-msgid "Read error"
-msgstr "የIRC ስህተት"
-
-#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
-#, fuzzy
-msgid "Users"
-msgstr "ተጠቃሚ (_U)"
-
-#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
-#, fuzzy
-msgid "Topic"
-msgstr "ጉዳዩ፦"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4743,38 +4383,26 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:611
+#: src/protocols/irc/irc.c:530
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:531
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
-#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
 #, fuzzy
 msgid "Server"
 msgstr "ሰርቨር፦"
 
-#: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
-#: src/protocols/msn/msn.c:1680 src/protocols/napster/napster.c:642
-#: src/protocols/trepia/trepia.c:1350
-msgid "Port"
-msgstr "ፖርት"
-
-#: src/protocols/irc/irc.c:635
+#: src/protocols/irc/irc.c:554
 #, fuzzy
 msgid "Encoding"
 msgstr "የሆሄያት ኮድ፦"
 
-#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:580
-#, fuzzy
-msgid "Username"
-msgstr "ተጠቃሚ፦ (_U)"
-
 #: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr ""
@@ -4796,7 +4424,12 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
+#, fuzzy
+msgid "Username"
+msgstr "ተጠቃሚ፦ (_U)"
+
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
 #, fuzzy
 msgid "Realname"
 msgstr "እንደገና ሰይም (_R)"
@@ -4824,263 +4457,283 @@
 msgid "Buddy Information for %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:277
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:282
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:296
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:267
 #, fuzzy
 msgid "Unknown message"
 msgstr "ያልታወቀ ስህተት"
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:400
-msgid "No such channel"
-msgstr ""
-
 #. does this happen?
-#: src/protocols/irc/msgs.c:411
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:439
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:495
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:496
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:592
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:597
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:618
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:698
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:719
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:761
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:836
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:837
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:867
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:166
+#: src/protocols/irc/parse.c:160
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
 
-#: src/protocols/irc/parse.c:297
+#: src/protocols/irc/parse.c:291
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:292
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:292
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
-msgid "Disconnected."
-msgstr ""
-
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/irc/parse.c:391
+#, fuzzy
+msgid "Disconnected"
+msgstr "ተገናኝቷል"
+
+#: src/protocols/jabber/auth.c:50
 msgid "Server requires SSL for login"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:111
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
-msgid "Plaintext Authentication"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
+#: src/protocols/jabber/auth.c:354
+msgid "Invalid response from server"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:327
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/auth.c:357
+msgid "Bad Protocol"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:360
+msgid "Encryption Required"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:363
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:366
+msgid "Invalid Mechanism"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:368
+msgid "Invalid Realm"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:371
+msgid "Mechanism Too Weak"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
+#: src/protocols/oscar/oscar.c:5472
+msgid "Not Authorized"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:377
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:379
+msgid "Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "የቤተሰብ ስም"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
+#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2675
 msgid "Nickname"
 msgstr "ቅጽል ስም"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
-msgid "URL"
-msgstr "URL"
-
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
 msgid "Locality"
 msgstr "አካባቢ"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
 msgid "Region"
 msgstr "አካባቢ"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:630
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/jabber.c:584
 msgid "Postal Code"
 msgstr ""
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
 msgid "Country"
 msgstr "አገር"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
+#: src/protocols/jabber/buddy.c:694
 msgid "Telephone"
 msgstr "ስልክ"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
+#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2669
 msgid "Email"
 msgstr "ኢሜይል"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
 msgid "Title"
 msgstr "አርእስት"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4140
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
+#: src/protocols/oscar/oscar.c:3926
 msgid "Birthday"
 msgstr "የልደት በዓል"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:554
 msgid "Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
+#: src/protocols/jabber/jabber.c:856
 #, fuzzy
 msgid "Status"
 msgstr "ሁኔታ፦"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
 #, fuzzy
 msgid "Resource"
 msgstr "ቀጥል (_R)"
@@ -5089,570 +4742,333 @@
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
+#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
+#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
 #, fuzzy
 msgid "Address"
 msgstr "አድራሻ፦"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:651
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:757
 #, fuzzy
 msgid "Photo"
 msgstr "ፖርት"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:757
 #, fuzzy
 msgid "Logo"
 msgstr "ዝምብለህ ይግባ"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:771
 #, fuzzy
 msgid "Jabber Profile"
 msgstr "የJabber ስህተት %s"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:866
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:869
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:905
+#: src/protocols/jabber/buddy.c:877
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:913
-msgid "(Re-)Request authorization"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:919
-msgid "Unsubscribe"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
-#, fuzzy
-msgid "_Room:"
+#: src/protocols/jabber/buddy.c:885
+msgid "Re-request authorization"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
+msgid "Room:"
 msgstr "ቤት፦"
 
-#: src/protocols/jabber/chat.c:47
-#, fuzzy
-msgid "_Server:"
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
 msgstr "ሰርቨር፦"
 
-#: src/protocols/jabber/chat.c:53
-msgid "_Handle:"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:164
-#, c-format
-msgid "%s is not a valid room name"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:165
-msgid "Invalid Room Name"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:170
-#, c-format
-msgid "%s is not a valid server name"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
-#, fuzzy
-msgid "Invalid Server Name"
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:110
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "ቀጥል (_R)"
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:116
+#, fuzzy
+msgid "Host Unknown"
+msgstr "ያልታወቀ"
+
+#: src/protocols/jabber/jabber.c:118
+#, fuzzy
+msgid "Improper Addressing"
+msgstr "የቤት አድራሻ፦"
+
+#: src/protocols/jabber/jabber.c:120
+#, fuzzy
+msgid "Internal Server Error"
 msgstr "የውስጥ ብልሽት"
 
-#: src/protocols/jabber/chat.c:176
-#, c-format
-msgid "%s is not a valid room handle"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
-msgid "Invalid Room Handle"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:332
-#, fuzzy
-msgid "Configuration error"
-msgstr "ተገናኝቷል"
-
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
-msgid "Unable to configure"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:357
-#, fuzzy
-msgid "Room Configuration Error"
-msgstr "ተገናኝቷል"
-
-#: src/protocols/jabber/chat.c:358
-msgid "This room is not capable of being configured"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
-#, fuzzy
-msgid "Registration error"
-msgstr "የIRC ስህተት"
-
-#: src/protocols/jabber/chat.c:556
-msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
-#, fuzzy
-msgid "Roomlist Error"
-msgstr "የIRC ስህተት"
-
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
-msgid "Error retreiving roomlist"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:651
-#, fuzzy
-msgid "Invalid Server"
-msgstr "ሰርቨር፦"
-
-#: src/protocols/jabber/chat.c:688
-#, fuzzy
-msgid "Enter a Conference Server"
-msgstr "የጌም ማውሪያ"
-
-#: src/protocols/jabber/chat.c:689
-msgid "Select a conference server to query"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:691
-#, fuzzy
-msgid "Find Rooms"
-msgstr "የውሪ ቤቶች"
-
-#: src/protocols/jabber/jabber.c:73
-msgid "Error initializing session"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
-#: src/protocols/msn/msn.c:161 src/protocols/msn/msn.c:261
-#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:721
-#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:776
-#: src/protocols/msn/msn.c:784 src/protocols/msn/msn.c:817
-#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:839
-#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:863
-#: src/protocols/msn/msn.c:873 src/protocols/msn/msn.c:895
-#: src/protocols/msn/msn.c:945 src/protocols/msn/msn.c:983
-#: src/protocols/msn/msn.c:1085 src/protocols/msn/msn.c:1118
-#: src/protocols/msn/msn.c:1139 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1185
-#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1278
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
-#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1038
-#: src/protocols/trepia/trepia.c:1082 src/protocols/trepia/trepia.c:1181
-#: src/protocols/trepia/trepia.c:1237
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid Namespace"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:134
+#, fuzzy
+msgid "Remote Connection Failed"
+msgstr "መድረክን አስወግድ"
+
+#: src/protocols/jabber/jabber.c:136
+#, fuzzy
+msgid "Resource Constraint"
+msgstr "መድረክን አስወግድ"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:154
+#, fuzzy
+msgid "Stream Error"
+msgstr "የውስጥ ብልሽት"
+
+#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
+#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
+#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1095 src/protocols/msn/msn.c:1106
+#: src/protocols/msn/msn.c:1117 src/protocols/msn/msn.c:1141
+#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1218
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1655 src/protocols/msn/notification.c:1675
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
 msgid "Write error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
+#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
 #, fuzzy
 msgid "Read Error"
 msgstr "የIRC ስህተት"
 
-#: src/protocols/jabber/jabber.c:316
-#, fuzzy
-msgid "Connection Failed"
-msgstr "መድረክን አስወግድ"
-
-#: src/protocols/jabber/jabber.c:319
-msgid "SSL Handshake Failed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
-msgid "Invalid Jabber ID"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
-msgid "SSL support unavailable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
-#: src/protocols/trepia/trepia.c:1121
+#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
+#: src/protocols/trepia/trepia.c:1106
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:425
+#: src/protocols/jabber/jabber.c:419
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
 msgid "Registration Successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:431
 #, fuzzy
 msgid "Unknown Error"
 msgstr "ያልታወቀ ስህተት"
 
+#: src/protocols/jabber/jabber.c:434
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
 msgid "Registration Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
 msgid "Already Registered"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
 #, fuzzy
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/protocols/jabber/jabber.c:595
+#: src/protocols/jabber/jabber.c:549
 #, fuzzy
 msgid "E-Mail"
 msgstr "ኢሜይል"
 
+#. First Name
+#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "ስም፦"
+
 #. State
-#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4163
-#: src/protocols/oscar/oscar.c:4179 src/protocols/trepia/trepia.c:335
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
 msgid "State"
 msgstr "ሁኔታ"
 
-#: src/protocols/jabber/jabber.c:635
+#: src/protocols/jabber/jabber.c:589
 #, fuzzy
 msgid "Phone"
 msgstr "ምንም"
 
-#: src/protocols/jabber/jabber.c:645
-msgid "Date"
-msgstr "ቀን"
-
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:607
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
 msgid "Register New Jabber Account"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:487 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:750 src/protocols/trepia/trepia.c:1115
-#: src/protocols/yahoo/yahoo.c:2173
+#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1923
 msgid "Connecting"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:778
+#: src/protocols/jabber/jabber.c:714
 msgid "Initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:720
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:728
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1161
-#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1235
-#: src/protocols/oscar/oscar.c:5800
-msgid "Not Authorized"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:905
-#, fuzzy
-msgid "Both"
-msgstr "ወደ ታች"
-
-#: src/protocols/jabber/jabber.c:907
-msgid "From (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:909
-msgid "From"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:912
-#, fuzzy
-msgid "To"
-msgstr "ወደ ላይ"
-
-#: src/protocols/jabber/jabber.c:914
-msgid "None (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:918
-#, fuzzy
-msgid "Subscription"
-msgstr "መግለጫ"
-
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
+#: src/protocols/jabber/presence.c:257
 #, fuzzy
 msgid "Error"
 msgstr "የIRC ስህተት"
 
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:102
-#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:112
+#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
 msgid "Chatty"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:105
-#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:108
-#: src/protocols/jabber/presence.c:65 src/protocols/jabber/presence.c:119
-#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:4751
-#: src/protocols/oscar/oscar.c:6411
+#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:884
 #, fuzzy
 msgid "Password Changed"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:885
 msgid "Your password has been changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
-#, fuzzy
-msgid "Error changing password"
-msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
-
-#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:895
+#, c-format
+msgid "Error changing password: %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:899
+msgid "Unknown error occurred changing password"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password (again)"
 msgstr "ሚስጢራዊ ቃል፦"
 
-#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
 #, fuzzy
 msgid "Change Jabber Password"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
-#: src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:962
 msgid "Please enter your new password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1141
-msgid "Bad Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1143
-#, fuzzy
-msgid "Conflict"
-msgstr "አገናኝ"
-
-#: src/protocols/jabber/jabber.c:1145
-msgid "Feature Not Implemented"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1147
-#, fuzzy
-msgid "Forbidden"
-msgstr "የተደበቀ"
-
-#: src/protocols/jabber/jabber.c:1149
-#, fuzzy
-msgid "Gone"
-msgstr "ምንም"
-
-#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
-#, fuzzy
-msgid "Internal Server Error"
-msgstr "የውስጥ ብልሽት"
-
-#: src/protocols/jabber/jabber.c:1153
-msgid "Item Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1155
-msgid "Malformed Jabber ID"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1157
-msgid "Not Acceptable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1159
-msgid "Not Allowed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1163
-msgid "Payment Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1165
-msgid "Recipient Unavailable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1169
-msgid "Registration Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1171
-msgid "Remote Server Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1173
-msgid "Remote Server Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1175
-msgid "Server Overloaded"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1177
-msgid "Service Unavailable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1179
-msgid "Subscription Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1181
-msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1188
-msgid "Authorization Aborted"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1190
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1193
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1196
-msgid "Invalid Authorization Mechanism"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1199
-msgid "Authorization mechanism too weak"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1204
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1206
-msgid "Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1210
-msgid "Bad Format"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1212
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1215
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "ቀጥል (_R)"
-
-#: src/protocols/jabber/jabber.c:1217
-msgid "Connection Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1219
-msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1221
-#, fuzzy
-msgid "Host Unknown"
-msgstr "ያልታወቀ"
-
-#: src/protocols/jabber/jabber.c:1223
-#, fuzzy
-msgid "Improper Addressing"
-msgstr "የቤት አድራሻ፦"
-
-#: src/protocols/jabber/jabber.c:1227
-msgid "Invalid ID"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1229
-msgid "Invalid Namespace"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1231
-msgid "Invalid XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1233
-msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1237
-msgid "Policy Violation"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1239
-#, fuzzy
-msgid "Remote Connection Failed"
-msgstr "መድረክን አስወግድ"
-
-#: src/protocols/jabber/jabber.c:1241
-#, fuzzy
-msgid "Resource Constraint"
-msgstr "መድረክን አስወግድ"
-
-#: src/protocols/jabber/jabber.c:1243
-msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1245
-msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1247
-msgid "System Shutdown"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1249
-msgid "Undefined Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1251
-msgid "Unsupported Encoding"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1253
-msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1255
-msgid "Unsupported Version"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1257
-msgid "XML Not Well Formed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1259
-#, fuzzy
-msgid "Stream Error"
-msgstr "የውስጥ ብልሽት"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5663,127 +5079,75 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
 msgid "Jabber Protocol Plugin"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1375
-msgid "Use TLS if available"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1380
-msgid "Force old SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1385
-msgid "Allow plaintext auth over unencrypted streams"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1083
+msgid "Force Old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1091
 #, fuzzy
 msgid "Connect server"
 msgstr "ተገናኝቷል"
 
-#: src/protocols/jabber/jabber.c:1411
-msgid "Hide Operating System"
-msgstr ""
-
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:95
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:173
-#, c-format
-msgid "%s has set the topic to: %s"
-msgstr ""
-
-#: src/protocols/jabber/message.c:175
-#, c-format
-msgid "The topic is: %s"
-msgstr ""
-
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:181
 #, fuzzy
 msgid "Jabber Message Error"
 msgstr "የJabber ስህተት %s"
 
-#: src/protocols/jabber/message.c:288
+#: src/protocols/jabber/message.c:244
 #, c-format
 msgid " (Code %s)"
 msgstr ""
 
-#: src/protocols/jabber/parser.c:131
+#: src/protocols/jabber/parser.c:129
 msgid "XML Parse error"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:216
+#: src/protocols/jabber/presence.c:167
+#, c-format
+msgid "%s (Code %s)"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:172
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:219
+#: src/protocols/jabber/presence.c:176
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
-#, fuzzy
-msgid "Create New Room"
-msgstr "የውሪ ቤቶች"
-
-#: src/protocols/jabber/presence.c:274
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:276
-msgid "Configure Room"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:278
-msgid "Accept Defaults"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:298
-#, c-format
-msgid "Error in chat %s"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:301
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
-
-#: src/protocols/jabber/si.c:579
-#, c-format
-msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
-#, fuzzy
-msgid "File Send Failed"
-msgstr "ፋይልን ላክ"
-
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
+#: src/protocols/jabber/presence.c:253
+msgid "Unable to join chat"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:509
 msgid "Unable to request USR\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr ""
 
@@ -5791,15 +5155,15 @@
 msgid "Protocol version not supported"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:771
 msgid "Unable to request CVR\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:780
 msgid "Unable to request INF\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1889
 msgid "Got invalid XFR"
 msgstr ""
 
@@ -5807,20 +5171,27 @@
 msgid "Unable to transfer"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:192
+#: src/protocols/msn/dispatch.c:199
 msgid "Unable to parse message."
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
-#: src/protocols/msn/notification.c:1811
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2116 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
+#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+msgid "Unable to connect"
+msgstr ""
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:876
+#: src/protocols/msn/notification.c:2138
 msgid "Unable to write to server"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2145
 msgid "Syncing with server"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2159
 msgid "Error reading from server"
 msgstr ""
 
@@ -5917,12 +5288,12 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr ""
 
 #: src/protocols/msn/error.c:111
-msgid "Service Temporarily Unavailable"
+msgid "Internal server error"
 msgstr ""
 
 #: src/protocols/msn/error.c:114
@@ -5930,334 +5301,319 @@
 msgstr ""
 
 #: src/protocols/msn/error.c:117
-#, fuzzy
-msgid "Command disabled"
-msgstr "ትእዛዝ"
+msgid "File operation error"
+msgstr ""
 
 #: src/protocols/msn/error.c:120
-msgid "File operation error"
+msgid "Memory allocation error"
 msgstr ""
 
 #: src/protocols/msn/error.c:123
-msgid "Memory allocation error"
-msgstr ""
-
-#: src/protocols/msn/error.c:126
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:127
 msgid "Server busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:198
 msgid "Server unavailable"
 msgstr ""
 
+#: src/protocols/msn/error.c:133
+msgid "Peer Notification server down"
+msgstr ""
+
 #: src/protocols/msn/error.c:136
-msgid "Peer Notification server down"
-msgstr ""
-
-#: src/protocols/msn/error.c:139
 msgid "Database connect error"
 msgstr ""
 
-#: src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/error.c:150
+#: src/protocols/msn/error.c:147
 msgid "Error creating connection"
 msgstr ""
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:151
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:623
+#: src/protocols/msn/notification.c:1269 src/protocols/msn/notification.c:1437
 msgid "Unable to write"
 msgstr ""
 
+#: src/protocols/msn/error.c:157
+msgid "Session overload"
+msgstr ""
+
 #: src/protocols/msn/error.c:160
-msgid "Session overload"
+msgid "User is too active"
 msgstr ""
 
 #: src/protocols/msn/error.c:163
-msgid "User is too active"
-msgstr ""
-
-#: src/protocols/msn/error.c:166
 msgid "Too many sessions"
 msgstr ""
 
-#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/error.c:180
+#: src/protocols/msn/error.c:177
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: src/protocols/msn/error.c:189
+#: src/protocols/msn/error.c:186
 msgid "Server too busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:196
+#: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
 msgstr ""
 
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/error.c:208
+#: src/protocols/msn/error.c:205
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: src/protocols/msn/error.c:212
+#: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
 msgstr ""
 
-#: src/protocols/msn/error.c:215
-msgid "Bad ticket"
-msgstr ""
-
-#: src/protocols/msn/error.c:219
+#: src/protocols/msn/error.c:213
 #, fuzzy, c-format
 msgid "Unknown Error Code %d"
 msgstr "ያልታወቀ የስህተት ኮድ"
 
-#: src/protocols/msn/msn.c:71
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#: src/protocols/msn/msn.c:177
+msgid "Set your friendly name."
+msgstr ""
+
 #: src/protocols/msn/msn.c:178
-msgid "Set your friendly name."
-msgstr ""
-
-#: src/protocols/msn/msn.c:179
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr ""
 
+#: src/protocols/msn/msn.c:221
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
 #: src/protocols/msn/msn.c:222
-msgid "Allow MSN Mobile pages?"
-msgstr ""
-
-#: src/protocols/msn/msn.c:223
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
+#: src/protocols/msn/msn.c:226
+msgid "Allow"
+msgstr ""
+
 #: src/protocols/msn/msn.c:227
-msgid "Allow"
-msgstr ""
-
-#: src/protocols/msn/msn.c:228
 msgid "Disallow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr ""
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:246
 #, fuzzy
 msgid "Page"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:640
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:642
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2271
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:2704
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
+#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:644
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2273
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:646
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2281
-#: src/protocols/yahoo/yahoo.c:2606 src/protocols/yahoo/yahoo.c:2709
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
+#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:648
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
-#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "የተደበቀ"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:371
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:382
 #, fuzzy
 msgid "Set Mobile Phone Number"
 msgstr "የሞቢል ስልክ፦"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:399
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:425
+#: src/protocols/msn/msn.c:424
 #, fuzzy
 msgid "Send to Mobile"
 msgstr "ፋይልን ላክ"
 
-#: src/protocols/msn/msn.c:434
+#: src/protocols/msn/msn.c:433
 #, fuzzy
 msgid "Initiate Chat"
 msgstr "የጌም ማውሪያ"
 
-#: src/protocols/msn/msn.c:458
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-
-#: src/protocols/msn/msn.c:757
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
-#, fuzzy
-msgid "Invalid MSN screen name"
-msgstr "እስክሪን ስም"
-
-#: src/protocols/msn/msn.c:797
+"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:731 src/protocols/msn/msn.c:771
+msgid "Invalid MSN screenname"
+msgstr ""
+
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
+"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:1242 src/protocols/yahoo/yahoo.c:2582
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1374 src/protocols/oscar/oscar.c:4145
-#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2998
+#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:3931
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2693
 #, fuzzy
 msgid "Age"
 msgstr "ዕድሜ፦"
 
 #. Gender
-#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
-#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:3006
+#: src/protocols/msn/msn.c:1317 src/protocols/oscar/oscar.c:3917
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2705
 msgid "Gender"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
+#: src/protocols/msn/msn.c:1325 src/protocols/yahoo/yahoo.c:2699
 msgid "Marital Status"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2687
 #, fuzzy
 msgid "Location"
 msgstr "አካባቢ"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/msn.c:1340 src/protocols/yahoo/yahoo.c:2711
 #, fuzzy
 msgid "Occupation"
 msgstr "/ምርጫዎች (_O)"
 
-#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1441
-#: src/protocols/msn/msn.c:1448
+#: src/protocols/msn/msn.c:1357 src/protocols/msn/msn.c:1363
+#: src/protocols/msn/msn.c:1370 src/protocols/msn/msn.c:1377
+#: src/protocols/msn/msn.c:1384
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
-#: src/protocols/msn/msn.c:1477
+#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1406
+#: src/protocols/msn/msn.c:1413
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1428
+#: src/protocols/msn/msn.c:1435
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
-#: src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/msn/msn.c:1444 src/protocols/msn/msn.c:1450
+#: src/protocols/yahoo/yahoo.c:2755
 msgid "Favorite Quote"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/msn/msn.c:1458 src/protocols/yahoo/yahoo.c:2799
 #, fuzzy
 msgid "Last Updated"
 msgstr "የአባት ስም"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:457
+#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
+#: src/protocols/msn/msn.c:1491 src/protocols/yahoo/yahoo.c:2817
 #, c-format
 msgid "User information for %s unavailable"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
+#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo.c:2819
 msgid "The user's profile is empty."
 msgstr ""
 
@@ -6271,90 +5627,83 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
+#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1593
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
+#: src/protocols/msn/msn.c:1612 src/protocols/trepia/trepia.c:1330
 #, fuzzy
 msgid "Login server"
 msgstr "ሰርቨርን የለም"
 
-#: src/protocols/msn/msn.c:1684
-msgid "Use HTTP Method"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1702
-msgid "Display conversation closed notices"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1707
-msgid "Display timeout notices"
-msgstr ""
-
-#: src/protocols/msn/nexus.c:56
-#, fuzzy
-msgid "Unable to connect to server"
-msgstr "ተገናኝቷል"
-
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr ""
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr ""
-
-#: src/protocols/msn/nexus.c:204
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr ""
-
-#: src/protocols/msn/notification.c:215
+#: src/protocols/msn/notification.c:247
 #, fuzzy, c-format
 msgid "MSN Error: %s\n"
 msgstr "ስህተት %s፦ %s"
 
-#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:366 src/protocols/msn/notification.c:534
+msgid "Unable to write to MSN Nexus server."
+msgstr ""
+
+#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:549
+msgid "Unable to read from MSN Nexus server."
+msgstr ""
+
+#: src/protocols/msn/notification.c:395
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr ""
+
+#: src/protocols/msn/notification.c:448
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr ""
+
+#: src/protocols/msn/notification.c:560
+msgid "MSN Nexus server returned invalid information."
+msgstr ""
+
+#: src/protocols/msn/notification.c:628 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr ""
 
-#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/msn/notification.c:690
+msgid "Unable to connect to passport server"
+msgstr ""
+
+#: src/protocols/msn/notification.c:695 src/protocols/msn/notification.c:727
 msgid "Password sent"
 msgstr ""
 
-#: src/protocols/msn/notification.c:367
+#: src/protocols/msn/notification.c:722
 msgid "Unable to send password"
 msgstr ""
 
-#: src/protocols/msn/notification.c:403
+#: src/protocols/msn/notification.c:758
 msgid "Protocol not supported"
 msgstr ""
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:800
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 
-#: src/protocols/msn/notification.c:450
+#: src/protocols/msn/notification.c:805
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr ""
 
-#: src/protocols/msn/notification.c:577
+#: src/protocols/msn/notification.c:931
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1250 src/protocols/msn/notification.c:1416
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/msn/notification.c:1596
+#: src/protocols/msn/notification.c:1931
 msgid "Unable to transfer to notification server"
 msgstr ""
 
-#: src/protocols/msn/notification.c:1752
+#: src/protocols/msn/notification.c:2079
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6373,20 +5722,16 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/servconn.c:536
-msgid "Received HTTP error. Please report this."
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:154
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:285
+#: src/protocols/msn/switchboard.c:277
 msgid "An MSN message may not have been received."
 msgstr ""
 
@@ -6432,1101 +5777,9 @@
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "መረጃ አግኝ"
-
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
-#: src/protocols/toc/toc.c:1259
-msgid "_Group:"
-msgstr "መድረክ፦ (_G)"
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
-msgid "NAPSTER Protocol Plugin"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:181
-msgid "Invalid error"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:182
-msgid "Invalid SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Rate to host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:193
-msgid "Responses lost"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:194
-msgid "Request denied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:195
-msgid "Busted SNAC payload"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:196
-msgid "Insufficient rights"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:197
-msgid "In local permit/deny"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:198
-msgid "Too evil (sender)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:199
-msgid "Too evil (receiver)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:200
-msgid "User temporarily unavailable"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:201
-msgid "No match"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:202
-msgid "List overflow"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:203
-msgid "Request ambiguous"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:204
-msgid "Queue full"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:205
-msgid "Not while on AOL"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:520
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:522
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:609
-msgid "Chat is currently unavailable"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
-msgid "Couldn't connect to host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:690
-#, fuzzy
-msgid "Screen name sent"
-msgstr "እስክሪን ስም"
-
-#: src/protocols/oscar/oscar.c:705
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:734
-msgid "Unable to login to AIM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
-msgid "Could Not Connect"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:846
-msgid "Connection established, cookie sent"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:959 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
-msgid "Unable to establish file descriptor."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:964
-msgid "Unable to create new connection."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1035
-msgid "Unable to establish listener socket."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
-msgid "Incorrect nickname or password."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1145
-msgid "Your account is currently suspended."
-msgstr ""
-
-#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1149
-msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1154
-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/oscar/oscar.c:1159
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1191
-msgid "Internal Error"
-msgstr "የውስጥ ብልሽት"
-
-#: src/protocols/oscar/oscar.c:1263
-msgid "Received authorization"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
-#: src/protocols/oscar/oscar.c:1417
-#, 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:1302 src/protocols/oscar/oscar.c:1332
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1420
-msgid "Gaim was unable to get a valid login hash."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5906
-#, c-format
-msgid "Direct IM with %s established"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
-msgid "(There was an error receiving this message)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2504
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2507
-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:2512 src/protocols/oscar/oscar.c:6288
-msgid "Connect"
-msgstr "አገናኝ"
-
-#: src/protocols/oscar/oscar.c:2539
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2547
-msgid "Authorization Request Message:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2548
-msgid "Please authorize me!"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2577
-#, 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:2582 src/protocols/oscar/oscar.c:2584
-msgid "Request Authorization"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2705
-#: src/protocols/oscar/oscar.c:2725 src/protocols/oscar/oscar.c:3081
-#: src/protocols/oscar/oscar.c:3141 src/protocols/oscar/oscar.c:5366
-#: src/protocols/oscar/oscar.c:5412
-msgid "No reason given."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2628
-msgid "Authorization Denied Message:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2705
-#, c-format
-msgid ""
-"The user %u wants to add you to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
-msgid "Authorization Request"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2725
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2726
-msgid "ICQ authorization denied."
-msgstr ""
-
-#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2733
-#, c-format
-msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2741
-#, c-format
-msgid ""
-"You have received a special message\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2749
-#, c-format
-msgid ""
-"You have received an ICQ page\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2757
-#, c-format
-msgid ""
-"You have received an ICQ email from %s [%s]\n"
-"\n"
-"Message is:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2778
-#, c-format
-msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2784
-msgid "Do you want to add this buddy to your buddy list?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2788
-msgid "Decline"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2870
-#, c-format
-msgid "You missed %hu message from %s because it was invalid."
-msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:2879
-#, c-format
-msgid "You missed %hu message from %s because it was too large."
-msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:2888
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:2897
-#, c-format
-msgid "You missed %hu message from %s because he/she was too evil."
-msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:2906
-#, c-format
-msgid "You missed %hu message from %s because you are too evil."
-msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:2915
-#, c-format
-msgid "You missed %hu message from %s for an unknown reason."
-msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
-#: src/protocols/oscar/oscar.c:6414
-msgid "Free For Chat"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
-#: src/protocols/oscar/oscar.c:6412
-msgid "Not Available"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
-#: src/protocols/oscar/oscar.c:6413
-msgid "Occupied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2941
-msgid "Web Aware"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2984
-#, 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:3043
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3044
-msgid "Unknown error"
-msgstr "ያልታወቀ ስህተት"
-
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3079
-#, c-format
-msgid "Your message to %s did not get sent:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3138
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3177
-msgid "Voice"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3180
-msgid "AIM Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3183
-msgid "Chat"
-msgstr "ውሪ"
-
-#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6523
-msgid "Get File"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3193
-msgid "Games"
-msgstr "ጨዋታዎች"
-
-#: src/protocols/oscar/oscar.c:3196
-msgid "Add-Ins"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3199
-msgid "Send Buddy List"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3202
-msgid "ICQ Direct Connect"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3205
-msgid "AP User"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3208
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3211
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3214
-msgid "ICQ Server Relay"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3217
-#, fuzzy
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3220
-msgid "Trillian Encryption"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3223
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3226
-#, fuzzy
-msgid "Hiptop"
-msgstr "ታሪክ"
-
-#: src/protocols/oscar/oscar.c:3229
-msgid "Security Enabled"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3232
-#, fuzzy
-msgid "Video Chat"
-msgstr "ውሪ"
-
-#: src/protocols/oscar/oscar.c:3236
-#, fuzzy
-msgid "iChat AV"
-msgstr "ውሪ"
-
-#: src/protocols/oscar/oscar.c:3239
-msgid "Live Video"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3242
-#, fuzzy
-msgid "Camera"
-msgstr "ስም"
-
-#: src/protocols/oscar/oscar.c:3271
-#, fuzzy, c-format
-msgid "Username: <b>%s</b><br>\n"
-msgstr "<b>ሁኔታ፦</b> %s"
-
-#: src/protocols/oscar/oscar.c:3272
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3275
-#, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3279
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3284
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3287
-msgid "Idle: <b>Active</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3359
-msgid "Your AIM connection may be lost."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3760
-msgid "Rate limiting error."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3761
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3824
-msgid ""
-"You have been disconnected because you have signed on with this screen name "
-"at another location."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3826
-msgid "You have been signed off for an unknown reason."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3857
-msgid "Finalizing connection"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
-#, fuzzy
-msgid "Email Address"
-msgstr "ኢሜያል አድራሻ"
-
-#: src/protocols/oscar/oscar.c:4128
-#, fuzzy
-msgid "Mobile Phone"
-msgstr "የሞቢል ስልክ፦"
-
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:422
-msgid "Female"
-msgstr "ሴት"
-
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:422
-msgid "Male"
-msgstr "ወንድ"
-
-#: src/protocols/oscar/oscar.c:4148
-#, fuzzy
-msgid "Personal Web Page"
-msgstr "ድረ-ገጽ፦"
-
-#: src/protocols/oscar/oscar.c:4151
-#, fuzzy
-msgid "Additional Information"
-msgstr "የቢሮ መረጃ፦"
-
-#: src/protocols/oscar/oscar.c:4155
-#, fuzzy
-msgid "Home Address"
-msgstr "የቤት አድራሻ፦"
-
-#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
-msgid "Zip Code"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4171
-#, fuzzy
-msgid "Work Address"
-msgstr "የቢሮ አድራሻ፦"
-
-#: src/protocols/oscar/oscar.c:4187
-#, fuzzy
-msgid "Work Information"
-msgstr "የቢሮ መረጃ፦"
-
-#: src/protocols/oscar/oscar.c:4189
-#, fuzzy
-msgid "Company"
-msgstr "ትእዛዝ"
-
-#: src/protocols/oscar/oscar.c:4192
-msgid "Division"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4195
-#, fuzzy
-msgid "Position"
-msgstr "ቦታ፦"
-
-#: src/protocols/oscar/oscar.c:4198
-#, fuzzy
-msgid "Web Page"
-msgstr "ድረ-ገጽ፦"
-
-#: src/protocols/oscar/oscar.c:4204
-#, c-format
-msgid "ICQ Info for %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4254
-#, fuzzy
-msgid "Pop-Up Message"
-msgstr "አዲስ መልእክት"
-
-#: src/protocols/oscar/oscar.c:4275
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4279
-msgid "Search Results"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4296
-#, c-format
-msgid "No results found for email address %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4317
-#, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4319
-msgid "Account Confirmation Requested"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4347
-msgid "Error Changing Account Info"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4350
-#, 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:4353
-#, 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:4356
-#, 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:4359
-#, 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:4362
-#, 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:4365
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4368
-#, c-format
-msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4378
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
-msgid "Account Info"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4384
-#, c-format
-msgid "The email address for %s is %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4616
-msgid "Unable to set AIM profile."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4617
-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:4644
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:4649
-msgid "Profile too long."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6418
-msgid "Visible"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4676
-msgid "Unable to set AIM away message."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4677
-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:4717
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:4722
-msgid "Away message too long."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4815
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
-#: src/protocols/oscar/oscar.c:5246
-msgid "Unable To Add"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4952
-msgid "Unable To Retrieve Buddy List"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4953
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5129 src/protocols/oscar/oscar.c:5130
-#: src/protocols/oscar/oscar.c:5135 src/protocols/oscar/oscar.c:5290
-#: src/protocols/oscar/oscar.c:5291 src/protocols/oscar/oscar.c:5296
-msgid "Orphans"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5232
-#, 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:5232 src/protocols/oscar/oscar.c:5245
-msgid "(no name)"
-msgstr "(ስም የለም)"
-
-#: src/protocols/oscar/oscar.c:5245
-#, 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:5327
-#, 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:5333
-msgid "Authorization Given"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5366
-#, c-format
-msgid ""
-"The user %s wants to add you to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-
-#. Granted
-#: src/protocols/oscar/oscar.c:5408
-#, c-format
-msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5409
-msgid "Authorization Granted"
-msgstr ""
-
-#. Denied
-#: src/protocols/oscar/oscar.c:5412
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5413
-msgid "Authorization Denied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
-#, fuzzy
-msgid "_Exchange:"
-msgstr "ለውጥ"
-
-#: src/protocols/oscar/oscar.c:5472
-msgid "Invalid chat name specified."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5703
-#, fuzzy
-msgid "<b>Status:</b> "
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:5715
-msgid "<b>IP Address:</b> "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5723
-#, fuzzy
-msgid "<b>Capabilities:</b> "
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:5732
-msgid "<b>Buddy Comment:</b> "
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5741
-#, fuzzy
-msgid "<b>Available:</b> "
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#: src/protocols/oscar/oscar.c:5760
-#, fuzzy
-msgid "<b>Away Message:</b> "
-msgstr ""
-"\n"
-"<b>ቅጽል ስም፦</b>"
-
-#: src/protocols/oscar/oscar.c:5768
-#, fuzzy
-msgid "<b>Status:</b> Not Authorized"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-#: src/protocols/oscar/oscar.c:5802 src/protocols/yahoo/yahoo.c:2293
-#, fuzzy
-msgid "Offline"
-msgstr "ኦንላይን"
-
-#: src/protocols/oscar/oscar.c:6268
-msgid "Unable to open Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6281
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6284
-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:6468
-msgid "Buddy Comment:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6484
-msgid "Edit Buddy Comment"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6492
-msgid "Get Status Msg"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6507
-msgid "Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6536
-msgid "Re-request Authorization"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6557
-msgid "The new formatting is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6558
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6564
-msgid "New screen name formatting:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6613
-#, fuzzy
-msgid "Change Address To:"
-msgstr "የቤት አድራሻ፦"
-
-#: src/protocols/oscar/oscar.c:6657
-msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6660
-msgid "You are awaiting authorization from the following buddies"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6661
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6675
-msgid "Find Buddy by E-mail"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6676
-msgid "Search for a buddy by e-mail address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6677
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6694
-#, fuzzy
-msgid "Available Message:"
-msgstr "አዲስ መልእክት"
-
-#: src/protocols/oscar/oscar.c:6695
-msgid "I'm doing work and hoping for a distraction--IM me!"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6766
-msgid "Set User Info..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6773
-#, fuzzy
-msgid "Set Available Message..."
-msgstr "አዲስ መልእክት"
-
-#: src/protocols/oscar/oscar.c:6780
-#, fuzzy
-msgid "Change Password..."
-msgstr "ሚስጢራዊ ቃልን ለውጥ"
-
-#: src/protocols/oscar/oscar.c:6787
-msgid "Change Password (URL)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6795
-msgid "Configure IM Forwarding (URL)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6806
-#, fuzzy
-msgid "Format Screen Name..."
-msgstr "እስክሪን ስም"
-
-#: src/protocols/oscar/oscar.c:6812
-msgid "Confirm Account"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6818
-msgid "Display Currently Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6824
-msgid "Change Currently Registered Address..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6833
-msgid "Show Buddies Awaiting Authorization"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6841
-msgid "Search for Buddy by Email..."
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
+#: src/protocols/toc/toc.c:1258
+msgid "Join what group:"
 msgstr ""
 
 #. *< api_version
@@ -7539,16 +5792,1036 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:6964
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+msgid "NAPSTER Protocol Plugin"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:175
+msgid "Invalid error"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:176
+msgid "Invalid SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:177
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:178
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:184
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:186
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:187
+msgid "Responses lost"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:188
+msgid "Request denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:190
+msgid "Insufficient rights"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:191
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:192
+msgid "Too evil (sender)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:193
+msgid "Too evil (receiver)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:194
+msgid "User temporarily unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:195
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:196
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:198
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:199
+msgid "Not while on AOL"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:470
+#, c-format
+msgid "Direct IM with %s closed"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:472
+#, c-format
+msgid "Direct IM with %s failed"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
+msgid "Disconnected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:559
+msgid "Chat is currently unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
+msgid "Couldn't connect to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:675
+msgid "Unable to login to AIM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
+msgid "Could Not Connect"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:785
+msgid "Connection established, cookie sent"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
+msgid "File Transfer Aborted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:853
+msgid "Unable to establish listener socket."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:866
+msgid "Unable to establish file descriptor."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:871
+msgid "Unable to create new connection."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
+msgid "Incorrect nickname or password."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1056
+msgid "Your account is currently suspended."
+msgstr ""
+
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:1060
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1065
+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/oscar/oscar.c:1070
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1102
+msgid "Internal Error"
+msgstr "የውስጥ ብልሽት"
+
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
+#, 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:1207 src/protocols/oscar/oscar.c:1237
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1325
+msgid "Gaim was Unable to get a valid login hash."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
+#, c-format
+msgid "Direct IM with %s established"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
+msgid "(There was an error receiving this message)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2403
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2406
+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:2411 src/protocols/oscar/oscar.c:5941
+msgid "Connect"
+msgstr "አገናኝ"
+
+#: src/protocols/oscar/oscar.c:2438
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2446
+msgid "Authorization Request Message:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2447
+msgid "Please authorize me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2475
+#, 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:2480 src/protocols/oscar/oscar.c:2482
+msgid "Request Authorization"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
+msgid "No reason given."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2526
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2599
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
+msgid "Authorization Request"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2619
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2620
+msgid "ICQ authorization denied."
+msgstr ""
+
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2635
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2643
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2651
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2682
+msgid "Decline"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2764
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:2773
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:2782
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:2791
+#, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgid_plural "You missed %hu messages from %s because he/she was too evil."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:2800
+#, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgid_plural "You missed %hu messages from %s because you are too evil."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:2809
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
+#: src/protocols/oscar/oscar.c:6068
+msgid "Free For Chat"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:6066
+msgid "Not Available"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
+#: src/protocols/oscar/oscar.c:6067
+msgid "Occupied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2835
+msgid "Web Aware"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2878
+#, 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:2937
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2938
+msgid "Unknown error"
+msgstr "ያልታወቀ ስህተት"
+
+#. Data is assumed to be the destination sn
+#: src/protocols/oscar/oscar.c:2973
+#, c-format
+msgid "Your message to %s did not get sent:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3070
+msgid "Voice"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3073
+msgid "AIM Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
+msgid "Get File"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
+msgid "Send File"
+msgstr "ፋይልን ላክ"
+
+#: src/protocols/oscar/oscar.c:3086
+msgid "Games"
+msgstr "ጨዋታዎች"
+
+#: src/protocols/oscar/oscar.c:3089
+msgid "Add-Ins"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3092
+msgid "Send Buddy List"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3095
+msgid "ICQ Direct Connect"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3098
+msgid "AP User"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3101
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:3104
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:3107
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3110
+#, fuzzy
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3113
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3116
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3119
+#, fuzzy
+msgid "Hiptop"
+msgstr "ታሪክ"
+
+#: src/protocols/oscar/oscar.c:3122
+msgid "Secure IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3151
+#, fuzzy, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+#: src/protocols/oscar/oscar.c:3152
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3155
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3159
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3164
+#, c-format
+msgid "Idle: <b>%s</b>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3167
+msgid "Idle: <b>Active</b>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3206
+msgid "Your AIM connection may be lost."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3594
+msgid "Rate limiting error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3595
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3656
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3658
+msgid "You have been signed off for an unknown reason."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
+#, fuzzy
+msgid "Email Address"
+msgstr "ኢሜያል አድራሻ"
+
+#: src/protocols/oscar/oscar.c:3914
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "የሞቢል ስልክ፦"
+
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
+msgid "Female"
+msgstr "ሴት"
+
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
+msgid "Male"
+msgstr "ወንድ"
+
+#: src/protocols/oscar/oscar.c:3934
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "ድረ-ገጽ፦"
+
+#: src/protocols/oscar/oscar.c:3937
+#, fuzzy
+msgid "Additional Information"
+msgstr "የቢሮ መረጃ፦"
+
+#: src/protocols/oscar/oscar.c:3941
+#, fuzzy
+msgid "Home Address"
+msgstr "የቤት አድራሻ፦"
+
+#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
+msgid "Zip Code"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3957
+#, fuzzy
+msgid "Work Address"
+msgstr "የቢሮ አድራሻ፦"
+
+#: src/protocols/oscar/oscar.c:3973
+#, fuzzy
+msgid "Work Information"
+msgstr "የቢሮ መረጃ፦"
+
+#: src/protocols/oscar/oscar.c:3975
+#, fuzzy
+msgid "Company"
+msgstr "ትእዛዝ"
+
+#: src/protocols/oscar/oscar.c:3978
+msgid "Division"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3981
+#, fuzzy
+msgid "Position"
+msgstr "ቦታ፦"
+
+#: src/protocols/oscar/oscar.c:3984
+#, fuzzy
+msgid "Web Page"
+msgstr "ድረ-ገጽ፦"
+
+#: src/protocols/oscar/oscar.c:3990
+#, c-format
+msgid "ICQ Info for %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4040
+#, fuzzy
+msgid "Pop-Up Message"
+msgstr "አዲስ መልእክት"
+
+#: src/protocols/oscar/oscar.c:4061
+#, c-format
+msgid "The following screennames are associated with %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4065
+msgid "Search Results"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4082
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4103
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4105
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4133
+msgid "Error Changing Account Info"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4136
+#, 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:4139
+#, 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:4142
+#, 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:4145
+#, 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:4148
+#, 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:4151
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4154
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4164
+#, c-format
+msgid ""
+"Your screen name is currently formatted as follows:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
+msgid "Account Info"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4170
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4400
+msgid "Unable to set AIM profile."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4401
+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:4431
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:4436
+msgid "Profile too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4455
+msgid "Unable to set AIM away message."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4456
+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:4496
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocols/oscar/oscar.c:4501
+msgid "Away message too long."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4721
+msgid "Unable To Retrieve Buddy List"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4722
+msgid ""
+"Gaim was temporarily unable to retrieve your buddy list from the AIM "
+"servers.  Your buddy list is not lost, and will probably become available in "
+"a few hours."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
+#: src/protocols/oscar/oscar.c:4819
+msgid "Orphans"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4985
+#, 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:4985 src/protocols/oscar/oscar.c:4998
+msgid "(no name)"
+msgstr "(ስም የለም)"
+
+#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
+msgid "Unable To Add"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4998
+#, 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:5033
+#, 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:5039
+msgid "Authorization Given"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5072
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
+"%s"
+msgstr ""
+
+#. Granted
+#: src/protocols/oscar/oscar.c:5114
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5115
+msgid "Authorization Granted"
+msgstr ""
+
+#. Denied
+#: src/protocols/oscar/oscar.c:5118
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5119
+msgid "Authorization Denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
+msgid "Exchange:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5379
+#, fuzzy
+msgid "<b>Status:</b> "
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:5388
+msgid "<b>Logged In:</b> "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5400
+msgid "<b>IP Address:</b> "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5408
+#, 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:5431
+#, fuzzy
+msgid "<b>Away Message:</b> "
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+#: src/protocols/oscar/oscar.c:5440
+#, fuzzy
+msgid "<b>Status:</b> Not Authorized"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2030
+#, fuzzy
+msgid "Offline"
+msgstr "ኦንላይን"
+
+#: src/protocols/oscar/oscar.c:5921
+msgid "Unable to open Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5934
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5937
+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:6112
+msgid "Buddy Comment:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6128
+msgid "Edit Buddy Comment"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6136
+msgid "Get Status Msg"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6151
+msgid "Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6180
+msgid "Re-request Authorization"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6201
+msgid "The new formatting is invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6202
+msgid "Screenname formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6208
+msgid "New screenname formatting:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6257
+#, fuzzy
+msgid "Change Address To:"
+msgstr "የቤት አድራሻ፦"
+
+#: src/protocols/oscar/oscar.c:6301
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6304
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6305
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6319
+msgid "Find Buddy by E-mail"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6320
+msgid "Search for a buddy by e-mail address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6321
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6324
+msgid "Search"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6337
+#, fuzzy
+msgid "Available Message:"
+msgstr "አዲስ መልእክት"
+
+#: src/protocols/oscar/oscar.c:6415
+msgid "Set Available Message"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6429
+msgid "Change Password (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6437
+msgid "Configure IM Forwarding (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6448
+msgid "Format Screenname"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6454
+msgid "Confirm Account"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6460
+msgid "Display Current Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6466
+msgid "Change Current Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6475
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6483
+msgid "Search for Buddy by Email"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:6623
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6986
+#: src/protocols/oscar/oscar.c:6628
 msgid "Auth port"
 msgstr ""
 
@@ -7698,44 +6971,44 @@
 "is only temporary, please be patient."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1908
+msgid "Could not connect for transfer!"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr ""
-
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -7750,90 +7023,94 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2177
 #, fuzzy
 msgid "TOC host"
 msgstr "የTOC እንግዳ ተቀባይ"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2181
 #, fuzzy
 msgid "TOC port"
 msgstr "የTOC ፖርት፦"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:263
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr ""
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:294
+#: src/protocols/trepia/trepia.c:285
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:291
 #, fuzzy
 msgid "Profile Information"
 msgstr "የቢሮ መረጃ፦"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:306
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr ""
 
 #. AIM
-#: src/protocols/trepia/trepia.c:310
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr ""
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:314
+#: src/protocols/trepia/trepia.c:305
 #, fuzzy
 msgid "ICQ UIN"
 msgstr "ICQ UTF8"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr ""
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:322
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr ""
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:327
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:344
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:468
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:490
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:526
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:872 src/protocols/trepia/trepia.c:875
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:1078
+#: src/protocols/trepia/trepia.c:962
+#, fuzzy
+msgid "Read error"
+msgstr "የIRC ስህተት"
+
+#: src/protocols/trepia/trepia.c:1063
 #, fuzzy
 msgid "Logging in"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
@@ -7848,47 +7125,31 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:308
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:700
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:765
-msgid "Buzz!!"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:800
-#, c-format
-msgid "Yahoo! system message for %s:"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:758
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:761
 msgid "Add buddy rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1595
+#: src/protocols/yahoo/yahoo.c:1381
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7896,166 +7157,151 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1598
+#: src/protocols/yahoo/yahoo.c:1384
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1671
+#: src/protocols/yahoo/yahoo.c:1457
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1460
 #, fuzzy
 msgid "Ignore buddy?"
 msgstr "ተዉት"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1489
 msgid "Invalid username."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1710
+#: src/protocols/yahoo/yahoo.c:1492
 msgid "Incorrect password."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1713
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1716
-#, fuzzy, c-format
-msgid "Unknown error number %d."
-msgstr "ያልታወቀ የስህተት ኮድ"
-
-#: src/protocols/yahoo/yahoo.c:1773
+#: src/protocols/yahoo/yahoo.c:1495
+#, fuzzy
+msgid "Unknown error."
+msgstr "ያልታወቀ ስህተት"
+
+#: src/protocols/yahoo/yahoo.c:1542
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1775
+#: src/protocols/yahoo/yahoo.c:1544
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
 msgid "Unable to read"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2148
-#: src/protocols/yahoo/yahoo.c:2191 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
+#: src/protocols/yahoo/yahoo.c:1934
 #, fuzzy
 msgid "Connection problem"
 msgstr "ተገናኝቷል"
 
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
+#: src/protocols/yahoo/yahoo.c:2408
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
-#: src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2409
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not In Office"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
-#: src/protocols/yahoo/yahoo.c:2710
+#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
 #, fuzzy
 msgid "Not on server list"
 msgstr "ሰርቨርን የለም"
 
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2178
 #, fuzzy
 msgid "Join in Chat"
 msgstr "ውሪን አገጣጥም"
 
-#: src/protocols/yahoo/yahoo.c:2445
+#: src/protocols/yahoo/yahoo.c:2184
 #, fuzzy
 msgid "Initiate Conference"
 msgstr "የጌም ማውሪያ"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2230
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2506
-#, fuzzy
-msgid "Join who in chat?"
-msgstr "ውሪን አገጣጥም"
-
-#: src/protocols/yahoo/yahoo.c:2517
-msgid "Activate ID..."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2523
-#, fuzzy
-msgid "Join user in chat..."
-msgstr "ውሪ አገጣጥም..."
-
-#: src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2241
+msgid "Activate ID"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2599
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2928
+#: src/protocols/yahoo/yahoo.c:2619
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2976 src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2664
 msgid "Yahoo! ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
+#: src/protocols/yahoo/yahoo.c:2732
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
+#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
 #, fuzzy
 msgid "Latest News"
 msgstr "የአባት ስም"
 
-#: src/protocols/yahoo/yahoo.c:3053
+#: src/protocols/yahoo/yahoo.c:2765
 #, fuzzy
 msgid "Home Page"
 msgstr "ድረ-ገጽ፦"
 
-#: src/protocols/yahoo/yahoo.c:3065
+#: src/protocols/yahoo/yahoo.c:2779
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3069
+#: src/protocols/yahoo/yahoo.c:2784
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3071
+#: src/protocols/yahoo/yahoo.c:2787
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3077
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Member Since"
 msgstr ""
 
@@ -8069,141 +7315,90 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
+#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3302
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3305
+#: src/protocols/yahoo/yahoo.c:2982
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3308
-msgid "File transfer host"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3311
-msgid "File transfer port"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3314
-#, fuzzy
-msgid "Chat Room List Url"
-msgstr "የውሪ ቤቶች"
-
-#: src/protocols/yahoo/yahoo_filexfer.c:200
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Failed to join chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Maybe the room is full?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:426
-#, c-format
-msgid "You are now chatting in %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:531
 msgid "Failed to join buddy in chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:532
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1301
-msgid "Unable to connect"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1301
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1346
-msgid "Voices"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1349
-msgid "Webcams"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
-msgid "Unable to fetch room list."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1414
-#, fuzzy
-msgid "User Rooms"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#: src/protocols/zephyr/zephyr.c:525
+#: src/protocols/zephyr/zephyr.c:344
 #, fuzzy, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/protocols/zephyr/zephyr.c:527
+#: src/protocols/zephyr/zephyr.c:346
 #, fuzzy, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>ሁኔታ፦</b> %s"
 
-#: src/protocols/zephyr/zephyr.c:529
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:533
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
-#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:820
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:821
+#: src/protocols/zephyr/zephyr.c:610
 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:1158
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1198
-msgid "_Class:"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1203
-msgid "_Instance:"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1208
-msgid "_Recipient:"
+#: src/protocols/zephyr/zephyr.c:908
+msgid "Class:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:913
+msgid "Instance:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:918
+msgid "Recipient:"
 msgstr ""
 
 #. *< api_version
@@ -8216,215 +7411,137 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1377
-msgid "Export to .anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1380
-msgid "Export to .zephyr.subs"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1383
-msgid "Exposure"
-msgstr ""
-
-#. Forbidden
-#: src/proxy.c:954
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr ""
-
-#: src/proxy.c:956
-#, fuzzy, c-format
-msgid "Proxy connection error %d"
-msgstr "ተገናኝቷል"
-
-#: src/proxy.c:1695
+#: src/proxy.c:1681
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: src/proxy.c:1695
+#: src/proxy.c:1681
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:189
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "የተለየ"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1247
+#: src/request.h:862
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:58
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr ""
 
-#: src/server.c:960
+#: src/server.c:949
 #, fuzzy, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d መልዕክቶች)"
 msgstr[1] "(%d መልዕክቶች)"
 
-#: src/server.c:974
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 መልዕክት)"
 
-#: src/server.c:1161 src/server.c:1171
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr ""
 
-#: src/server.c:1188 src/server.c:1196
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr ""
 
-#: src/server.c:1243
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1246
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr ""
 
-#: src/server.c:1349
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1353
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr ""
 
-#: src/server.c:1359
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr ""
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:36
+#: src/status.c:35
 msgid "Sorry, I ran out for a bit!"
 msgstr ""
 
-#: src/stock.c:86
-msgid "_Alias"
-msgstr ""
-
-#: src/stock.c:88
+#: src/stock.c:84
 msgid "_Modify"
 msgstr "ለውጡ (_M)"
 
-#: src/stock.c:89
+#: src/stock.c:85
 #, fuzzy
 msgid "_Open Mail"
 msgstr "እሜይልን ክፈት"
 
-#: src/stock.c:91
-msgid "_Warn"
-msgstr ""
-
-#: src/util.c:1884
+#: src/util.c:1527
 msgid "Calculating..."
 msgstr ""
 
-#: src/util.c:1887
+#: src/util.c:1530
 msgid "Unknown."
 msgstr "ያልታወቀ።"
 
-#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ቀን"
 msgstr[1] "ቀን"
 
-#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ሰዓት"
 msgstr[1] "ሰዓት"
 
-#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ደቂቃ"
 msgstr[1] "ደቂቃ"
 
-#: src/util.c:2274
+#: src/util.c:1917
 msgid "g003: Error opening connection.\n"
 msgstr ""
 
-#: src/win32/win32dep.c:272
-msgid "Moving Gaim Settings.."
-msgstr ""
-
-#: src/win32/win32dep.c:275
-msgid "Moving Gaim user settings to: "
-msgstr ""
-
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:474
 msgid "Notification"
 msgstr ""
 
-#~ msgid "(No"
-#~ msgstr "(አይ"
-
-#~ msgid "_Screenname:"
-#~ msgstr "እስክሪን ስም፦ (_S)"
-
-#, fuzzy
-#~ msgid "Log"
-#~ msgstr "ዝምብለህ ይግባ"
-
-#~ msgid "Clear"
-#~ msgstr "ሰርዝ"
-
-#~ msgid "Gaim - Information"
-#~ msgstr "ጌም - መረጃ"
-
-#, fuzzy
-#~ msgid "Add a new group"
-#~ msgstr "መድረክ ጨምር"
-
-#~ msgid "Gaim - Insert Image"
-#~ msgstr "ጌም - ምስል አስገባ"
-
-#~ msgid "_Host"
-#~ msgstr "እንግዳ ተቀባይ (_H)"
-
-#~ msgid "Pa_ssword"
-#~ msgstr "ሚስጢራዊ ቃል (_S)"
-
-#~ msgid "Browser Options"
-#~ msgstr "የመቃኛ ምርጫዎች"
-
-#~ msgid "Gaim - Save Icon"
-#~ msgstr "ጌም -  ምልክትን አስቀምጥ"
-
-#, fuzzy
-#~ msgid "Disconnected"
-#~ msgstr "ተገናኝቷል"
-
-#, fuzzy
-#~ msgid "Unknown error."
-#~ msgstr "ያልታወቀ ስህተት"
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Event Test"
@@ -8433,6 +7550,13 @@
 #~ msgid "Appl_y"
 #~ msgstr "ተጠቀም (_Y)"
 
+#, fuzzy
+#~ msgid "User"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#~ msgid "IRC Error"
+#~ msgstr "የIRC ስህተት"
+
 #~ msgid "IRC CTCP info"
 #~ msgstr "የIRC CTCP መረጃ"
 
@@ -8454,6 +7578,9 @@
 #~ msgid "First Name:"
 #~ msgstr "ስም፦"
 
+#~ msgid "Last Name:"
+#~ msgstr "የአባት ስም፦"
+
 #~ msgid "Birthday:"
 #~ msgstr "የልደት በዓል፦"
 
@@ -8466,9 +7593,15 @@
 #~ msgid "State:"
 #~ msgstr "ሁኔታ፦"
 
+#~ msgid "_Group:"
+#~ msgstr "መድረክ፦ (_G)"
+
 #~ msgid "Group"
 #~ msgstr "መድረክ"
 
+#~ msgid "Screenname"
+#~ msgstr "እስክሪን ስም"
+
 #, fuzzy
 #~ msgid "Gaim - Popup"
 #~ msgstr "ጌም - ክፈት..."
@@ -8479,6 +7612,9 @@
 #~ msgid "Preferences..."
 #~ msgstr "ምርጫዎች..."
 
+#~ msgid "Chat Rooms"
+#~ msgstr "የውሪ ቤቶች"
+
 #~ msgid "Refresh"
 #~ msgstr "በድጋሚ ጀምር"
 
@@ -8494,6 +7630,9 @@
 #~ msgid "Gaim - Save Image"
 #~ msgstr "ጌም - ምስሉን አስቀምት"
 
+#~ msgid "_Password"
+#~ msgstr "ሚስጢራዊ ቃል (_P)"
+
 #~ msgid ""
 #~ "%s\n"
 #~ "%s: %s"
@@ -8513,6 +7652,9 @@
 #~ msgid "No Subject"
 #~ msgstr "ጉዳዩ የለም"
 
+#~ msgid "New"
+#~ msgstr "አዲስ"
+
 #~ msgid "Exit"
 #~ msgstr "ውጣ"