pidgin: 181c5ea2: Updated Bengali translation and retire t...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Wed Jul 22 17:21:27 EDT 2009


-----------------------------------------------------------------
Revision: 181c5ea2c448b7bdce3f3e9dcfac31ef4d04f0f2
Ancestor: ce403e5b7edad709f1f7e438548ae2b11194c648
Author: darkrain42 at pidgin.im
Date: 2009-07-22T21:17:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/181c5ea2c448b7bdce3f3e9dcfac31ef4d04f0f2

Modified files:
        pidgin/gtkdialogs.c po/ChangeLog po/bn.po

ChangeLog: 

Updated Bengali translation and retire two translators. Closes #9738.

-------------- next part --------------
============================================================
--- pidgin/gtkdialogs.c	fbda2ed44fa875649eb2a22ac59858db09a7c4c6
+++ pidgin/gtkdialogs.c	34624928e2c26046e3e457bb9b07599059f1eab6
@@ -147,10 +147,8 @@ static const struct translator translato
 	{N_("Bulgarian"),           "bg", "Vladimira Girginova", "missing at here.is"},
 	{N_("Bulgarian"),           "bg", "Vladimir (Kaladan) Petkov", "vpetkov at i-space.org"},
 	{N_("Bengali"),             "bn", "Israt Jahan", "israt at ankur.org.bd"},
-	{N_("Bengali"),             "bn", "INDRANIL DAS GUPTA", "indradg at l2c2.org"},
 	{N_("Bengali"),             "bn", "Jamil Ahmed", "jamil at bengalinux.org"},
 	{N_("Bengali"),             "bn", "Samia Nimatullah", "mailsamia2001 at yahoo.com"},
-	{N_("Bengali"),             "bn", "Tisa Nafisa", "tisa_nafisa at yahoo.com"},
 	{N_("Bosnian"),             "bs", "Lejla Hadzialic", "lejlah at gmail.com"},
 	{N_("Catalan"),             "ca", "Josep Puigdemont", "josep.puigdemont at gmail.com"},
 	{N_("Valencian-Catalan"),   "ca at valencia", "Toni Hermoso", "toniher at softcatala.org"},
@@ -245,6 +243,8 @@ static const struct translator past_tran
 	{N_("Amharic"),             "am", "Daniel Yacob", NULL},
 	{N_("Arabic"),              "ar", "Mohamed Magdy", "alnokta at yahoo.com"},
 	{N_("Bulgarian"),           "bg", "Hristo Todorov", NULL},
+	{N_("Bengali"),             "bn", "INDRANIL DAS GUPTA", "indradg at l2c2.org"},
+	{N_("Bengali"),             "bn", "Tisa Nafisa", "tisa_nafisa at yahoo.com"},
 	{N_("Catalan"),             "ca", "JM P?rez C?ncer", NULL},
 	{N_("Catalan"),             "ca", "Robert Millan", NULL},
 	{N_("Czech"),               "cs", "Honza Kr?l", NULL},
============================================================
--- po/ChangeLog	539c287d283c8126d5ca08d28f7503e26e681cde
+++ po/ChangeLog	e44b4109acfa71307b887120f8d3e84debfd3c36
@@ -2,6 +2,7 @@ version 2.6.0
 
 version 2.6.0
 	* Armenian translation added (David Avsharyan)
+	* Bengali translation updated (Samia Niamatullah)
 	* Catalan translation updated (Josep Puigdemont)
 	* Chinese (Simplified) translation updated under new translator (Aron Xu)
 	* Czech translation updated (David Vachulka)
============================================================
--- po/bn.po	967f1573dc628fe908a608f84bc1b84d5f274b1e
+++ po/bn.po	44dabf1eec44f40a13c34dbb9dc1f81ff2fc6c2f
@@ -4,31 +4,37 @@
 # Samia Nimatullah <mailsamia2001 at yahoo.com>, 2005.
 # Tisa Nafisa <tisa_nafisa at yahoo.com>, 2007.
 # Jamil Ahmed <jamil at bengalinux.org>, 2007.
-# Israt Jahan <israt at ankur.org.bd>, 2008.
+# Israt Jahan <israt at ankur.org.bd>, 2008-2009.
+# Samia Niamatullah <samia at ankur.org.bd>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2008-11-13 17:07+0600\n"
-"Last-Translator: Israt Jahan <israt at ankur.org.bd>\n"
-"Language-Team: Bengali <core at bengalinux.org>\n"
+"POT-Creation-Date: 2009-07-22 14:13-0700\n"
+"PO-Revision-Date: 2009-07-21 18:20+0700\n"
+"Last-Translator: Samia <samia at ankur.org.bd>\n"
+"Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Bengali\n"
+"X-Poedit-Country: BANGLADESH\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,213,212,-1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Finch"
-msgstr "Finch"
+msgstr "Finch "
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s? ??? ???? ?????? `%s -h' ?????? ?????? ?????\n"
+msgstr "%s? ??? ???? ????? `%s -h' ???? ?????? ?????\n"
 
-#, fuzzy, c-format
+# Not sure if [OPTION] is a variable or not
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -40,13 +46,13 @@ msgstr ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s\n"
-"???????: %s [????]...\n"
+"???????: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    ??????? ?????? ???? DIR ??????? ????\n"
-"  -d, --debug         stdout ? ??????? ?????? ?????? ????\n"
-"  -h, --help          ?? ???????? ???????? ???? ??? ????? ????\n"
-"  -n, --nologin       ???????????????? ???? ????? ??\n"
-"  -v, --version       ??????? ??????? ???????? ???? ??? ????? ????\n"
+"  -c, --config=DIR    ?????????? ?????? ???? DIR ??????? ????\n"
+"  -d, --debug         stderr ? ??????? ?????? ??????? ????\n"
+"  -h, --help          ?? ???????? ???????? ??? ???????? ????\n"
+"  -n, --nologin       ???????????????? ???? ??? ??? ??\n"
+"  -v, --version       ??????? ??????? ???????? ??? ???????? ????\n"
 
 # tithi
 #, c-format
@@ -55,55 +61,54 @@ msgstr ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%2s ???? %3s ? ????? ???????????? ???????? ???? %1s ??????? ???????? ??????? ??????? "
-"??? ????? ???? ??? ????? ???? ???????? ??? ????? ??????? ??? http://developer."
-"pidgin.im ? ?? ????????? ????????? ?????"
+"????? ????? %2$s ???? %3$s ?? ?????????? ???? %1$s ??????? ???????? ??????? ??????? "
+"??? ????? ???? ??? ??? ???? ?????????? ??? ????? ??????? ??? ?? ????????? ??????? "
+"http://developer.pidgin.im ? ??????"
 
 msgid "Error"
 msgstr "??????"
 
 msgid "Account was not added"
-msgstr "??????? ????? ??? ?????"
+msgstr "??????? ??? ??? ?????"
 
 # ????
 msgid "Username of an account must be non-empty."
 msgstr "???? ????????? ???????????? ??? ????? ????? ????? ???"
 
 msgid "New mail notifications"
-msgstr "???? ?????? ?????????"
+msgstr "???? ?????? ?????"
 
 msgid "Remember password"
-msgstr "?????????? ????? ?????"
+msgstr "????????? ??? ???? ???"
 
 # ????
 msgid "There are no protocol plugins installed."
-msgstr "????? ???? ??????? ??????? ????????? ??? ????"
+msgstr "????? ???? ???????? ??????? ?????? ??? ????"
 
-# ????
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(???? ?????? '???????? ????' ???? ??????)"
+msgstr "(???? ?????? 'make install' ???? ???? ??????)"
 
 msgid "Modify Account"
-msgstr "??????? ???????? ????"
+msgstr "??????? ????????"
 
 msgid "New Account"
 msgstr "???? ???????"
 
 msgid "Protocol:"
-msgstr "???????:"
+msgstr "????????:"
 
 msgid "Username:"
 msgstr "???????????? ???:"
 
 msgid "Password:"
-msgstr "??????????:"
+msgstr "?????????:"
 
 msgid "Alias:"
 msgstr "?????:"
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "???????? ?? ????????? ???? ?????"
+msgstr "???????? ?? ????????? ???? ??? ????"
 
 #. Cancel button
 #. Cancel
@@ -117,24 +122,24 @@ msgid "Are you sure you want to delete %
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "???? ?? ??????? ???? %s ???? ????? ????"
+msgstr "???? ?? ??????????? %s ???? ????? ????"
 
 msgid "Delete Account"
 msgstr "??????? ???? ?????"
 
 #. Delete button
 msgid "Delete"
-msgstr "?????"
+msgstr "??????"
 
 msgid "Accounts"
 msgstr "???????????"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "???? ????????? ?????? ??? ????????????? ???????/?????????? ???? ??????"
+msgstr "???? ????????? ?????? ???? ????? ??????? ???????/?????????? ???? ??????"
 
 #. Add button
 msgid "Add"
-msgstr "?????"
+msgstr "???"
 
 #. Modify button
 msgid "Modify"
@@ -142,24 +147,24 @@ msgid "%s%s%s%s has made %s his or her b
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%1s%2s%3s%4s, %5s-?? ??? ????? ??????%6s%7s"
+msgstr "%1$s%2$s%3$s%4$s, %5$s ?? ??? ????? ??????%6$s%7$s"
 
 msgid "Add buddy to your list?"
-msgstr "????? ???????? ????? ??? ???? ??? ???"
+msgstr "????? ???????? ????? ??? ???? ????"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%1s%2s%3s%4s ??? ????? ?????? %s6%7s ?? %5s ?? ????? ???? ????"
+msgstr "%1$s%2$s%3$s%4$s ??? ????? ?????? ?? %5$s ?? ??? ???? ???? %6$s%7$s"
 
 msgid "Authorize buddy?"
-msgstr "??????? ?? ????????? ???? ????"
+msgstr "??????? ??????? ???? ????"
 
 # ????
 msgid "Authorize"
-msgstr "????????"
+msgstr "???????"
 
 msgid "Deny"
-msgstr "???????????? ????"
+msgstr "????????????"
 
 #, c-format
 msgid ""
@@ -171,7 +176,7 @@ msgid "Account: %s (%s)"
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "???????: %1s (%2s)"
+msgstr "???????: %1$s (%2$s)"
 
 #, c-format
 msgid ""
@@ -182,14 +187,14 @@ msgid "Default"
 "??? ????: %s ???"
 
 msgid "Default"
-msgstr "??????????????"
+msgstr "??????"
 
 msgid "You must provide a username for the buddy."
 msgstr "?????? ??????  ?????? ???? ???? ??? ???? ????"
 
 # tithi
 msgid "You must provide a group."
-msgstr "?????? ?????? ???? ????? ?????? ???? ????"
+msgstr "?????? ?????? ???? ?? ?????? ???? ????"
 
 msgid "You must select an account."
 msgstr "?????? ?????? ???? ??????? ???????? ???? ????"
@@ -199,7 +204,7 @@ msgid "Error adding buddy"
 msgstr "????????? ????????? ??????? ????"
 
 msgid "Error adding buddy"
-msgstr "??????? ????? ???? ??????"
+msgstr "????? ??? ???? ??????"
 
 msgid "Username"
 msgstr "???????????? ???"
@@ -208,16 +213,16 @@ msgid "Add in group"
 msgstr "????? (??????)"
 
 msgid "Add in group"
-msgstr "?????? ??? ???"
+msgstr "??? ???"
 
 msgid "Account"
 msgstr "???????"
 
 msgid "Add Buddy"
-msgstr "????? ??? ????"
+msgstr "????? ???"
 
 msgid "Please enter buddy information."
-msgstr "??????? ??? ?????? ???? ?????? ?????"
+msgstr "??????? ??? ?????? ???? ????"
 
 msgid "Chats"
 msgstr "?????"
@@ -230,108 +235,110 @@ msgid "Group"
 msgstr "?????"
 
 msgid "Group"
-msgstr "?????"
+msgstr "??"
 
 msgid "Auto-join"
-msgstr "??????-??????"
+msgstr "?????????? ??????"
 
 msgid "Add Chat"
-msgstr "??????? ??? ???"
+msgstr "????? ???"
 
 # tihi
 msgid "You can edit more information from the context menu later."
-msgstr "???? ????????? ??????? ?????? ??? ??? ???? ???????? ???? ??????"
+msgstr "???? ????????? ??????????-???? ???? ??? ???? ???????? ???? ??????"
 
 msgid "Error adding group"
-msgstr "????? ????? ???? ??????"
+msgstr "?? ??? ???? ??????"
 
 msgid "You must give a name for the group to add."
-msgstr "?????? ??????  ??????? ??? ???? ???? ???? ??? ???? ????"
+msgstr "?????? ??????  ???? ??? ???? ???? ???? ??? ???? ????"
 
 msgid "Add Group"
-msgstr "????? ????? ????"
+msgstr "?? ???"
 
 msgid "Enter the name of the group"
-msgstr "??????? ??? ?????? ????"
+msgstr "???? ??? ???"
 
 msgid "Edit Chat"
-msgstr "????? ???????? ???"
+msgstr "????? ????????"
 
 # tihi
 msgid "Please Update the necessary fields."
 msgstr "??????? ??? ??????????? ??????????? ???????? ?????"
 
 msgid "Edit"
-msgstr "???????"
+msgstr "????????"
 
 msgid "Edit Settings"
-msgstr "???????????? ??????? ????"
+msgstr "????? ????????"
 
 msgid "Information"
 msgstr "????"
 
 msgid "Retrieving..."
-msgstr "?????? ????..."
+msgstr "????? ??? ?????..."
 
 msgid "Get Info"
-msgstr "???? ????? ????"
+msgstr "???? ??????"
 
 msgid "Add Buddy Pounce"
-msgstr "????? ?????? ????? ????"
+msgstr "????? ?????? ???"
 
 msgid "Send File"
-msgstr "???? ?????"
+msgstr "???? ??????"
 
+# Samia: Complete
 msgid "Blocked"
-msgstr "?????"
+msgstr "???? ???"
 
 msgid "Show when offline"
-msgstr "??????? ????? ???????? ????"
+msgstr "?????? ??? ???????? ??? ???"
 
 #, c-format
 msgid "Please enter the new name for %s"
-msgstr "??????? ??? %s ?? ???? ???? ??? ?????? ????"
+msgstr "??????? ??? %s ?? ???? ???? ??? ???"
 
 msgid "Rename"
-msgstr "???? ?????? ????"
+msgstr "????????"
 
 msgid "Set Alias"
-msgstr "????? ???????? ????"
+msgstr "????? ????????"
 
 # tithi
 msgid "Enter empty string to reset the name."
-msgstr "????? ???????????? ???? ???? ??????? ?????? ?????"
+msgstr "????? ???????????? ???? ????? ??????? ????"
 
-# tithi
+# ***
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "?? ????????? ?????? ???? ????? ????????? ??? ?????? ??????? ????"
+msgstr "?? ??????? ?????? ???? ????? ???????? ?? ?????? ??????? ????"
 
 # tihi
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "?? ??????? ?????? ???? ????? ??????? ??? ?????? ??????? ????"
+msgstr "?? ???? ?????? ???? ???? ?? ?????? ??????? ????"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "???? ?? ??????? ???? %s ?????? ???? ????"
+msgstr "???? ?? ??????????? %s ?????? ???? ????"
 
 #. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
-msgstr "?????? ??????? ????"
+msgstr "?????? ?????????? "
 
 msgid "Remove"
 msgstr "??????"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Buddy List"
+msgstr "????? ??????"
 
 msgid "Place tagged"
-msgstr "????? ??????? ??? ??????"
+msgstr "????? ????? ??? ??????"
 
-# tithi
+# ***
 msgid "Toggle Tag"
-msgstr "???? ?????"
+msgstr "????? ??? ????"
 
+# ***
 msgid "View Log"
 msgstr "?? ????????"
 
@@ -342,7 +349,7 @@ msgid "Idle"
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr "???"
+msgstr "?????????"
 
 msgid "On Mobile"
 msgstr "???????"
@@ -357,20 +364,20 @@ msgid "Block/Unblock"
 msgstr "???????"
 
 msgid "Block/Unblock"
-msgstr "????/???? ????"
+msgstr "????/??????"
 
 msgid "Block"
 msgstr "????"
 
 msgid "Unblock"
-msgstr "???? ????"
+msgstr "??????"
 
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"??????? ??? ???? ?? ?????????? ????/????????? ???? ??? ??? ???????????-??? ?? ?????? "
-"?????? ?????"
+"??????? ??? ???? ?? ?????????? ????/?????? ???? ??? ??? ??????????? ??? ?? ????? "
+"????"
 
 #. Not multiline
 #. Not masked?
@@ -379,21 +386,21 @@ msgid "New Instant Message"
 msgstr "??? ???"
 
 msgid "New Instant Message"
-msgstr "???? ????????? ??????"
+msgstr "???? ??????"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"??????? ??? ???? ?? ?????????? ????????? ?????? ?????? ??? ??? ???????????-??? ?? "
-"?????? ?????? ?????"
+"??????? ??? ???? ?? ?????????? ????????? ?????? ?????? ??? ??? ??????????? ??? ?? "
+"????? ????"
 
 msgid "Channel"
 msgstr "???????"
 
 msgid "Join a Chat"
-msgstr "??????? ??? ???"
+msgstr "??????? ??????"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "??????? ??? ???? ?? ??????? ??? ???? ??? ??? ??? ?????? ?????"
+msgstr "??????? ??? ???? ?? ??????? ??? ???? ??? ??? ??? ????"
 
 msgid "Join"
 msgstr "??? ???"
@@ -402,40 +409,39 @@ msgstr ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"??????? ??? ???? ?? ????????? ?? ????? ??? ??? ???????????-??? ?? ?????? ?????? "
-"?????"
+"??????? ??? ???? ?? ????????? ??????? ????? ??? ??? ??????????? ??? ?? ????? ????"
 
 #. Create the "Options" frame.
 msgid "Options"
-msgstr "?????????"
+msgstr "????"
 
 msgid "Send IM..."
-msgstr "????????? ?????? ??????..."
+msgstr "IM ??????..."
 
 msgid "Block/Unblock..."
-msgstr "???? ????/???? ????..."
+msgstr "????/??????"
 
 msgid "Join Chat..."
-msgstr "??????? ??? ???..."
+msgstr "??????? ???..."
 
 msgid "View Log..."
 msgstr "?? ????????..."
 
 msgid "View All Logs"
-msgstr "?? ?? ???????? ????"
+msgstr "?? ????????"
 
 # tithi
 msgid "Show"
-msgstr "???????? ????"
+msgstr "????????"
 
 msgid "Empty groups"
-msgstr "????? ?????????"
+msgstr "????? ??"
 
 msgid "Offline buddies"
-msgstr "?????? ???????"
+msgstr "?????? ?????"
 
 msgid "Sort"
-msgstr "?????"
+msgstr "??????"
 
 msgid "By Status"
 msgstr "?????? ???????"
@@ -444,7 +450,7 @@ msgid "By Log Size"
 msgstr "?????????????????"
 
 msgid "By Log Size"
-msgstr "???? ???? ???????"
+msgstr "???? ?????? ???????"
 
 msgid "Buddy"
 msgstr "?????"
@@ -456,7 +462,7 @@ msgid "Certificate Import"
 msgstr "???????"
 
 msgid "Certificate Import"
-msgstr "????????????? ?????? ????"
+msgstr "??????????? ???????"
 
 # ????
 msgid "Specify a hostname"
@@ -464,52 +470,53 @@ msgid "Type the host name this certifica
 
 # tithi
 msgid "Type the host name this certificate is for."
-msgstr "?? ??????????????? ????? ??? ???? ?????"
+msgstr "?? ????????????? ????? ??? ???? ?????"
 
-# tithi
+# mark2
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
-"%s ???? ?????? ??? ????? ????\n"
+"%s ???? ??????? ??? ????? ?????\n"
 "??????? ???? ?? ?????? ???????? ??? PEM ??????????\n"
 
 # tithi
 msgid "Certificate Import Error"
-msgstr "????????????? ?????? ???? ??????"
+msgstr "??????????? ??????? ???? ??????"
 
 # tithi
 msgid "X.509 certificate import failed"
-msgstr "X.??? ????????????? ?????? ???? ??????"
+msgstr "X.509 ??????????? ??????? ???? ??????"
 
 msgid "Select a PEM certificate"
-msgstr "???? PEM ????????????? ???????? ????"
+msgstr "???? PEM ??????????? ???????? ????"
 
 # tithi
+# ***
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"%s ????? ??????? ???? ???????\n"
-"??????? ???? ?? ????? ???????? ??? ???? ?????? ???\n"
+"%s ????? ????????? ???? ???????\n"
+"??????? ???? ????? ??????? ???? ????? ?????? ??? ?? ??\n"
 
 # tithi
 msgid "Certificate Export Error"
-msgstr "????????????? ??????? ???? ??????"
+msgstr "??????????? ????????? ???? ??????"
 
 # tithi
 msgid "X.509 certificate export failed"
-msgstr "X.??? ????????????? ??????? ???? ??????"
+msgstr "X.509 ??????????? ????????? ???? ??????"
 
 # tithi
 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.??? ????????????? ??????? ????"
+msgstr "PEM X.509 ??????????? ?????????"
 
 #, c-format
 msgid "Certificate for %s"
-msgstr "%s-?? ?????????????"
+msgstr "%s-?? ???????????"
 
 # tithi
 #, c-format
@@ -521,25 +528,25 @@ msgstr ""
 msgstr ""
 "?????? ???: %s\n"
 "\n"
-"SHA1 ????????????-???:\n"
+"SHA1 ??????????????:\n"
 "%s"
 
 # tithi
 msgid "SSL Host Certificate"
-msgstr "SSL ????? ?????????????"
+msgstr "SSL ????? ???????????"
 
 # tithi
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "%s ?? ???? ?????????????? ?? ?????? ???? ????? ????"
+msgstr "%s ?? ???? ??????????? ?? ?????? ???? ????? ????"
 
 # tithi
 msgid "Confirm certificate delete"
-msgstr "?????????????? ???? ???? ??????? ????"
+msgstr "??????????? ???? ???? ??????? ????"
 
 # tithi
 msgid "Certificate Manager"
-msgstr "?????????????? ??????????"
+msgstr "??????????? ??????????"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -554,7 +561,7 @@ msgid "%s (%s)"
 
 #, c-format
 msgid "%s (%s)"
-msgstr "%1s (%2s)"
+msgstr "%1$s (%2$s)"
 
 #, c-format
 msgid "%s disconnected."
@@ -570,10 +577,10 @@ msgstr ""
 "%s\n"
 "\n"
 "?????? ??????? ?? ???? ???????????? ??????????? ??? ??????? ??????? ?? ????? ?????? ??????? "
-"????? ???? ????? ???? ?????? ???? ???"
+"Finch ?????? ????? ???? ?????? ???? ???"
 
 msgid "Re-enable Account"
-msgstr "??????? ???? ??????? ????"
+msgstr "??????? ?????? ?????????? "
 
 # tithi
 msgid ""
@@ -581,36 +588,38 @@ msgstr ""
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
 "?? ????????? ????????? ?????? ??? ???? ?? ??????? ???? ????????? ??????? ??????? ??? "
-"???? ???????????? ???? ??????? ??????? ????? ?????"
+"???? ???????????? ???? ??????? ????? ?????"
 
+# ***
 msgid "No such command."
-msgstr "??? ???? ??????? ????"
+msgstr "??? ???? ?????? ????"
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "????????? ??????:  ???? ? ???????? ??? ?????? ?????? ???? ???????"
+msgstr "?????????? ??????:  ???? ? ??????? ??? ?????? ?????????? ???? ???????"
 
+# ***
 msgid "Your command failed for an unknown reason."
-msgstr "???? ????? ????? ????? ??????? ?????? ???????"
+msgstr "???? ????? ????? ????? ?????? ?????? ???????"
 
 msgid "That command only works in chats, not IMs."
-msgstr "? ??????? ????????? ???????? ????????, ????????? ???????? ????"
+msgstr "? ?????? ????????? ???????? ????????, ????????? ???????? ????"
 
 msgid "That command only works in IMs, not chats."
-msgstr "? ????????? ????????? ????????? ????????? ????????, ?????? ???????? ????"
+msgstr "? ???????? ????????? ????????? ????????? ????????, ?????? ???????? ????"
 
 msgid "That command doesn't work on this protocol."
-msgstr "? ????????? ?? ????????? ??? ??? ???"
+msgstr "? ???????? ?? ????????? ??? ??? ???"
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "?????? ?????? ?????, ???? ???? ?????????? ???"
+msgstr "?????? ?????? ??????, ???? ???? ???? ???"
 
 #, c-format
 msgid "%s (%s -- %s)"
-msgstr "%1s (%2s -- %3s)"
+msgstr "%1$s (%2$s -- %3$s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr "%1s [%2s]"
+msgstr "%1$s [%2$s]"
 
 #, c-format
 msgid ""
@@ -624,35 +633,37 @@ msgid "Logging started. Future messages 
 msgstr "???? ??  ????? ????? ???????"
 
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "?? ??? ???? ??????? ?? ????????? ????? ?????????? ?? ??? ????"
+msgstr "??????? ??????? ??? ???? ??????? ???????? ?????? ?? ??? ????"
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "?? ??? ???? ??? ??????? ?? ????????? ????? ?????????? ?? ??? ????"
+msgstr "??????? ??????? ???? ??? ??????? ???????? ?????? ?? ??? ??? ???"
 
+# ***
 msgid "Send To"
-msgstr "????? ?????? ????"
+msgstr "????? ??????"
 
 msgid "Conversation"
 msgstr "???????"
 
 msgid "Clear Scrollback"
-msgstr "????????? ???????? ????"
+msgstr "??????????? ??????"
 
 msgid "Show Timestamps"
-msgstr "??????? ???????? ????"
+msgstr "???? ????????"
 
 msgid "Add Buddy Pounce..."
-msgstr "????? ?????? ????? ????..."
+msgstr "????? ?????? ???..."
 
 msgid "Invite..."
 msgstr "????????..."
 
+# mark3
 msgid "Enable Logging"
-msgstr "????? ?????? ????"
+msgstr "?? ??????????"
 
 msgid "Enable Sounds"
-msgstr "???? ??????? ????"
+msgstr "???? ??????????"
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY>"
@@ -664,73 +675,74 @@ msgid "Supported debug options are:  ver
 msgstr[1] "%d ??????????????? ??????:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "??????? ????? ????????? ??: ???????"
+msgstr "??????? ????? ????: ???????"
 
+# ***
 msgid "No such command (in this context)."
-msgstr "??? ???? ??????? ??? (?? ????????)?"
+msgstr "??? ???? ?????? ??? (?? ????????)?"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"?????? ??????????? ??????? ???????? ??????? ???? \"/help &?lt;command&?gt;\" ??????? "
+"?????? ??????????? ?????? ???????? ??????? ???? \"/help &lt;command&gt;\" ??????? "
 "?????\n"
-"?? ???????? ????????? ??????????? ???????:\n"
+"?? ???????? ????????? ?????? ????????:\n"
 
 # tithi
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr "%s ??????? ??? ?????? ???? ???????????? ??? ??????? '/?????? ??????-??' ??????"
+msgstr "%s ??????? ?????? ??????? ???? ??????? ??????? ???? '/help msgcolor' ??????"
 
 # tithi
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr "%s ??? ?? ???? ??? ?? ?? ???? '/?????? ??????-??' ??????"
+msgstr "%s ??????? ?? ???? ??? ?? ?? ???? '/help msgcolor' ??????"
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"???? &lt;??????&gt;:  ???? ?????? ??????? ??? ???? ????? ??? ???? ??????? ??????? "
-"???? ???"
+"say &lt;message&gt;:  ???? ?????? ??????? ??? ???? ????? ??? ???? ?????? "
+"??????? ???? ???"
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "??? &lt;?????&gt;: ???? ??????? ?? ??????? ?????? ????? ????? ??????"
+msgstr "me &lt;action&gt;: ???? ??????? ?? ??????? IRC ?? ?? ??????????? ??????"
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "????? &lt;?????&gt;:  ??????? ???????? ??????? ????? ???? ??????"
+msgstr "debug &lt;option&gt;:  ??????? ???????? ??????? ????? ???? ?????? ????"
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "????????: ????????? ????????? ???????? ????"
+msgstr "clear: ????????? ??????????? ?????? ????"
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "??????? &lt;???????&gt;: ???? ??????????? ????????? ?????????"
+msgstr "help &lt;command&gt;: ???? ????????? ???????? ?????????"
 
 # tithi
 msgid "users:  Show the list of users in the chat."
-msgstr "?????????????: ??????? ?????????????? ?????? ??????"
+msgstr "users: ??????? ?????????????? ?????? ?????? ????"
 
 msgid "plugins: Show the plugins window."
-msgstr "???????: ????????? ?????? ??????"
+msgstr "plugins: ????????? ?????? ??????"
 
 msgid "buddylist: Show the buddylist."
-msgstr "?????-??????: ?????-?????? ??????"
+msgstr "buddylist: ?????-?????? ??????"
 
 msgid "accounts: Show the accounts window."
-msgstr "??????????: ???????????? ?????? ??????"
+msgstr "accounts: ???????????? ?????? ??????"
 
 msgid "debugwin: Show the debug window."
-msgstr "?????????????? ??????: ????? ?????? ??????"
+msgstr "debugwin: ????? ?????? ??????"
 
 msgid "prefs: Show the preference window."
-msgstr "?????: ??????? ?????? ??????"
+msgstr "prefs: ??????????? ?????? ??????"
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "??????????: ????????-???????????? ?????? ??????"
+msgstr "statuses: savedstatuses ???????? ??????"
 
 # fix me tithi
 msgid ""
@@ -740,14 +752,14 @@ msgstr ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
-"??????-?? &1lt;??????&2gt; &3lt;????????&4gt; &5lt;??????????&6gt;:  ??????? "
-"???????? ??????? ?????? ??????? ???? ?? ???????? ???? ?<br>    &7lt;??????&8gt;: "
-"????? ????, ?????? ????, ???????????, ?????, ?????????????<br>    &9lt;????????/"
-"??????????&10gt;: ????, ???, ????, ???, ????, ????, ???? ????, ??????????, ??????, "
-"??????????????<br><br>??????:<br>    ??????-?? ?????????????????? ?????? ?????? ???"
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;:  ??????? "
+"???????? ??????? ?????? ??????? ???? ?? ???????? ???? ?<br>   &lt;class&gt;: ?????, "
+"??????, ???????, ???, ?????????????<br>    &lt;foreground/background&gt;: ????, "
+"???, ????, ???, ????, ????, ?????????, ??????????, ?????, ??????<br><br>??????:"
+"<br>    msgcolor ?????? ?????? ????? ?????? ???"
 
 msgid "Unable to open file."
-msgstr "???? ????? ????? ????"
+msgstr "???? ????? ???????"
 
 msgid "Debug Window"
 msgstr "????? ??????"
@@ -757,10 +769,10 @@ msgid "Clear"
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
 msgid "Clear"
-msgstr "???? ????"
+msgstr "???? ?????"
 
 msgid "Filter:"
-msgstr "?????????:"
+msgstr "???????:"
 
 msgid "Pause"
 msgstr "?????"
@@ -769,18 +781,18 @@ msgid_plural "File Transfers - %d%% of %
 #, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "???? ?????????? ??? - %d ?????? %d%%"
-msgstr[1] "???? ?????????? ??? - %d ?????????? %d%%"
+msgstr[0] "???? ?????????? - %d ?? ?????? %d%%"
+msgstr[1] "???? ?????????? - %d ?? ?????? %d%%"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "???? ?????????? ???"
+msgstr "???? ??????????"
 
 msgid "Progress"
 msgstr "???????"
 
 msgid "Filename"
-msgstr "????-???"
+msgstr "?????? ???"
 
 msgid "Size"
 msgstr "????"
@@ -796,20 +808,21 @@ msgid "Close this window when all transf
 msgstr "??????"
 
 msgid "Close this window when all transfers finish"
-msgstr "?? ?????????? ??? ??? ?? ???????? ???? ????"
+msgstr "?? ?????????? ??? ??? ?? ???????? ???? ??? ???? ???"
 
 msgid "Clear finished transfers"
-msgstr "????????? ?????????????? ???????? ????"
+msgstr "??????? ?????????? ????? ???? ???"
 
 msgid "Stop"
-msgstr "?????"
+msgstr "??????"
 
 msgid "Waiting for transfer to begin"
-msgstr "?????????? ???? ???? ???? ??????? ????"
+msgstr "?????????? ???? ???? ???? ??????? ??? ?????"
 
 msgid "Canceled"
 msgstr "????? ??? ??????"
 
+# mark6
 msgid "Failed"
 msgstr "?????? ??????"
 
@@ -828,21 +841,21 @@ msgid "The file was saved as %s."
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr "?????? %s ?????? ??????? ??? ???????"
+msgstr "?????? %s ?????? ???????? ??????"
 
 msgid "Sending"
-msgstr "????????"
+msgstr "?????? ?????"
 
 msgid "Receiving"
-msgstr "????? ????"
+msgstr "????? ??? ?????"
 
 #, c-format
 msgid "Conversation in %s on %s"
-msgstr "%1s ? %2s ?? ??? ???????"
+msgstr "%1$s ? %2$s ?? ??? ???????"
 
 #, c-format
 msgid "Conversation with %s on %s"
-msgstr "%2s ?? ??? %1s-?? ????? ???????"
+msgstr "%2$s ?? ??? %1$s-?? ????? ???????"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -851,31 +864,30 @@ msgstr ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"\"??? ??????? ???????????? ????????? ??? ?? ????\" ????????? ??? ??????? ???? ??? "
-"????????? ????????? ?????????? ?? ??? ????"
+"?????????  \"?? ??????? ???????? ??????? ??? ???? ???\" ?????? ??????? ????? "
+"????????? ?????????? ?? ??? ????"
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"\"?? ????????? ?????? ?? ????\" ????????? ??? ??????? ???? ??? ????????? ????????? "
-"?????????? ?? ??? ????"
+"????? \"?? ????????? ?????? ?? ??? ???\" ??????? ????? ???? ????????? ?????????? ?? "
+"??? ????"
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"\"?? ????? ?? ????\" ????????? ??? ??????? ???? ??? ????????? ????????? ?? ??? ????"
+msgstr "????? \"?? ????? ?? ??? ???\" ??????? ????? ???? ????????? ?? ??? ????"
 
 msgid "No logs were found"
 msgstr "???? ?? ????? ?????? ???????"
 
 msgid "Total log size:"
-msgstr "??? ?? ????:"
+msgstr "??? ????????? ??????:"
 
 # fix me tithi
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr "?????? ????/??????:"
+msgstr "??????/?????????:"
 
 #, c-format
 msgid "Conversations in %s"
@@ -886,48 +898,47 @@ msgid "All Conversations"
 msgstr "%s-?? ????? ???????"
 
 msgid "All Conversations"
-msgstr "??? ???????"
+msgstr "?? ???????"
 
+# mark4
 msgid "System Log"
 msgstr "??????? ??"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "???? ??? ?????..."
+msgstr "?? ??? ?????..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "?? ??? ????"
 
 #. Number of actions
 msgid "Accept"
-msgstr "????? ????"
+msgstr "?????"
 
 msgid "Reject"
-msgstr "?????????? ????"
+msgstr "??????????"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "???? ??????? ?????"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "?? ?????? ??? ??????"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "????? ???? %s ???? ???? ???? ???? ???? ????"
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "????? ???? %s ???? ???????? ????? ?????? ???? ???? ???? ?????? ?????"
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "???? ???????%s%s ?????? ??????"
+msgstr "???? ???? ???????????? ???????"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: ???? ???? ?? ?????"
 
 msgid "Emails"
-msgstr "?-????????"
+msgstr "?????"
 
 msgid "You have mail!"
 msgstr "????? ???? ???!"
@@ -941,8 +952,8 @@ msgid_plural "%s (%s) has %d new message
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%1s (%2s) ??  %3d?? ???? ?????? ????"
-msgstr[1] "%1s (%2s)-??  %3d???? ???? ?????? ????"
+msgstr[0] "%1$s (%2$s) ??  %3$d ?? ???? ?????? ????"
+msgstr[1] "%1$s (%2$s) ??  %3$d ?? ???? ?????? ????"
 
 msgid "New Mail"
 msgstr "???? ????"
@@ -955,13 +966,13 @@ msgid "Continue"
 msgstr "?????? ????"
 
 msgid "Continue"
-msgstr "???????"
+msgstr "???????"
 
 msgid "IM"
-msgstr "????????? ??????"
+msgstr "IM"
 
 msgid "Invite"
-msgstr "????????"
+msgstr "???????? ?????"
 
 msgid "(none)"
 msgstr "(????? ??)"
@@ -971,14 +982,14 @@ msgid "ERROR"
 
 # tithi
 msgid "ERROR"
-msgstr "??????"
+msgstr "ERROR"
 
 msgid "loading plugin failed"
 msgstr "??????? ??? ???? ??????"
 
 # tithi
 msgid "unloading plugin failed"
-msgstr "??????? ?????? ???? ???????"
+msgstr "??????? ????? ???? ???????"
 
 # tithi
 #, c-format
@@ -990,47 +1001,47 @@ msgstr ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-"???: %1s\n"
-"???????: %2s\n"
-"??????: %3s\n"
-"????: %4s\n"
-"?????????: %5s\n"
-"?????? ???: %6s\n"
+"???: %1$s\n"
+"???????: %2$s\n"
+"??????: %3$s\n"
+"????: %4$s\n"
+"?????????: %5$s\n"
+"?????? ???: %6$s\n"
 
 # tithi
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "??????? ??????? ???? ?????? ????? ???  ??? ??? ?????????"
+msgstr "??????? ??????? ???? ?????? ????? ??? ??? ???? ????"
 
 # tithi
 msgid "No configuration options for this plugin."
-msgstr "?? ????????? ???? ???? ???????? ????? ????"
+msgstr "?? ????????? ???? ???? ?????????? ???? ????"
 
 msgid "Error loading plugin"
-msgstr "????????? ???? ??????"
+msgstr "??????? ??? ???? ??????"
 
 # tithi
+# mark5
 msgid "The selected file is not a valid plugin."
-msgstr "????????? ?????? ??? ??????? ????"
+msgstr "????????? ?????? ??????? ??????? ????"
 
 # tithi
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
-"????????????? ?????????????? ?????? ????? ??? ???? ?????? ???????? ????? ?????? ?????? ?????"
+msgstr "????????????? ????? ?????? ????? ??? ???? ?????? ???????? ?????? ????? ?????? ?????"
 
 msgid "Select plugin to install"
-msgstr "????????? ???? ??????? ???????? ????"
+msgstr "?????? ???? ???? ??????? ???????? ????"
 
 # tithi
 msgid "You can (un)load plugins from the following list."
-msgstr "???? ????????? ?????? ??? ????????????? ???(?????) ???? ??????"
+msgstr "???? ????????? ?????? ???? ????????????? ???/????? ???? ??????"
 
 # tithi
 msgid "Install Plugin..."
-msgstr "??????? ???????? ????..."
+msgstr "??????? ??????..."
 
 msgid "Configure Plugin"
-msgstr "??????? ??????? ??????? ????"
+msgstr "??????? ?????????? "
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1038,19 +1049,19 @@ msgid "Preferences"
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 msgid "Preferences"
-msgstr "?????????????"
+msgstr "?????????"
 
 msgid "Please enter a buddy to pounce."
-msgstr "??????? ??? ?????? ???? ???? ???? ????? ?????? ?????"
+msgstr "??????? ??? ?????? ???? ???? ???? ?????? ??? ????"
 
 msgid "New Buddy Pounce"
-msgstr "???? ????? ?????? ????"
+msgstr "???? ????? ??????"
 
 msgid "Edit Buddy Pounce"
-msgstr "????? ?????? ??????? ????"
+msgstr "????? ?????? ????????"
 
 msgid "Pounce Who"
-msgstr "???? ??????"
+msgstr "???? ?????? ??? ???"
 
 #. Account:
 msgid "Account:"
@@ -1064,28 +1075,28 @@ msgid "Signs on"
 msgstr "?????? ???? ??? ?????..."
 
 msgid "Signs on"
-msgstr "???? ??"
+msgstr "???? ???"
 
 msgid "Signs off"
-msgstr "???? ??"
+msgstr "????? ???"
 
 msgid "Goes away"
-msgstr "?????????"
+msgstr "??????? ???"
 
 msgid "Returns from away"
-msgstr "??? ??? ???? ???"
+msgstr "??????? ???? ???? ???"
 
 msgid "Becomes idle"
-msgstr "??? ??? ???"
+msgstr "????????? ??"
 
 msgid "Is no longer idle"
-msgstr "?? ??? ????? ??"
+msgstr "???????? ??"
 
 msgid "Starts typing"
-msgstr "???? ???? ????"
+msgstr "???? ???? ???"
 
 msgid "Pauses while typing"
-msgstr "???? ???? ???? ????? ???"
+msgstr "???? ???? ???? ????"
 
 msgid "Stops typing"
 msgstr "???? ???? ???"
@@ -1095,93 +1106,95 @@ msgid "Action"
 
 #. Create the "Action" frame.
 msgid "Action"
-msgstr "?????"
+msgstr "???????????"
 
 msgid "Open an IM window"
-msgstr "????????? ??????? ?????? ?????"
+msgstr "IM ?????? ???? ???"
 
 msgid "Pop up a notification"
-msgstr "???? ????? ???? ????"
+msgstr "???? ????? ???? ??? ???"
 
 msgid "Send a message"
-msgstr "???? ?????? ?????"
+msgstr "???? ?????? ?????? ???"
 
 msgid "Execute a command"
-msgstr "???? ??????? ??????? ????"
+msgstr "???? ?????? ??????? ??? ???"
 
 msgid "Play a sound"
-msgstr "???? ?????"
+msgstr "???? ?????? ???"
 
+# mark7
 msgid "Pounce only when my status is not Available"
-msgstr "???? ?????? ??????? ?? ????? ????????? ?????? ????"
+msgstr "????????? ???? ?????? ????????? ????? ?????? ??? ???"
 
 # tithi
 msgid "Recurring"
-msgstr "???????????"
+msgstr "??????????"
 
 msgid "Cannot create pounce"
-msgstr "?????? ???? ???? ???? ??"
+msgstr "?????? ???? ??? ????? ????"
 
 msgid "You do not have any accounts."
 msgstr "????? ???? ??????? ????"
 
 # tithi
 msgid "You must create an account first before you can create a pounce."
-msgstr "???? ???? ?????? ???? ???? ?????? ?????? ?????? ???? ??????? ???? ???? ????"
+msgstr "?????? ???? ???? ?????? ?????? ?????? ???? ??????? ???? ???? ????"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "???? ?? ??????? ???? %2s ?? ???? %1s ?? ?????? ???? ????? ????"
+msgstr "???? ?? ??????????? %2$s ?? ???? %1$s ?? ?????? ???? ????? ????"
 
 msgid "Buddy Pounces"
-msgstr "????? ?????? ???"
+msgstr "????? ??????"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%1s ????? ???? ???? ??? ???? ????? (%2s)"
+msgstr "%1$s ????? ???? ???? ??? ???? ????? (%2$s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%1s ????? ???? ???? ???? ???? ????? ?????? (%2s)"
+msgstr "%1$s ????? ???? ???? ???? ???? ????? ?????? (%2$s)"
 
+# mark8
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%1s ???? ?? ????? (%2s)"
+msgstr "%1$s ???? ????? (%2$s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%1s ??? ?????? ???? ???? ????? (%2s)"
+msgstr "%1$s ????????? ?????? ???? ???? ????? (%2$s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%1s ??? ??? ???? ????? (%2s)"
+msgstr "%1$s ??????? ???? ?????? (%2$s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%1s ????? ???? ???? ??? ???? ??? ?????? (%2s)"
+msgstr "%1$s ????? ???? ???? ??? ???? ????? (%2$s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%1s ??????? ??? (%2s)"
+msgstr "%1$s ????? ????? (%2$s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%1s ??? ??? (%2s)"
+msgstr "%1$s ????????? ????? (%2$s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%1s ??? ?????????? (%2s)"
+msgstr "%1$s ??????? ??????? (%2$s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%1s ?????? ???? ?????? ?????????? (%2s)"
+msgstr "%1$s ?????? ???? ?????? ?????????? (%2$s)"
 
 msgid "Unknown pounce event. Please report this!"
 msgstr "????? ?????? ??????? ??????? ??? ??? ??????? ????!"
 
 # tithi
 msgid "Based on keyboard use"
-msgstr "??-??????? ????????? ??? ?????? ???"
+msgstr "????????? ??????? ???????"
 
 msgid "From last sent message"
 msgstr "??????? ?????? ?????? ????"
@@ -1190,34 +1203,34 @@ msgid "Show Idle Time"
 msgstr "???? ???"
 
 msgid "Show Idle Time"
-msgstr "??? ???? ???????? ????"
+msgstr "????????? ???? ???????? ??? ???"
 
 msgid "Show Offline Buddies"
-msgstr "?????? ?????????? ???????? ????"
+msgstr "?????? ???????? ???????? ??? ???"
 
 msgid "Notify buddies when you are typing"
-msgstr "????? ???? ???? ??? ???????? ???? ????"
+msgstr "???? ???? ???? ???????? ?? ???? ??? ???"
 
 msgid "Log format"
-msgstr "?? ???????"
+msgstr "?? ?????????? ???????"
 
 msgid "Log IMs"
-msgstr "????????? ?????????? ?? ????"
+msgstr "IM ??????? ??? ???"
 
 msgid "Log chats"
-msgstr "????????? ?? ????"
+msgstr "??????? ??????? ??? ???"
 
 msgid "Log status change events"
-msgstr "?? ?????? ?????? ???????? ???"
+msgstr "?????? ?????????? ???? ?? ??? ???"
 
 msgid "Report Idle time"
-msgstr "??? ???? ??????? ????"
+msgstr "????????? ???? ??????? ??? ???"
 
 msgid "Change status when idle"
-msgstr "??? ????? ?????? ???????? ????"
+msgstr "????????? ????? ?????? ???????? ??? ???"
 
 msgid "Minutes before changing status"
-msgstr "?????? ???????? ???? ??????? ?????"
+msgstr "?????? ?????????? ?????????? ???"
 
 msgid "Change status to"
 msgstr "?????? ???????? ????"
@@ -1226,37 +1239,38 @@ msgid "Logging"
 msgstr "???????"
 
 msgid "Logging"
-msgstr "?? ????"
+msgstr "??????? ???????"
 
 msgid "You must fill all the required fields."
-msgstr "?????? ?????? ??????????? ??????????? ???? ???? ????"
+msgstr "?????? ?? ???????? ??????? ???? ???? ????"
 
 msgid "The required fields are underlined."
-msgstr "??????????? ????????????? ?????????????? ??? ??????"
+msgstr "???????? ??????? ?????????????? ??? ??????"
 
 # tithi
 msgid "Not implemented yet."
 msgstr "???? ??????????? ??????"
 
 msgid "Save File..."
-msgstr "???? ??????? ????..."
+msgstr "???? ???????..."
 
 msgid "Open File..."
 msgstr "???? ?????..."
 
 msgid "Choose Location..."
-msgstr "????? ????? ????..."
+msgstr "??????? ????????..."
 
 # tithi
+# samia: I am assuming these are chat rooms
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "?? ????????????? ??? ???? ???? ????? ???? 'Enter' ??????"
+msgstr "?? ??????? ??? ???? ??? ????? ???? 'Enter' ??????"
 
 msgid "Get"
-msgstr "????? ????"
+msgstr "??????"
 
 #. Create the window.
 msgid "Room List"
-msgstr "?????? ??????"
+msgstr "????? ??????"
 
 msgid "Buddy logs in"
 msgstr "????? ???? ???"
@@ -1265,28 +1279,28 @@ msgid "Message received"
 msgstr "????? ????? ???"
 
 msgid "Message received"
-msgstr "?????? ????? ??? ??????"
+msgstr "?????? ????? ??"
 
 msgid "Message received begins conversation"
-msgstr "?????? ????? ????? ????????? ???? ??????"
+msgstr "?????? ????? ??? ??????? ???? ??"
 
 msgid "Message sent"
-msgstr "?????? ?????? ??????"
+msgstr "?????? ?????? ???"
 
 msgid "Person enters chat"
-msgstr "??????? ??????? ?????? ?????"
+msgstr "??????? ??????? ?????? ???"
 
 msgid "Person leaves chat"
-msgstr "??????? ????? ????? ?????"
+msgstr "??????? ????? ????? ???"
 
 msgid "You talk in chat"
-msgstr "???? ??????? ??? ?????"
+msgstr "???? ??????? ??? ????"
 
 msgid "Others talk in chat"
-msgstr "?????????? ??????? ??? ????"
+msgstr "?????????? ??????? ??? ???"
 
 msgid "Someone says your username in chat"
-msgstr "??? ???? ??????? ????? ???????????? ??? ????"
+msgstr "??? ??????? ????? ??? ?????? ???"
 
 # tithi
 msgid "GStreamer Failure"
@@ -1295,70 +1309,74 @@ msgstr "GStreamer ????? ??
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer ????? ??? ???????"
 
-# tithi
+# tithi mark
 msgid "(default)"
-msgstr "(??????????????)"
+msgstr "(??????)"
 
 msgid "Select Sound File ..."
-msgstr "?????? ???? ???????? ????..."
+msgstr "???? ???? ????????..."
 
+# ***
 msgid "Sound Preferences"
-msgstr "???????? ??????????????"
+msgstr "?????? ?????????"
 
+# ***
 msgid "Profiles"
-msgstr "?????????? ??????????"
+msgstr "?????????"
 
 msgid "Automatic"
 msgstr "????????????"
 
 msgid "Console Beep"
-msgstr "????? ??? ????"
+msgstr "????? ???"
 
+# ***
 msgid "Command"
-msgstr "???????"
+msgstr "??????"
 
 msgid "No Sound"
-msgstr "???? ???? ???"
+msgstr "???? ???? ??"
 
 msgid "Sound Method"
-msgstr "?????? ??????????"
+msgstr "?????? ????"
 
 msgid "Method: "
-msgstr "??????????:"
+msgstr "?????????:"
 
+# ***
 #, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"?????? ??????? \n"
+"?????? ?????? \n"
 "(?????? ????? ???? %s)"
 
 #. Sound options
 msgid "Sound Options"
-msgstr "?????? ?????????"
+msgstr "?????? ????"
 
 msgid "Sounds when conversation has focus"
-msgstr "??????? ????? ???? ???? ???"
+msgstr "???????? ????? ???? ?? ???? ???"
 
 msgid "Always"
-msgstr "??????"
+msgstr "?? ???"
 
 msgid "Only when available"
-msgstr "????????? ??? ???????"
+msgstr "????????? ??? ???????"
 
 msgid "Only when not available"
-msgstr "????????? ??? ??????? ??"
+msgstr "????????? ??? ?????????"
 
 msgid "Volume(0-100):"
 msgstr "?????(?-???):"
 
 #. Sound events
 msgid "Sound Events"
-msgstr "???? ??????????"
+msgstr "???? ????????"
 
 msgid "Event"
-msgstr "??????"
+msgstr "????"
 
 msgid "File"
 msgstr "????"
@@ -1367,26 +1385,26 @@ msgid "Reset"
 msgstr "???????"
 
 msgid "Reset"
-msgstr "???? ??????? ????"
+msgstr "?????"
 
 msgid "Choose..."
-msgstr "????? ????..."
+msgstr "????? ????..."
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "???? ??  ??????? ???? \"%s\" ???? ????? ???"
+msgstr "???? ??  ??????????? \"%s\" ???? ????? ???"
 
 msgid "Delete Status"
-msgstr "?????? ?????"
+msgstr "?????? ???? ?????"
 
 msgid "Saved Statuses"
-msgstr "???????? ??????????"
+msgstr "???????? ??????"
 
 msgid "Title"
 msgstr "???????"
 
 msgid "Type"
-msgstr "???"
+msgstr "???"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1401,23 +1419,24 @@ msgid "Use"
 
 #. Use
 msgid "Use"
-msgstr "??????? ????"
+msgstr "???????"
 
+# mark
 msgid "Invalid title"
-msgstr "???? ???????"
+msgstr "???????? ???????"
 
 # tithi
 msgid "Please enter a non-empty title for the status."
-msgstr "??????? ??? ??????? ???? ???? ??? ??? ??????? ?????? ?????"
+msgstr "??????? ??? ??????? ???? ???? ??????? ????"
 
 msgid "Duplicate title"
-msgstr "?????? ???????"
+msgstr "??????????? ???????"
 
 msgid "Please enter a different title for the status."
-msgstr "??????? ??? ????????? ???? ???? ????? ??????? ?????? ?????"
+msgstr "??????? ??? ????????? ???? ???? ????? ??????? ????"
 
 msgid "Substatus"
-msgstr "????????"
+msgstr "??-??????"
 
 msgid "Status:"
 msgstr "??????:"
@@ -1426,37 +1445,37 @@ msgid "Edit Status"
 msgstr "??????:"
 
 msgid "Edit Status"
-msgstr "?????? ??????? ????"
+msgstr "?????? ????????"
 
 msgid "Use different status for following accounts"
-msgstr "????????? ????????????? ???? ????? ?????? ??????? ????"
+msgstr "????????? ????????????? ???? ????? ?????? ??????? ??? ???"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "??????? ??? ??????? ????"
+msgstr "??????? & ???????"
 
 # tithi
 msgid "Certificates"
-msgstr "???????? ????"
+msgstr "???????????"
 
 msgid "Sounds"
-msgstr "????????"
+msgstr "????"
 
 msgid "Statuses"
-msgstr "??????????"
+msgstr "??????"
 
 msgid "Error loading the plugin."
-msgstr "??????? ??? ???? ???????"
+msgstr "??????? ??? ???? ???????"
 
 msgid "Couldn't find X display"
-msgstr "X ???????? ????? ???? ??"
+msgstr "X ??????? ????? ????? ?????"
 
 msgid "Couldn't find window"
-msgstr "?????? ????? ???? ??"
+msgstr "?????? ????? ????? ?????"
 
 # tithi
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "?? ????????? ??? ??? ??? ?? ???? ??? X11 ??????? ???? ??????"
+msgstr "?? ????????? ??? ??? ????? ?? ???? ????? X11 ??????? ????"
 
 # tithi
 msgid "GntClipboard"
@@ -1465,21 +1484,20 @@ msgstr "?????????? ?msgid "Clipboard plugin"
 msgstr "?????????? ???????"
 
-# tithi
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-"??? ????? ??? , ??? gnt ???????????? ????????????? ???????? ???, ??? X ? ????????????? "
-"??????? ?????"
+"??? ????? ???, ??? gnt ??????????? ??????? ??? ???????? ??? ??? ?? X ?????? "
+"????????????? ??? ????"
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s ???????"
+msgstr "%s ??????? ???? ?????"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s ???????"
+msgstr "%s ??????? ????? ?????"
 
 #, c-format
 msgid "%s sent you a message"
@@ -1488,35 +1506,36 @@ msgid "%s said your nick in %s"
 # tithi
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%1s ????? ??? ??? %2s ? ????"
+msgstr "%1$s ????? ??? ??? %2$s ?????"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%1s %2s ? ???? ?????? ?????????"
+msgstr "%1$s %2$s ? ???? ?????? ?????????"
 
 msgid "Buddy signs on/off"
-msgstr "????? ???? ????/????"
+msgstr "????? ????/????? ???"
 
 msgid "You receive an IM"
-msgstr "????? ???? ????????? ?????? ????? ??????"
+msgstr "???? ???? IM ????? ????"
 
 msgid "Someone speaks in a chat"
-msgstr "??? ???? ??????? ??? ????"
+msgstr "??? ??????? ??? ???"
 
 msgid "Someone says your name in a chat"
-msgstr "??? ???? ??????? ????? ??? ??? ?????"
+msgstr "??? ??????? ????? ??? ?????? ???"
 
 # tithi
 msgid "Notify with a toaster when"
-msgstr "??????? ?????? ????? ???? ???"
+msgstr "??????? ?????? ???? ???? ???"
 
 # tithi
 msgid "Beep too!"
-msgstr "????? ????!"
+msgstr "???? ?????? ????!"
 
 # tithi
+# ***
 msgid "Set URGENT for the terminal window."
-msgstr "???????? ??????? ???? ????? ???????? ?????"
+msgstr "???????? ??????? ???? URGENT ???????? ?????"
 
 # tithi
 msgid "GntGf"
@@ -1528,34 +1547,34 @@ msgid "<b>Conversation with %s on %s:</b
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>%2s ? %2s ?? ???? ???????:</b><br>"
+msgstr "<b>%2$s ? %1$s ?? ???? ???????:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "?????? ????????? ?? ??? ????????"
+msgstr "?????? ??????? ????????? ???? ??????? ??????? ??? ???????"
 
+# ***
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"??????? -> ?????????????? -> ????? ???? ????? ??????? ??? ????\n"
+"??? -> ????????? -> ??????? ??????? ???? ??????? ???????? ????????? ??????? ??? ?????\n"
 "\n"
-"????????? ??????? ???? ??????????????? ?????? ???? ???/?? ??? ????? ?????????? ???? "
-"????? ?????? ??????? ?????"
+"????????? ?????? ?? ?????? ?????? ???? ??? ??? ????? ?????? ??????? ??? ????"
 
 msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "???? ???????????? ?????????? ????? ??????????? ???????? ????"
+msgstr "???????? ???????? ??????? ???? ?????? ???????? ??? ???"
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"??? ???? ???? ??????? ???? ?? ??? ?? ?????-???? ???? ???????? ??????? ??????? "
-"?????? ?????"
+"???? ??????? ???? ???? ??? ?? ????????? ???? ????????? ???????? ??????? ??????? "
+"?????? ??????"
 
 msgid "Online"
 msgstr "??????"
@@ -1564,7 +1583,7 @@ msgid "Online Buddies"
 msgstr "?????? "
 
 msgid "Online Buddies"
-msgstr "?????? ?????"
+msgstr "?????? ?????"
 
 msgid "Offline Buddies"
 msgstr "?????? ?????"
@@ -1577,7 +1596,7 @@ msgid "No Grouping"
 msgstr "Meebo"
 
 msgid "No Grouping"
-msgstr "???? ??"
+msgstr "??????? ??"
 
 # tithi
 msgid "Nested Subgroup"
@@ -1588,16 +1607,16 @@ msgid "Provides alternate buddylist grou
 msgstr "??????? ??????? (???????????)"
 
 msgid "Provides alternate buddylist grouping options."
-msgstr "??????????? ?????-??????? ??????? ????????? ?????? ????"
+msgstr "?????-??????? ?????? ??????? ???? ?????? ????"
 
 # tithi
 msgid "Lastlog"
-msgstr "???????-??"
+msgstr "Lastlog"
 
 # tithi
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "???????-??: ???????? ????????? ???????"
+msgstr "lastlog: backlog ? ?????????? ????????? ??? ???"
 
 # tithi
 msgid "GntLastlog"
@@ -1605,82 +1624,84 @@ msgid "Lastlog plugin."
 
 # tithi
 msgid "Lastlog plugin."
-msgstr "???????-?? ????????"
+msgstr "Lastlog ????????"
 
 #, c-format
 msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURL  ??? ?????..."
 
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "????????? ????? ???? ?? ????? ?? ????????? URL ?? ???? TinyURL ???? ?????"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (???? ????????) ??????? ??????"
 
 # tithi
-#, fuzzy
 msgid "TinyURL"
-msgstr "???? URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL ???????"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
+"URL ?? ???? ?????? ????? ???? ??? ??????? ??????? ???? ???? TinyURL ??????? ??"
 
 msgid "accounts"
-msgstr "???????????"
+msgstr "???????"
 
 msgid "Password is required to sign on."
-msgstr "???????? ???? ?????????? ???????"
+msgstr "?????? ???? ????????? ???????"
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "%1s (%2s) ?? ???? ?????????? ?????? ????"
+msgstr "%1$s (%2$s) ?? ???? ????????? ???"
 
 msgid "Enter Password"
-msgstr "?????????? ?????? ????"
+msgstr "????????? ???"
 
 msgid "Save password"
-msgstr "?????????? ??????? ????"
+msgstr "????????? ???????"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s ?? ???? ??????????? ??????? ???????"
+msgstr "%s ?? ???? ?????? ???????? ???????"
 
 msgid "Connection Error"
-msgstr "????? ??????"
+msgstr "?????? ??????"
 
 msgid "New passwords do not match."
-msgstr "???? ?????????????? ????? ???"
+msgstr "???? ????????????? ????? ???"
 
 msgid "Fill out all fields completely."
-msgstr "?? ??????? ???????????? ???? ?????"
+msgstr "?? ??????? ???????????? ???? ?????"
 
 msgid "Original password"
-msgstr "??? ??????????"
+msgstr "??? ?????????"
 
 msgid "New password"
-msgstr "???? ??????????"
+msgstr "???? ?????????"
 
 msgid "New password (again)"
-msgstr "???? ?????????? (????)"
+msgstr "???? ????????? (????)"
 
 #, c-format
 msgid "Change password for %s"
-msgstr "%s ?? ???? ?????????? ???????? ????"
+msgstr "%s ?? ???? ????????? ???????? ????"
 
 msgid "Please enter your current password and your new password."
-msgstr "??????? ??? ????? ??????? ?????????? ??? ???? ?????????? ?????? ?????"
+msgstr "??????? ??? ????? ??????? ????????? ??? ???? ????????? ????"
 
 #, c-format
 msgid "Change user information for %s"
-msgstr "%s ?? ???? ??????????? ???? ???????? ????"
+msgstr "%s ?? ???? ?????????? ???? ???????? ????"
 
 msgid "Set User Info"
-msgstr "???????????? ???? ???????? ????"
+msgstr "???????????? ???? ????????"
 
 msgid "Unknown"
 msgstr "?????"
@@ -1699,7 +1720,7 @@ msgid "%s has presented the following ce
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr "?????????-???-????? ????????? ???? %s ?????????? ???????? ???? ???????? ?????:"
+msgstr "????????? ????? ????????? ???? %s ?????????? ??????????? ???????? ?????:"
 
 # tithi
 #, c-format
@@ -1707,41 +1728,40 @@ msgstr ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"?????? ???: %1s %2s\n"
-"?????????????? (SHA1): %3s"
+"?????? ???: %1$s %2$s\n"
+"?????????????? (SHA1): %3$s"
 
 # tithi
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "???-????????? ???????? ?????? ?????? ?????"
+msgstr "???-??????? ????????????? ?????? ?????"
 
 # tithi
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr "???????? ?????? ?????????"
+msgstr "????????????? ?????????"
 
 # tithi
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr "SSL ???????? ??????"
+msgstr "SSL ???????? ?????"
 
 #. Make messages
 #, c-format
 msgid "Accept certificate for %s?"
-msgstr "%s ?? ???? ?? ???????? ???? ????? ??????"
+msgstr "%s ?? ???? ?? ??????????? ????? ??? ????"
 
 # tithi
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr "SSL ???????? ?????? ?????? ?????"
+msgstr "SSL ????????????? ?????? ?????"
 
 # tithi
 msgid "_View Certificate..."
-msgstr "???????? ???? ?????...(_V)"
+msgstr "??????????? ????????... (_V)"
 
-# tithi
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1749,24 +1769,25 @@ msgstr ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
-"\"%s\" ?????? ????????? ???????? ?????? ???-????????? ??? ???????????????? ??????? ??? "
+"\"%s\" ?????? ????????? ????????????? ???-??????????? ??? ???????????????? ??????? ??? "
 "???? ???"
 
-# tithi
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr "%s ?? ???? ????????? ???????? ?????? ?????? ??? ????"
+msgstr "%s ?? ???? ????????? ??????????? ???? ??????? ????"
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr "SSL ???????? ?????? ??????"
+msgstr "SSL ??????????? ??????"
 
 msgid "Invalid certificate chain"
-msgstr "???? ???????? ?????? ??????"
+msgstr "???????? ??????????? ????"
 
 # tithi
 #. vrq will be completed by user_auth
@@ -1774,29 +1795,27 @@ msgstr ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-"????? ??? ???????? ?????? ???? ????????? ???, ?????? ?? ???????? ?????? ??? ??? ???? "
-"???"
+"????? ??? ????????????? ???? ??????? ???, ?????? ?? ?????????????? ??????????? "
+"??????? ??? ???? ???"
 
 # tithi
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "??? ???????? ?????? ??? ?????? ?????? ??? ????? ?? ??????? ???? ????????"
+msgstr "??? ????????????? ??? ?????? ?????? ??? ????? ?? ??????? ???? ????????"
 
-# tithi
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
-"%s ?????? ????????? ???????? ???? ???????? ???????? ?????? ????????? ??? ??????? ??? "
-"??????? ???????? ??? ?? ?????? ??? ???? ??? ?? ?? ???????? ????"
+"%s ?????? ????????? ??????????? ??????? ??? ????? ?????? ??????? ????????? ???? ??? "
+"??? ??????? ???????? ????"
 
 msgid "Invalid certificate authority signature"
-msgstr "???? ???????? ???? ????????? ????????"
+msgstr "???????? ??????????? ????????? ????????"
 
-# tithi
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
@@ -1806,9 +1825,9 @@ msgstr ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"???????? ?????? ???? ??? ?? ??? \"%2s\" ?? ???????? \"%1s\" ?????? ????????? "
-"???????  ??? ?????? ??? ?? ???? ??? ????? ???? ??????? ?? ???? ???? ???? ??? "
-"??????? ?????"
+"????????????? ???? ??? ?? ??? \"%1$s\" ?? ???????? \"%2$s\" ?????? ????????? "
+"??????? ?? ???? ??? ??? ??, ???? ?? ????????? ???? ??????? ??? ??? ????? ???? ?? "
+"???"
 
 # tithi
 #. Make messages
@@ -1821,62 +1840,61 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
-"?????? ???: %s\n"
+"?????? ???: %1$s\n"
 " \n"
-"???????????? ??? (SHA1): %s\n"
+"?????????????? (SHA1): %2$s\n"
 "\n"
-"?????????? ?????: %s\n"
-"????? ?????????? ?????: %s\n"
+"?????????? ?????: %3$s\n"
+"????? ?????????? ?????: %4$s\n"
 
 #. TODO: Find what the handle ought to be
 msgid "Certificate Information"
-msgstr "???????? ?????? ????"
+msgstr "????????????? ????"
 
 msgid "Registration Error"
 msgstr "??????? ??????"
 
 msgid "Unregistration Error"
-msgstr "?????????? ??????"
+msgstr "???????? ??????"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s ??? ?????? "
+msgstr "+++ %s ???? ?????"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s ??? ??????"
+msgstr "+++ %s ????? ?????"
 
 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "????? ??????"
 
 msgid "Unable to send message: The message is too large."
-msgstr "?????? ?????? ????? ??: ???????? ???? ???"
+msgstr "?????? ?????? ??????: ???????? ???? ???"
 
 #, c-format
 msgid "Unable to send message to %s."
-msgstr "%s-? ???????? ?????? ????? ???"
+msgstr "%s-?? ?????? ?????? ??????"
 
 msgid "The message is too large."
 msgstr "???????? ???? ???"
 
 msgid "Unable to send message."
-msgstr "?????? ?????? ????? ???"
+msgstr "?????? ?????? ??????"
 
 msgid "Send Message"
-msgstr "?????? ?????? ????"
+msgstr "?????? ?????"
 
 msgid "_Send Message"
-msgstr "?????? ?????? ???? (_S)"
+msgstr "?????? ????? (_S)"
 
 #, c-format
 msgid "%s entered the room."
-msgstr "%s ?? ????? ?????? ??????"
+msgstr "%s  ???? ?????? ??????"
 
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%1s [<I>%2s</I>] ?? ????? ?????? ??????"
+msgstr "%1$s [<I>%2$s</I>] ???? ?????? ??????"
 
 #, c-format
 msgid "You are now known as %s"
@@ -1884,20 +1902,19 @@ msgid "%s is now known as %s"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%1s ??? %2s ???? ??????"
+msgstr "%1$s ??? %2$s ???? ??????"
 
 #, c-format
 msgid "%s left the room."
-msgstr "%s ?? ????? ????? ??????"
+msgstr "%s ??? ????? ??????"
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%1s (%2s) ?? ????? ????? ??????"
+msgstr "%1$s (%2$s) ??? ????? ??????"
 
 # tithi
-#, fuzzy
 msgid "Invite to chat"
-msgstr "???????? ???????? ?????"
+msgstr "?????? ???????? ?????"
 
 #. Put our happy label in it.
 msgid ""
@@ -1905,7 +1922,7 @@ msgstr ""
 "invite message."
 msgstr ""
 "???? ?????? ???????? ?????? ??, ??????? ??? ???? ?? ????????????? ???????? ?????? ??? "
-"??? ????? ?????? ?????"
+"??? ????? ????"
 
 #, c-format
 msgid "Failed to get connection: %s"
@@ -1919,48 +1936,48 @@ msgstr "??????? ??? 
 msgid "Failed to get serv name: %s"
 msgstr "??????? ??? ???? ??????: %s"
 
-# tithi
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "Purple-?? D-BUS ??????? ????? ??????????? ?????? ???? ???? ??"
+msgstr "Purple-?? D-BUS ??????? ???????????? ????? ???? ??"
 
 msgid "No name"
 msgstr "???? ??? ???"
 
+# ***
 msgid "Unable to create new resolver process\n"
-msgstr "???? ?????? ?????? ???? ???? ?????\n"
+msgstr "???? ??????? ?????? ???? ???? ??????\n"
 
 msgid "Unable to send request to resolver process\n"
-msgstr "??????????? ???????? ?????? ?????? ?????\n"
+msgstr "??????? ??????? ?????? ?????? ??????\n"
 
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"%1s ??????? ??????: \n"
-"%2s"
+"%1$s ??????? ??????: \n"
+"%2$s"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "%1s ??????? ??????: %2d"
+msgstr "%1$s ??????? ??????: %2$d"
 
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-"??????????? ?????? ??? ?????? ??????:\n"
+"??????? ?????? ???? ?????? ??????:\n"
 "%s"
 
 # tithi
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr "?????????? ?????? ?????? ???????? ????? ?? ????? ???????? ?????"
+msgstr "??????? ?????? ???????? ????? ?? ????? ???????? ?????"
 
 # tithi
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "????? ?????? ??????: %s"
+msgstr "????? ???? ???? ??????: %s"
 
 msgid "Unknown reason"
 msgstr "????? ????"
@@ -1970,42 +1987,42 @@ msgstr ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"%1s ?????? ??????: \n"
-"%2s?\n"
+"%1$s ?????? ??????: \n"
+"%2$s?\n"
 
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"%1s ?????? ??????: \n"
-"%2s?\n"
+"%1$s ?????? ??????: \n"
+"%2$s?\n"
 
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"%s-? ??????? ??????: \n"
-"%s?\n"
+"%1$s-? ??????? ??????: \n"
+"%2$s?\n"
 
-# tithi
 msgid "Directory is not writable."
-msgstr "?????????? ????????? ???"
+msgstr "????????? ????????? ???"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "? ?????? ???? ???? ?????? ???? ???"
+msgstr "? ?????? ???? ???? ?????? ????? ???"
 
 msgid "Cannot send a directory."
-msgstr "?????????? ?????? ???? ???"
+msgstr "????????? ?????? ????? ???"
 
+# ***
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s ?????? ???? ???? ???? ??????????? ???? ??????? ???? ???????????? ?????\n"
+msgstr "%s ???? ????????? ???? ???? ???????????? ???????? ???????????? ??? ??????\n"
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%1s ?????? %2s (%3s) ?????? ???"
+msgstr "%1$s ?????? %2$s (%3$s) ?????? ???"
 
 #, c-format
 msgid "%s wants to send you a file"
@@ -2013,7 +2030,7 @@ msgid "Accept file transfer request from
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "%s ?? ???? ?????????? ???? ?????? ????? ????? ???"
+msgstr "%s ?? ???? ???????????? ?????? ????? ??? ??? ???"
 
 #, c-format
 msgid ""
@@ -2021,13 +2038,13 @@ msgstr ""
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"???? ???? ????? ???? ??????? ???? ???? ???????:\n"
+"?????????? ????? ???? ???? ???? ????????????:\n"
 "???????? ?????: %s\n"
 "???????? ?????: %d"
 
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%1s %2s ?????? ??????? ???????? ??????"
+msgstr "%1$s %2$s ?????? ??????? ???????? ??????"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -2035,18 +2052,22 @@ msgid "Offering to send %s to %s"
 
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "%2s ? %1s ??????? ???????? ??????"
+msgstr "%2$s ? %1$s ??????? ???????? ??????"
 
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "%2s ??? %1s-?? ?????????? ???? ?????"
+msgstr "%2$s ???? %1$s-?? ?????????? ???? ?????"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "<A HREF=\"file://%s\">%s</A> ?????? ?????????? ???????"
+
+#, c-format
 msgid "Transfer of file %s complete"
-msgstr "%s ?????? ?????????? ????????"
+msgstr "%s ?????? ?????????? ???????"
 
 msgid "File transfer complete"
-msgstr "???? ?????????? ????????"
+msgstr "???? ?????????? ???????"
 
 #, c-format
 msgid "You canceled the transfer of %s"
@@ -2057,7 +2078,7 @@ msgid "%s canceled the transfer of %s"
 
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%1s %2s-?? ?????????? ????? ?????"
+msgstr "%1$s %2$s-?? ?????????? ????? ?????"
 
 #, c-format
 msgid "%s canceled the file transfer"
@@ -2065,49 +2086,46 @@ msgid "File transfer to %s failed."
 
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "%s ? ?????? ?????????? ?????? ??????"
+msgstr "%s ? ???? ?????????? ?????? ??????"
 
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "%s ???? ?????? ?????????? ?????? ??????"
+msgstr "%s ???? ???? ?????????? ?????? ??????"
 
 msgid "Run the command in a terminal"
-msgstr "????????? ?????????? ?????"
+msgstr "???????? ?????????? ?????"
 
 # tithi
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "??? ??????? ????, ?? ????????? ??\"aim\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????, ??\"aim\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "??? ??????? ????, ?? ????????? ??\"gg\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????,  \"gg\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "??? ??????? ????, ?? ????????? ??\"icq\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????,  \"icq\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "??? ??????? ????, ?? ????????? ??\"irc\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????,  \"irc\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
-"??? ??????? ????, ?? ????????? ??\"msnim\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????,  \"msnim\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "??? ??????? ????, ?? ????????? ??\"sip\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????, \"sip\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
-"??? ??????? ????, ?? ????????? ??\"xmpp\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????,  \"xmpp\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
-"??? ??????? ????, ?? ????????? ??\"ymsgr\" ?? URL ?????????? ???? ??????? ??? ????"
+msgstr "??? ??????? ????, \"ymsgr\" ?? URL ?????????? ???? ??????? ???????"
 
 # tithi
 msgid "The handler for \"aim\" URLs"
@@ -2145,208 +2163,208 @@ msgid ""
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
-msgstr "???? ??? \"???????\" ??-?? ???????? ????????? \"aim\" ?? URL ?????????? ????"
+msgstr "????, ??? \"command\" ??-?? ???????? ???????? \"aim\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
-msgstr "???? ??? \"???????\" ??-?? ???????? ????????? \"gg\" ?? URL ?????????? ????"
+msgstr "????, ??? \"command\" ??-?? ???????? ???????? \"gg\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
-msgstr "???? ??? \"???????\" ??-?? ???????? ????????? \"icq\" ?? URL ?????????? ????"
+msgstr "????, ??? \"command\" ??-?? ???????? ???????? \"icq\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
-msgstr "???? ??? \"???????\" ??-?? ???????? ????????? \"irc\" ?? URL ?????????? ????"
+msgstr "????, ??? \"command\" ??-?? ???????? ???????? \"irc\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"???? ??? \"???????\" ??-?? ???????? ????????? \"msnim\" ?? URL ?????????? ????"
+"????, ??? \"command\" ??-?? ???????? ???????? \"msnim\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
-msgstr "???? ??? \"???????\" ??-?? ???????? ????????? \"sip\" ?? URL ?????????? ????"
+msgstr "????, ??? \"command\" ??-?? ???????? ???????? \"sip\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
-msgstr "???? ??? \"???????\" ??-?? ???????? ????????? \"xmpp\" ?? URL ?????????? ????"
+msgstr ""
+"????, ??? \"command\" ??-?? ???????? ???????? \"xmpp\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"???? ??? \"???????\" ??-?? ???????? ????????? \"ymsgr\" ?? URL ?????????? ????"
+"????, ??? \"command\" ??-?? ???????? ???????? \"ymsgr\" ?? URL ?????????? ????"
 
 # tithi
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr "???? ??? ??? ?? ????? URL ?????????? ???? ??????? ????????? ?????????? ???? "
+msgstr "????, ??? ??? ?? ????? URL ?????????? ???? ??????? ???????? ?????????? ???? "
 
 # tithi
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "???????? ????????? \"aim\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"aim\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "???????? ????????? \"gg\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"gg\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "???????? ????????? \"icq\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"icq\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "???????? ????????? \"irc\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"irc\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "???????? ????????? \"msnim\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"msnim\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "???????? ????????? \"sip\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"sip\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "???????? ????????? \"xmpp\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"xmpp\" ?? URL ????????? ???? ????"
 
 # tithi
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "???????? ????????? \"ymsgr\" ?? URL ????????? ???? ????"
+msgstr "???????? ???????? \"ymsgr\" ?? URL ????????? ???? ????"
 
+# ***
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">?? ???????? ??? ???? ????  ????? ???</font></b>"
+msgstr "<b><font color=\"red\">?? ?????? ???? read ????? ???</font></b>"
 
 msgid "HTML"
-msgstr "?????????"
+msgstr "HTML"
 
 msgid "Plain text"
-msgstr "??? ???"
+msgstr "??? ??????"
 
 # tithi
 msgid "Old flat format"
-msgstr "?????? ???????? ???????"
+msgstr "?????? ??? ???????"
 
 msgid "Logging of this conversation failed."
-msgstr "?? ????????? ?????????? ???????"
+msgstr "?? ??????? ?? ???? ???????"
 
 msgid "XML"
-msgstr "????????"
+msgstr "XML"
 
+# ***
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%1s)</font> <b>%2s &3lt;????????????-"
-"?????&4gt;:</b></font> %5s<br/>\n"
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 
+# ***
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%1s)</font> <b>%2s &3lt;????????????-"
-"?????&4gt;:</b></font> %5s<br/>\n"
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 
+# ***
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>?? ?? ?????? ?????</b></font>"
+msgstr "<font color=\"red\"><b>?? ??? ????? ????? ?????!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>???? ????? ??????: %s</b></font>"
+msgstr "<font color=\"red\"><b>???? ???? ????? ????: %s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%1s) %2s <AUTO-REPLY>: %3s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 # tithi
-#, fuzzy
 msgid "Error creating conference."
-msgstr "????? ?????? ??????"
+msgstr "??????? ?????? ??????"
 
-# tithi
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "???? %1s ??????? ?????, ?????? ?? ????????? %2s ?????????"
+msgstr "???? %1$s ??????? ?????, ?????? ?? ????????? %2$s ?????????"
 
-# tithi
 msgid "This plugin has not defined an ID."
-msgstr "?? ??????? ???? ???? ???????? ??????"
+msgstr "?? ??????? ??? ID ???????? ??????"
 
-# tithi
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "??????? ??????? %1d ?? ???? ???? ?? (%2d ????????)"
+msgstr "??????? ????????? ???? ???? %1$d (%2$d ????????)"
 
-# tithi
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "ABI ??????? %1d ?? ???? ???? ???%2d.x (%3d.%4d.x ????????)"
+msgstr "ABI ??????? ? ???? %d.%d.x (%d.%d.x ???????)"
 
 # tithi
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr ""
-"??????? ??? ??????????? ????? ?????????? ??? ?? (?????-???? (_i), ???? ??? ???? ????)"
+msgstr "??????? ?? ??????????? ????? ?????????? ??? ?? (list_icon, login and close)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"??????????? ??????? %s ????? ?????? ??????? ??????? ??? ?? ????????? ???????? ???? ??? "
+"??????????? ??????? %s ????? ?????? ??????? ??????? ??? ?? ????????? ?????? ???? ??? "
 "??????? ?????? ?????"
 
 msgid "Unable to load the plugin"
-msgstr "????????? ??? ???? ?????"
+msgstr "????????? ??? ???? ??????"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "??????????? ??????? %s ??? ???? ??????"
+msgstr "??????????? ??????? %s ??? ??? ???????"
 
 msgid "Unable to load your plugin."
-msgstr "????? ????????? ??? ???? ??????"
+msgstr "????? ????????? ??? ???? ???????"
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "%1s ?? %2s ????????, ?????? ??? ?????? ???? ???????"
+msgstr "%1$s ?? %2$s ????????, ?????? ??? ????? ???? ?????? ??????"
 
+# ***
 msgid "Autoaccept"
-msgstr "????????????-?????"
+msgstr "?????????????? ?????"
 
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "????????? ???????????? ??? ???? ??????-????? ?????? ?????????? ?????? ?????"
+msgstr "????????? ??????????? ???? ???? ???????????? ?????? ??????????????? ????? ????"
 
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "\"%1s\" ??? \"%2s\" ??????-????? ???? ?????????? ???????? ??????"
+msgstr "\"%2$s\" ???? ??????????????? ????? \"%1$s\" ???? ?????????? ????????"
 
 msgid "Autoaccept complete"
-msgstr "??????-????? ???????"
+msgstr "??????????????? ????? ???????"
 
 #, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "??? %s ???? ????-?????????? ?????? ?????"
+msgstr "??? %s ???? ???? ???????????? ?????? ???"
 
 # tithi
 msgid "Set Autoaccept Setting"
-msgstr "??????-????? ???????? ???????? ????"
+msgstr "??????????????? ??????? ????? ????????"
 
 msgid "_Save"
 msgstr "??????? (_S)"
@@ -2356,48 +2374,47 @@ msgid "Ask"
 
 # tithi
 msgid "Ask"
-msgstr "???????? ????"
+msgstr "???????? ??? ???"
 
 msgid "Auto Accept"
-msgstr "?????? ????? ????"
+msgstr "??????????????? ????? ???"
 
 msgid "Auto Reject"
-msgstr "?????? ???????????? ????"
+msgstr "??????????????? ???????????? ???"
 
 msgid "Autoaccept File Transfers..."
-msgstr "????????????-????? ???? ?????????? ???..."
+msgstr "??????????? ???? ??????????..."
 
-# tithi
 #. XXX: Is there a better way than this? There really should be.
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"?????? ??????? ???? ??\n"
-"(??????? ??? ???????? ?? ?????? ????)"
+"???? ????????? ?????\n"
+"(??????? ??? ???????? ??? ?????? ????)"
 
 msgid "Automatically reject from users not in buddy list"
-msgstr "????? ??????? ???????? ????????????? ??? ???????????? ???? ????? ????"
+msgstr "????? ??????? ???????? ??????????? ???? ???????????? ???? ????? ??? ???"
 
 # tithi
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"???? ??????-????? ???? ?????????? ???????? ??? ??-?? ?????? ???? ????\n"
-"(????????? ??? ???????? ????? ???? ??????? ??? ??)"
+"??????????????? ???? ????? ??????? ??? ???? ??-?? ?????? ???? ??? ???\n"
+"(????????? ??? ???????? ????? ???? ??????? ?????)"
 
 msgid "Create a new directory for each user"
-msgstr "???????? ???????????? ???? ???? ?????????? ???? ????"
+msgstr "???????? ???????????? ???? ???? ???? ????????? ???? ??? ???"
 
 msgid "Notes"
 msgstr "???"
 
 msgid "Enter your notes below..."
-msgstr "????? ??????? ???? ?????? ????..."
+msgstr "????? ??????? ???? ?????..."
 
 msgid "Edit Notes..."
-msgstr "??? ??????? ????..."
+msgstr "??? ????????..."
 
 #. *< major version
 #. *< minor version
@@ -2414,13 +2431,13 @@ msgid "Store notes on particular buddies
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr "????????? ???????? ???? ??? ??????? ????"
+msgstr "????????? ????? ???????? ??? ???????"
 
-# tithi
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "????? ????? ??????? ???????? ???? ??? ??????? ???? ????? ??? ????"
+msgstr "????? ????? ??????? ???????? ???????? ??? ??????? ???? ???? ??? ????"
 
+# ***
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2430,13 +2447,13 @@ msgstr "?????? ?????msgid "Cipher Test"
 msgstr "?????? ???????"
 
-# fix me tithi
+# ***
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr "????????? ?? ??? ??? ??? ?????????? ??????? ????"
+msgstr "libpurple ???? ??????? ?????????? ??????? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -2461,14 +2478,15 @@ msgid "File Control"
 #. *< priority
 #. *< id
 msgid "File Control"
-msgstr "???? ?????????? ????"
+msgstr "???? ??????????"
 
+# ***
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "????? ??????????? ?????? ???? ??????? ?????????? ??????? ?????"
+msgstr "????? ?????? ???? ?????????? ???? ??????? ????"
 
 msgid "Minutes"
 msgstr "?????"
@@ -2476,31 +2494,32 @@ msgid "I'dle Mak'er"
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
 msgid "I'dle Mak'er"
-msgstr "?'?? ???????'?"
+msgstr "I'dle Mak'er"
 
 msgid "Set Account Idle Time"
-msgstr "????????? ??? ???? ???????? ????"
+msgstr "????????? ????????? ???? ????????"
 
 msgid "_Set"
 msgstr "???????? (_S)"
 
 msgid "None of your accounts are idle."
-msgstr "????? ???? ??????? ??? ????"
+msgstr "????? ???? ??????? ????????? ???"
 
 msgid "Unset Account Idle Time"
-msgstr "????????? ??? ???? ?????? ????"
+msgstr "????????? ????????? ???? ??????"
 
+# ***
 msgid "_Unset"
-msgstr "????????? ???? (_U)"
+msgstr "????? (_U)"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "?? ????????? ???? ??? ???? ???????? ????"
+msgstr "?? ????????? ???? ????????? ???? ????????"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "?? ??? ????????? ???? ??? ???? ?????? ????"
+msgstr "?? ????????? ????????? ???? ????????? ???? ??????"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "???? ?????? ??? ?????? ?? ?????? ??? ????-??????? ???? ??????? ???"
+msgstr "???? ?????? ????????? ?? ???? ????? ??????? ???? ??????"
 
 #. *< type
 #. *< ui_requirement
@@ -2515,15 +2534,16 @@ msgid "Test plugin IPC support, as a cli
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "?????????? ??????, ????????? IPC ?????? ??????? ?????"
+msgstr "?????????? ??????, ????????? IPC ??????? ??????? ??? ????"
 
+# ***
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"?????????? ??????, ????????? IPC ?????? ??????? ????? ??? ??????? ??????? ??????? ??? "
-"??? ???????? ??????????? ??????? ????"
+"?????????? ??????, ????????? IPC ??????? ??????? ??? ???? ??? ??????? ??????? ??????? "
+"??? ??? ???????? ?????????? ??????"
 
 #. *< type
 #. *< ui_requirement
@@ -2538,27 +2558,28 @@ msgid "Test plugin IPC support, as a ser
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "??????? ??????, ????????? IPC ?????? ??????? ?????"
+msgstr "??????? ??????, ????????? IPC ??????? ??????? ??? ????"
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"??????? ??????, ????????? IPC ?????? ??????? ????? ??? IPC ??????????? ??????? ????"
+"??????? ??????, ????????? IPC ??????? ??????? ??? ???? ??? IPC ?????????? ??????? "
+"????"
 
+# ***
 msgid "Join/Part Hiding Configuration"
-msgstr "?????? ?????????? ?????/?????? ????"
+msgstr "?????? ?????????? ?????/?????? ??? ???"
 
 # tithi
 msgid "Minimum Room Size"
-msgstr "??????? ?????? ????"
+msgstr "????? ??????? ????"
 
 # tithi
 msgid "User Inactivity Timeout (in minutes)"
-msgstr "???????????? ???????????? ???????? ???????? (??????)"
+msgstr "???????????? ????????????? ???????? ???????? (??????)"
 
-# tithi
 msgid "Apply hiding rules to buddies"
-msgstr "???????? ??? ??????? ????? ??????? ????"
+msgstr "???????? ??????? ????? ??????? ????"
 
 # tithi
 #. *< type
@@ -2575,16 +2596,16 @@ msgid "Hides extraneous join/part messag
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr "?????????? ?????/?????? ?????????? ???? ????"
+msgstr "?????/?????? ?? ???????? ?????????? ?????? ?????"
 
-# tithi
+# ***
 #. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"?? ??????? ?????/?????? ???????????? ???? ????? ?????? ????, ???????? ?????????? "
-"???????????? ??? ??????????? ???????"
+"?? ??????? ?? ????? ?????/?????? ???????????? ?????? ????, ????????? ???????? "
+"?????????? ???????????? ??????????? ???????"
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2597,26 +2618,27 @@ msgid "Auto-response sent:"
 msgstr "??????????? ????????"
 
 msgid "Auto-response sent:"
-msgstr "??????-???? ?????? ??????:"
+msgstr "??????????? ???? ?????? ??????:"
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s ????????"
+msgstr "%s ????? ??????"
 
 msgid "One or more messages may have been undeliverable."
-msgstr "?? ?? ?????? ?????? ?????? ?????? ???"
+msgstr "?? ?? ?????? ?????? ?????? ????? ?????"
 
 msgid "You were disconnected from the server."
-msgstr "???? ??????? ???? ????????? ??????"
+msgstr "???? ??????? ???? ????????? ??? ??????"
 
+# mark9
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"???? ???????? ?????????? ???? ?? ?? ?? ??? ??????? ?????????? ????? ??? ??? ???"
+"????? ????? ???????? ?????????? ???? ???? ?? ??? ??????? ?????? ????? ??? ???? ???"
 
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "???????? ???? ?????????? ??????? ?????? ?????? ?????? ???"
+msgstr "???????? ???? ??????? ???? ?????? ?????? ????? ??????"
 
 msgid "Message could not be sent."
 msgstr "?????? ?????? ????? ??????"
@@ -2625,19 +2647,19 @@ msgid "Adium"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Adium"
-msgstr "???????"
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Fire"
-msgstr "????"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Messenger Plus!"
-msgstr "?????????? ?????!"
+msgstr "Messenger Plus!"
 
 # tithi
 #. The names of IM clients are marked for translation at the request of
@@ -2650,13 +2672,13 @@ msgid "MSN Messenger"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "MSN Messenger"
-msgstr "?????? ??????????"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
-msgstr "??????????"
+msgstr "Trillian"
 
 # tithi
 #. The names of IM clients are marked for translation at the request of
@@ -2665,20 +2687,22 @@ msgstr "aMSN"
 msgid "aMSN"
 msgstr "aMSN"
 
+# ***
 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "?????? ?? ????? ????????"
+msgstr "?? ????? ?????? ??????????"
 
+# ***
 msgid "Fast size calculations"
-msgstr "????? ???? ????????"
+msgstr "????? ???? ??????"
 
 # fix me- tithi
 msgid "Use name heuristics"
-msgstr "??? ?????????? ??????? ????"
+msgstr "????? ?????????? ??????? ??? ???"
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
-msgstr "?? ??????????"
+msgstr "?? ?????????"
 
 #. *< type
 #. *< ui_requirement
@@ -2693,10 +2717,10 @@ msgid "Includes other IM clients' logs i
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "?? ????????? ???????? ???? ????????????? ?????? ??????????? ????"
+msgstr "?? ????????? ???????? IM ????????????? ?? ??????????? ????"
 
+# ***
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2704,25 +2728,26 @@ msgstr ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"??? ?? ????????? ???, ??? ?? ??????? ???????? ???? ????????????? ?? ??????????? ????? "
-"????????, ??? ???????, ?????? ???????????, ??? ?????????? ??????????? ????\n"
+"?? ????????? ???? ??? ?? ??????? ???????? IM ????????????? ?? ??????????? ????? ????????, "
+"??? Adium, MSN Messenger,aMSN ??? Trillian ??????????? ????\n"
 "\n"
-"???????: ?? ????????? ???? ???? ??? ??? ??????? ???? ??? ?????  ????? ??? "
-"??????????? ??????? ????!"
+"?????????: ?? ????????? ???? ???? ??? ??? ?????? ??????? ???? ????? ??? ??????????? "
+"??????? ????!"
 
+# ***
 msgid "Mono Plugin Loader"
-msgstr "???? ??????? ???????"
+msgstr "Mono ??????? ?????"
 
 # sam: mono?
 msgid "Loads .NET plugins with Mono."
-msgstr "???? ?? ???? .NET ??????? ??? ???"
+msgstr "Mono ?? ???? .NET ??????? ??? ???"
 
 # tithi
 msgid "Add new line in IMs"
-msgstr "???? ? ???? ???? ??? ????"
+msgstr "IM ? ???? ???? ??? ??? ???"
 
 msgid "Add new line in Chats"
-msgstr "??????? ???? ???? ??? ????"
+msgstr "??????? ???? ???? ??? ??? ???"
 
 #. *< magic
 #. *< major version
@@ -2739,32 +2764,27 @@ msgid "Prepends a newline to displayed m
 #. *< name
 #. *< version
 msgid "Prepends a newline to displayed message."
-msgstr "????????? ??????? ????-???? ??? ????"
+msgstr "????????? ??????? ?????? ????-???? ??? ????"
 
-# tithi
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"??????????? ???? ???? ???? ??? ???? ??? ??????? ??????? ???????????? ????? ????? "
-"??????? ?????????? ??????? ???"
+"??????? ??????? ?????? ???? ???? ???? ??? ??? ???? ??????? ?????? ???????????? "
+"????? ???? ?????"
 
-# tithi
 msgid "Offline Message Emulation"
-msgstr "?????? ?????? ?????? ????"
+msgstr "?????? ?????? ??????"
 
-# tithi
 msgid "Save messages sent to an offline user as pounce."
-msgstr "?????? ????????????? ?????? ?????? ?????? ?????? ??????? ?????"
+msgstr "?????? ????????????? ?????? ?????? ?????? ?????? ???????? ????"
 
-# tithi
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"??????? ?????????? ?????? ?????? ???????? ???? ???? '????? ??????' ????? ??? ?????? "
+"??????? ?????????? ?????? ?????? ???????? ???? ???? '????? ??????' ?????? ???? ?????? "
 "????????/???? ????? ??????"
 
 #, c-format
@@ -2772,15 +2792,15 @@ msgstr ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"\"%s\" ???????? ??????? ????? ???? ?? ??????? ?????????? ??????? ??????? ???? ??? "
-"??? \"%s\" ??? ??????? ???? ??? ??? ??????? ???????????? ???? ?????? ????"
+"\"%s\" ???????? ??????? ???? ?? \"%s\" ??? ??????? ???? ??? ??? ??????? ?????????? "
+"??????? ??????? ??? ??????? ???????????? ???? ?????? ????"
 
 msgid "Offline Message"
 msgstr "?????? ??????"
 
-# tithi
+# mark10
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "???? '????? ??????' ????? ??? ?????? ????????/???? ????? ??????"
+msgstr "???? '????? ??????' ?????? ???? ?????? ???????? ???? ?? ???? ????? ??????"
 
 msgid "Yes"
 msgstr "?????"
@@ -2790,16 +2810,16 @@ msgid "Save offline messages in pounce"
 
 # tithi
 msgid "Save offline messages in pounce"
-msgstr "?????? ?????? ??????? ??????? ????"
+msgstr "?????? ?????? ??????? ??????? ??? ???"
 
-# tithi
 msgid "Do not ask. Always save in pounce."
-msgstr "???????? ????? ??? ?????? ??????? ??????? ?????"
+msgstr "???????? ??? ??? ??? ?????? ??????? ??????? ??? ????"
 
-#, fuzzy
+# ?? ????? ???????????? ?????????
 msgid "One Time Password"
-msgstr "?????????? ?????? ????"
+msgstr "??????? ?????????"
 
+# Context?
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2807,13 +2827,13 @@ msgid "One Time Password Support"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "??????? ????????? ???????"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "????????? ???? ????? ?????? ??????? ?? ?? ??????? ??? ????"
 
 #. *  description
 msgid ""
@@ -2821,7 +2841,11 @@ msgstr ""
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"????? ????????? ???? ???? ????????? ??????? ???? ????? ??, ????????? ????????? "
+"????????? ???? ??? ??????? ???? ??????? ????\n"
+"???: ??? ??? ???? ???? ????????? ??????????? ???????? ???? ????? ???"
 
+# ***
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2829,45 +2853,46 @@ msgid "Perl Plugin Loader"
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "????? ??????? ???????"
+msgstr "????? ??????? ?????"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "????? ??????? ??? ???? ???? ?????? ????"
+msgstr "????? ??????? ??? ???? ???? ??????? ?????? ????"
 
 # tithi
 msgid "Psychic Mode"
-msgstr "?????? ????????"
+msgstr "?????? ???"
 
 # fix me tithi
 msgid "Psychic mode for incoming conversation"
-msgstr "??? ?????????? ???? ?????? ????????"
+msgstr "??? ????????? ???? ?????? ???"
 
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"???????? ????????????? ?????? ?????? ?????? ???? ???? ????? ??????? ??????? ??????? "
-"???  ??? AIM, ICQ, XMPP, Sametime, ??? Yahoo ?? ???? ??? ???!"
+"???????? ????????????? ?????? ?????? ???? ???? ????????? ?????? ????? ???? ???? ??? "
+"AIM, ICQ, XMPP, Sametime, ??? Yahoo! ?? ???? ??? ????"
 
 # tithi
 msgid "You feel a disturbance in the force..."
-msgstr "???? ????? ???? ??????? ????? ?????..."
+msgstr "???? ????? ???? ???????? ????? ?????..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "????????? ????? ??????? ???????????? ???? ?????? ????"
+msgstr "????????? ????? ??????? ?????????????? ???? ?????? ??? ???"
 
 msgid "Disable when away"
-msgstr "???? ????? ??? ?????????? ????"
+msgstr "??????? ????? ?????????? ??? ???"
 
-# tithi
+# mark11
 msgid "Display notification message in conversations"
-msgstr "???????? ????????? ?????? ???????? ????"
+msgstr "???????? ????? ????????? ???"
 
+# ***
 msgid "Raise psychic conversations"
-msgstr "?????? ????????? ?????"
+msgstr "?????? ????????? ????????? ??? ???"
 
 #. *< type
 #. *< ui_requirement
@@ -2876,14 +2901,14 @@ msgid "Signals Test"
 #. *< priority
 #. *< id
 msgid "Signals Test"
-msgstr "??????????? ???????"
+msgstr "????? ???????"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "??? ????? ???????? ??? ???? ???? ?? ????? ??????? ?????"
+msgstr "?? ????? ???????? ??? ???? ???? ?? ??????? ??? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -2892,19 +2917,19 @@ msgid "Simple Plugin"
 #. *< priority
 #. *< id
 msgid "Simple Plugin"
-msgstr "??? ???????"
+msgstr "??? ???????"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "??????? ????? ???????? ??? ???? ???? ?? ????? ??????? ?????"
+msgstr "??????? ????? ???????? ??? ???? ???? ?? ??????? ????"
 
 # tithi
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr "X.??? ???????? ????"
+msgstr "X.509 ???????????"
 
 #. *< type
 #. *< ui_requirement
@@ -2920,7 +2945,7 @@ msgid "Provides SSL support through GNUT
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS ?? ??????? ?????? ?????? ?????? ????"
+msgstr "GNUTLS ?? ??????? SSL ??????? ?????? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -2936,7 +2961,7 @@ msgid "Provides SSL support through Mozi
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "????? NSS ?? ??????? SSL ?????? ?????? ????"
+msgstr "Mozilla NSS ?? ??????? SSL ??????? ?????? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -2947,44 +2972,45 @@ msgstr "SSL"
 msgid "SSL"
 msgstr "SSL"
 
+# ***
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "?????? ?????? ??????????????? ??????? ????? ?????? ????"
+msgstr "SSL ??????? ?????????? ??????? ???????? ?????? ????"
 
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s ?? ???? ????? ???"
+msgstr "%s ?? ??????? ???"
 
 #, c-format
 msgid "%s has gone away."
-msgstr "%s ???? ??? ?????"
+msgstr "%s ??????? ?????"
 
 #, c-format
 msgid "%s has become idle."
-msgstr "%s ??? ????"
+msgstr "%s ??? ??????????"
 
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s ?? ??? ????? ???"
+msgstr "%s ?? ????????? ???"
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s ??? ???????"
+msgstr "%s ???? ???????"
 
 msgid "Notify When"
-msgstr "?????? ???"
+msgstr "????? ???? ??? ???"
 
 msgid "Buddy Goes _Away"
-msgstr "????? ????????? (_A)"
+msgstr "????? ??????? ??? (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "????? ??? (_I)"
+msgstr "????? ????????? ?? (_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "????? ???? ??/?? (_S)"
+msgstr "????? ????/????? ??? (_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -2993,8 +3019,9 @@ msgid "Buddy State Notification"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "?????? ??????? ?????????"
+msgstr "?????? ?????? ?????"
 
+# mark12
 #. *< name
 #. *< version
 #. *  summary
@@ -3002,40 +3029,37 @@ msgid ""
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr ""
-"??? ????? ????????? ?? ??? ???? ?? ???? ???? ???? ??? ??? ??????? ???????? "
-"????????? ??????"
+msgstr "?????? ??????? ?? ???????????? ??????? ???????? ???, ?????? ???????? ????? ???"
 
 msgid "Tcl Plugin Loader"
-msgstr "?????? ??????? ???????"
+msgstr "Tcl ??????? ?????"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "?????? ??????? ??? ???? ???? ?????? ?????? ???"
+msgstr "Tcl ??????? ??? ???? ???? ?????? ?????? ???"
 
 # tithi
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"??????? TCL ???????? ?????? ???? ?????? ???? ??? TCL ??????? ??????? ???? ???, ??? "
-"http://www.activestate.com ???? ??????? TCL ???????? ????\n"
+"ActiveTCL ????????? ?????? ???? ??????? ???? ??? TCL ??????? ??????? ???? ???, ??? "
+"http://www.activestate.com ???? ActiveTCL ?????? ????\n"
 
 # tithi
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"??????? ???????? ???? ?????? ?????? ????? ?????? ??????, ??? ?????? ???? http://d."
-"pidgin.im/BonjourWindows ?? FAQ ??????"
+"Apple ?? \"Bonjour for Windows\" ???????? ????? ?????? ??????, ??? ?????? ????  "
+"http://d.pidgin.im/BonjourWindows ??????"
 
-#, fuzzy
+# ***
 msgid "Unable to listen for incoming IM connections"
-msgstr "??? ???? ??????????? ???? ????? ?????\n"
+msgstr "??? IM ??????? ???? ????? ???? ??????"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "???????? ???????? ????????? ???? ????? ??????? ??????? ??? ?? ?????"
+msgstr "???????? mDNS ????????? ???? ????? ??????? ??????? ??? ?? ???? ????"
 
 msgid "First name"
 msgstr "????? ???"
@@ -3044,10 +3068,10 @@ msgid "Email"
 msgstr "??? ???"
 
 msgid "Email"
-msgstr "?-????"
+msgstr "?????"
 
 msgid "AIM Account"
-msgstr "????? ???????"
+msgstr "AIM ???????"
 
 msgid "XMPP Account"
 msgstr "XMPP ???????"
@@ -3063,137 +3087,130 @@ msgid "Bonjour Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour ??????? ???????"
+msgstr "Bonjour ???????? ???????"
 
+# ***
 msgid "Purple Person"
 msgstr "??????? ???????"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "?????"
+msgstr "??????? ?????"
 
 msgid "Bonjour"
 msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s ??????? ???? ??? ????????"
+msgstr "%s ??????? ???? ??????"
 
+# mark13
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "?????? ?????? ?????, ??????? ???? ??? ???? ???"
+msgstr "?????? ?????? ??????, ??????? ???? ??? ????? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"???? ???? ???? ??????:\n"
-"%s"
+msgstr "???? ???? ???? ??????: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "??????? ???? ?????? ??????? ??? ??????"
+msgstr "??????? ???? ???? ??????? ???? ??????: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"???? ???? ???? ??????:\n"
-"%s"
+msgstr "????? ????? ???? ??????: %s"
 
-# tithi
 msgid "Error communicating with local mDNSResponder."
 msgstr "???????? mDNSResponder ?? ????? ???????? ???????"
 
 msgid "Invalid proxy settings"
-msgstr "???? ??????? ????????????"
+msgstr "???????? ??????? ?????"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "????? ??????? ???????? ????? ???? ???????? ????? ??? ?? ????? ????? ?????"
+msgstr "????? ???????? ????? ???? ???????? ????? ??? ?? ????? ??????? ?????????"
 
 msgid "Token Error"
 msgstr "????? ??????"
 
 msgid "Unable to fetch the token.\n"
-msgstr "????? ???? ??????\n"
+msgstr "????? ???? ???????\n"
 
 msgid "Save Buddylist..."
-msgstr "?????? ?????? ??????? ????..."
+msgstr "?????? ?????? ??????? ??? ???..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "????? ????? ???????? ?????, ????? ????? ???? ??? ???"
+msgstr "????? ????? ???????? ?????, ????? ????? ???? ?????"
 
 msgid "Buddylist saved successfully!"
 msgstr "????? ?????? ??????? ???????? ??????!"
 
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "%1s ?? ???? %2s ? ?????? ?????? ????? ???????"
+msgstr "%1$s ?? ???? %2$s ? ?????? ?????? ???? ????? ?????"
 
 msgid "Couldn't load buddylist"
-msgstr "?????-?????? ??? ??? ???????"
+msgstr "????? ?????? ??? ??? ???????"
 
 msgid "Load Buddylist..."
-msgstr "??????-?????? ??? ????..."
+msgstr "????? ?????? ??? ??? ???..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "?????-?????? ??????? ??? ??? ???????"
+msgstr "????? ?????? ??????? ??? ??? ??????!"
 
 msgid "Save buddylist..."
-msgstr "?????-?????? ??????? ????..."
+msgstr "????? ?????? ??????? ??? ???..."
 
 msgid "Load buddylist from file..."
-msgstr "???? ???? ?????-?????? ??? ????..."
+msgstr "???? ???? ????? ?????? ??? ??? ???..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "??????? ???????? ???? ?????"
+msgstr "?????? ????????? ?? ??????? ???? ???? ???"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "?????????? ???? ???"
+msgstr "????????????? ????? ??"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "???? ??????? ??????? ???? ??????? ?????? ???? ????????\n"
+msgstr "???? ??????? ??????? ???? ??????? ???? ????? ?????? ???? ????????"
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "???? ????-???? ??????? ??????? ??? ?????"
+msgstr "???? Gadu-Gadu ??????? ??????? ??? ?????"
 
 msgid "Registration completed successfully!"
 msgstr "??????? ??????? ??? ??????!"
 
 msgid "Password"
-msgstr "??????????"
+msgstr "?????????"
 
 msgid "Password (again)"
-msgstr "?????????? (????)"
+msgstr "????????? (????)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "????????? ?????? ????? ?????? ????  "
 
 # fix me tithi
-#, fuzzy
 msgid "Captcha"
-msgstr "Captcha ?????"
+msgstr "???????"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "???? ????-???? ??????? ??????? ????"
+msgstr "???? Gadu-Gadu ??????? ??????? ????"
 
 msgid "Please, fill in the following fields"
-msgstr "??????? ???, ????? ???????????? ???? ????"
+msgstr "??????? ???, ????? ??????????? ???? ????"
 
 msgid "City"
 msgstr "???"
 
+# ***
 msgid "Year of birth"
-msgstr "???? ??"
+msgstr "???? ???"
 
 msgid "Gender"
 msgstr "?????"
 
 msgid "Male or female"
-msgstr "????? ???? ?????"
+msgstr "????? ?? ?????"
 
 msgid "Male"
 msgstr "?????"
@@ -3205,45 +3222,43 @@ msgid "Find buddies"
 msgstr "????????? ??????"
 
 msgid "Find buddies"
-msgstr "????? ???? ????"
+msgstr "????? ???? "
 
 msgid "Please, enter your search criteria below"
-msgstr "??????? ???, ????? ????????? ???????? ???? ?????? ????"
+msgstr "??????? ???, ????? ??????????? ???????? ???? ???"
 
 msgid "Fill in the fields."
-msgstr "???????????? ???? ?????"
+msgstr "??????????? ???? ?????"
 
 msgid "Your current password is different from the one that you specified."
-msgstr "????? ??????? ???????????? ????? ???????? ???? ?????????? ???? ????"
+msgstr "????? ??????? ??????????? ????? ???????? ????????? ???? ??????"
 
 msgid "Unable to change password. Error occurred.\n"
-msgstr "?????????? ????????? ?????? ?????? ???? ????????\n"
+msgstr "????????? ???????? ??? ????? ?????? ??????\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "????-???? ????????? ???? ?????????? ???????? ????"
+msgstr "Gadu-Gadu ????????? ???? ????????? ????????"
 
 msgid "Password was changed successfully!"
-msgstr "?????????? ??????? ????????? ???????!"
+msgstr "????????? ??????? ????????? ??????!"
 
 msgid "Current password"
-msgstr "??????? ??????????"
+msgstr "??????? ?????????"
 
 msgid "Password (retype)"
-msgstr "?????????? (??????? ???? ????)"
+msgstr "????????? (??????? ???? ????)"
 
 msgid "Enter current token"
-msgstr "??????? ????? ?????? ????"
+msgstr "??????? ????? ???"
 
 msgid "Current token"
 msgstr "??????? ?????"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
-"??????? ???, UIN-?? ???? ????? ??????? ?????????? ??? ????? ???? ?????????? ?????? "
-"????:"
+msgstr "??????? ???, UIN-?? ???? ????? ??????? ????????? ??? ???? ????????? ???:"
 
 msgid "Change Gadu-Gadu Password"
-msgstr "????-???? ?????????? ???????? ????"
+msgstr "Gadu-Gadu ?? ????????? ???????? ????"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
@@ -3252,15 +3267,16 @@ msgstr "?????? ??? ?
 msgid "Add to chat..."
 msgstr "?????? ??? ???..."
 
+# ***
 #. Global
 msgid "Available"
-msgstr "???????"
+msgstr "???????"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 msgid "Away"
-msgstr "????? ???"
+msgstr "???????"
 
 msgid "UIN"
 msgstr "UIN"
@@ -3272,22 +3288,22 @@ msgid "Unable to display the search resu
 msgstr "???? ???"
 
 msgid "Unable to display the search results."
-msgstr "????????? ????? ???????? ???? ??????"
+msgstr "????????? ????? ???????? ???? ???????"
 
 msgid "Gadu-Gadu Public Directory"
-msgstr "????-???? ???????? ??????????"
+msgstr "Gadu-Gadu ?????? ?????????"
 
 msgid "Search results"
-msgstr "????????? ?????"
+msgstr "??????????? ?????"
 
 msgid "No matching users found"
-msgstr "???? ?????????? ??????????? ?????? ???????"
+msgstr "?????? ???? ??????????? ?????? ???????"
 
 msgid "There are no users matching your search criteria."
-msgstr "????? ??????????? ???????? ???? ???? ??? ???? ??????????? ????"
+msgstr "??????????? ??????????? ???? ??????????? ????? ??????"
 
 msgid "Unable to read from socket"
-msgstr "???? ???? ??? ???? ??????"
+msgstr "???? ???? ???? ??????"
 
 msgid "Buddy list downloaded"
 msgstr "????? ?????? ??????? ??? ??????"
@@ -3299,7 +3315,7 @@ msgid "Your buddy list was stored on the
 msgstr "????? ?????? ????? ??? ??????"
 
 msgid "Your buddy list was stored on the server."
-msgstr "????? ????? ???????? ???????? ??????? ??? ???????"
+msgstr "????? ????? ???????? ???????? ??????? ??? ??????"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
@@ -3311,35 +3327,34 @@ msgid "Add to chat"
 msgstr "????? ?????? ?????"
 
 msgid "Add to chat"
-msgstr "?????? ??? ???"
+msgstr "?????? ??? ???"
 
 msgid "Chat _name:"
 msgstr "?????? ??? (_n):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "????????? ???? ????? ??????? ???????"
+msgstr " '%1$s' ??????? ????? ?????? ???? ??????: %2$s"
 
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "????? ????"
+msgstr "??????? ??? ?????"
 
 msgid "Chat error"
 msgstr "????? ??????"
 
 msgid "This chat name is already in use"
-msgstr "?? ????? ????? ???????? ??????? ?????"
+msgstr "?? ?????? ????? ???????? ??????? ?????"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "????????? ???? ??????? ????"
+msgstr "????????? ???? ??????? ???"
 
 msgid "Find buddies..."
 msgstr "????? ??????..."
 
 msgid "Change password..."
-msgstr "??????????? ???????? ????..."
+msgstr "????????? ????????..."
 
 msgid "Upload buddylist to Server"
 msgstr "???????? ????? ?????? ????? ????"
@@ -3348,7 +3363,7 @@ msgid "Delete buddylist from Server"
 msgstr "??????? ???? ????? ?????? ??????? ????"
 
 msgid "Delete buddylist from Server"
-msgstr "??????? ???? ????? ?????? ???? ?????"
+msgstr "??????? ???? ????? ?????? ?????? ????"
 
 msgid "Save buddylist to file..."
 msgstr "????? ?????? ?????? ??????? ????..."
@@ -3365,22 +3380,22 @@ msgid "Gadu-Gadu Protocol Plugin"
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu ??????? ???????"
+msgstr "Gadu-Gadu ???????? ???????"
 
 #. summary
 msgid "Polish popular IM"
-msgstr "???????? ???? ????????? ????"
+msgstr "???????? ????? IM"
 
 msgid "Gadu-Gadu User"
-msgstr "????-???? ???????????"
+msgstr "Gadu-Gadu ???????????"
 
-#, fuzzy
 msgid "GG server"
-msgstr "??????? ??????"
+msgstr "GG ???????"
 
+# ***
 #, c-format
 msgid "Unknown command: %s"
-msgstr "????? ???????: %s"
+msgstr "????? ??????: %s"
 
 #, c-format
 msgid "current topic is: %s"
@@ -3390,17 +3405,16 @@ msgid "File Transfer Failed"
 msgstr "???? ????? ???????? ??? ?????"
 
 msgid "File Transfer Failed"
-msgstr "???? ?????? ??????"
+msgstr "???? ?????????? ??????"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "????? ???? ????? ????? ????? ???"
+msgstr "?????????? ???? ???? ????? ???? ????? ????"
 
 msgid "Error displaying MOTD"
-msgstr "MOTD ??????? ???? ?????? ???? ??????"
+msgstr "MOTD ??????? ???? ?????? ?????"
 
 msgid "No MOTD available"
-msgstr "???? MOTD ??????? ??"
+msgstr "???? MOTD ???"
 
 msgid "There is no MOTD associated with this connection."
 msgstr "?? ??????? ???? ????????? ???? MOTD ????"
@@ -3416,43 +3430,39 @@ msgstr "%s ?? ???? MOTD"
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"????????? ???? ??????? ????????:\n"
-"%s"
+msgstr "????????? ???? ????? ????????? ?????: %s"
 
 msgid "View MOTD"
-msgstr "MOTD ???????? ????"
+msgstr "MOTD ????????"
 
 msgid "_Channel:"
 msgstr "??????? (_C):"
 
 msgid "_Password:"
-msgstr "?????????? (_P):"
+msgstr "????????? (_P):"
 
-# tithi
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC ?? ?????????? ????? ????? ???? ??? ???? ????"
+msgstr "IRC ?????? ??? ???????? ????? ????? ????? ????? ??"
 
 msgid "SSL support unavailable"
-msgstr "?????? ?????? ????????"
+msgstr "SSL ??????? ????? ?????"
 
 msgid "Unable to connect"
-msgstr "????? ???? ????? ??"
+msgstr "????? ???? ??????"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "%s ? ????? ???? ?????? ?????"
+msgstr "??????? ??? ??????: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "??????? ??????? ???? ??? ????????"
+msgstr "??????? ??????? ???? ??? ???????"
 
 msgid "Users"
-msgstr "?????????????"
+msgstr "???????????"
 
 msgid "Topic"
 msgstr "?????"
@@ -3466,12 +3476,12 @@ msgid "IRC Protocol Plugin"
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr "?????? ??????? ???????"
+msgstr "IRC ???????? ???????"
 
 # tithi
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "IRC ??????? ??????? ?? ?? ??????? ???? ???"
+msgstr "IRC ???????? ??????? ?? ?? ?????? ???? ???"
 
 #. host to connect to
 msgid "Server"
@@ -3481,12 +3491,12 @@ msgstr "?????"
 msgid "Port"
 msgstr "?????"
 
+# ***
 msgid "Encodings"
-msgstr "?????????????"
+msgstr "???????"
 
-# tithi
 msgid "Auto-detect incoming UTF-8"
-msgstr "????? UTF-8 ??????-?????? ???"
+msgstr "????? UTF-8 ??????????????? ?????? ??? ???"
 
 msgid "Real name"
 msgstr "??? ???"
@@ -3496,22 +3506,22 @@ msgid "Use SSL"
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
 msgid "Use SSL"
-msgstr "SSL ??????? ????"
+msgstr "SSL ??????? ??? ???"
 
+# ***
 msgid "Bad mode"
-msgstr "????? ?????"
+msgstr "??????????? ???"
 
-# tithi
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr "%2s ?????? %1s ? ????, %3s ??? ???????? ????"
+msgstr "%2$s ?????? %1$s ?? ??????? ??? ?????, %3$s ??? ????????? "
 
 #, c-format
 msgid "Ban on %s"
-msgstr "%s ? ???? ??????"
+msgstr "%s ?? ??????????"
 
 msgid "End of ban list"
-msgstr "??????? ??????? ????"
+msgstr "??????? ?????? ??????"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3522,29 +3532,30 @@ msgid "Cannot ban %s: banlist is full"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "%s ??????? ??? ?????? ??: ??????? ?????? ?????"
+msgstr "%s ?? ??????? ??? ?????? ??: ??????? ?????? ????????"
 
 msgid " <i>(ircop)</i>"
 msgstr "<i>(ircop)</i>"
 
+# ***
 msgid " <i>(identified)</i>"
-msgstr "<i>(?????????)</i>"
+msgstr " <i>(?????????)</i>"
 
 msgid "Nick"
 msgstr "??????"
 
 # tithi
 msgid "Currently on"
-msgstr "????????"
+msgstr "???????? ???? ???"
 
 msgid "Idle for"
-msgstr "?? ???? ???"
+msgstr "?????? ?????????"
 
 msgid "Online since"
-msgstr "??? ???? ?????? "
+msgstr "?????? ???????"
 
 msgid "<b>Defining adjective:</b>"
-msgstr "<b>?????? ???????? ????:</b>"
+msgstr "<b>?????? ????????:</b>"
 
 # tithi
 msgid "Glorious"
@@ -3552,15 +3563,15 @@ msgid "%s has changed the topic to: %s"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%1s ????? ???????? ????: %2s"
+msgstr "%1$s ????? ???????? ?????, ??? ????: %2$s"
 
 #, c-format
 msgid "%s has cleared the topic."
-msgstr "%s ??????? ???????? ??????"
+msgstr "%s ??????? ?????? ??????"
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%1s ?? ???? ????? ???: %2s"
+msgstr "%1$s ?? ???? ????? ???: %2$s"
 
 #, c-format
 msgid "Unknown message '%s'"
@@ -3574,13 +3585,14 @@ msgid "Users on %s: %s"
 
 #, c-format
 msgid "Users on %s: %s"
-msgstr "%1s ?? ???????????: %2s"
+msgstr "%1$s ?? ???????????: %2$s"
 
+# ***
 msgid "Time Response"
 msgstr "???? ?????? ???"
 
 msgid "The IRC server's local time is:"
-msgstr "?????? ????????? ???????? ???? ???:"
+msgstr "IRC ????????? ???????? ????:"
 
 msgid "No such channel"
 msgstr "??? ???? ??????? ???"
@@ -3590,7 +3602,7 @@ msgid "User is not logged in"
 msgstr "??? ???? ??????? ???"
 
 msgid "User is not logged in"
-msgstr "??????????? ???? ???????? ???"
+msgstr "??????????? ???? ??? ???"
 
 msgid "No such nick or channel"
 msgstr "??? ???? ?????? ?? ??????? ???"
@@ -3600,78 +3612,78 @@ msgid "Joining %s requires an invitation
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s ?? ?????????? ????? ???????? ????????"
+msgstr "%s ?? ?????????? ????? ???????? ?????????"
 
 msgid "Invitation only"
 msgstr "????????? ????????"
 
+# Kick =  ????????
+# OR  ??????
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "%1s ?????? ?????? ??? ??? ????? ?????: (%2s)"
+msgstr "%1$s ?????? ???????? ??????: (%2$s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%1s (%2s) ?????? ????????"
+msgstr "%1$s (%2$s) ?????? ????????"
 
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "%s ?????? (%s %s) ????????"
+msgstr "%s ?????? (%s %s) ???"
 
 msgid "Invalid nickname"
-msgstr "???? ??????"
+msgstr "???????? ??????"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"????? ????????? ???????? ??????? ?????? ????? ??? ??????? ??? ?????? ???? ????????? "
-"???? ????"
+"????? ????????? ???????? ??????? ????? ??? ???????? ?????? ??? ???? ????????? ????"
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"????? ????????? ??????? ??? ??????? ???? ????? ??? ??????? ??? ?????? ???? "
-"????????? ???? ????"
+"????? ????????? ??????? ????? ??????? ????? ??? ???????? ?????? ??? ???? ????????? "
+"????"
 
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "?? ????? ????? ???????? ??????? ?????"
+msgstr "\"%s\" ???????? ????????? ??????? ??????"
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "??????"
+msgstr "??????? ??????"
 
 msgid "Cannot change nick"
-msgstr "?????? ???????? ???? ???? ??"
+msgstr "?????? ???????? ??? ????? ??"
 
 msgid "Could not change nick"
-msgstr "?????? ???????? ???? ??????"
+msgstr "?????? ???????? ??? ????? ????"
 
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "???? ???????%s%s ?????? ??????"
 
 msgid "Error: invalid PONG from server"
-msgstr "??????: ??????? ???? ???? PONG"
+msgstr "??????: ??????? ???? ???????? PONG"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING ????? ??-- ???: %lu ???????"
+msgstr "PING reply -- Lag: %lu seconds"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "%s ????? ???? ???? ??: ??????? ???????"
+msgstr "%s ? ?????? ??? ????? ????: ??????? ???????"
 
 msgid "Cannot join channel"
-msgstr "???????? ???????? ???? ???? ??"
+msgstr "???????? ???????? ??? ????? ????"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "?????? ?? ??????? ??????????? ????????"
+msgstr "?????? ?? ??????? ??????????? ?????????"
 
 #, c-format
 msgid "Wallops from %s"
@@ -3679,215 +3691,207 @@ msgid "action &lt;action to perform&gt;:
 
 # tithi
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "???? &1lt;&2gt ??????? ???? ???;:  ???? ??? ??????? ?????"
+msgstr "action &lt;action to perform&gt;:  ???? ?????? ??????? ?????"
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"????????? [??????]: ???? ????????? ?????? ???????? ????, ?? ???? ?????? ??????? ?? ??? "
-"????????? ?????? ???? ???? ?????"
+"away [message]: ???? ??????? ????????? ?????? ???????? ????, ?? ???? ?????? ??????? "
+"?? ??? ??????? ?????? ???? ???? ?????"
 
-# tithi
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <nick> <msg>: ???????? ctcp ?????? ??????"
 
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: chanserv ? ??????? ?????"
+msgstr "chanserv: chanserv ? ?????? ?????"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &1lt;???????&2gt; [???????] ...: ???? ??? ???? ?????? ??????? ?????? ???? "
-"?????? ??? ???? ?????? ?????? ??????? ??????? ??? ????"
+"deop &lt;nick1&gt; [nick2] ...: ???? ?????? ????????? ?????? ???? ?????? ??? "
+"???? ?????? ?????? ??????? ??????? ??? ????"
 
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &1lt;???????&2gt; [???????] ...: ????????? ??? ?????? (+m) ??? ??? "
-"???? ?????? ??? ??? ???? ???? ????, ????????? ???? ?????? ?????? ????? ??? ???? "
-"?????? ?????? ??????? ??????? ??? ????"
+"devoice &lt;nick1&gt; [nick2] ...: ????????? ??? ??????? ?? (+m) ??? "
+"????????????? ??? ??? ???? ???? ????? ????????? ???? ?????? ?????? ????? ??? "
+"???? ?????? ?????? ??????? ??????? ??? ????"
 
-# tithi
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"???????? ????? &1lt;??????&2gt; [???]:  ?????? ??????????? ???????? ?? ??????? "
-"???????? ????? ????? ????? ???????? ??????"
+"invite &lt;nick&gt; [room]:  ????????? ?? ??????? ???????? ????? ???? ????? ??? "
+"????? ???????? ??????"
 
 # tithi
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &1lt;????&2gt;[,????][,...] [???[,???][,...]]:  ??? ???????? ??? ??? ?????????? "
-"?????????? ???? ??????? ?? ?????? ??? ?? ?? ?????? ??????? ?????? ?????"
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ?? ?? ?????? ??????? ???, "
+"????????? ?????????? ???? ??????? ?? ?????? ?????"
 
 # tithi
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"?????? ???? &1lt;????&2gt;[,????][,...] [???[,???][,...]]:  ??? ???????? ??? ??? "
-"?????????? ?????????? ???? ??????? ?? ?????? ??? ?? ?? ?????? ??????? ?????? ?????"
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ?? ?? ?????? ??????? "
+"???, ????????? ?????????? ???? ??????? ?? ?????? ?????"
 
 # tithi
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"???? ???? &1lt;??????&2gt; [??????]:  ???? ??????? ???? ????? ?????? ????? ??? "
-"???? ?????? ?????? ???????? ??????? ??? ????"
+"kick &lt;nick&gt; [message]:  ???? ??????? ???? ????? ?????? ????? ??? ???? "
+"?????? ?????? ???????? ??????? ??? ????"
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"??????: ??????????? ????? ???? ?????? ???????? ????? <i>Warning, some servers may "
-"disconnect you upon doing this</i>"
+"list: ??????????? ?????? ????? ?????? ???????? ??? ???? <i>?????????: ??? ???? ???? "
+"??????? ?????? ????????? ??? ???? ?????</i>   "
 
 # tithi
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "????? &1lt;????????? ???&2gt;:  ???? ??? ??????? ?????"
+msgstr "me &lt;action to perform&gt;: ???? ?????? ??????? ?????"
 
 # tithi
 msgid "memoserv: Send a command to memoserv"
-msgstr "?????? ???????: ?????? ???????? ???? ??????? ?????"
+msgstr "memoserv: memoserv? ???? ?????? ?????? ???"
 
-# tithi
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"?????? &1lt;+|-&2gt;&3lt;A-Za-z&4gt; &5lt;??????|???????&6gt;:  ???? ??????? ?? "
-"???????????? ??? ???????? ?? ????????? ?????"
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  ???? ??????? ?? "
+"???????????? ??? ???????? ???? ?? ????? ??????"
 
-# tithi
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"?????? &1lt;??????&2gt; &3lt;??????&4gt;:  ???? ????????????? ???? ????????? "
-"?????? ????? (???? ????????? ???????)?"
+"msg &lt;nick&gt; &lt;message&gt;:  ???? ????????????? (???????? ??) ???? "
+"????????? ?????? ????? ?"
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "??????? [????????]: ???????? ??????? ?????????????? ?????? ?????"
+msgstr "names [channel]: ???????? ??????? ?????????????? ?????? ?????"
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "?????? &1lt;???? ??????&2gt;: ????? ?????? ???????? ?????"
+msgstr "nick &lt;new nickname&gt;: ????? ?????? ???????? ?????"
 
 # tithi
 msgid "nickserv: Send a command to nickserv"
-msgstr "??????-???????: ??????-???????? ???? ??????? ?????"
+msgstr "nickserv: nickserv? ???? ?????? ?????? ???"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "????? &1lt;??????&2lt;: ???????????? ???? ?? ???????? ???? ????? ??????"
+msgstr "notice &lt;target&lt;: ?????????????? ?? ???????? ???? ????? ??????"
 
-# tithi
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"??????? &1lt;???????&2gt; [???????] ...:  ??????? ????????? ?????? ???? ???? "
-"???? ???? ??? ???? ?????? ?????? ???? ??????? ??????? ??? ????"
+"op &lt;nick1&gt; [nick2] ...:  ????? ??????? ????????? ????????? ???? ??? ???? "
+"?????? ?????? ???? ??????? ??????? ??? ????"
 
-# tithi
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &1lt;??????&2gt;:  ??? ?? ?? ??? ???? ?? ?????, ???? ?????? ??? "
+"operwall &lt;message&gt;:  ??? ?? ?? ??? ???? ?? ?????, ???? ?????? ??? "
 "??????? ???? ?????? ???"
 
 # tithi
 msgid "operserv: Send a command to operserv"
-msgstr "???????-???????: ???????-???????? ???? ??????? ?????"
+msgstr "operserv: operserv ???? ?????? ?????? ???"
 
 # tithi
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"??? [???] [??????]:  ???? ?????? ??????? ??, ??????? ???????, ?? ???????? ??????? "
-"????? ?????"
+"part [room] [message]:  ???? ?????? ?????? ??, ??????? ??????? ?? ????????? "
+"??????? ????? ?????"
 
 # tithi
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"????? [??????]: ???? ??????????? ?? ????? ??? ?? ???????? (?? ??????? ??? ???? "
-"??????????? ???????? ?? ????) ?????"
+"ping [nick]: ???? ??????????? (?? ??????? ??? ???? ??????????? ???????? ?? ????) "
+"?? ????? ??? ?? ???????? ?????"
 
-# tithi
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"???????? &1lt;??????&2gt; &3lt;??????&4gt;: ???? ????????????? ???? ????????? "
-"?????? ????? (???? ????????? ?????? ??????)?"
+"query &lt;nick&gt; &lt;message&gt;: ???? ????????????? (???????? ??) ???? "
+"????????? ?????? ??????"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "???????? ???? [??????]: ???? ?????? ????????, ????????? ???? ????????? ?????"
+msgstr "quit [message]: ???? ?????? ?????? ??, ????????? ???? ????????? ????"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "????? [...]: ???????? ???? ??????????? ?????? ?????"
+msgstr "quote [...]: ???????? ???? ?????? ?????? ??????"
 
 # tithi
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"?????? ???? &1lt;??????&2gt; [??????]: ???? ??? ???? ???? ???? ?????? ????? ??? "
-"???? ?????? ?????? ???? ??????? ??????? ??? ????"
+"remove &lt;nick&gt; [message]: ????? ????? ???? ?????? ????? ??? ???? ?????? "
+"?????? ???? ??????? ??????? ??? ????"
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "????: ?????? ???????? ??????? ???????? ???? ???????? ????"
+msgstr "time: IRC ????????? ??????? ???????? ???? ???????? ????"
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "?????????? [???? ??????????]: ????????? ?????????? ???????? ?? ???????? ?????"
+msgstr "topic [new topic]:  ????????? ????? ???????? ?? ???????? ?????"
 
 # tithi
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-"??????????? ??? &1lt;+|-&2gt;&3lt;A-Za-z&4gt;: ???????????r ??? ???????? ?? "
-"????????? ?????"
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;: ??????????? ??? ???????? ???? ?? ???? ??????"
 
-# tithi
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "??????? [??????]: ???? ????????????? CTCP ??????? ?????? ?????"
+msgstr "version [nick]: ???? ????????????? CTCP VERSION ?????? ??????"
 
 # tithi
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"???? &1lt;???????&2gt; [???????] ...:  ??? ?????? ???? ????????? ???? ?????? "
-"???? ???? ??? ???? ?????? ?????? ??????? ??????? ??? ????"
+"voice &lt;nick1&gt; [nick2] ...:  ????? ????????? ?????? ??????? ???? ??? ???? "
+"?????? ?????? ??????? ??????? ??? ????"
 
 # tithi
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &1lt;??????&2gt;:  ???? ??? ?? ????? ??? ??, ???? ?????? ??? ??????? "
-"???? ?????? ???"
+"wallops &lt;message&gt;:  ??? ?? ?? ?? ?????, ???? ?????? ??? ??????? ???? "
+"?????? ???"
 
 # tithi
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "?? [???????] &1lt;??????&2gt;: ???? ???????????? ???? ????? ?????"
+msgstr "whois [server] &lt;nick&gt;: ???? ???????????? ???? ?????? ?????"
 
 # tithi
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "?? ???&1lt;??????&2gt;: ???? ?????? ??? ???? ???????????? ???? ????? ?????"
+msgstr "whowas &lt;nick&gt;: ????? ?????? ??? ???? ???????????? ???? ?????? ?????"
 
+# mark15
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "%1s ??? ????? ?????? ????: %2lu ???????"
+msgstr "%1$s ???? ????? ?????? ????: %2$lu ???????"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3902,86 +3906,74 @@ msgid "Ad-Hoc Command Failed"
 msgstr "????? ??????"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "??-?? ??????? ??????"
+msgstr "Ad-Hoc ?????? ??????"
 
 msgid "execute"
 msgstr "??????? ????"
 
-# tithi
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"????????? ???? ???? ???? TSL/SSL ??????,  ???? TLS/SSL ?????? ????? ????? ??????"
+"???????? ???? ???? ???? TSL/SSL ??????,  ???? TLS/SSL ??????? ????? ????? ??????"
 
 # tithi
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "????? ????????? ???????, ?????? ???? TLS/SSL ?????? ????? ????? ??????"
+msgstr "????? ????????? ???????, ?????? ???? TLS/SSL ??????? ????? ????? ??????"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "???? ?????????????? ???????? ????????? ???-??? ?????????? ????????"
+msgstr "???? ?????????????? ???????? ????????? ???-?????? ?????????? ????????"
 
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"???? ?????????????? ?????? %s ?? ???-??? ?????????? ????????? ??? ??????? ???? ??? "
-"?????????? ?? ??????? ????? ????"
+"???? ?????????????? ?????? %s ?? ???-?????? ?????????? ????????? ??? ??????? ??? "
+"?????????? ??????? ????? ????"
 
+# ***
 msgid "Plaintext Authentication"
-msgstr "???-??? ??????????"
+msgstr "???-?????? ??????????"
 
 # tithi
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "?????????? ??????"
+msgstr "SASL ?????????? ??????"
 
-#, fuzzy
 msgid "Invalid response from server"
-msgstr "??????? ???? ???? ??????"
+msgstr "??????? ???? ???????? ?????"
 
 msgid "Server does not use any supported authentication method"
 msgstr "??????? ???? ??????? ?????????? ?????????? ??????? ??? ???"
 
 # tithi
 msgid "You require encryption, but it is not available on this server."
-msgstr "????? ????????? ????????, ?????? ??? ?? ??????????? ??????? ????"
+msgstr "????? ????????? ????????, ?????? ??? ?? ??????????? ????"
 
 msgid "Invalid challenge from server"
-msgstr "??????? ???? ???? ?????????"
+msgstr "??????? ???? ???????? ?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL ??????"
+msgstr "SASL ??????: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "????? ?????? BOSH ????? ?????????? ?????? ??????"
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "???? ???? ??????? ?????"
+msgstr "???? ???? ID ?????? ??? ????"
 
 # tithi
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "???????? ???????"
+msgstr "BOSH ?????????? ???????? ???????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"????????? ???? ????? ?????? ???? ???? ??:\n"
-"%s"
+msgstr "????????? ???? ????? ??????? ??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"????????? ???? ????? ?????? ???? ???? ??:\n"
-"%s"
+msgstr "????????? ???? ????? ??????? ??????: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "????? ???????? ???? ??????"
+msgstr "SSL ????? ??????? ??????"
 
 msgid "Full Name"
 msgstr "???? ???"
@@ -4002,13 +3994,13 @@ msgid "Locality"
 msgstr "?????? ??????"
 
 msgid "Locality"
-msgstr "?????"
+msgstr "????"
 
 msgid "Region"
 msgstr "?????"
 
 msgid "Postal Code"
-msgstr "??????? ???"
+msgstr "??????? ???"
 
 msgid "Country"
 msgstr "???"
@@ -4022,7 +4014,7 @@ msgid "Organization Unit"
 msgstr "??????? ???"
 
 msgid "Organization Unit"
-msgstr "????? ???"
+msgstr "??????? ?????"
 
 msgid "Role"
 msgstr "??????"
@@ -4031,42 +4023,38 @@ msgid "Description"
 msgstr "???????"
 
 msgid "Description"
-msgstr "?????"
+msgstr "??????"
 
 msgid "Edit XMPP vCard"
-msgstr "XMPP vCard ???????? ????"
+msgstr "XMPP vCard ????????"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"????? ?? ???????? ??????? ???? ?? ???? ?????? ????? ????????????? ???? ????????? ?? "
-"?????? ?????"
+"????? ?? ???????? ??????? ???? ???? ???? ???? ???????????? ??? ???? ?? ????? ??????"
 
 msgid "Client"
 msgstr "??????????"
 
-# tithi
 msgid "Operating System"
 msgstr "???????? ???????"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "???????? ????:"
+msgstr "???????? ???"
 
 msgid "Priority"
 msgstr "??????????"
 
 msgid "Resource"
-msgstr "?????"
+msgstr "???????"
 
 #, c-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s ???"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "???? ?????"
+msgstr "?? ??? ?????"
 
 msgid "Middle Name"
 msgstr "???? ???"
@@ -4075,7 +4063,7 @@ msgid "P.O. Box"
 msgstr "??????"
 
 msgid "P.O. Box"
-msgstr "??.?. ????"
+msgstr "P.O. ?????"
 
 msgid "Photo"
 msgstr "???"
@@ -4085,39 +4073,39 @@ msgid "Un-hide From"
 
 # tithi
 msgid "Un-hide From"
-msgstr "?? ??? ????????"
+msgstr "?? ???? ????????"
 
 # tithi
 msgid "Temporarily Hide From"
-msgstr "?? ??? ?????????? ?????"
+msgstr "?? ???? ?????????? ??????"
 
 #. && NOT ME
 msgid "Cancel Presence Notification"
-msgstr "????????? ????????? ????? ????"
+msgstr "????????? ????? ?????"
 
 # tithi
 msgid "(Re-)Request authorization"
-msgstr "(???????-)???????? ?????????????"
+msgstr "(???????) ??????? ??????"
 
 # tithi
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "???????? ????? ????"
+msgstr "?????????????"
 
 msgid "Log In"
-msgstr "???? ????"
+msgstr "????"
 
 msgid "Log Out"
-msgstr "?? ??? ????"
+msgstr "?? ???"
 
 msgid "Chatty"
 msgstr "????????"
 
 # tithi
 msgid "Extended Away"
-msgstr "??? ?????? ????"
+msgstr "???????? ???? ???????"
 
 msgid "Do Not Disturb"
 msgstr "?????? ????? ??"
@@ -4130,56 +4118,55 @@ msgid "The following are the results of 
 msgstr "??? ???"
 
 msgid "The following are the results of your search"
-msgstr "????????? ????? ??????????? ?????"
+msgstr "????? ??????????? ????? ????????"
 
-# fix-me tithi
 #. current comment from Jabber User Directory users.jabber.org
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"??????? ???????? ?????? ????????? ?????? ???? ??????? ???? ??????? ??????? ???: ???????? "
-"??????? ??????? ????? ????????????? ?????? ??? (%)"
+"??????????? ???????? ??? ?????? ??? ???? ??????? ????????? ????? ???: ?????????? ??????? "
+"??????? ????? ????????? ?????? ??? (%)"
 
 msgid "Directory Query Failed"
-msgstr "?????????? ???????? ?????? ?????"
+msgstr "????????? ?????? ??????"
 
 msgid "Could not query the directory server."
-msgstr "???????? ??????? ???????? ?????? ?????"
+msgstr "???????? ??????? ?????? ???? ??????"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "??????? ?????????: %s"
+msgstr "??????? ???????????: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "?????? ????????? XMPP ???????????? ???? ?????? ?? ?? ?????? ??????? ???? ?????"
+msgstr "?????? XMPP ???????????? ???? ????????? ???? ?? ?? ?????? ??????? ???? ?????"
 
 msgid "Email Address"
-msgstr "?-???? ??????"
+msgstr "????? ??????"
 
 msgid "Search for XMPP users"
-msgstr "XMPP ???????????? ???? ????????? ????"
+msgstr "XMPP ??????????? ?????????"
 
 #. "Search"
 msgid "Search"
-msgstr "??????"
+msgstr "?????????"
 
 msgid "Invalid Directory"
-msgstr "???? ??????????"
+msgstr "???????? ?????????"
 
 msgid "Enter a User Directory"
-msgstr "???? ???????????? ?????????? ?????? ????"
+msgstr "???? ??????????? ????????? ???"
 
 msgid "Select a user directory to search"
-msgstr "?????? ???? ???? ??????????? ?????????? ???????? ????"
+msgstr "??????????? ???? ???? ??????????? ????????? ???????? ????"
 
 msgid "Search Directory"
-msgstr "????????? ??????????"
+msgstr "????????? ????????? "
 
 msgid "_Room:"
-msgstr "????: (_R)"
+msgstr "??? (_R):"
 
 msgid "_Server:"
 msgstr "???????: (_S)"
@@ -4189,110 +4176,105 @@ msgid "%s is not a valid room name"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s ??? ?????? ??? ???"
+msgstr "%s ??????? ????? ??? ???"
 
 msgid "Invalid Room Name"
-msgstr "???? ?????? ???"
+msgstr "???????? ????? ???"
 
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "%s ??? ??????? ??? ???"
+msgstr "%s ??????? ??????? ??? ???"
 
 msgid "Invalid Server Name"
-msgstr "???? ??????? ???"
+msgstr "???????? ??????? ???"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s ??? ???? ????????? ???"
+msgstr "%s ??? ??????? ??? ????????? ???"
 
 msgid "Invalid Room Handle"
-msgstr "???? ???? ?????????"
+msgstr "???????? ??? ?????????"
 
 msgid "Configuration error"
-msgstr "???????? ??????"
+msgstr "?????????? ??????"
 
 msgid "Unable to configure"
-msgstr "??????? ???? ?????"
+msgstr "??????? ???? ??????"
 
 msgid "Room Configuration Error"
-msgstr "???? ???????? ??????"
+msgstr "??? ??????????? ??????"
 
 # tithi
 msgid "This room is not capable of being configured"
-msgstr "?? ?????? ????????? ??? ????? ???"
+msgstr "?? ????? ??????? ??? ????? ??"
 
 msgid "Registration error"
-msgstr "??????? ??????"
+msgstr "??????? ??????"
 
 # tithi
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "?????? ???????? MUC-??????? ????????? ??????? ??"
+msgstr "MUC-??????? ?????? ???? ?????? ???????? ??????? ??"
 
 msgid "Error retrieving room list"
-msgstr "??? ?????? ?????? ???? ??????"
+msgstr "????? ?????? ?????? ???? ??????"
 
 msgid "Invalid Server"
-msgstr "???? ???????"
+msgstr "???????? ???????"
 
 msgid "Enter a Conference Server"
-msgstr "???? ????????? ??????? ?????? ????"
+msgstr "??????? ????????? ??? ???"
 
 msgid "Select a conference server to query"
-msgstr "??????????? ???? ???? ????????? ??????? ?????? ????"
+msgstr "?????? ???? ???? ??????? ????????? ??? ???"
 
 msgid "Find Rooms"
-msgstr "???? ??????"
+msgstr "??? ??????"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "?????:"
+msgstr "?????????:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "???? ?????????? ??????????? ?????? ???????"
+msgstr "???? ??????????? ?????? ??????"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "??????"
+msgstr "??????:"
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "????? ????-???????? ?????"
+msgstr "??? ?? ??? ???????? ?????"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"?????? ????? ??????? ?????? ????? ?? ?????? XMPP ????? ????????? ????? ????? ??????"
 
 msgid "Invalid XMPP ID"
-msgstr "???? XMPP ID"
+msgstr "???????? XMPP ID"
 
-# tithi
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "???? XMPP ID? ?????? ?????? ???????? ???? ????"
+msgstr "???????? XMPP ID? ?????? ?????? ???????? ???? ????"
 
-#, fuzzy
+# tithi
 msgid "Malformed BOSH URL"
-msgstr "???????? ????? ???? ?????? ???????"
+msgstr "??????????? BOSH URL"
 
-# tithi
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%1s@%2s ?? ??????? ???"
+msgstr "%1$s@%2$s ?? ??????? ???"
 
 #, c-format
 msgid "Registration to %s successful"
-msgstr "%s ? ??????? ??? ??????"
+msgstr "%s ? ??????? ???"
 
 msgid "Registration Successful"
-msgstr "??????? ??? ??????"
+msgstr "??????? ???"
 
 msgid "Registration Failed"
 msgstr "??????? ?????? ??????"
 
 #, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s ??? ??????? ??????? ?????? ??? ??????"
+msgstr "%s ???? ??????? ??????? ?????? ??? ??????"
 
 msgid "Unregistration Successful"
 msgstr "???????? ??? ??????"
@@ -4301,10 +4283,10 @@ msgid "State"
 msgstr "???????? ?????? ??????"
 
 msgid "State"
-msgstr "?????"
+msgstr "?????????"
 
 msgid "Postal code"
-msgstr "??? ?????"
+msgstr "??????? ???"
 
 msgid "Phone"
 msgstr "???"
@@ -4313,7 +4295,7 @@ msgid "Already Registered"
 msgstr "?????"
 
 msgid "Already Registered"
-msgstr "???????? ????????"
+msgstr "????????? ????????"
 
 msgid "Unregister"
 msgstr "????????"
@@ -4323,13 +4305,13 @@ msgid "Please fill out the information b
 msgstr "????? ??????? ??????? ???????? ???? ??????? ??? ????? ???? ???? ?????"
 
 msgid "Please fill out the information below to register your new account."
-msgstr "????? ???? ??????? ??????? ???????? ???? ??????? ??? ????? ???? ???? ?????"
+msgstr "????? ???? ??????? ??????? ???? ??????? ??? ????? ???? ???? ?????"
 
 msgid "Register New XMPP Account"
-msgstr "???? XMPP ??????? ??????? ????"
+msgstr "???? XMPP ??????? ???????"
 
 msgid "Register"
-msgstr "??????? ????"
+msgstr "???????"
 
 #, c-format
 msgid "Change Account Registration at %s"
@@ -4340,146 +4322,141 @@ msgid "Change Registration"
 msgstr "%s ? ???? ??????? ??????? ????"
 
 msgid "Change Registration"
-msgstr "??????? ???????? ????"
+msgstr "??????? ????????"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "???????? ????? ???? ?????? ???????"
-
 msgid "Error unregistering account"
-msgstr "??????? ?????????? ???? ??????"
+msgstr "??????? ????????? ??????"
 
 # tithi
 msgid "Account successfully unregistered"
-msgstr "??????? ??????? ????????? ??? ?????"
+msgstr "??????? ??????? ????????? ?????"
 
 msgid "Initializing Stream"
-msgstr "??????? ???????? ????"
+msgstr "??????? ????? ??? ?????"
 
 msgid "Initializing SSL/TLS"
-msgstr "SSL/TLS ???????? ????"
+msgstr "SSL/TLS ???????? ??? ?????"
 
 # tithi
 msgid "Authenticating"
-msgstr "??????????"
+msgstr "?????????? ??? ?????"
 
 # tithi
 msgid "Re-initializing Stream"
-msgstr "??????? ??????? ???????? ????"
+msgstr "??????? ??????? ???????? ??? ?????"
 
 msgid "Server doesn't support blocking"
-msgstr "??????? ???????? ?????? ??? ??"
+msgstr "??????? ???? ??? ?????? ??? ??"
 
-# tithi
 msgid "Not Authorized"
 msgstr "???????? ???"
 
 msgid "Mood"
-msgstr "??????"
+msgstr "???????"
 
 # tithi
 msgid "Now Listening"
-msgstr "??? ?????"
+msgstr "??? ????? ??? ?????"
 
 msgid "Both"
 msgstr "????"
 
 # tithi
 msgid "From (To pending)"
-msgstr "??? (?????????)"
+msgstr "?????? (?????? ?????????)"
 
 msgid "From"
-msgstr "???"
+msgstr "??????"
 
 msgid "To"
-msgstr "?????"
+msgstr "??????"
 
 # tithi
 msgid "None (To pending)"
-msgstr "????? ??? (?????????)"
+msgstr "????? ??? (?????? ?????????)"
 
 msgid "None"
-msgstr "????? ??"
+msgstr "????? ??"
 
 msgid "Subscription"
-msgstr "????????"
+msgstr "????????????"
 
 msgid "Mood Text"
-msgstr "??? ???"
+msgstr "????????? ??????"
 
 msgid "Allow Buzz"
-msgstr "??? ??????? ????"
+msgstr "???! ??????? ??? ???"
 
 # tithi
 msgid "Tune Artist"
-msgstr "???? ??????"
+msgstr "????? ??????"
 
 msgid "Tune Title"
-msgstr "???? ???????"
+msgstr "????? ???????"
 
 # tithi
 msgid "Tune Album"
-msgstr "???? ????????"
+msgstr "????? ????????"
 
 # tithi
 msgid "Tune Genre"
-msgstr "?????? ???"
+msgstr "????? ????"
 
 msgid "Tune Comment"
-msgstr "?????? ???????"
+msgstr "????? ???????"
 
 # tithi
 msgid "Tune Track"
-msgstr "???? ?????"
+msgstr "????? ???????"
 
 # tithi
 msgid "Tune Time"
-msgstr "???? ????"
+msgstr "????? ????"
 
 # tithi
 msgid "Tune Year"
-msgstr "???? ??"
+msgstr "????? ??"
 
 # tithi
 msgid "Tune URL"
-msgstr "???? URL"
+msgstr "????? URL"
 
 msgid "Password Changed"
-msgstr "?????????? ????????? ??????"
+msgstr "????????? ????????? ??????"
 
 msgid "Your password has been changed."
-msgstr "????? ?????????? ????????? ???????"
+msgstr "????? ????????? ????????? ???????"
 
 msgid "Error changing password"
-msgstr "?????????? ????????? ??????"
+msgstr "????????? ????????? ??????"
 
 msgid "Change XMPP Password"
-msgstr "XMPP ?????????? ???????? ????"
+msgstr "XMPP ????????? ????????"
 
 msgid "Please enter your new password"
-msgstr "????? ???? ???????????? ?????? ????"
+msgstr "????? ???? ????????? ???"
 
 msgid "Set User Info..."
-msgstr "???????????? ???? ???????? ????..."
+msgstr "???????????? ???? ????????..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "?????????? ???????? ????..."
+msgstr "????????? ????????..."
 
 #. }
 msgid "Search for Users..."
-msgstr "???????????? ???? ??????..."
+msgstr "???????????? ?????????..."
 
 # tithi
 msgid "Bad Request"
-msgstr "????? ??????"
+msgstr "??????????? ??????"
 
 msgid "Conflict"
 msgstr "????????"
 
 # tithi
 msgid "Feature Not Implemented"
-msgstr "????????? ???? ??????????? ?????"
+msgstr "????? ???? ??????????? ?????"
 
 msgid "Forbidden"
 msgstr "???????"
@@ -4492,11 +4469,11 @@ msgid "Item Not Found"
 
 # tithi
 msgid "Item Not Found"
-msgstr "????????? ????? ?????? ?????"
+msgstr "????? ????? ?????? ?????"
 
 # tithi
 msgid "Malformed XMPP ID"
-msgstr "????? XMPP ID"
+msgstr "??????????? XMPP ID"
 
 msgid "Not Acceptable"
 msgstr "?????????? ???"
@@ -4506,10 +4483,10 @@ msgid "Payment Required"
 
 # tithi
 msgid "Payment Required"
-msgstr "?????????? ???????"
+msgstr "?????????? ??????"
 
 msgid "Recipient Unavailable"
-msgstr "?????? ????????"
+msgstr "?????? ??????? ???"
 
 msgid "Registration Required"
 msgstr "??????? ???????"
@@ -4519,45 +4496,45 @@ msgid "Remote Server Timeout"
 
 # tithi
 msgid "Remote Server Timeout"
-msgstr "???????? ????????? ???? ???????? ?????"
+msgstr "???????? ????????? ??????? ?????"
 
 # tithi
 msgid "Server Overloaded"
-msgstr "??????? ???????? ????????"
+msgstr "??????? ???????? ??? ?????"
 
 msgid "Service Unavailable"
-msgstr "??????? ????????"
+msgstr "??????? ????? ?????"
 
 # tithi
 msgid "Subscription Required"
-msgstr "???????? ???????"
+msgstr "???????????? ???????"
 
 msgid "Unexpected Request"
 msgstr "??????????? ??????"
 
 # tithi
 msgid "Authorization Aborted"
-msgstr "????????????? ????????"
+msgstr "??????? ?????? ?????"
 
 # tithi
 msgid "Incorrect encoding in authorization"
-msgstr "?????????????? ??????????? ?????????"
+msgstr "???????? ??????????? ???????"
 
 # tithi
 msgid "Invalid authzid"
-msgstr "???? ?????????????"
+msgstr "???????? authzid"
 
 # tithi
 msgid "Invalid Authorization Mechanism"
-msgstr "???? ????????????? ????"
+msgstr "???????? ??????? ????"
 
 # tithi
 msgid "Authorization mechanism too weak"
-msgstr "????????????? ???? ??? ??????"
+msgstr "??????? ???? ??? ??????"
 
 # tithi
 msgid "Temporary Authentication Failure"
-msgstr "?????? ?????????? ??????"
+msgstr "?????? ?????????? ????????"
 
 # tithi
 msgid "Authentication Failure"
@@ -4565,16 +4542,16 @@ msgid "Bad Format"
 
 # tithi
 msgid "Bad Format"
-msgstr "????? ???????"
+msgstr "??????????? ???????"
 
 msgid "Bad Namespace Prefix"
-msgstr "????? ???-??????? ????"
+msgstr "??????????? ???????? ??????"
 
 msgid "Resource Conflict"
-msgstr "????? ???????? ???? ???"
+msgstr "??????? ????????"
 
 msgid "Connection Timeout"
-msgstr "????? ??? ???????? ?????"
+msgstr "????? ?????? ????????"
 
 # tithi
 msgid "Host Gone"
@@ -4584,23 +4561,20 @@ msgid "Improper Addressing"
 msgstr "????? ?????"
 
 msgid "Improper Addressing"
-msgstr "????????? ??????????"
+msgstr "?????? ??????"
 
 msgid "Invalid ID"
-msgstr "???? ????"
+msgstr "???????? ID"
 
-# tithi
 msgid "Invalid Namespace"
-msgstr "???? ????????"
+msgstr "???????? ????????"
 
 msgid "Invalid XML"
-msgstr "???? ????????"
+msgstr "???????? XML"
 
-# tithi
 msgid "Non-matching Hosts"
-msgstr "????????? ?????"
+msgstr "?????? ??? ??? ??"
 
-# tithi
 msgid "Policy Violation"
 msgstr "???????? ?????"
 
@@ -4608,54 +4582,50 @@ msgid "Resource Constraint"
 msgstr "???????? ????? ?????? ??????"
 
 msgid "Resource Constraint"
-msgstr "???????  ??????????"
+msgstr "??????? ??????????"
 
-# tithi
 msgid "Restricted XML"
-msgstr "??????????? XML"
+msgstr "????? XML"
 
 msgid "See Other Host"
-msgstr "???????? ????? ?????"
+msgstr "???????? ????? ?????"
 
 msgid "System Shutdown"
-msgstr "??????? ???? ????"
+msgstr "??????? ????"
 
-# tithi
 msgid "Undefined Condition"
 msgstr "?????????? ????"
 
-# tithi
+# mark20
 msgid "Unsupported Encoding"
-msgstr "???????? ?????????"
+msgstr "???????? ???????"
 
-# tithi
 msgid "Unsupported Stanza Type"
-msgstr "???????? ????????? ???"
+msgstr "???????? ????? ?????"
 
 # tithi
 msgid "Unsupported Version"
 msgstr "???????? ???????"
 
-# tithi
 msgid "XML Not Well Formed"
-msgstr "XML???? ???? ???? ???"
+msgstr "XML ???????? ???? ???"
 
 msgid "Stream Error"
 msgstr "??????? ??????"
 
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "%s ????????????? ??????? ???? ?????"
+msgstr "%s ????????????? ??????? ???? ??????"
 
 # tithi
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "????? ???????: \"%s\""
+msgstr "????? ?????????: \"%s\""
 
 # tithi
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "%1s ????????????? \"%2s\" ?????? ????????? ???? ??????"
+msgstr "%1$s ????????????? \"%2$s\" ?????? ???????? ???? ??????"
 
 #, c-format
 msgid "Unknown role: \"%s\""
@@ -4663,144 +4633,137 @@ msgid "Unable to set role \"%s\" for use
 
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "???????????? ???? \"%1s\" ?????? ???????? ???? ??????: %2s"
+msgstr "???????????? ???? \"%1$s\" ?????? ???????? ???? ??????: %2$s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "%s ????????????? ??? ??? ???? ?????"
+msgstr "%s ????????????? ???????? ???? ??????"
 
 #, c-format
 msgid "Unable to ping user %s"
-msgstr "%s ????????????? ????? ???? ?????"
+msgstr "%s ????????????? ??? ???? ??????"
 
-# tithi
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "??? ???? ??????, ???? %s ???????????? ???????? ???? ???? ???? ????"
+msgstr "???! ???? ??????, ???? %s  ???????? ???? ???? ???? ????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "??? ???? ??????, ???? %s ????????????? ?????? ????????"
+msgstr "???! ???? ??????, ???? %s ?????? ???????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "??? ???? ??????, ???? %s ??????????? ??? ?????? ??? ???"
+msgstr "???! ???? ??????, ???? %s ??? ?????? ???? ?? ?? ??? ?? ????? ???? ?????? ???"
 
 # tithi
 #, c-format
 msgid "Buzzing %s..."
-msgstr "%s ??? ??????..."
+msgstr "%s ?? ???! ???? ?????..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "???"
+msgstr "???!"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s ?????? ??? ??????!"
+msgstr "%s ?????? ???! ???????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "%s ? ???? ?????? ????? ??? ??, ???? JID"
+msgstr "%s ?????? ?????? ???? ???? ??????: ???????? JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "%s ? ???? ?????? ????? ??? ??, ??????????? ??????? ???"
+msgstr "%s ?????? ?????? ???? ???? ??????: ??????????? ??????? ???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "%s ? ???? ?????? ????? ??? ??, ??????????? ?????????? ????? ???"
+msgstr "%s ?????? ?????? ???? ???? ??????: ??????????? ?????????? ??????????? ??? ???"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "??????? ?????? ??????"
+msgstr "?????? ????? ??? ?????? ??????"
 
 # fix me tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"??????? ??? ???? %s ?? ??? ???? ????? ???????? ???? ???? ???? ???? ???? ?????? ???"
+"??????? ??? %s ?? ???? ??????? ???????? ???? ??? ??????? ???? ???? ?????? ???? ???? "
+"???? ????"
 
 msgid "Select a Resource"
-msgstr "???? ????? ???????? ????"
+msgstr "???? ??????? ???????? ????"
 
 # tithi
-#, fuzzy
 msgid "Initiate Media"
-msgstr "????? ???????? ???? (_C)"
+msgstr "?????? ???? ????"
 
 msgid "config:  Configure a chat room."
-msgstr "???????: ???? ?????? ???? ??????? ??????? ?????"
+msgstr "config: ???? ?????? ??? ??????? ????"
 
 msgid "configure:  Configure a chat room."
-msgstr "????????: ???? ?????? ???? ??????? ??????? ?????"
+msgstr "configure: ???? ?????? ??? ??????? ????"
 
 msgid "part [room]:  Leave the room."
-msgstr "??? [????]:  ???? ????? ?????"
+msgstr "part [room]:  ??? ????? ?????"
 
 # tithi
 msgid "register:  Register with a chat room."
-msgstr "??????? ????: ????? ????? ???? ??????? ?????"
+msgstr "register: ?????? ???? ???????? ????"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "?????????? [???? ??????????]:  ?????????? ???????? ???? ???????? ?????"
+msgstr "topic [new topic]:  ????? ???????? ???? ???????? ?????"
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr ""
-"??????? &lt;???????????&2gt; [????]: ???? ????????????? ???? ???? ??????? ?????"
+msgstr "ban &lt;user&gt; [reason]: ???? ????????????? ??? ???? ??????? ?????"
 
 # tithi
-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"??????? &1lt;???????????&2gt; &3lt;?????|???????|?????|??????|?????&4gt;:?????? "
-"????? ???? ???????????? ??????? ???????? ?????"
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ????????? "
+"?????? ??????????? ????? ???? ???? ????? ????? ???????????? ????????? ???????? ?????"
 
 # tithi
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"?????? &1lt;???????????&2gt; &3lt;??????????|????????????|????????|?????&4gt;: ????? "
-"???????????? ?????? ???????? ?????"
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ?????? ?????? "
+"??????????? ????? ???? ???? ????? ????? ???????????? ?????? ???????? ?????"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"???????? &1lt;??????????&2gt; [??????]: ???? ????????????? ????? ???????? ?????"
+msgstr "invite &lt;user&gt; [message]: ???? ????????????? ???? ???????? ?????"
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "??? ???: &1lt;????&2gt; [???????????]:  ?? ????????? ???? ??????? ??? ????"
+msgstr "join: &lt;room&gt; [password]: ?? ????????? ???? ??????? ??? ????"
 
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr ""
-"??? ??? ??? &1lt;???????????&2gt; [????]:  ???? ???? ???? ????????????? ??? ??? "
-"????"
+msgstr "kick &lt;user&gt; [reason]:  ??? ???? ????????????? ??? ??? ????"
 
 # tithi
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"?????? &1lt;???????????&2gt; &3lt;??????&4gt;: ???????? ????????????? ???? ????????? "
-"?????? ??????"
+"msg &lt;user&gt; &lt;message&gt;: ???????? ????????????? ???? ????????? ?????? "
+"??????"
 
 # tithi
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
-"ping &lt;jid&gt;:                    ???? ???????????/?????/????????? ????? ?????"
+"ping &lt;jid&gt;:                    ???? ???????????/??????????/????????? ??? "
+"?????"
 
 # tithi
 msgid "buzz: Buzz a user to get their attention"
-msgstr "???: ????????????? ??? ????? ???? ??? ???"
+msgstr "buzz: ???????????? ????? ???? ???! ??????? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -4813,7 +4776,7 @@ msgid "XMPP Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "XMPP Protocol Plugin"
-msgstr "XMPP ??????? ???????"
+msgstr "XMPP ???????? ???????"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 msgid "Domain"
@@ -4825,32 +4788,31 @@ msgid "Force old (port 5223) SSL"
 
 # tithi
 msgid "Force old (port 5223) SSL"
-msgstr "?????? (????? ????) SSL ?? ??? ???"
+msgstr "?????? (????? 5223) SSL ?????? ????? ??? ???"
 
 # tithi
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "??????????? ???????? ???-??? ?????? ??????? ????"
+msgstr "????????? ?? ??? ???????? ??? ?????? ?????? ?????????? ??????? ??? ???"
 
 msgid "Connect port"
-msgstr "????? ?????"
+msgstr "?????? ????? ???"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 msgid "Connect server"
-msgstr "????? ???????"
+msgstr "???????? ????? ???"
 
 msgid "File transfer proxies"
-msgstr "???? ??????????? ???????"
+msgstr "???? ???????????? ???????"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
-# tithi
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "???????????? ??????????? ???????? ????"
+msgstr "???????????? ??????? ???????? ??? ???"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4858,11 +4820,11 @@ msgid "Message from %s"
 
 #, c-format
 msgid "Message from %s"
-msgstr "%s ??? ??????"
+msgstr "%s ???? ??????"
 
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%1s ?????????? ???????? ??????: %2s"
+msgstr "%1$s ?????????? ???????? ??????: %2$s"
 
 #, c-format
 msgid "The topic is: %s"
@@ -4870,10 +4832,10 @@ msgid "Message delivery to %s failed: %s
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%1s ? ?????? ?????? ?????? ??????: %2s"
+msgstr "%1$s ? ?????? ?????? ?????? ??????: %2$s"
 
 msgid "XMPP Message Error"
-msgstr "XMPP ?????? ??????"
+msgstr "XMPP ??????? ??????"
 
 # tithi
 #, c-format
@@ -4886,71 +4848,68 @@ msgid "Unknown Error in presence"
 
 # tithi
 msgid "Unknown Error in presence"
-msgstr "???????? ????? ??????"
+msgstr "?????????? ????? ??????"
 
 #, c-format
 msgid "Error joining chat %s"
-msgstr "%s ?????? ?????????? ??????"
+msgstr "%s ?????? ????????? ??????"
 
 #, c-format
 msgid "Error in chat %s"
 msgstr "%s ??????? ??????"
 
 msgid "Create New Room"
-msgstr "???? ???? ???? ????"
+msgstr "???? ??? ????"
 
 # tithi
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"???? ???? ???? ???? ???? ??????  ???? ?? ??? ??????? ???? ??????, ?? ?????????????? "
-"???????????? ????? ??????"
+"???? ???? ???? ??? ???? ???? ???????? ???? ?? ??? ??????? ???? ??????, ???? "
+"?????????????? ??????? ????? ??????"
 
 msgid "_Configure Room"
-msgstr "???? ??????? ???? (_C)"
+msgstr "??? ??????????  (_C)"
 
 msgid "_Accept Defaults"
-msgstr "?????????????? ????? (_A)"
+msgstr "?????????????? ??????? ????? ??? ??? (_A)"
 
-#, fuzzy
 msgid "No reason"
-msgstr "???? ???? ??????? ?????"
+msgstr "???? ???? ???"
 
-#, fuzzy, c-format
+# Kick =  ????????
+# OR  ??????
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "%1s ?????? ?????? ??? ??? ????? ?????: (%2s)"
+msgstr "?????? ???????? ??? ?????: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%1s (%2s) ?????? ????????"
+msgstr "(%s) ????????"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "?????? ????? ????? ???? ?????? ??????"
+msgstr "??-??????? ??????????? ??????? ?????? ?????\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "???? ?????? ??????"
+msgstr "?????????? ???? ??? ???? ??????"
 
-#, fuzzy
 msgid "Failed to open the file"
-msgstr "'%1s' ?????? ????? ??????: %2s"
+msgstr "?????? ????? ??????"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "??-??????? ??????????? ????? ??????"
 
-# tithi
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "%s ? ???? ?????? ?????, ???????????? ???? ?????????? ?????? ??? ??"
+msgstr "%s ? ???? ?????? ??????, ?????????? ???? ?????????? ?????? ??? ??"
 
 msgid "File Send Failed"
 msgstr "???? ?????? ?????? ??????"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "%s ? ???? ?????? ????? ??? ??, ???? JID"
+msgstr "%s ? ???? ?????? ??????, ???????? JID"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -4958,66 +4917,65 @@ msgid "Unable to send file to %s, not su
 
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "%s ? ???? ?????? ????? ??? ??, ??????????? ?????????? ????? ???"
+msgstr "%s ? ???? ?????? ??????, ??????????? ?????????? ??????????? ??? ???"
 
 # fix me tithi
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"??????? ??? ???? %s ?? ??? ???? ????? ???????? ???? ???? ???? ???? ???? ?????? ???"
+msgstr "??????? ??? %s ?? ???? ??????? ???????? ???? ???? ???? ???? ?????? ???"
 
 msgid "Edit User Mood"
-msgstr "???????????? ??? ??????? ????"
+msgstr "??????????? ??????? ???????"
 
 # tithi
 msgid "Please select your mood from the list."
-msgstr "??????? ??? ?????? ???? ????? ??? ???????? ?????"
+msgstr "??????? ??? ?????? ???? ????? ??????? ???????? ?????"
 
 msgid "Set"
 msgstr "???????? ????"
 
 msgid "Set Mood..."
-msgstr "??? ???????? ????..."
+msgstr "??????? ????????..."
 
 msgid "Set User Nickname"
-msgstr "???????????? ?????? ???????? ????"
+msgstr "???????????? ?????? ????????"
 
 msgid "Please specify a new nickname for you."
-msgstr "??????? ??? ????? ???? ???? ?????? ????????? ?????"
+msgstr "??????? ??? ????? ???? ???? ?????? ????"
 
 # tithi
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-"?? ?????? ????? ??????? ??????? ??? ???????? ????????, ?????? ??????? ???? ????? ?????"
+"?? ?????? ????? ??????? ??????? ?? ?????? ???? ????????, ?????? ??????? ???? ????? ?????"
 
 msgid "Set Nickname..."
-msgstr "?????? ???????? ????..."
+msgstr "?????? ????????..."
 
 msgid "Actions"
-msgstr "?????????"
+msgstr "???????????"
 
 msgid "Select an action"
-msgstr "???? ????? ???????? ????"
+msgstr "???? ??????????? ???????? ????"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "\"%s\" ??? ???? ????? ???"
+msgstr "\"%s\" ??? ???? ???????"
 
 msgid "Buddy Add error"
 msgstr "????? ??? ???? ??????"
 
 msgid "The username specified does not exist."
-msgstr "???????? ????????????? ????? ???????? ???"
+msgstr "???????? ???????????? ????? ???????? ???"
 
 # fix me tithi
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%1s (%2s) ? ????? ??????? ????????????? ?????"
+msgstr "%1$s (%2$s) ? ????? ??????? ????????? ?????"
 
 # tithi
 #, c-format
@@ -5025,8 +4983,8 @@ msgstr ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"???????? ??????? %1s \"%2s\" ??????? ????? ?????? ??????? ???????? ???? ???? ?? ?? "
-"??????? ??? ???? ????"
+"%1$s ???????? ??????? ??? \"%2$s\" ??? ??????????? ?????? ??????? ???????? ???? ???? "
+"?? ?? ??????? ??? ???? ????"
 
 # msgstr ""
 # "???????? ??????? %s ????? ? ???? ?????? ??????? ???????? ???????? ?? ?? ????????? ??? "
@@ -5036,8 +4994,7 @@ msgstr ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s ??????? ??????? ??? ?????? ??????? ???????? ???? ???? ?? ?? ????????? ??? ???? "
-"????"
+"%s ??????? ??????? ??? ?????? ??????? ???????? ???? ???? ?? ?? ??????? ??? ???? ????"
 
 #, c-format
 msgid "Unable to parse message"
@@ -5045,11 +5002,11 @@ msgid "Syntax Error (probably a client b
 
 #, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "????????? ?????? (?????? ???????????? ???)"
+msgstr "?????????? ?????? (?????? ?????????? ???)"
 
 #, c-format
 msgid "Invalid email address"
-msgstr "???? ??-???? ??????"
+msgstr "???????? ?????? ??????"
 
 #, c-format
 msgid "User does not exist"
@@ -5058,27 +5015,27 @@ msgid "Fully qualified domain name missi
 # tithi
 #, c-format
 msgid "Fully qualified domain name missing"
-msgstr "???????????? ????? ?????? ??? ???????????"
+msgstr "???????? ??????? ?????? ??? ???"
 
 #, c-format
 msgid "Already logged in"
-msgstr "???????? ???? ?????"
+msgstr "???????? ???? ???"
 
 #, c-format
 msgid "Invalid username"
-msgstr "???? ???????????? ???"
+msgstr "???????? ???????????? ???"
 
 #, c-format
 msgid "Invalid friendly name"
-msgstr "???? ????????? ???"
+msgstr "???????? ????????? ???"
 
 #, c-format
 msgid "List full"
-msgstr "?????? ?????"
+msgstr "?????? ????????"
 
 #, c-format
 msgid "Already there"
-msgstr "???????? ?????? ???"
+msgstr "???????? ?????? ???"
 
 #, c-format
 msgid "Not on list"
@@ -5090,57 +5047,57 @@ msgid "Already in the mode"
 
 #, c-format
 msgid "Already in the mode"
-msgstr "???????? ????????? ???"
+msgstr "???????? ?? ???? ???"
 
 #, c-format
 msgid "Already in opposite list"
-msgstr "???????? ?????? ???????? ???"
+msgstr "???????? ?????? ???????? ???"
 
 #, c-format
 msgid "Too many groups"
-msgstr "???????? ?????"
+msgstr "???? ???? ??"
 
 #, c-format
 msgid "Invalid group"
-msgstr "???? ?????"
+msgstr "???????? ??"
 
 #, c-format
 msgid "User not in group"
-msgstr "??????????? ?????? ???"
+msgstr "??????????? ??? ???"
 
 #, c-format
 msgid "Group name too long"
-msgstr "????? ????? ??????? ?????"
+msgstr "???? ????? ??????? ?????"
 
 #, c-format
 msgid "Cannot remove group zero"
-msgstr "????? ???? ???? ????? ???? ??"
+msgstr "???????????? ?? ???? ???? ??? ??"
 
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "????????????? ??? ???? ?????? ???????? ?????? ??? ????? ?? ???????? ???"
+msgstr "????????????? ??? ???? ??? ???????? ?????? ??? ????? ?? ???????? ???"
 
 #, c-format
 msgid "Switchboard failed"
-msgstr "????????? ??????"
+msgstr "????????? ?????? ?????"
 
 #, c-format
 msgid "Notify transfer failed"
-msgstr "????????? ?????????? ??????"
+msgstr "???????????? ????? ?????? ?????"
 
 # tithi
 #, c-format
 msgid "Required fields missing"
-msgstr "??????????? ??????? ???????????"
+msgstr "??????????? ??????? ???"
 
 # tithi
 #, c-format
 msgid "Too many hits to a FND"
-msgstr "???? FND ? ??? ???? ???? ??? ?????"
+msgstr "???? FND ??? ???? ????????? ?????"
 
 #, c-format
 msgid "Not logged in"
-msgstr "???? ??? ????"
+msgstr "???? ??? ???"
 
 #, c-format
 msgid "Service temporarily unavailable"
@@ -5148,11 +5105,11 @@ msgid "Database server error"
 
 #, c-format
 msgid "Database server error"
-msgstr "????????? ????????? ??????"
+msgstr "??????? ????????? ??????"
 
 #, c-format
 msgid "Command disabled"
-msgstr "??????? ??????????"
+msgstr "?????? ??????????"
 
 #, c-format
 msgid "File operation error"
@@ -5161,12 +5118,12 @@ msgid "Memory allocation error"
 # tithi
 #, c-format
 msgid "Memory allocation error"
-msgstr "?????? ??????? ??????"
+msgstr "????? ??????? ??????"
 
 # tithi
 #, c-format
 msgid "Wrong CHL value sent to server"
-msgstr "??? CHL ??? ???????? ??????????"
+msgstr "???????? ??? CHL ??? ?????? ?????"
 
 #, c-format
 msgid "Server busy"
@@ -5174,21 +5131,21 @@ msgid "Server unavailable"
 
 #, c-format
 msgid "Server unavailable"
-msgstr "??????? ???????? "
+msgstr "??????? ???????? ??"
 
 # fix me tithi
 #, c-format
 msgid "Peer notification server down"
-msgstr "????? ????????? ??????? ??????????"
+msgstr "????? ????? ??????? ??????????"
 
 #, c-format
 msgid "Database connect error"
-msgstr "????????? ?????? ??????"
+msgstr "??????? ?????? ??????"
 
 # tithi
 #, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "??????? ????????? ??? ?????? (????? ????)"
+msgstr "??????? ????????? ??? ?????? (??? ???? ???)"
 
 # tithi
 #, c-format
@@ -5198,26 +5155,26 @@ msgid "CVR parameters are either unknown
 # tithi
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
-msgstr "CVR ??????????????? ??? ????? ?? ???????? ???"
+msgstr "CVR ??????????? ??? ????? ???? ???????? ???"
 
 #, c-format
 msgid "Unable to write"
-msgstr "????? ????? ??"
+msgstr "????? ??????"
 
 # tithi
 #, c-format
 msgid "Session overload"
-msgstr "??????? ????????"
+msgstr "???? ???????"
 
 # tithi
 #, c-format
 msgid "User is too active"
-msgstr "??????????? ???? ???? ???????"
+msgstr "??????????? ??? ???????"
 
 # tithi
 #, c-format
 msgid "Too many sessions"
-msgstr "???? ???? ???????"
+msgstr "???????? ?????? ????"
 
 # tithi
 #, c-format
@@ -5227,17 +5184,17 @@ msgid "Bad friend file"
 # tithi
 #, c-format
 msgid "Bad friend file"
-msgstr "????? ????? ????"
+msgstr "??????????? ????? ????"
 
 # tithi
 #, c-format
 msgid "Not expected"
-msgstr "?????????? ??? ??"
+msgstr "?????????? ??"
 
 # tithi
 #, c-format
 msgid "Friendly name changes too rapidly"
-msgstr "????????????? ??? ??? ????? ???????? ??"
+msgstr "????????? ??? ??? ????? ????????? ??"
 
 #, c-format
 msgid "Server too busy"
@@ -5251,7 +5208,7 @@ msgid "Not allowed when offline"
 # tithi
 #, c-format
 msgid "Not allowed when offline"
-msgstr "??????? ???????? ???"
+msgstr "?????? ????? ???????? ???"
 
 # tithi
 #, c-format
@@ -5287,43 +5244,63 @@ msgid "Other Contacts"
 msgstr "MSN ??????: %s\n"
 
 msgid "Other Contacts"
-msgstr "???????? ???????????"
+msgstr "???????? ???????"
 
 msgid "Non-IM Contacts"
-msgstr "IM ??? ??? ???????????"
+msgstr "IM ? ??? ??? ???????"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s ???? ????? ????????? <a href='msn-wink://%s'>????? ???? ????? ????? ????</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ???? ????? ????????, ?????? ?? ??????? ??? ????? ????"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s ???? ?????? ????? ????????? <a href='audio://%s'>????? ???? ????? ????? ????</"
+"a>"
+
 # tithi
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ???? ?????? ????? ?????????, ?????? ?? ??????? ??? ????? ????"
+
+# tithi
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s ?????? ?????????? ???????? ??????????, ?? ???? ??????? ???"
+msgstr "?????? %s ???? ???? ?????? ???????? ??????????, ?? ???? ??????? ?????"
 
 # tithi
 msgid "Nudge"
-msgstr "???????"
+msgstr "??????"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s ?????? ??????? ??? ??????!"
+msgstr "%s ?????? ?????? ???????!"
 
 # fix-me tithi
 #, c-format
 msgid "Nudging %s..."
-msgstr "%s ?????? ?????? ????..."
+msgstr "%s ?? ?????? ???? ?????..."
 
 msgid "Email Address..."
-msgstr "?-???? ??????..."
+msgstr "????? ??????..."
 
 # tithi
 msgid "Your new MSN friendly name is too long."
-msgstr "????? ???? MSN ????????????? ??? ??? ??????"
+msgstr "????? ???? MSN ????????? ??? ??? ??????"
 
 # tithi
 msgid "Set your friendly name."
-msgstr "????? ????????????? ??? ???????? ?????"
+msgstr "????? ????????? ??? ?????????"
 
 # tithi
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "??? ??? ??? ?? ?????? ???????? MSN ??????? ?????? ??????"
+msgstr "???????? MSN ??????? ?????? ?? ???? ?????"
 
 # tithi
 msgid "Set your home phone number."
@@ -5331,7 +5308,7 @@ msgid "Set your work phone number."
 
 # tithi
 msgid "Set your work phone number."
-msgstr "????? ????? ??? ??????? ????"
+msgstr "????? ?????????? ??? ??????? ????"
 
 # tithi
 msgid "Set your mobile phone number."
@@ -5339,39 +5316,39 @@ msgid "Allow MSN Mobile pages?"
 
 # tithi
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN ?????? ??????? ?? ??????? ??????"
+msgstr "MSN ?????? ?????????? ?? ??????? ??? ????"
 
 # tithi
 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 ""
-"???? ?? ????? ????? ??????? ?????? ????? ??? ??? ?? ???????? ?????? ??????? MSN "
-"?????? ?????????? ?????? ??????? ???? ??? ?? ??? ???"
+"???? ?? ??????? ?????????? ????? ?????? ??? ?? ???????? ?????? ??????? MSN "
+"?????? ?????? ?????? ??????? ???? ???????"
 
 msgid "Allow"
-msgstr "??????? ????"
+msgstr "??????? ??? ???"
 
 msgid "Disallow"
-msgstr "??????? ????? ??"
+msgstr "??????? ??? ??? ??"
 
 #, c-format
 msgid "Blocked Text for %s"
-msgstr "%s ?? ???? ??????? ???"
+msgstr "%s ?? ???? ??????? ??????"
 
 # tithi
 msgid "No text is blocked for this account."
-msgstr "?? ?????????? ???? ???? ??? ????? ???"
+msgstr "?? ?????????? ???? ???? ?????? ???? ??? ????"
 
 # tithi
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "MSN ??????? ???????? ?????????? ??????? ???????? ????? ????:<br/>%s"
+msgstr "MSN ??????? ???????? ?????????? ??????? ?????????????? ???? ????:<br/>%s"
 
 # tithi
 msgid "This account does not have email enabled."
-msgstr "?? ????????? ?-???? ??????? ????"
+msgstr "?? ?????????? ??? ????? ??????? ????"
 
 msgid "Send a mobile message."
 msgstr "?????? ?????? ??????"
@@ -5387,13 +5364,13 @@ msgid "Has you"
 
 # tithi
 msgid "Has you"
-msgstr "????? ??"
+msgstr "???? ?? ??? ?????"
 
 msgid "Home Phone Number"
 msgstr "????? ??? ?????"
 
 msgid "Work Phone Number"
-msgstr "?????? ??? ????? "
+msgstr "?????????? ??? ?????"
 
 msgid "Mobile Phone Number"
 msgstr "?????? ??? ?????"
@@ -5405,11 +5382,11 @@ msgid "On the Phone"
 msgstr "??????"
 
 msgid "On the Phone"
-msgstr "??? ? ??? ????"
+msgstr "???? ??? ????"
 
 # tithi
 msgid "Out to Lunch"
-msgstr "?????? ????? ???? ?????"
+msgstr "?????? ?????? ???? ?????"
 
 #. primitive
 #. ID
@@ -5430,45 +5407,71 @@ msgid "Set Friendly Name..."
 msgstr "?????? ???????"
 
 msgid "Set Friendly Name..."
-msgstr "????????? ??? ???????? ????..."
+msgstr "????????? ??? ????????..."
 
 msgid "Set Home Phone Number..."
-msgstr "????? ??? ????? ???????? ????..."
+msgstr "????? ??? ????? ????????..."
 
 msgid "Set Work Phone Number..."
-msgstr "?????? ??? ????? ???????? ????..."
+msgstr "?????????? ??? ????? ????????..."
 
 msgid "Set Mobile Phone Number..."
-msgstr "?????? ??? ????? ???????? ????..."
+msgstr "?????? ??? ????? ????????..."
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "?????? ?????????? ???????/?????????? ????..."
+msgstr "?????? ?????? ???????/?????????????..."
 
 # tithi
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "?????? ???????????? ??????? ????/????? ??..."
+msgstr "?????? ?????? ???????..."
 
 # tithi
 msgid "View Blocked Text..."
-msgstr "??????? ??? ?????..."
+msgstr "???? ??? ?????? ????????..."
 
 msgid "Open Hotmail Inbox"
 msgstr "?????? ?????? ?????"
 
 msgid "Send to Mobile"
-msgstr "??????? ?????"
+msgstr "??????? ??????"
 
 # tithi
 msgid "Initiate _Chat"
-msgstr "????? ???????? ???? (_C)"
+msgstr "????? ???? ???? (_C)"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"MSN ?? ???? SSL ?????? ????????? ??????? ??? ???? ??????? SSL ????????? ???????? ?????"
+"MSN ?? ???? SSL ?????? ????????? ??????? ??? ???? ??????? SSL ????????? ?????? ?????"
 
 # tithi
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"????? %s ?? ??? ??? ????? ???? ???? ???????????? ????? ????????? ??????????? ??? "
+"?????? ???? ??????? ????? ?????? ??? ????"
+
+msgid "Unable to Add"
+msgstr "??? ???? ??????"
+
+# tithi
+msgid "Authorization Request Message:"
+msgstr "????????? ??????:"
+
+# tithi
+msgid "Please authorize me!"
+msgstr "??????? ??? ????? ??????? ???!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "??? ??? (_O)"
+
+# tithi
 msgid "Error retrieving profile"
-msgstr "????????? ??????? ??????"
+msgstr "???????? ??????? ??????"
 
 msgid "General"
 msgstr "??????"
@@ -5486,7 +5489,7 @@ msgid "A Little About Me"
 msgstr "?? ??? ?????"
 
 msgid "A Little About Me"
-msgstr "???? ???????? ???? ????"
+msgstr "???? ???????? ???? ???"
 
 msgid "Social"
 msgstr "???????"
@@ -5495,16 +5498,16 @@ msgid "Interests"
 msgstr "??????? ??????"
 
 msgid "Interests"
-msgstr "?????????"
+msgstr "?????"
 
 msgid "Pets"
-msgstr "???? ??????????"
+msgstr "???? ??????"
 
 msgid "Hometown"
-msgstr "?????-?????"
+msgstr "??????? ?????"
 
 msgid "Places Lived"
-msgstr "??????? ???????"
+msgstr "???? ?????? ??????"
 
 msgid "Fashion"
 msgstr "??????"
@@ -5520,14 +5523,14 @@ msgid "Contact Info"
 msgstr "?????? ?????"
 
 msgid "Contact Info"
-msgstr "????????? ????"
+msgstr "???????? ????"
 
 msgid "Personal"
 msgstr "?????????"
 
 # tithi
 msgid "Significant Other"
-msgstr "???????????? ????????"
+msgstr "???????????? ?????"
 
 msgid "Home Phone"
 msgstr "????? ???"
@@ -5545,10 +5548,10 @@ msgid "Personal Email"
 msgstr "????? ???????"
 
 msgid "Personal Email"
-msgstr "????????? ?-????"
+msgstr "????????? ?????"
 
 msgid "Personal IM"
-msgstr "????????? ????"
+msgstr "????????? IM"
 
 # tithi
 msgid "Anniversary"
@@ -5556,11 +5559,11 @@ msgid "Work"
 
 #. Business
 msgid "Work"
-msgstr "????"
+msgstr "???"
 
 # tithi
 msgid "Job Title"
-msgstr "????? ???????"
+msgstr "?????????"
 
 msgid "Company"
 msgstr "????????"
@@ -5572,63 +5575,61 @@ msgid "Work Phone"
 msgstr "????"
 
 msgid "Work Phone"
-msgstr "???? ???"
+msgstr "?????????? ???"
 
 msgid "Work Phone 2"
-msgstr "???? ??? ?"
+msgstr "?????????? ??? ?"
 
 msgid "Work Address"
-msgstr "???? ??????"
+msgstr "?????????? ??????"
 
 msgid "Work Mobile"
-msgstr "???? ??????"
+msgstr "?????????? ??????"
 
 msgid "Work Pager"
-msgstr "???? ??????"
+msgstr "?????????? ??????"
 
 msgid "Work Fax"
-msgstr "???? ???????"
+msgstr "?????????? ???????"
 
 msgid "Work Email"
-msgstr "???? ?-????"
+msgstr "?????????? ?????"
 
 msgid "Work IM"
-msgstr "???? ????"
+msgstr "?????????? IM"
 
 msgid "Start Date"
 msgstr "????? ?????"
 
 msgid "Favorite Things"
-msgstr "?????? ?????????"
+msgstr "?????? ?????"
 
 msgid "Last Updated"
-msgstr "??????? ???????????"
+msgstr "??????? ???????? ???"
 
 msgid "Homepage"
-msgstr "??????"
+msgstr "???????"
 
 msgid "The user has not created a public profile."
-msgstr "??????????? ???? ?????????? ???????? ???? ??????"
+msgstr "??????????? ???? ?????? ???????? ???? ??????"
 
-# tithi
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN ???????????? ????????? ????? ???? ????? ?? ????? ????????? ???????  ??? ???? "
-"?????? ?? ??????????? ???????? ???, ?? ??????????? ??????? ?????? ???? ?????? "
-"????????? ???? ??????"
+"MSN, ???????????? ???????? ????? ?????? ?? ???? ?? ??, ?? ??? ??? ??????????? ???, "
+"???? ??????????? ??? ???????? ????????? ???? ??????"
 
 # tithi
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"???????????? ?????????? ???? ???? ????? ??????? ??????????? ?????? ???????? ????? ???"
+"???????????? ????????? ???? ???? ????? ????? ?????? ?????? ??? ??? ??????????? ????"
 
 msgid "View web profile"
-msgstr "????? ???????? ?????"
+msgstr "????? ???????? ????????"
 
 #. *< type
 #. *< ui_requirement
@@ -5640,48 +5641,49 @@ msgid "Windows Live Messenger Protocol P
 #. *< version
 #. *< summary
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "????????? ?????? ???????? ???????? ???????"
+msgstr "Windows Live Messenger ???????? ???????"
 
 # tithi
 msgid "Use HTTP Method"
-msgstr "HTTP ?????? ??????? ????"
+msgstr "HTTP ?????? ??????? ??? ???"
 
 msgid "HTTP Method Server"
 msgstr "HTTP ??????? ???????"
 
 # tithi
 msgid "Show custom smileys"
-msgstr "???????????? ??????????? ?????"
+msgstr "???????????? ??????? ?????? ???"
 
 # fix -me tithi
 msgid "nudge: nudge a user to get their attention"
-msgstr "???: ?????????????? ?????? ???? ??????? ??? ???"
+msgstr "nudge: ?????????????? ?????? ???? ??????? ?????? ???"
 
 # tithi
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "??????? ?????? ???? ??????????:????? ???? ?????"
+msgstr "Windows Live ID ??????????:????? ???? ??????"
 
 # tithi
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "??????? ??????  ???? ??????????:???? ?????"
+msgstr "Windows Live ID ??????????: ???????? ?????"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s ????? ?????? ?????? ????!"
+msgstr "%s ?????? ?????? ??????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "????? ?????? (%d)"
+msgstr "????? ?????? (%d): %s"
 
 msgid "Unable to add user"
-msgstr "??????????? ??? ???? ????? ??"
+msgstr "??????????? ??? ???? ??????"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "????? ?????? (%d)"
 
 msgid "The following users are missing from your addressbook"
-msgstr "????? ?????? ?? ???? ????????? ????????????? ??????? ????"
+msgstr "????? ?????? ???? ????????? ????????????? ???"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????? ???????? ???? ??? ?????? ?????? ??????"
@@ -5703,39 +5705,39 @@ msgstr[0] ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN ??????? ?????????????? ???? %d ?????? ???? ???? ????? ???? ??  ???? "
-"???????????????? ???? ??? ???? ??????  ??????? ??? ????? ?????? ??????? ??? ?????\n"
+"MSN ??????? ?????????????? ???? %d ?????? ???? ???? ????? ???? ?? ???? ???????????????? "
+"????? ???? ?????? ??????? ??? ????? ??????? ??? ?????\n"
 "\n"
-"???????????? ???????? ???? ??, ???? ??????? ???? ?? ???? ???????"
+"???????????? ???????? ???? ??, ???? ??????? ???? ???? ???????"
 msgstr[1] ""
-"MSN ??????? ?????????????? ???? %d ?????? ???? ???? ????? ???? ??  ???? "
-"???????????????? ???? ??? ???? ??????  ??????? ??? ????? ?????? ??????? ??? ?????\n"
+"MSN ??????? ?????????????? ???? %d ?????? ???? ???? ????? ???? ?? ???? ???????????????? "
+"????? ???? ?????? ??????? ??? ????? ???? ??????? ??? ?????\n"
 "\n"
-"???????????? ???????? ???? ??, ???? ??????? ???? ?? ???? ???????"
+"???????????? ???????? ???? ??, ???? ??????? ???? ???? ???????"
 
 # tithi
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
-"?????? ?????? ????? ???? ??????? ???????  ??? ???? ??????? ??? ??? ??????????? "
-"????? ?? ??????????? ???????? ???? ???"
+"?????? ?????? ????? ???? ??????? ??????? ??? ???? ??????? ??? ??? ??????????? ???? "
+"??? ???? ?? ???? ??? ??????????? ?? ?????"
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "?????? ?????? ????? ???? ?????????? ??? ?????????? ?????? ???????"
 
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "????? ????????? ?????? ?????? ????? ????? ?????? ?????? ???????"
+msgstr "????? ??????? ?????? ?????? ????? ?????? ?????? ???????"
 
 msgid "Message was not sent because an unknown error occurred."
-msgstr "????? ?????? ?????? ????? ????? ?????? ?????? ???????"
+msgstr "????? ?????? ?????? ????? ?????? ?????? ???????"
 
 # tithi
 msgid "Writing error"
-msgstr "???? ??????"
+msgstr "????? ??????"
 
 msgid "Reading error"
-msgstr "??? ??????"
+msgstr "???? ??????"
 
 # tithi
 #, c-format
@@ -5743,39 +5745,35 @@ msgstr ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%1s ??????? ??? ??????? ??????:\n"
-"%2s"
+"%1$s ??????? ???? ??????? ??????:\n"
+"%2$s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "?????? ??????? ??????? ?????? ??? ???"
+msgstr "?????? ?????????? ??????? ?????? ??? ???"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "HTTP ????? ???? ???????"
+msgstr "HTTP ????? ???? ??????"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "???? ???? ????? ???? ???? ?? ???????"
+msgstr "???? ???? ????? ???? ???? ??????"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"??????????? ?????? ??????? ?????? ?????? ??? ??????? ??? ??????? ???? ??? ??????? "
-"?????? ????"
+"MSN ??????? ??????????? ?????? ?????? ??? ??????? ??? ??????? ???? ??? ??????? ?????? "
+"?????"
 
 # tithi
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN ??????? ??????????? ????????? ??????"
+msgstr "MSN ??????????? ??????????? ????????? ??? ??????"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "?????????? ???? ?????: %s"
+msgstr "?????????? ???? ??????: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"??????????? ????? ?????? ?????-?????? ?????? ?????? ??? ??????? ??? ??????? ???? ??? "
+"??????????? ????? MSN ?????-?????? ?????? ?????? ??? ??????? ??? ??????? ???? ??? "
 "??????? ?????? ?????"
 
 # tithi
@@ -5783,26 +5781,27 @@ msgid "Transferring"
 msgstr "????????????"
 
 msgid "Transferring"
-msgstr "?????????? ????"
+msgstr "?????????? ??? ?????"
 
 # tithi
 msgid "Starting authentication"
-msgstr "?????????? ???? ????"
+msgstr "?????????? ???? ?????"
 
 # tithi
 msgid "Getting cookie"
-msgstr "???? ????? ????"
+msgstr "???? ????? ??? ?????"
 
 msgid "Sending cookie"
-msgstr "???? ????????"
+msgstr "???? ?????? ?????"
 
 msgid "Retrieving buddy list"
-msgstr "????? ?????? ?????? ????"
+msgstr "????? ?????? ?????? ??? ?????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s ?????? ?????????? ???????? ??????????, ?? ???? ??????? ???"
+msgstr ""
+"????? ?????????? ?????????? ???? %s ?????? ?????? ?????? ?? ???????? ???? ??????? ?????"
 
 # tithi
 #, c-format
@@ -5813,50 +5812,50 @@ msgid "On The Phone"
 msgstr "????????? ???? ????"
 
 msgid "On The Phone"
-msgstr "??? ? ??? ????"
+msgstr "???? ??? ????"
 
 msgid "Out To Lunch"
-msgstr "????? ?? ???? ?????"
+msgstr "??????? ???? ?????"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "???? ??? ???? ?????? ????? ?????? ?????? ?????? ?????:"
+msgstr "???????? ??????? ???? ????? ?????? ?????? ?????? ?????:"
 
 # tithi
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "?????? ?????? ???? ??, ?????? ??????? ???????? ???:"
+msgstr "?????? ??????? ?????? ?????? ???????? ???:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr "?????? ?????? ?????? ?? ???? ??????????? ???????:"
+msgstr "?????? ?????? ?????? ?? ???? ??????????? ??????:"
 
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "?????? ?????? ?????? ?? ???? ?????? ?????? ?????? ?????:"
+msgstr "?????? ?????? ?????? ?? ???? ?????? ?????? ?????:"
 
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "?????? ?????? ?????? ?? ???? ???? ??? ?????????? ????????:"
+msgstr "?????? ?????? ?????? ?? ???? ??? ?????????? ?????? ?????:"
 
 # tithi
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
-"?????? ?????? ?????? ?? ???? ???? ????????? ???? ???? ??????? ?????????? ???? "
-"????? ?????? ??? ?????? ??????? ??????, ???? ??????? ????? ??????? ???? ?????? ????:"
+"?????? ?????? ?????? ?? ???? ????????? ???? ???? ????????? ??? ?????? ?????? ??? "
+"?????? ????????? ??????, ???? ??????? ????? ??????? ?????? ??? ???:"
 
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "?????????? ?????? ????? ????? ?????? ?????? ?????:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "???? ????? ??????? ?????? ????? ????? ?????? ??? ?????? ??????:"
+msgstr "???? ????? ??????? ?????? ????? ????? ?????? ?????? ?????? ??????:"
 
 msgid "Delete Buddy from Address Book?"
 msgstr "??????? ?? ???? ?? ????? ???? ????? ????"
 
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "???? ?? ?? ?????????? ????? ?????? ?? ???? ???? ????? ????"
+msgstr "???? ?? ?? ??????? ????? ?????? ?? ????? ???? ????? ????"
 
 msgid "The username specified is invalid."
-msgstr "???????? ????????????? ????? ?????"
+msgstr "???????? ???????????? ????? ?????????"
 
 # tithi
 msgid "This Hotmail account may not be active."
@@ -5881,26 +5880,26 @@ msgid "%s is not a valid group."
 
 #, c-format
 msgid "%s is not a valid group."
-msgstr "%s ???? ??? ????? ????"
+msgstr "%s ???? ??????? ?? ????"
 
 msgid "Unknown error."
 msgstr "????? ???????"
 
 #, c-format
 msgid "%s on %s (%s)"
-msgstr "%2s (%3s) ? %1s"
+msgstr "%2$s (%3$s) ? %1$s"
 
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "%1s (%2s) ? ??????????? ??? ???? ????? ??"
+msgstr "%1$s (%2$s) ? ??????????? ??? ???? ??????"
 
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "%1s (%2s) ? ??????????? ????? ???? ????? ??"
+msgstr "%1$s (%2$s) ? ??????????? ???? ???? ??????"
 
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "%1s (%2s) ????????????? ?????? ?????? ???? ????? ??"
+msgstr "%1$s (%2$s) ????????????? ?????? ?????? ???? ??????"
 
 #, c-format
 msgid "%s could not be added because your buddy list is full."
@@ -5914,10 +5913,10 @@ msgid "Unable to rename group"
 msgstr "??????????? ???? ?????? ?????? ???"
 
 msgid "Unable to rename group"
-msgstr "????? ??????? ?????? ???? ????? ??"
+msgstr "???? ???????? ???? ??????"
 
 msgid "Unable to delete group"
-msgstr "????? ???? ????? ?????"
+msgstr "?? ???? ????? ??????"
 
 #, c-format
 msgid "%s has added you to his or her buddy list."
@@ -5925,7 +5924,7 @@ msgid "%s has removed you from his or he
 
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?????? ??? ????? ?????? ???? ?????? ??????"
+msgstr "%s ?????? ??? ????? ?????? ???? ?????? ???????"
 
 # tithi
 #, c-format
@@ -5933,28 +5932,28 @@ msgid "User lookup"
 msgstr "??? ???? ??????????? ???: %s"
 
 msgid "User lookup"
-msgstr "??????????? ?????"
+msgstr "??????????? ?????????"
 
 msgid "Reading challenge"
-msgstr "????? ?????? ?????"
+msgstr "????? ?????????"
 
 # fix me tithi
 msgid "Unexpected challenge length from server"
-msgstr "????????? ??????????? ????????? ????"
+msgstr "??????????? ????????? ??????? ????????? "
 
 msgid "Logging in"
-msgstr "??????? ?????"
+msgstr "???? ?????"
 
 msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - ???? ???????????? ??? ??????? ??? ????"
+msgstr "MySpaceIM - ???? ???????????? ??? ???? ????"
 
 # tithi
 msgid "You appear to have no MySpace username."
-msgstr "???? MySpace ????????????-??? ?????? ??????? ???????"
+msgstr "?????? ????? MySpace ????????????-??? ????"
 
 # tithi
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "???? ?? ??? ???? ???????? ???? ??????? (???: ??? ???????? ??? ??? ??!)"
+msgstr "???? ?? ??? ???????? ???? ??????? (???: ??? ???????? ??? ??? ??!)"
 
 msgid "Lost connection with server"
 msgstr "????????? ???? ????? ????????? ?????"
@@ -5963,7 +5962,7 @@ msgid "New mail messages"
 #. khc: then use N_() in the array initializer and use _() when they are
 #. used
 msgid "New mail messages"
-msgstr "???? ???? ??????????"
+msgstr "???? ????"
 
 # tithi
 msgid "New blog comments"
@@ -5986,7 +5985,7 @@ msgid "IM Friends"
 msgstr "MySpace"
 
 msgid "IM Friends"
-msgstr "IM ?????????"
+msgstr "IM ?????"
 
 # tithi
 #, c-format
@@ -5997,95 +5996,94 @@ msgstr[0] ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
-"??????? ????  %d ????? ??? ?? ???????? ???  ??????? ( ???????-????????? ???????? "
-"???????? ??????? ??)"
+"??????? ????  %d ?? ????? ??? ?? ???????? ??? ?????? (???????-????????? ??????? "
+"??????? ??)"
 msgstr[1] ""
-"??????? ????  %d ????????? ??? ?? ???????? ???  ??????? ( ???????-????????? ???????? "
-"???????? ??????? ??)"
+"??????? ???? %d ?? ????? ??? ?? ???????? ???  ?????? (???????-????????? ??????? "
+"??????? ??)"
 
 msgid "Add contacts from server"
-msgstr "??????? ???? ??????????? ??? ????"
+msgstr "??????? ???? ??????????? ??? ????"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "??????? ??????, ??? %1d: %2s"
+msgstr "???????? ??????, ??? %1$d: %2$s"
 
-# tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s ????? ?????????? %d ???????????, MySpaceIM ?? ???? %d ?? ?????????? ???????? ??????? "
-"??????? ???????? ??????? ??? ????? ?????????? http://profileedit.myspace.com/index."
-"cfm?fuseaction=accountSettings? ?????????? ????????? ???? ??? ??????? ?????? ?????"
+"%s ????? ??????????? %zu ???????, ?? ??????? %d ?? ???????? ????????? ????? ??? "
+"??????? ??? ????? ????????? http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings ??????? ???? ????????? ???? ??? ??????? ?????? ?????"
 
 msgid "Incorrect username or password"
-msgstr "??? ???????????? ??? ?? ??????????"
+msgstr "??? ???????????? ??? ?? ?????????"
 
 # tithi
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ??????"
 
 msgid "Invalid input condition"
-msgstr "???? ????? ????"
+msgstr "???????? ????? ????"
 
 msgid "Failed to add buddy"
 msgstr "????? ??? ???? ??????"
 
 msgid "'addbuddy' command failed."
-msgstr "\"????? ??? ????\" ????????? ?????? ???????"
+msgstr "'addbuddy' ???????? ?????? ???????"
 
 msgid "persist command failed"
-msgstr "??????? ??????? ?????? ??????"
+msgstr "persist ?????? ?????? ??????"
 
 msgid "Failed to remove buddy"
-msgstr "????? ?????? ???? ?????? ?????"
+msgstr "????? ?????? ???? ??????"
 
 # tithi
 msgid "'delbuddy' command failed"
-msgstr "'????? ???? ?????' ??????? ?????? ??????"
+msgstr "'delbuddy' ?????? ?????? ??????"
 
 msgid "blocklist command failed"
-msgstr "????-????? ??????? ?????? ??????"
+msgstr "blocklist ?????? ?????? ??????"
 
 msgid "Missing Cipher"
-msgstr "??????? ?????? ??????"
+msgstr "?????? ?????????"
 
 # tithi
 msgid "The RC4 cipher could not be found"
-msgstr "RC4 ???????? ????? ?????? ??????"
+msgstr "RC4 ?????? ????? ?????? ??????"
 
-# tithi
+# mark25
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-"RC4 ?????? (>= 2.0.1) ?? libpurple? ??????? ????? MySpaceIM ??????? ??? ??? ??? "
-"???"
+"RC4 ??????? (>= 2.0.1) libpurple? ??????? ??? ???? MySpaceIM ??????? ??? ??? "
+"??? ???"
 
 # tithi
 msgid "Add friends from MySpace.com"
 msgstr "MySpace.com ???? ????? ??? ????"
 
 msgid "Importing friends failed"
-msgstr "???????? ???? ?????? ??????"
+msgstr "???????? ??????? ??? ?????? ??????"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "???? ??????..."
+msgstr "??? ?????????? ??????..."
 
 msgid "Change IM name..."
-msgstr "IM ??? ???????? ????..."
+msgstr "IM ??? ????????..."
 
 # tithi
 msgid "myim URL handler"
-msgstr "myim URL ?????????"
+msgstr "myim URL ??????????"
 
 # tithi
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr "?? myim URL ????? ???? ??????? MySpaceIM ??????? ????? ?????? ???? ???"
+msgstr "?? myim URL ????? ???? ??????? MySpaceIM ??????? ????? ?????? ??????"
 
 # tithi
 msgid "Enable the proper MySpaceIM account and try again."
@@ -6093,23 +6091,23 @@ msgid "Show display name in status text"
 
 # tithi
 msgid "Show display name in status text"
-msgstr "?????? ???? ???????? ??? ?????"
+msgstr "?????? ??????? ??? ?????"
 
 # tithi
 msgid "Show headline in status text"
-msgstr "?????? ???? ??????? ?????"
+msgstr "?????? ??????? ??????? ?????"
 
 # fix me tithi
 msgid "Send emoticons"
-msgstr "??????? ?????????? ?????"
+msgstr "???????????? ?????"
 
 # tithi
 msgid "Screen resolution (dots per inch)"
-msgstr "?????? ????????? (????? ?????? ??)"
+msgstr "?????? ????????? (????? ????? ??)"
 
 # fix me tithi
 msgid "Base font size (points)"
-msgstr "??????? ???? ???? (??????)"
+msgstr "??? ?????? ???? (???????)"
 
 msgid "User"
 msgstr "???????????"
@@ -6122,7 +6120,7 @@ msgid "Total Friends"
 
 # tithi
 msgid "Total Friends"
-msgstr "?? ?????"
+msgstr "??? ?????"
 
 msgid "Client Version"
 msgstr "?????????? ???????"
@@ -6132,13 +6130,16 @@ msgstr ""
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"???????????? ??? ???????? ???? ??? ???? ?????? ?????? ???? ?????? ???? ?? ?? "
+"??????? http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"???? ???????????? ??? ???????? ?????"
 
 msgid "MySpaceIM - Username Available"
-msgstr "MySpaceIM -???????????? ??? ???????"
+msgstr "MySpaceIM - ????? ????????"
 
 # tithi
 msgid "This username is available. Would you like to set it?"
-msgstr "?? ????????????-????? ???????? ???? ?? ??? ???????? ???? ???????"
+msgstr "?? ????? ????????? ???? ?? ??? ???????? ???? ???????"
 
 # tithi
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
@@ -6146,13 +6147,13 @@ msgid "MySpaceIM - Please Set a Username
 
 # tithi
 msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM- ??????? ??? ???? ???????????? ??? ???????? ????"
+msgstr "MySpaceIM- ??????? ??? ???? ???????????? ??? ???????? ????"
 
 msgid "This username is unavailable."
-msgstr "?? ??????????? ????? ?????????"
+msgstr "?? ??????????? ????? ??????????"
 
 msgid "Please try another username:"
-msgstr "??????? ??? ???? ???? ???????????? ??? ?????? ????:"
+msgstr "??????? ??? ???? ???? ??? ?????? ????:"
 
 #. Protocol won't log in now without a username set.. Disconnect
 msgid "No username set"
@@ -6160,7 +6161,7 @@ msgid "Please enter a username to check 
 
 # tithi
 msgid "Please enter a username to check its availability:"
-msgstr "??????? ??? ?? ????????? ??????? ???? ???? ???????????? ??? ?????? ????:"
+msgstr "??????? ??? ???? ???????????? ??? ??? ?? ???????? ???? ??????? ???? ???:"
 
 # tithi
 #. TODO: icons for each zap
@@ -6170,77 +6171,77 @@ msgid "Zap"
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr "?????? ????"
+msgstr "????"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr "%s ?????? ?????? ?????! "
+msgstr "%s ?????? ????! ??????! "
 
 # tithi
 #, c-format
 msgid "Zapping %s..."
-msgstr "%s ?????? ???? ..."
+msgstr "%s ?? ????! ???? ?????..."
 
 # tithi
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr "????? ???? ????"
+msgstr "????"
 
 #, c-format
 msgid "%s has whacked you!"
-msgstr "%s ?????? ???? ?????!"
+msgstr "%s ?????? ???? ??????!"
 
 # tithi
 #, c-format
 msgid "Whacking %s..."
-msgstr "%s ????? ???? ????..."
+msgstr "%s ?? ???? ???? ?????..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
 msgid "Torch"
-msgstr "??????? ????"
+msgstr "????"
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "%s ????? ??? ??????? ?????!"
+msgstr "%s ????? ???? ?????!"
 
 # tithi
 #, c-format
 msgid "Torching %s..."
-msgstr "%s ??????? ????..."
+msgstr "%s ??  ????  ??? ?????..."
 
 # fix me tithi
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "??????????"
+msgstr "????"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s ????? ???? ???????? ??????!"
+msgstr "%s ?????? ???? ??????!"
 
 # fix me tithi
 #, c-format
 msgid "Smooching %s..."
-msgstr "%s ???????? ????..."
+msgstr "%s ?? ???? ??????..."
 
 # tithi
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr "??????? ????"
+msgstr "???????"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s ?????? ??????? ?????!"
+msgstr "%s ?????? ??????? ?????!"
 
 # tithi
 #, c-format
 msgid "Hugging %s..."
-msgstr "%s ??????? ????..."
+msgstr "%s ?? ??????? ????..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "??? ?????"
+msgstr "???"
 
 #, c-format
 msgid "%s has slapped you!"
@@ -6249,20 +6250,20 @@ msgid "Slapping %s..."
 # tithi
 #, c-format
 msgid "Slapping %s..."
-msgstr "%s ??? ?????..."
+msgstr "%s ?? ??? ???? ?????..."
 
 # fix me tithi
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "???? ????"
+msgstr "?????"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s ?????? ???? ?????!"
+msgstr "%s ?????? ????? ??????!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "%s ???? ????..."
+msgstr "%s ?? ????? ?????..."
 
 # tithi
 #. A high-five is when two people's hands slap each other
@@ -6278,23 +6279,23 @@ msgid "High-fiving %s..."
 # tithi
 #, c-format
 msgid "High-fiving %s..."
-msgstr "%s ???-???? ?????..."
+msgstr "%s ?? ???? ???-???? ????..."
 
 # tithi
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
-msgstr "???"
+msgstr "????"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ????? ???? ??? ?????!"
+msgstr "%s ?????? ???? ?????!"
 
 # tithi
 #, c-format
 msgid "Punking %s..."
-msgstr "%s ??? ????..."
+msgstr "%s ?? ???? ??? ?????..."
 
 # tithi
 #. Raspberry is a slang term for the vibrating sound made
@@ -6305,21 +6306,21 @@ msgid "Raspberry"
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr "?????????"
+msgstr "?????"
 
 # fix me tithi
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ?????? ????????? ??????!"
+msgstr "%s ?????? ????? ??????!"
 
 # tithi
 #, c-format
 msgid "Raspberrying %s..."
-msgstr "%s ????????? ????..."
+msgstr "%s ?? ????? ?????..."
 
 # tithi
 msgid "Required parameters not passed in"
-msgstr "??????????? ??????? ?????? ??? ????"
+msgstr "??????????? ??????????? ???? ????"
 
 msgid "Unable to write to network"
 msgstr "??????????? ????? ??????"
@@ -6327,29 +6328,26 @@ msgstr "?????????? ?msgid "Unable to read from network"
 msgstr "?????????? ???? ????? ??????"
 
-# tithi
 msgid "Error communicating with server"
 msgstr "????????? ???? ????????? ??????"
 
-# tithi
 msgid "Conference not found"
-msgstr "??????? ?????? ?????? ??"
+msgstr "??????? ?????? ?????"
 
-# tithi
 msgid "Conference does not exist"
-msgstr "??????? ???????? ??"
+msgstr "??? ??? ??????? ???"
 
 msgid "A folder with that name already exists"
-msgstr "???????? ? ????? ???? ??????? ????????"
+msgstr "???????? ? ????? ???? ??????? ????????"
 
 msgid "Not supported"
 msgstr "??????? ???"
 
 msgid "Password has expired"
-msgstr "????????????? ?????? ???"
+msgstr "??????????? ?????? ???"
 
 msgid "Incorrect password"
-msgstr "??? ????????????"
+msgstr "??? ?????????"
 
 msgid "User not found"
 msgstr "??????????? ????? ?????? ??????"
@@ -6358,48 +6356,45 @@ msgid "The server could not access the d
 msgstr "????????? ?????????? ??? ??????"
 
 msgid "The server could not access the directory"
-msgstr "??????? ???????????? ?????? ???? ???? ??"
+msgstr "??????? ??????????? ?????? ???? ???? ??"
 
-# tithi
 msgid "Your system administrator has disabled this operation"
 msgstr "????? ??????? ??????? ?? ????????? ?????????? ?????"
 
 # tithi
 msgid "The server is unavailable; try again later"
-msgstr "??????? ????????; ????????? ???? ?????? ????"
+msgstr "??????? ???????? ??; ????????? ???? ?????? ????"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "??? ???????? ???? ??????? ?????? ??? ??? ???? ??"
+msgstr "??? ???????? ???? ??????? ?????? ??? ??? ???? ??"
 
 msgid "Cannot add yourself"
 msgstr "???? ?????? ??? ???? ?????? ??"
 
 # tithi
 msgid "Master archive is misconfigured"
-msgstr "??????? ??????? ???????-?????????"
+msgstr "??????? ??????? ???????-??????? ??? ????? "
 
 # tithi
 msgid "Could not recognize the host of the username you entered"
-msgstr "????? ????????? ????????????-????? ????? ?????? ???? ???? ??"
+msgstr "????? ????????? ???????????? ????? ????? ?????? ??? ?????"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr ""
-"????? ????????? ?????????? ??? ?????? ???? ???????? ??? ?????????? ?????? ??? ??????"
+msgstr "????? ????????? ?????????? ??? ?????? ???? ??????? ??? ????????? ???? ??????"
 
 msgid "You cannot add the same person twice to a conversation"
 msgstr "???? ???? ???????? ??? ????????? ?????? ??? ???? ????? ??"
 
-# tithi
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "???? ????? ???????? ??????? ??????? ?????? ????????"
+msgstr "???? ????? ???????? ??????? ??????? ?????? ????????"
 
 msgid "You have entered an incorrect username"
 msgstr "???? ???? ??? ???????????? ??? ?????? ??????"
 
 msgid "An error occurred while updating the directory"
-msgstr "???????????? ???????? ???? ???? ???? ?????? ???? ??????"
+msgstr "??????????? ???????? ???? ???? ???? ?????? ???? ??????"
 
 # tithi
 msgid "Incompatible protocol version"
@@ -6413,7 +6408,7 @@ msgstr ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"?? ????????? ????????? ??? ????? ???? ???????????? ???? ???? ???? ??????? ??? ??"
+"?? ????????? ????????? ??? ????? ?????? ???? ?????????????? ???? ???? ??????? ??? ??"
 
 msgid "The user is either offline or you are blocked"
 msgstr "?? ??????????? ?? ??????? ?? ?????? ???? ??? ??????"
@@ -6422,9 +6417,9 @@ msgstr "????? ??????msgid "Unknown error: 0x%X"
 msgstr "????? ??????: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "%s ????????????? ????? ???? ?????"
+msgstr "???? ???? ??????: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6433,45 +6428,44 @@ msgid "Unable to add %s to your buddy li
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "%s ?? ????? ????????????? (%s) ??? ???? ????? ???"
+msgstr "%s ?? ????? ???????????? (%s) ??? ???? ???????"
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr "?????? (%s) ?????? ????? ???"
+msgstr "?????? (%s) ?????? ???????"
 
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "????????????? (%s) ???????? ?????? ????? ???"
+msgstr "????????????? (%s) ???????? ?????? ???????"
 
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "%s ? ?????? ?????? ????? ??? ??????? (%s) ???? ???? ???? ??? "
+msgstr "%s ?? ?????? ?????? ??????? ??????? (%s) ???? ??? ????? ?????"
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "?????? ?????? ????? ??? ??????? (%s) ???? ???? ???? ??? "
+msgstr "?????? ?????? ??????? ??????? (%s) ???? ??? ????? ?????"
 
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"??????????? %s ?? ????????? ????????? ??????? %s ???????? ?????? ???? ????? ??? "
-"??????? (%s) ????? ???? ?????? ???? ????????"
+"??????????? %1s ?? ??????? ????????? ??????? %s ???????? ?????? ???? ??????? ??????? "
+"(%s) ????? ???? ?????? ???? ????????"
 
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"????? ????? ???????? %s ?? ??? ???? ??????? ????????? ????????? ??????? (%s) ??????? "
+"????? ????? ???????? %s ?? ??? ???? ??????? ??????? ????????? ??????? (%s) ??????? "
 "????? ???? ?????? ???? ????????"
 
-# tithi
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "%1s (%2s) ???????????? ???? ????????? ?????? ???? ???"
+msgstr "%1$s (%2$s) ???????????? ???????? ????? ??????"
 
 # msgstr "??????????? %s ?? ????? ?????? ?????? ??"
 #, c-format
@@ -6488,19 +6482,19 @@ msgid "Unable to remove %s from privacy 
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "%s ?? ????????? ?????? (%s) ???? ???? ????? ????? ?????"
+msgstr "%s ?? ????????? ?????? (%s) ???? ???? ???? ????? ??????"
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "??????? ????????? ?????????? ???????????? (%s) ???????? ???? ????? ?????"
+msgstr "??????? ????????? ?????? ????? (%s) ???????? ??? ????? ??????"
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "??????? (%s) ???? ???? ????? ?????"
+msgstr "??????? (%s) ???? ??? ????? ??????"
 
 # tithi
 msgid "Error communicating with server. Closing connection."
-msgstr "????????? ????? ???????? ??????? ????? ???? ?????"
+msgstr "????????? ????? ???????? ??????? ????? ???? ??? ??????"
 
 msgid "Telephone Number"
 msgstr "??????? ?????"
@@ -6508,12 +6502,11 @@ msgstr "????????? ??msgid "Personal Title"
 msgstr "????????? ???????"
 
-# tithi
 msgid "Mailstop"
-msgstr "????-????"
+msgstr "????????"
 
 msgid "User ID"
-msgstr "??????????? ????"
+msgstr "??????????? ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6522,7 +6515,7 @@ msgid "Full name"
 #. }
 #.
 msgid "Full name"
-msgstr "???????? ???"
+msgstr "????? ???"
 
 #, c-format
 msgid "GroupWise Conference %d"
@@ -6530,10 +6523,10 @@ msgid "Authenticating..."
 
 # tithi
 msgid "Authenticating..."
-msgstr "??????????..."
+msgstr "?????????? ??? ?????..."
 
 msgid "Waiting for response..."
-msgstr "??????? ???? ??????? ????..."
+msgstr "??????? ???? ??????? ??? ?????..."
 
 #, c-format
 msgid "%s has been invited to this conversation."
@@ -6549,9 +6542,9 @@ msgstr ""
 "\n"
 "Sent: %s"
 msgstr ""
-"?? ??? ????????: %1s \n"
+"?? ???? ????????: %1$s \n"
 "\n"
-"???????: %2s"
+"???????: %2$s"
 
 msgid "Would you like to join the conversation?"
 msgstr "???? ?? ???????? ???????? ???? ???????"
@@ -6560,15 +6553,14 @@ msgid ""
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s ??????? ??????? ??? ????? ??????? ???????? ????? ??????"
+msgstr "%s ?????? ??? ????? ??????? ???????? ??????"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
-"???????? ????? ???? ??????? ??????? ??? ???? ?? ???????? ????? ???? ??? ??? "
-"?????? ?????? ?????"
+"???????? ????? ???? ??????? ??????? ??? ???? ?? ???????? ????? ???? ??? ??? ?????? "
+"????"
 
 # tithi
 msgid "This conference has been closed. No more messages can be sent."
@@ -6586,7 +6578,7 @@ msgid "Novell GroupWise Messenger Protoc
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "????? GroupWise ?????????? ???????? ???????"
+msgstr "Novell GroupWise Messenger ???????? ???????"
 
 msgid "Server address"
 msgstr "????????? ??????"
@@ -6594,9 +6586,8 @@ msgstr "????????? ??msgid "Server port"
 msgstr "????????? ?????"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "??????? ???? ??????????? ????????? ????? ???????"
+msgstr "??? ???? ??????????? ????? ????? ?????"
 
 # tithi
 #. username connecting too frequently
@@ -6604,26 +6595,24 @@ msgstr ""
 "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 ""
-"???? ??? ???? ????? ????? ??? ????? ????????? ?????? ?? ????? ??????? ???? ??? "
-"??????? ?????? ????? ???? ??? ?????? ??????? ????? ???, ?????? ??? ???? ??????? "
-"???? ????"
+"???? ??? ???? ????? ?????? ??? ????????? ?????? ?? ????? ??????? ??? ??????? ?????? "
+"????? ???? ??? ?????? ??????? ????? ???, ?????? ??? ???? ??????? ???? ????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "%s ????????? ??????"
+msgstr "?????? ???? ??????"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL ????? ????? ??????? ????? ?????????? ??????? ??? ???"
 
 msgid "Could not join chat room"
-msgstr "?????? ???? ????? ??? ??????"
+msgstr "?????? ???? ????? ???? ????? ????"
 
 msgid "Invalid chat room name"
-msgstr "???? ?????? ????? ???"
+msgstr "???????? ?????? ????? ???"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "????????? ???? ??????? ???????? ???? ?????? ????? ??????"
+msgstr "????????? ???? ??????? ??? ???????? ???? ????? ??????"
 
 #. *< type
 #. *< ui_requirement
@@ -6636,7 +6625,7 @@ msgid "AIM Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "AIM Protocol Plugin"
-msgstr "????? ???????? ???????"
+msgstr "AIM ???????? ???????"
 
 # tithi
 msgid "ICQ UIN..."
@@ -6653,14 +6642,14 @@ msgid "ICQ Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "ICQ Protocol Plugin"
-msgstr "??????? ???????? ???????"
+msgstr "ICQ ???????? ???????"
 
 # tithi
 msgid "Encoding"
-msgstr "?????????"
+msgstr "???????"
 
 msgid "The remote user has closed the connection."
-msgstr "???????? ??????????? ????????? ???? ??? ????????"
+msgstr "???????? ??????????? ??????? ???? ??? ????????"
 
 msgid "The remote user has declined your request."
 msgstr "???????? ??????????? ????? ?????? ???????? ??????"
@@ -6668,15 +6657,14 @@ msgid "Lost connection with the remote u
 # tithi
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr "???????? ???????????? ????? ????? ????????:<br>%s"
+msgstr "???????? ???????????? ????? ????? ????????? ?????:<br>%s"
 
 # tithi
 msgid "Received invalid data on connection with remote user."
-msgstr "???????? ???????????? ???? ??????? ???????? ???? ?????? ????? ??????"
+msgstr "???????? ???????????? ???? ??????? ??? ???????? ???? ????? ???????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
-msgstr "???????? ????????????? ???? ????? ?????? ???? ???????"
+msgstr "???????? ???????????? ???? ????? ?????? ??? ????? ?????"
 
 msgid "Direct IM established"
 msgstr "?????? IM ?????? ??? ?????"
@@ -6687,31 +6675,31 @@ msgstr ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
-"%1s ?????? ???? %2s ???? ?????? ?????? ??????, ?????? ???? ?????? IM ?? ??? "
-"????????? %3s ??????? ???? ??????? ????  ?????? ?????? ???? ?????????? ??????? ???? "
-"?????? ?????\n"
+"%1$s ?????? ???? %2$s ???? ?????? ?????? ??????, ?????? ???? ?????? IM ? ????????? "
+"%3$s ??????? ???? ??????? ???? ?????? ?????? ???? ?????????? ??????? ???? ?????? "
+"?????\n"
 
 # tithi
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "???? %1s ??? %2s, ?? %3s ?? ???????? ???? ??????? ????????"
+msgstr "???? %1$s ??? %2$s, ?? ???????? ???? %3$s ???? ?????"
 
 msgid "Invalid error"
-msgstr "???? ??????"
+msgstr "???????? ??????"
 
 msgid "Invalid SNAC"
-msgstr "???? SNAC"
+msgstr "???????? SNAC"
 
 # tithi
 msgid "Rate to host"
-msgstr "??????? ???"
+msgstr "?????? ??????? ???"
 
 # tithi
 msgid "Rate to client"
-msgstr "???????? ???"
+msgstr "?????????? ??????? ???"
 
 msgid "Service unavailable"
-msgstr "???? ????????"
+msgstr "??????? ???????? ??"
 
 # tithi
 msgid "Service not defined"
@@ -6727,26 +6715,26 @@ msgid "Not supported by client"
 
 # tithi
 msgid "Not supported by client"
-msgstr "?????? ?????? ??????? ???"
+msgstr "????????? ?????? ??????? ???"
 
 # tithi
 msgid "Refused by client"
-msgstr "?????? ?????? ????????"
+msgstr "????????? ?????? ????????????"
 
 # tithi
 msgid "Reply too big"
-msgstr "????? ???? ???? ???"
+msgstr "???????? ??? ?????"
 
 # tithi
 msgid "Responses lost"
-msgstr "????????? ?????????"
+msgstr "??????????? ??????? ????"
 
 msgid "Request denied"
-msgstr "?????? ???????????? ??? ?????"
+msgstr "?????? ????????????"
 
 # tithi
 msgid "Busted SNAC payload"
-msgstr "??????? SNAC ?????"
+msgstr "?????? SNAC ?????"
 
 # tithi
 msgid "Insufficient rights"
@@ -6754,7 +6742,7 @@ msgid "In local permit/deny"
 
 # tithi
 msgid "In local permit/deny"
-msgstr "???????? ??????/???????? ?"
+msgstr "???????? ??????/?????????"
 
 # tithi
 msgid "Warning level too high (sender)"
@@ -6766,7 +6754,7 @@ msgid "User temporarily unavailable"
 
 # tithi
 msgid "User temporarily unavailable"
-msgstr "??????????? ??????????? ????????"
+msgstr "????????????? ??????????? ????? ?????"
 
 # tithi
 msgid "No match"
@@ -6774,18 +6762,17 @@ msgid "List overflow"
 
 # tithi
 msgid "List overflow"
-msgstr "?????? ????????"
+msgstr "????? ?????????"
 
 msgid "Request ambiguous"
 msgstr "?????? ???????"
 
 # tithi
 msgid "Queue full"
-msgstr "???? ?????"
+msgstr "??? ????????"
 
-# tithi
 msgid "Not while on AOL"
-msgstr "?? ????? AOL ? ???"
+msgstr "AOL ? ???? ??????? ??"
 
 # tithi
 msgid ""
@@ -6794,10 +6781,9 @@ msgstr ""
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"(?? ???????? ?????? ???? ?????? ????  ???? ?? ?????? ????? ??? ????? ?? ?????? "
-"?????????? ????? ????? ???? ????????? ??????? ?????  ??? ???? ????? ?? ?? ?? "
-"????????? ??????? ????, ???? ????? AIM/ICQ ????????? ???? ??? ??????? ??????? "
-"?????????? ?????? ???? ??????)"
+"(?? ???????? ?????? ?????? ?????? ???? ?? ?????? ????? ??? ????? ???? ?????? ????? "
+"???? ??????? ??????? ?????? ??? ???? ????? ???? ?? ??????? ??????? ?????, ???? "
+"????? AIM/ICQ ????????? ???????????? ????? ?? ?????? ???? ??????)"
 
 # tithi
 #, c-format
@@ -6805,8 +6791,8 @@ msgstr ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(?? ???????? ?????? ???? ?????? ????  ??? ????? ??? %s ?? ???? ????????? ????????? "
-"???, ?? %s ?? ???? ??????????? ?????? ???????)"
+"(?? ???????? ?????? ???? ?????? ?????? ??? ????? ??? %s ?? ???? ??????? ????????? "
+"???, ?? %s ?? ??????????? ????????????)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6821,16 +6807,16 @@ msgid "Get File"
 msgstr "AIM ?????? IM"
 
 msgid "Get File"
-msgstr "???? ????? ????"
+msgstr "???? ??????"
 
 msgid "Games"
 msgstr "????"
 
 msgid "Add-Ins"
-msgstr "?????????????"
+msgstr "?????-??"
 
 msgid "Send Buddy List"
-msgstr "????? ?????? ?????"
+msgstr "????? ?????? ?????? ??? ???"
 
 msgid "ICQ Direct Connect"
 msgstr "ICQ ?????? ?????"
@@ -6842,13 +6828,12 @@ msgstr "ICQ RTF"
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-# tithi
 msgid "Nihilist"
 msgstr "??????????"
 
 # tithi
 msgid "ICQ Server Relay"
-msgstr "ICQ ??????? ?????????"
+msgstr "ICQ ??????? ????"
 
 # tithi
 msgid "Old ICQ UTF8"
@@ -6856,7 +6841,7 @@ msgid "Trillian Encryption"
 
 # tithi
 msgid "Trillian Encryption"
-msgstr "????????? ?????????"
+msgstr "Trillian ?????????"
 
 # tithi
 msgid "ICQ UTF8"
@@ -6866,13 +6851,13 @@ msgid "Security Enabled"
 msgstr "?????"
 
 msgid "Security Enabled"
-msgstr "????????? ??????????"
+msgstr "????????? ???????"
 
 msgid "Video Chat"
 msgstr "????? ?????"
 
 msgid "iChat AV"
-msgstr "??????? AV"
+msgstr "iChat AV"
 
 # tithi
 msgid "Live Video"
@@ -6886,14 +6871,14 @@ msgid "Free For Chat"
 
 # tithi
 msgid "Free For Chat"
-msgstr "?????? ???? ?????"
+msgstr "????? ?????? ??, ????? ???? ???"
 
 msgid "Not Available"
-msgstr "???????? ??? "
+msgstr "?????????"
 
 # tithi
 msgid "Occupied"
-msgstr "????????"
+msgstr "??????"
 
 # tithi
 msgid "Web Aware"
@@ -6903,7 +6888,7 @@ msgid "IP Address"
 msgstr "??????"
 
 msgid "IP Address"
-msgstr "???? ??????"
+msgstr "IP ??????"
 
 # tithi
 msgid "Warning Level"
@@ -6913,15 +6898,13 @@ msgstr "?????? ?????msgstr "?????? ???????"
 
 # fix me tithi
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"?????????? ???? ??????? ??? ?????:\n"
-"%s"
+msgstr "?????????? ????????? ???? ????? ?????? ??? ????? ????: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "????????? ???? ????? ??????? ???????"
+msgstr "BOS ????????? ???? ????? ??????? ??????: %s"
 
 msgid "Username sent"
 msgstr "????????????-??? ?????? ??????"
@@ -6936,108 +6919,90 @@ msgstr "????? ??????msgstr "????? ??????? ??? ?????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"???? ???? ?????: ????????????-??? ???? ????? ????? %s ?????? ????? ??? ????? ??? "
-"???????????? ?????? ???? ??? ?-???? ?????? ????? ???, ?? ???? ???? ?????? ???? ??? "
-"??? ????????? ????, ?????? ??? ????? ???? ????, ?? ????????? ?????? ???? ?????"
+"???????????? ??? ???????? ????? ????? %s ?????? ???? ??? ????? ????? "
+"???????????? ??? ?????? ???? ??????? ????? ?????? ??? ???, ?? ???? ???? ?????? ???? "
+"???, ????????? ????, ?????? ??? ????? ?????? ???? ???, ?? ????????? ?????? ?????? ???? "
+"????"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???? ?????????? ????????? ????? ??????  ?????????? ???? %s ??????? ????."
+msgstr "???? ?????????? ????????? ??? ?????? ??????????? ???? %s ??????? ????."
 
 msgid "Unable to get a valid AIM login hash."
-msgstr "???? ??? AIM ???? ????? ???? ???????"
+msgstr "???? ??????? AIM ???? ????? ???? ???????"
 
 msgid "Unable to get a valid login hash."
-msgstr "???? ??? ???? ????? ???? ???????"
+msgstr "???? ??????? ???? ????? ???? ???????"
 
-# tithi
 msgid "Received authorization"
-msgstr "????? ??????? ???????"
+msgstr "??????? ????? ?????"
 
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "??????????? ???????? ??"
+msgstr "???????????? ??? ???????? ??"
 
 # tithi
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "????? ????????? ???????? ???????"
+msgstr "????? ????????? ?????????? ??????? ??? ?????"
 
 # tithi
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL ????????? ?????????? ??????? ??????????? ?????????"
+msgstr "AOL ????????? ?????????? ??????? ??????????? ????? ??????"
 
 # tithi
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????? ??????? ?????? ??????? ??? ?????? ??????? ??? %s ? ??????? ????"
+msgstr "????? ??????? ????????? ????????? ??? ?????? ??????? ??? %s ? ???????? ????"
 
 # tithi
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"???? ??? ???? ????? ????? ??? ????? ????????? ?????? ?? ????? ??????? ???? ??? "
-"??????? ?????? ????? ???? ??? ?????? ??????? ????? ???, ?????? ??? ???? ??????? "
-"???? ????"
+"???? ??? ???? ????? ?????? ??? ????????? ?????? ???????? ??????? ??? ??????? ?????? "
+"????? ???? ??? ?????? ??????? ????? ???, ?????? ??? ???? ??? ??????? ???? ????"
 
 # tithi
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "???? ??????-???? ?? ?????? ??? ??????"
+msgstr "???????? SecurID ?? ???? ?????"
 
 # tithi
 msgid "Enter SecurID"
-msgstr "??????-???? ?????? ????"
+msgstr "SecurID ???"
 
 # tithi
 msgid "Enter the 6 digit number from the digital display."
-msgstr "??????? ???????? ???? ? ??????? ?????? ?????? ?????"
+msgstr "??????? ??????? ???? ? ??????? ???????? ????"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "??? ??? (_O)"
-
 msgid "Password sent"
-msgstr "??????????? ?????? ??????"
+msgstr "????????? ?????? ??????"
 
 msgid "Unable to initialize connection"
-msgstr "????? ???????? ???? ??????"
+msgstr "????? ????? ???? ??????"
 
 # tithi
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "??????? ??? ????? ??????? ??? ??? ??? ?????? ???? ????? ???????? ????? ???? ?????"
 
-# tithi
-msgid "Authorization Request Message:"
-msgstr "????????????? ?????? ??????:"
-
-# tithi
-msgid "Please authorize me!"
-msgstr "??????? ??? ????? ??????? ???!"
-
 msgid "No reason given."
 msgstr "???? ???? ??????? ??????"
 
 # tithi
 msgid "Authorization Denied Message:"
-msgstr "????????????? ???????? ??????:"
+msgstr "??????? ????????????:"
 
 # tithi
 #, c-format
@@ -7046,20 +7011,19 @@ msgstr ""
 "following reason:\n"
 "%s"
 msgstr ""
-"??????????? %1u ?????????? ?????? ???? ????? ????? ???????? ??????? ??? ???? "
-"????? ?????? ???????? ?????: \n"
-"%2s"
+"??????????? %1$u ?????????? ????? ????? ????? ???????? ??????? ??? ???? ?????? "
+"???????????? ?????: \n"
+"%2$s"
 
 # tithi
 msgid "ICQ authorization denied."
-msgstr "ICQ ????????????? ?????????"
+msgstr "ICQ ??????? ?????????????"
 
 # tithi
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"%u ??????????? ????? ????? ???????? ??????? ??? ???? ????? ?????? ????? ??????"
+msgstr "%u ??????????? ????? ????? ???????? ??????? ??? ???? ?????? ????? ??????"
 
 # tithi
 #, c-format
@@ -7071,8 +7035,8 @@ msgstr ""
 msgstr ""
 "???? ???? ????? ?????? ????? ??????\n"
 "\n"
-"???: %1s [%2s]\n"
-"%3s "
+"??????: %1$s [%2$s]\n"
+"%3$s "
 
 # tithi
 #, c-format
@@ -7082,10 +7046,10 @@ msgstr ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"???? ???? ICQ ?????? ????? ??????\n"
+"???? ???? ICQ ???? ????? ??????\n"
 "\n"
-"???: %1s [%2s]\n"
-"%3s"
+"??????: %1$s [%2$s]\n"
+"%3$s"
 
 # tithi
 #, c-format
@@ -7095,37 +7059,37 @@ msgstr ""
 "Message is:\n"
 "%s"
 msgstr ""
-"???? %1s [%2s] ???? ???? ICQ ?-???? ????? ??????\n"
+"???? %1$s [%2$s] ???? ???? ICQ ????? ????? ??????\n"
 " \n"
 "???????? ??:\n"
-"%3s"
+"%3$s"
 
 # tithi
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ %1u ??????????? ?????? ???? ????? ?????????: %2s (%3s)"
+msgstr "ICQ %1$u ??????????? ?????? ???? ????? ?????????: %2$s (%3$s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "???? ?? ?? ??????? ????? ????? ???????? ??? ???? ????"
 
 msgid "_Add"
-msgstr "??? ???? (_A)"
+msgstr "??? (_A)"
 
 msgid "_Decline"
-msgstr "?????????? ???? (_D)"
+msgstr "?????????? (_D)"
 
 # tithi
 #, 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] "???? %2$s ?? %1$hu ???????? ????????? ???? ??? ???? ????"
-msgstr[1] "???? %2$s ?? %1$hu ?????????? ????????? ???? ??? ???? ????"
+msgstr[0] "???? %2$s ?? %1$hu?? ?????? ????????? ???? ??? ???????? ????"
+msgstr[1] "???? %2$s ?? %1$hu?? ?????? ????????? ???? ??? ???????? ????"
 
 #, 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] "???? %1hu ???????? %2s ???  ????????? ???? ??? ???? ?? ????"
-msgstr[1] "???? %1hu ?????????? %2s ???  ????????? ???? ???? ???? ?? ????"
+msgstr[0] "???? %2$s ???? %1$hu?? ?????? ????????? ???? ??? ???? ?? ????"
+msgstr[1] "???? %2$s ???? %1$hu?? ?????? ????????? ???? ?? ???? ?? ????"
 
 # tithi
 #, c-format
@@ -7134,9 +7098,9 @@ msgstr[0] ""
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-"???? %1hu ????????  %2s ??? ????????? ???? ????? ???? ??????? ??? ???????"
+"???? %2$s ???? %1$hu?? ?????? ????????? ???? ????? ???? ?????????? ???????"
 msgstr[1] ""
-"???? %1hu ?????????? %2s ???  ????????? ???? ????? ???? ??????? ??? ???????"
+"%2$s ???? ???? %1$hu?? ?????? ????????? ???? ????? ???? ?????????? ???????"
 
 # fix me tithi
 #, c-format
@@ -7144,38 +7108,38 @@ msgid_plural ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "???? %1hu ???????? %2s ??? ????????? ???? ??? ??????? ???? ??? ?????"
-msgstr[1] "???? %1hu ?????????? %2s ??? ????????? ???? ??? ??????? ???? ??? ?????"
+msgstr[0] "???? %2$s ???? %1$hu?? ?????? ????????? ???? ??? ??????? ???? ??? ?????"
+msgstr[1] "???? %2$s ???? %1$hu?? ?????? ????????? ???? ??? ??????? ???? ??? ?????"
 
 # fix me tithi
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "???? %1hu ???????? %2s ??? ????????? ???? ????? ??????? ???? ??? ?????"
-msgstr[1] "???? %1hu ?????????? %2s ??? ????????? ???? ????? ??????? ???? ??? ?????"
+msgstr[0] "???? %2$s ???? %1$hu?? ?????? ????????? ???? ????? ??????? ???? ??? ?????"
+msgstr[1] "???? %2$s ???? %1$hu?? ?????? ????????? ???? ????? ??????? ???? ??? ?????"
 
 #, 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] "???? ?????? ????? %1hu ???????? %2s ??? ??????????"
-msgstr[1] "???? ?????? ????? %1hu ?????????? %2s ??? ??????????"
+msgstr[0] "???? ?????? ????? %2$s ???? %1$hu?? ?????? ??????????"
+msgstr[1] "???? ?????? ????? %2$s ???? %1$hu?? ?????? ??????????"
 
 #. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "?????? ?????? ??????: %s?"
+msgstr "?????? ?????? ??????: %s?"
 
 msgid "Unknown reason."
 msgstr "?????? ?????"
 
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "%s ? ?????? ?????? ????? ??:"
+msgstr "%s ? ?????? ?????? ??????:"
 
 #, c-format
 msgid "User information not available: %s"
-msgstr "???????????? ???? ??????? ??: %s"
+msgstr "???????????? ???? ????? ?????? ??: %s"
 
 msgid "Online Since"
 msgstr "??? ???? ???????"
@@ -7186,14 +7150,14 @@ msgid "Capabilities"
 
 # tithi
 msgid "Capabilities"
-msgstr "???????"
+msgstr "??????"
 
 msgid "Profile"
 msgstr "????????"
 
 # tithi
 msgid "Your AIM connection may be lost."
-msgstr "????? AIM ????? ???? ???? ??? ?????"
+msgstr "????? AIM ????? ????? ????????? ??????"
 
 # tithi
 #. The conversion failed!
@@ -7201,20 +7165,19 @@ msgstr ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
-"[?? ??????????? ???? ???? ?????? ???????? ???? ????? ???? ??? ???? ????????? ???? "
-"???????]"
+"[?? ??????????? ???? ???? ?????? ???????? ???? ?????? ???? ??? ???????? ????????? "
+"???? ???????]"
 
-# tithi
 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 ""
-"???? ??????? ?? ??????? ?????? ?????? ?? ??????? ??? ????? ???? ???? ????? ???? "
-"??????? ??????? ??????? ??? ?? ??????? ??????? ???? ??? ??????? ?????? ?????"
+"???? ??????? ?? ????? ???? ?????? ?????? ?? ??????? ??? ????? ???? ???? ???????? "
+"???? ??????? ??????? ??????? ??? ?? ??????? ??????? ???? ??? ??????? ?????? ?????"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "?????? %s ?????? ??? ???? ????????? ??? ???????"
+msgstr "?????? %s ?????? ??? ???? ????????? ??? ???????"
 
 # tithi
 msgid "Mobile Phone"
@@ -7222,7 +7185,7 @@ msgid "Personal Web Page"
 
 # tithi
 msgid "Personal Web Page"
-msgstr "????????? ????? ???"
+msgstr "????????? ????? ????"
 
 #. aim_userinfo_t
 #. strip_html_tags
@@ -7245,7 +7208,7 @@ msgid "Web Page"
 
 # tithi
 msgid "Web Page"
-msgstr "????? ???"
+msgstr "????? ????"
 
 msgid "Pop-Up Message"
 msgstr "??-?? ??????"
@@ -7254,17 +7217,17 @@ msgstr[0] "?????????? msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "??????????? ????????????-??? %s ?? ???? ?????????"
-msgstr[1] "??????????? ????????????-???????  %s ?? ???? ?????????"
+msgstr[1] "??????????? ????????????-??? %s ?? ???? ?????????"
 
 # tithi
 #, c-format
 msgid "No results found for email address %s"
-msgstr "%s ?-???? ??????? ???? ???? ????? ????? ??????"
+msgstr "%s ????? ??????? ???? ???? ????? ????? ??????"
 
 # tithi
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "???? %s ??????? ???? ???? ?-???? ????? ??????"
+msgstr "???? %s ??????? ???? ???? ????? ????? ??????"
 
 # tithi
 msgid "Account Confirmation Requested"
@@ -7276,13 +7239,13 @@ msgstr ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"?????? 0x%04x: ???????????? ??? ??????? ???? ????? ???? ????????? ??? ??? ??? ???? "
+"?????? 0x%04x: ???????????? ??? ??????? ???? ?????? ???? ????????? ??? ??? ??? ???? "
 "??????"
 
 # tithi
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "?????? 0x%04x: ???????????? ??? ??????? ???? ????? ???? ??? ?????"
+msgstr "?????? 0x%04x: ???????????? ??? ??????? ???? ?????? ???? ??? ?????????"
 
 # tithi
 #, c-format
@@ -7290,7 +7253,7 @@ msgstr ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"?????? 0x%04x: ???????????? ??? ??????? ???? ????? ???? ????????? ??? ??? ??????"
+"?????? 0x%04x: ???????????? ??? ??????? ???? ?????? ???? ????????? ??? ??? ??????"
 
 # tithi
 #, c-format
@@ -7298,8 +7261,8 @@ msgstr ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"?????? 0x%04x: ?-???? ?????? ???????? ???? ????? ???? ?? ???????????? ?????? ???? "
-"???????? ???? ?????? ????????? ??????"
+"?????? 0x%04x: ????? ?????? ???????? ???? ?????? ???? ?? ???????????? ?????? ???? "
+"???????? ???? ?????? ????????? ??????"
 
 # tithi
 #, c-format
@@ -7307,7 +7270,7 @@ msgstr ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"?????? 0x%04x: ?-???? ?????? ???????? ???? ????? ???? ??????? ??????? ???? ????????? "
+"?????? 0x%04x: ????? ?????? ???????? ???? ?????? ???? ??????? ??????? ???? ????????? "
 "???? ???? ??????????? ??? ??????"
 
 # tithi
@@ -7315,7 +7278,7 @@ msgid ""
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr "?????? 0x%04x: ?-???? ?????? ???????? ???? ????? ???? ??????? ?????? ?????"
+msgstr "?????? 0x%04x: ????? ?????? ???????? ???? ?????? ???? ??????? ?????? ?????????"
 
 # tithi
 #, c-format
@@ -7329,7 +7292,7 @@ msgid "The email address for %s is %s"
 # tithi
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "%1s ?? ?-???? ?????? %2s"
+msgstr "%1$s ?? ????? ?????? %2$s"
 
 msgid "Account Info"
 msgstr "??????? ????"
@@ -7349,9 +7312,9 @@ msgstr ""
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"???? ?????? ???? ?????? ??????? ????? ?????? ????? ????????? ???????? ???? ?????? "
+"???? ?????? ???? ?????? ??????? ????? ?????? ????? ???????? ???????? ???? ?????? "
 "???????  ????? ????????? ?????????? ???; ??? ??????? ??????? ???? ?????? ???? ??? "
-"?????? ???????????? ????????"
+"???? ???????????? ????????"
 
 # tithi
 #, c-format
@@ -7362,8 +7325,7 @@ msgstr[0] ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"%d ?????? ???????? ????????? ??????? ??????? ??? ???????  ??? ????? ???? ????? ??? "
-"???????"
+"%d ?????? ???????? ????????? ??????? ??????? ??? ??????? ??? ????? ???? ????? ??? ???????"
 msgstr[1] ""
 "%d ???? ?????? ???????? ????????? ??????? ??????? ??? ???????  ??? ????? ???? ????? ??? "
 "???????"
@@ -7381,58 +7343,55 @@ msgstr[0] ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"???????? %d ???? ????????? ?????? ??????? ??? ???????  ????? ???? ??? ????? ??? ???????"
+"??????? ???????? ???????? %d ???? ??????? ??? ??????? ????? ???? ??? ????? ???? ???????"
 msgstr[1] ""
-"???????? %d ???? ????????? ?????? ??????? ??? ???????  ????? ???? ??? ????? ??? ???????"
+"??????? ???????? ???????? %d ???? ??????? ??? ??????? ????? ???? ??? ????? ???? ???????"
 
 msgid "Away message too long."
-msgstr "????? ???????? ??? ??????"
+msgstr "??????? ??????? ???????? ??? ??????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"%s ????? ??? ???? ?????? ???? ???????????? ??? ?????  ???????????? ?????? ???? "
-"??? ?-???? ?????? ????? ???, ?? ???? ???? ?????? ???? ??? ??? ????????? ????, ?????? "
-"??? ????? ???? ????, ?? ????????? ?????? ???? ?????"
+"????? %s ?? ??? ??? ????? ???? ???? ???????????? ????? ????????? ??????????? ??? "
+"?????? ???? ??????? ????? ?????? ??? ???, ?? ???? ???? ?????? ???? ??? ??? ????????? "
+"????, ?????? ??? ????? ???? ????, ?? ????????? ?????? ???? ?????"
 
-msgid "Unable to Add"
-msgstr "??? ???? ????? ??"
-
 msgid "Unable to Retrieve Buddy List"
-msgstr "????? ?????? ?????? ???? ????? ??"
+msgstr "????? ?????? ?????? ???? ??????"
 
 # tithi
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"????? ????? ?????? ?????? AIM ??????? ??????????? ????? ????  ????? ????? ?????? "
-"???? ????, ??? ?????? ???? ??????? ????? ??????? ????"
+"????? ????? ?????? ?????? AIM ??????? ??????????? ?????? ????  ????? ????? ?????? "
+"???? ????, ??? ?????? ???? ??????? ????? ????? ?????"
 
 # tithi
 msgid "Orphans"
 msgstr "????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"????? ????? ???????? ??? ???? ????? ????? ????? %s ????? ??? ???? ???? ??? ??????? "
-"??? ?????? ?????? ???? ??? ??????? ?????? ?????"
+"????? ????? ???????? ??? ???? ????? ????? ????? ????? %s ?? ??? ??? ????? ????? "
+"??????? ??? ?????? ?????? ???? ??? ??????? ?????? ?????"
 
 # tithi
 msgid "(no name)"
 msgstr "(???? ??? ???)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "???? ????? ????? %s ??????? ????? ??? ???????"
+msgstr "???? ????? ????? ????? %s ?? ????? ??? ???????"
 
 #, c-format
 msgid ""
@@ -7444,7 +7403,7 @@ msgid "Authorization Given"
 
 # tithi
 msgid "Authorization Given"
-msgstr "????????????? ????? ?????"
+msgstr "??????? ???? ?????"
 
 # tithi
 #. Granted
@@ -7455,7 +7414,7 @@ msgid "Authorization Granted"
 
 # tithi
 msgid "Authorization Granted"
-msgstr "????????????? ????? ??? ?????"
+msgstr "??????? ???? ?????"
 
 # tithi
 #. Denied
@@ -7465,26 +7424,25 @@ msgstr ""
 "following reason:\n"
 "%s"
 msgstr ""
-"%1s ??????????? ?????????? ?????? ???? ????? ????? ???????? ??????? ??? ???? "
-"????? ?????? ???????? ?????: \n"
-"%2s"
+"%1$s ??????????? ?????????? ?????? ???? ????? ????? ???????? ??????? ??? ???? "
+"????? ?????? ???????????? ?????: \n"
+"%2$s"
 
 # tithi
 msgid "Authorization Denied"
-msgstr "????????????? ????? ?????"
+msgstr "??????? ????????????"
 
 # tithi
 msgid "_Exchange:"
-msgstr "??????? ????: (_E)"
+msgstr "??????? (_E):"
 
 # tithi
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"????? ???? ????? ?????? ??????  ???? AIM ??????? ???? ????? ?????? ????? ???"
+msgstr "????? IM ????? ?????? ?????? ???? AIM ??????? IM ????? ?????? ????? ???"
 
 # tithi
 msgid "iTunes Music Store Link"
-msgstr "??-???? ?????? ??????? ????"
+msgstr "iTunes ?????? ??????? ???? "
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7496,55 +7454,54 @@ msgid "You have selected to open a Direc
 # tithi
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "???? %s ?? ????? ???? ?????? IM ????? ????? ???????? ???????"
+msgstr "???? %s ?? ????? ???? Direct IM ????? ????? ????????"
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"??? ????? IP ?????? ?????? ???? ?????, ??? ?????????? ????? ????? ?????  ???? ?? "
-"??????? ????? ???? "
+"?????? ??? ????? IP ?????? ?????? ???, ??? ?????????? ????? ????? ????? ???? ?? "
+"???????? "
 
 msgid "C_onnect"
-msgstr "????? ??? (_o)"
+msgstr "????? (_O)"
 
 msgid "Get AIM Info"
-msgstr "????? ???? ????? ????"
+msgstr "AIM ???? ?????"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "?????? ??????? ??????? ????"
+msgstr "?????? ??????? ???????"
 
+# mark30
 msgid "Get Status Msg"
-msgstr "??????? ?????? ????? ????"
+msgstr "??????? ?????? ??????"
 
 # tithi
 msgid "Direct IM"
-msgstr "?????? IM"
+msgstr "Direct IM"
 
 # tithi
 msgid "Re-request Authorization"
-msgstr "????-?????? ?????????????"
+msgstr "????????? ???? ?????? ??????"
 
 # tithi
 msgid "Require authorization"
-msgstr "????????????? ???????"
+msgstr "??????? ???????"
 
 # tithi
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "????? ????? (???? ??????? ???? ????? ???? SPAM ????? ?????!)"
+msgstr "????? ????? (??? ??????? ???? ???? SPAM ????? ?????!)"
 
 msgid "ICQ Privacy Options"
-msgstr "ICQ ????????? ?????????"
+msgstr "ICQ ??????? ????"
 
 msgid "The new formatting is invalid."
-msgstr "???? ???????????? ?????"
+msgstr "???? ????????? ?????????"
 
 # tithi
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr ""
-"????????????-??? ?????????? ????????? ??????????????????? ??? ????? ?????? ???????? ???? "
-"?????"
+msgstr "???????????? ????? ????????? ??????? ???? ??? ????? ?????? ???????? ??? ?????"
 
 # tithi
 msgid "Change Address To:"
@@ -7552,77 +7509,76 @@ msgid "<i>you are not waiting for author
 
 # tithi
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>???? ??????????????? ???? ??????? ????? ??</i>"
+msgstr "<i>???? ????????? ???? ??????? ????? ??</i>"
 
 # tithi
 msgid "You are awaiting authorization from the following buddies"
-msgstr "???? ????????? ????? ???? ??????????????? ???? ??????? ?????"
+msgstr "???? ????????? ????? ???? ????????? ???? ??????? ?????"
 
 # tithi
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"???? ????? ?????? ??? ????? ??? ???? \"????????????? ??????? ?????? ????\" ???????? ??? "
-"????? ???? ????????????? ??????? ?????? ???? ??????"
+"???? ????? ?????? ??? ????? ??? ???? \"????????? ???? ?????? ??????\" ???????? ??? "
+"????? ???? ???? ??????? ????? ??????"
 
 # tithi
 msgid "Find Buddy by Email"
-msgstr "?-?????? ??????? ????? ??????"
+msgstr "??????? ??????? ????? ??????"
 
 # tithi
 msgid "Search for a buddy by email address"
-msgstr "?-???? ??????? ??????? ????? ??????"
+msgstr "????? ??????? ??????? ?????? ????????? ????"
 
 # tithi
 msgid "Type the email address of the buddy you are searching for."
-msgstr "???? ?? ????? ??????? ??? ?-???? ?????? ???? ?????"
+msgstr "???? ?? ?????? ????????? ????? ??? ????? ?????? ???? ?????"
 
 msgid "_Search"
-msgstr "?????? (_S)"
+msgstr "????????? (_S)"
 
 msgid "Set User Info (web)..."
-msgstr "??????????? ???? ???????? ???? (?????)..."
+msgstr "??????????? ???? ???????? (?????)..."
 
 #. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
-msgstr "?????????? ???????? ???? (?????)"
+msgstr "????????? ???????? (?????)"
 
 # tithi
 msgid "Configure IM Forwarding (web)"
-msgstr "IM ???????????? ???????? ???? (?????)"
+msgstr "IM ?????????? ?????????? (?????)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "????????? ????????? ???????? ????..."
+msgstr "??????? ???? ???????? ..."
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "??????? ??????? ????"
+msgstr "??????? ??????????"
 
 # tithi
 msgid "Display Currently Registered Email Address"
-msgstr "???????? ?????????? ?-???? ?????? ???????? ????"
+msgstr "???????? ?????????? ????? ?????? ????????"
 
 # tithi
 msgid "Change Currently Registered Email Address..."
-msgstr "???????? ?????????? ?-???? ?????? ???????? ????..."
+msgstr "???????? ?????????? ????? ?????? ????????..."
 
 # tithi
 msgid "Show Buddies Awaiting Authorization"
-msgstr "???????? ????????? ????????????? ???????? ????"
+msgstr "??????? ????????? ???????? ????????"
 
 # tithi
 msgid "Search for Buddy by Email Address..."
-msgstr "?-???? ??????? ??????? ???????? ??????..."
+msgstr "????? ??????? ??????? ????? ?????????..."
 
 # tithi
 msgid "Search for Buddy by Information"
-msgstr "???? ?????? ???????? ??????"
+msgstr "???? ??????? ????? ????????? "
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "??????????? ???? ???????? ???"
+msgstr "clientLogin ???????"
 
 # tithi
 msgid ""
@@ -7630,40 +7586,39 @@ msgstr ""
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"???? ?????????? ??? ?????? ???? ?? ???? \n"
-"?????? AIM/ICQ ??????? ??????? ??????? ????\n"
-"(?????????? ???, ?????? ????? ???? ?????? ?????? ??? ??)"
+"???? ?????????? ??? ?????? IM ?? ???? \n"
+"?????? AIM/ICQ ??????? ??????? ??????? ??? ???\n"
+"(?????????? ???, ?????? ????? IP ?????? ?????? ??? ??)"
 
 # tithi
 msgid "Allow multiple simultaneous logins"
-msgstr "?????? ????? ???? ??????? ????"
+msgstr "?????? ?????? ???? ??????? ??? ???"
 
 # tithi
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
-"%2s ? ?????? ???? ????? ???? %1s ?? ???????? ????: ?????? ???? ?? ???? %3hu?"
+"%2$s ? ?????? ???? ????? ???? %1$s ?? ?????? ??? ?????: ?????? IM ?? ???? %3$hu?"
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%1s ?? ???? ????? ???????? ?????? ????:%2hu?"
+msgstr "%1$s ?? ???? ????? ???????? ?????? ??? ?????:%2$hu?"
 
 msgid "Attempting to connect via proxy server."
-msgstr "??????? ????????? ??????? ????? ???????? ?????? ?????"
+msgstr "??????? ????????? ??????? ????? ???????? ?????? ??? ??????"
 
 # tithi
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%1s ??????? %2s ?? ???? ?????? ????? ???? ???????? ?????"
+msgstr "%1$s ??????? %2$s ?? ???? ?????? ????? ???? ?????"
 
 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 ""
-"???? ???? ???? ??????????? ????? ?????? ????? ???????? ??? ??? ???? ?? ???? ???? "
-"?????????  ?????? ??? ????? ???? ?????? ?????? ????, ??? ??? ?????????? ???? ????? "
-"?????"
+"???? ???? ???? ??????????? ????? ?????? ????? ???????? ?? ???? IM ?? ???? ???? "
+"??????? ?????? ????? IP ?????? ???????? ???, ??? ??? ????????? ????? ????? ?????"
 
 # tithi
 msgid "Aquarius"
@@ -7710,7 +7665,7 @@ msgid "Rat"
 msgstr "??? ????"
 
 msgid "Rat"
-msgstr "????"
+msgstr "?????"
 
 # tithi
 msgid "Ox"
@@ -7782,22 +7737,22 @@ msgid "Authorize adding"
 msgstr "??????? ?????"
 
 msgid "Authorize adding"
-msgstr "???????? ??????????"
+msgstr "??? ??? ??????? ??? ???"
 
 msgid "Cellphone Number"
-msgstr "?????? ?????"
+msgstr "????????? ?????"
 
 msgid "Personal Introduction"
-msgstr "????????? ??????"
+msgstr "????????? ???????"
 
 msgid "City/Area"
 msgstr "???/?????"
 
 msgid "Publish Mobile"
-msgstr "?????? ?????? ????"
+msgstr "?????? ??????"
 
 msgid "Publish Contact"
-msgstr "??????? ?????? ????"
+msgstr "??????? ??????"
 
 msgid "College"
 msgstr "????"
@@ -7807,7 +7762,7 @@ msgid "Zodiac"
 
 # tithi
 msgid "Zodiac"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Blood"
 msgstr "????"
@@ -7820,22 +7775,22 @@ msgid "Modify Contact"
 msgstr "??????"
 
 msgid "Modify Contact"
-msgstr "??????? ???????? ????"
+msgstr "??????? ????????"
 
 msgid "Modify Address"
-msgstr "?????? ???????? ????"
+msgstr "?????? ????????"
 
 msgid "Modify Extended Information"
-msgstr "?????? ???? ???????? ????"
+msgstr "?????? ???? ????????"
 
 msgid "Modify Information"
-msgstr "???? ???????? ????"
+msgstr "???? ????????"
 
 msgid "Update"
-msgstr "???????? ????"
+msgstr "????????"
 
 msgid "Could not change buddy information."
-msgstr "?????? ???? ???????? ???? ???? ???"
+msgstr "?????? ???? ???????? ??? ????? ?????"
 
 msgid "Mobile"
 msgstr "??????"
@@ -7844,30 +7799,26 @@ msgstr "???"
 msgstr "???"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "?????? ???????? ????"
+msgstr "?????????"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "??? ???? ??????? ???????? ????"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "????????"
+msgstr "???????? (M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "????????"
+msgstr "???? ????????"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "??????? ??????"
+msgstr "??????? ????:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "????? ???????? ??????? ??? ??????"
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "????? ???????? ??????? ??? ??????"
 
 # tithi
 #, c-format
@@ -7875,35 +7826,35 @@ msgid "Add buddy question"
 msgstr "%u ?? ?????? ????? ??? ???????"
 
 msgid "Add buddy question"
-msgstr "?????? ?????? ??? ????"
+msgstr "?????? ?????? ???"
 
 # tithi
 msgid "Enter answer here"
-msgstr "????? ????? ?????? ????"
+msgstr "????? ????? ?????"
 
 msgid "Send"
-msgstr "?????? ????"
+msgstr "??????"
 
 msgid "Invalid answer."
-msgstr "???? ??????"
+msgstr "???????? ??????"
 
 msgid "Authorization denied message:"
-msgstr "????????????? ?????? ???????? ?????:"
+msgstr "??????? ???????????? ??????:"
 
 # tithi
 msgid "Sorry, you're not my style."
-msgstr "??????,???? ???? ???? ???"
+msgstr "??????, ???? ???? ?????? ???"
 
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u ?? ????????????? ???????"
+msgstr "%u ?? ??????? ???????"
 
 msgid "Add buddy authorize"
-msgstr "?????? ??????? ??? ????"
+msgstr "?????? ??????? ???"
 
 # tithi
 msgid "Enter request here"
-msgstr "????? ?????? ?????? ????"
+msgstr "????? ?????? ?????"
 
 msgid "Would you be my friend?"
 msgstr "???? ?? ???? ????? ?????"
@@ -7912,21 +7863,21 @@ msgid "Add buddy"
 msgstr "QQ ?????"
 
 msgid "Add buddy"
-msgstr "????? ??? ????"
+msgstr "????? ???"
 
 msgid "Invalid QQ Number"
-msgstr "???? QQ ?????"
+msgstr "???????? QQ ?????"
 
 msgid "Failed sending authorize"
-msgstr "??????? ?????? ?????? ??????"
+msgstr "??????? ?????? ??????"
 
 #, c-format
 msgid "Failed removing buddy %u"
-msgstr "%u ??????? ?????? ???? ?????? ?????"
+msgstr "%u ??????? ?????? ???? ??????"
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%d ?? ????? ?????? ???? ????? ?????? ???? ?????? ??????"
+msgstr "%d ?? ????? ?????? ???? ????? ?????? ???? ??????"
 
 msgid "No reason given"
 msgstr "???? ???? ??????? ?????"
@@ -7934,14 +7885,14 @@ msgid "You have been added by %s"
 #. only need to get value
 #, c-format
 msgid "You have been added by %s"
-msgstr "???? %s ?????? ??????? ??????"
+msgstr "?????? %s ??? ??????"
 
 msgid "Would you like to add him?"
 msgstr "???? ?? ???? ??? ???? ????"
 
 #, c-format
 msgid "Rejected by %s"
-msgstr "%s ?????? ????? ??? ?????"
+msgstr "%s ?????? ????????????"
 
 #, c-format
 msgid "Message: %s"
@@ -7949,24 +7900,24 @@ msgid "ID: "
 
 # tithi
 msgid "ID: "
-msgstr "????:"
+msgstr "ID: "
 
 msgid "Group ID"
-msgstr "???? ????"
+msgstr "???? ID"
 
 # tithi
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
 msgid "Please enter Qun number"
-msgstr "??????? ??? Qun ????? ?????? ????"
+msgstr "??????? ??? Qun ????? ???"
 
 # tithi
 msgid "You can only search for permanent Qun\n"
-msgstr "???? ????????? ??????? Qun ?????? ?????\n"
+msgstr "???? ????????? ??????? Qun ????????? ???? ?????\n"
 
 msgid "(Invalid UTF-8 string)"
-msgstr "(???? UTF-8 ???????)"
+msgstr "(???????? UTF-8 ???????)"
 
 # tithi
 msgid "Not member"
@@ -7977,10 +7928,10 @@ msgid "Requesting"
 msgstr "?????"
 
 msgid "Requesting"
-msgstr "?????? ????"
+msgstr "?????? ??? ?????"
 
 msgid "Admin"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Notice"
 msgstr "?????????"
@@ -7990,7 +7941,7 @@ msgid "Creator"
 
 # tithi
 msgid "Creator"
-msgstr "????????"
+msgstr "????????"
 
 msgid "About me"
 msgstr "???? ????????"
@@ -8000,10 +7951,10 @@ msgid "The Qun does not allow others to 
 
 # tithi
 msgid "The Qun does not allow others to join"
-msgstr "Qun ??????? ????? ???? ?????? ???? ??"
+msgstr "Qun ??????? ????? ??? ?????? ???? ??"
 
 msgid "Join QQ Qun"
-msgstr "QQ Qun ????? ????"
+msgstr "QQ Qun ? ??? ???"
 
 # tithi
 msgid "Input request here"
@@ -8012,15 +7963,15 @@ msgid "Successfully joined Qun %s (%u)"
 # tithi
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "%s (%u) Qun ??????? ????? ?????"
+msgstr "%s (%u) Qun ? ??????? ????? ?????"
 
 msgid "Successfully joined Qun"
-msgstr "Qun ??????? ????? ?????"
+msgstr "Qun ? ??????? ????? ?????"
 
 # tithi
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "%u Qun ???????? ????? ?????"
+msgstr "%u Qun? ???????? ??????????? ??? ?????"
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun ???????"
@@ -8030,22 +7981,22 @@ msgid "Join Qun, Unknown Reply"
 
 # tithi
 msgid "Join Qun, Unknown Reply"
-msgstr "Qun ????? ????, ????? ?????"
+msgstr "Qun ? ??????, ????? ?????"
 
 msgid "Quit Qun"
-msgstr "Qun ????? ????"
+msgstr "Qun ????????"
 
 # tithi
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"???, ???? ??? ???????????? ???, \n"
-"?? ????????? ?????? ?? Qun?? ?????? ?????"
+"???, ???? ??? ??? ???? ??? ?????, \n"
+"?? ????????? ?????? ?? Qun?? ?????? ?????"
 
 # tithi
 msgid "Sorry, you are not our style"
-msgstr "??????,???? ?????? ???? ??"
+msgstr "??????,???? ?????? ??????  ??"
 
 msgid "Successfully changed Qun members"
 msgstr "Qun ???????? ??????? ???????? ??? ??????"
@@ -8055,39 +8006,39 @@ msgid "You have successfully created a Q
 
 # tithi
 msgid "You have successfully created a Qun"
-msgstr "???? Qun ??????? ???? ??????"
+msgstr "???? ??????? ???? Qun ???? ??????"
 
 msgid "Would you like to set up detailed information now?"
-msgstr "???? ?? ??? ????????? ???? ???????? ???? ????"
+msgstr "???? ?? ??? ????????? ???? ???? ????"
 
 msgid "Setup"
-msgstr "???????? ????"
+msgstr "?????"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "%1$u %3$s ?? ???? %2$u Qun ??? ???? ?????? ????"
+msgstr "%1$u %3$s ?? ???? %2$u Qun? ????? ??? ?????? ????"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr "%1u %2u Qun ??? ???? ?????? ????"
+msgstr "%1u %2u Qun? ????? ??? ?????? ????"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "%u ??????? ?????? ????????, Qun %u ??? ???? ?????? ?????"
+msgstr "%u ??????? ?????? ????????, Qun %u ????? ??? ??????"
 
 # tithi
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>%3$s ?? ???? %2$u ??????? ?????? %1$u Qun ????? ???? ??????? ???????</b>"
+msgstr "<b>%3$s ?? ???? %2$u ??????? %1$u Qun? ????? ????? ??????? ???????</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "<b>%u ????? ?????? ??? ???????</b>"
+msgstr "<b>%u ??????? ?????? ??? ???????</b>"
 
 # tithi
 #, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "<b>???? %u ????? ?????? ??????</b>"
+msgstr "<b>???? ????? %u ?????? ??????</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -8125,23 +8076,23 @@ msgid "Invalid name"
 msgstr "Ver"
 
 msgid "Invalid name"
-msgstr "???? ???"
+msgstr "???????? ???"
 
 msgid "Select icon..."
-msgstr "???? ???????? ????..."
+msgstr "???? ????????..."
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>???? ????</b>: %1d-%2d-%3d, %4d:%5d:%6d<br>\n"
+msgstr "<b>???? ????</b>: %1$d-%2$d-%3$d, %4$d:%5$d:%6$d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>??????? ?????? ?????</b>: %d<br>\n"
+msgstr "<b>??? ?????? ?????</b>: %d<br>\n"
 
 # fix me tithi
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>??????? ???????</b>: %1d-%2d-%3d, %4d:%5d:%6d<br>\n"
+msgstr "<b>??????? ???????</b>: %1$d-%2$d-%3$d, %4$d:%5$d:%6$d<br>\n"
 
 #, c-format
 msgid "<b>Server</b>: %s<br>\n"
@@ -8157,19 +8108,19 @@ msgid "<b>My Internet IP</b>: %s:%d<br>\
 
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>???? ????????? IP</b>: %1s:%2d<br>\n"
+msgstr "<b>???? ????????? IP</b>: %1$s:%2$d<br>\n"
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>?????? ??????</b>: %lu<br>\n"
+msgstr "<b>???????</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>??????? ?????? ??????</b>: %lu<br>\n"
+msgstr "<b>??????? ??????</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>??????? ????</b>: %lu<br>\n"
+msgstr "<b>?????????</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
@@ -8177,44 +8128,43 @@ msgid "<b>Received Duplicate</b>: %lu<br
 
 #, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>?????? ????? ??????</b>: %lu<br>\n"
+msgstr "<b>????? ?????</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>????</b>: %1d-%2d-%3d, %4d:%5d:%6d<br>\n"
+msgstr "<b>????</b>: %1$d-%2$d-%3$d, %4$d:%5$d:%6$d<br>\n"
 
 #, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "???? ????"
 
 # tithi
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<p><b> ??? ????</b>:<br>\n"
+msgstr "<p><b>??? ????</b>:<br>\n"
 
 # tithi
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr "<p><b> ??? ??????????????</b>:<br>\n"
+msgstr "<p><b>?????-? ??????????????</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<p><b>?????? ????? ?????? </b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<p><b>???????????????</b>:<br>\n"
+msgstr "<p><b>????????</b>:<br>\n"
 
 # tithi
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b> ??? ????</b>:<br>\n"
+msgstr "<p><b>???????? ?????????</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "??? ???, ??????? ??? ????? ?????... ???????!))"
 
 # fix me tithi
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr "<p><i>???, ????? ???? ????-??????...</i><br>\n"
+msgstr "<p><i>???, ????? ?????? ?????? ??????...</i><br>\n"
 
 # tithi
 msgid "<i>Feel free to join us!</i> :)"
@@ -8222,27 +8172,26 @@ msgid "About OpenQ %s"
 
 #, c-format
 msgid "About OpenQ %s"
-msgstr "%s ????Q ????????"
+msgstr "%s OpenQ ????????"
 
 msgid "Change Icon"
-msgstr "???? ???????? ????"
+msgstr "???? ????????"
 
 msgid "Change Password"
-msgstr "?????????? ???????? ????"
+msgstr "????????? ????????"
 
 msgid "Account Information"
 msgstr "??????? ????"
 
 # tithi
 msgid "Update all QQ Quns"
-msgstr "?? QQ Quns ???????? ????"
+msgstr "?? QQ Quns ????????"
 
 msgid "About OpenQ"
-msgstr "????Q ????????"
+msgstr "OpenQ ????????"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "?????? ???????? ????"
+msgstr "????????? ????????"
 
 #. *< type
 #. *< ui_requirement
@@ -8255,50 +8204,49 @@ msgid "QQ Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "QQ Protocol Plugin"
-msgstr "QQ ??????? ???????"
+msgstr "QQ ???????? ???????"
 
 msgid "Auto"
 msgstr "????????????"
 
 msgid "Select Server"
-msgstr "??????? ???????? ????"
+msgstr "??????? ????????"
 
 # tithi
 msgid "QQ2005"
-msgstr "QQ????"
+msgstr "QQ2005"
 
 # tithi
 msgid "QQ2007"
-msgstr "QQ????"
+msgstr "QQ2007"
 
 # tithi
 msgid "QQ2008"
-msgstr "QQ????"
+msgstr "QQ2008"
 
 msgid "Connect by TCP"
-msgstr "TCP ?????? ????? ????"
+msgstr "TCP ?????? ????? ??? ???"
 
 msgid "Show server notice"
-msgstr "????????? ????? ???????? ????"
+msgstr "????????? ????? ???????? ??? ???"
 
 msgid "Show server news"
-msgstr "????????? ??? ???????? ????"
+msgstr "????????? ??? ???????? ??? ???"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "?????? ???? ?????? ??? ????????? ??? "
 
 # fix me tithi
 msgid "Keep alive interval (seconds)"
-msgstr "????? ??????? ????? (???????)"
+msgstr "??????? ????? ????? ??????? (???????)"
 
 # tithi
 msgid "Update interval (seconds)"
-msgstr "????? ???????? ???? (???????)"
+msgstr "?????????? ????? ??????? (???????)"
 
 # fix me tithi
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "??????? ???? ?????????? ??? ??"
+msgstr "????????? ????? ????????? ??? ?????? ??"
 
 # tithi
 #, c-format
@@ -8307,12 +8255,12 @@ msgid "Invalid token len, %d"
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr "???? ????? ???????, %d"
+msgstr "???????? ????? ???????, %d"
 
 # Fix me tithi
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr "?????????????EX ???????? ??????? ?? (_E)"
+msgstr "RedirectEX ???????? ??????? ?? (_E)"
 
 #. need activation
 #. need activation
@@ -8323,38 +8271,38 @@ msgid "Unknown reply code when logging i
 # tithi
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "(0x%02X) ? ???? ???? ??? ????? ????? ???"
+msgstr "???? ???? ??? ????? ????? ??? (0x%02X)"
 
 # tithi
 msgid "Requesting captcha"
-msgstr "captcha ?????? ????"
+msgstr "??????? ?????? ??? ?????"
 
 # tithi
 msgid "Checking captcha"
-msgstr "captcha ??????? ????"
+msgstr "??????? ??????? ??? ?????"
 
 # tithi
 msgid "Failed captcha verification"
-msgstr "captcha ???????? ?????? ?????"
+msgstr "??????? ???????? ?????? ?????"
 
 # fix me tithi
 msgid "Captcha Image"
-msgstr "Captcha ?????"
+msgstr "??????? ?????"
 
 msgid "Enter code"
-msgstr "??? ?????? ????"
+msgstr "??? ???"
 
 # tithi
 msgid "QQ Captcha Verification"
-msgstr "QQ Captcha ????????"
+msgstr "QQ ??????? ????????"
 
 msgid "Enter the text from the image"
-msgstr "????? ??? ??? ?????? ????"
+msgstr "?????? ?? ???????? ??? ?? ?????"
 
 # tithi
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr "??????????? ??????? ???? ??? ????? ????? (0x%02X)"
+msgstr "????????? ??????? ???? ??? ????? ????? (0x%02X)"
 
 # tithi
 #, c-format
@@ -8362,28 +8310,27 @@ msgstr ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-"(0x%02X) ? ???? ???? ??? ????? ????? ???:\n"
+"???? ???? ??? ????? ????? ??? (0x%02X):\n"
 "%s"
 
 msgid "Socket error"
 msgstr "???? ??????"
 
 msgid "Getting server"
-msgstr "??????? ??????"
+msgstr "??????? ????? ?????"
 
 msgid "Requesting token"
-msgstr "????? ?????? ????"
+msgstr "????? ?????? ??? ?????"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "????????? ???? ????? ??????? ???????"
+msgstr "??????? ??? ?????? ???? ??????"
 
 msgid "Invalid server or port"
-msgstr "???? ??????? ?? ?????"
+msgstr "???????? ??????? ?? ?????"
 
 # tithi
 msgid "Connecting to server"
-msgstr "???????? ??????? ?????"
+msgstr "???????? ??????? ??? ?????"
 
 msgid "QQ Error"
 msgstr "QQ ??????"
@@ -8396,13 +8343,13 @@ msgstr ""
 "%s"
 msgstr ""
 "????????? ???:\n"
-"%1s\n"
-"%2s\n"
-"%3s"
+"%1$s\n"
+"%2$s\n"
+"%3$s"
 
 #, c-format
 msgid "%s:%s"
-msgstr "%1s:%2s"
+msgstr "%1$s:%2$s"
 
 #, c-format
 msgid "From %s:"
@@ -8413,12 +8360,12 @@ msgstr ""
 "Server notice From %s: \n"
 "%s"
 msgstr ""
-"%1s ???? ??????? ????????? ?????????:\n"
-"%2s"
+"%1$s ???? ??????? ????????? ?????????:\n"
+"%2$s"
 
 # tithi
 msgid "Unknown SERVER CMD"
-msgstr "????? ??????? CMD"
+msgstr "????? SERVER CMD"
 
 # tithi
 #, c-format
@@ -8426,34 +8373,33 @@ msgstr ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-"%1s(0x%02X) ?? ??????????? ?????\n"
-"??? %2u, ????? 0x%02X"
+"%1$s ?? ??????????? ????? (0x%2$02X)\n"
+"??? %3$u, ????? 0x%4$02X"
 
 msgid "QQ Qun Command"
-msgstr "QQ Qun ???????"
+msgstr "QQ Qun ??????"
 
 # tithi
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "???? ????? ?????????? ???? ???? ??"
+msgstr "???? ????? ????????? ??? ????? ????"
 
 # fix me tithi
 msgid "Unknown LOGIN CMD"
-msgstr "????? ???? CMD"
+msgstr "????? LOGIN CMD"
 
 msgid "Unknown CLIENT CMD"
-msgstr "????? ????????? CMD"
+msgstr "????? CLIENT CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
-msgstr "%1d %2s ?????? ???????????? ?????"
+msgstr "%1$d %2$s ?????? ???????????? ?????"
 
 msgid "File Send"
-msgstr "???? ?????? ??? ?????"
+msgstr "???? ??????"
 
 #, c-format
 msgid "%d canceled the transfer of %s"
-msgstr "%1d %2s-?? ?????????? ????? ??????"
+msgstr "%1$d %2$s-?? ?????????? ????? ?????"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8461,7 +8407,7 @@ msgid "<b>Notes Group ID:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>????? ?? ????:</b> %s<br>"
+msgstr "<b>??? ???? ID:</b> %s<br>"
 
 # tithi
 #, c-format
@@ -8470,67 +8416,67 @@ msgid "Notes Address Book Information"
 
 # tithi
 msgid "Notes Address Book Information"
-msgstr "????? ?????? ????? ????"
+msgstr "Notes Address Book ????"
 
 # tithi
 msgid "Invite Group to Conference..."
-msgstr "???????? ??????? ???????? ?????..."
+msgstr "???????? ???? ????????..."
 
 msgid "Get Notes Address Book Info"
-msgstr "????? ?????? ?????? ???? ????? ????"
+msgstr "Notes Address Book ???? ?????"
 
 # tithi
 msgid "Sending Handshake"
-msgstr "?????????? ????????"
+msgstr "?????????? ?????? ?????"
 
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "???????????? ???? ?????? ???? ??????? ????"
+msgstr "???????????? ????????????????? ??????? ??? ?????"
 
 # tithi
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "?????????? ???? ??????, ???? ????????"
+msgstr "???????????? ??????????????? ??? ?????, ???? ?????? ?????"
 
 # tithi
 msgid "Waiting for Login Acknowledgement"
-msgstr "???? ????? ???? ??????? ????"
+msgstr "???? ????????????????? ???? ??????? ??? ?????"
 
 # tithi
 msgid "Login Redirected"
-msgstr "???? ???? ?????????"
+msgstr "???? ????????? ??? ?????"
 
 # tithi
 msgid "Forcing Login"
-msgstr "???? ????? ????"
+msgstr "???? ???? ????? ??? ?????"
 
 # tithi
 msgid "Login Acknowledged"
-msgstr "???? ???? ??????"
+msgstr "?????? ??????????????? ??? ?????"
 
 # tithi
 msgid "Starting Services"
-msgstr "???? ???? ????"
+msgstr "???? ???? ??? ?????"
 
 # tithi
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr "???? ??????? ??????? %s ???????? ?????????? ????? ?????? ?????"
+msgstr "???? Sametime ??????? %s ???????? ?????????? ????? ?????? ?????"
 
 # tithi
 msgid "Sametime Administrator Announcement"
-msgstr "??????? ????????? ?????"
+msgstr "Sametime ????????? ?????"
 
 # tithi
 #, c-format
 msgid "Announcement from %s"
-msgstr "%s ??? ?????"
+msgstr "%s ???? ?????"
 
 # tithi
 msgid "Conference Closed"
 msgstr "??????? ????"
 
 msgid "Unable to send message: "
-msgstr "?????? ?????? ??????:"
+msgstr "?????? ?????? ??????:"
 
 msgid "Place Closed"
 msgstr "????? ????"
@@ -8541,25 +8487,25 @@ msgid "Speakers"
 
 # tithi
 msgid "Speakers"
-msgstr "???????????"
+msgstr "???????"
 
 # tithi
 msgid "Video Camera"
 msgstr "????? ????????"
 
 msgid "File Transfer"
-msgstr "???? ?????????? ????"
+msgstr "???? ??????????"
 
 msgid "Supports"
-msgstr "??????????"
+msgstr "??????"
 
 # tithi
 msgid "External User"
-msgstr "??????? ???????????"
+msgstr "??????? ???????????"
 
 # tithi
 msgid "Create conference with user"
-msgstr "???????????? ???? ??????? ???? ????"
+msgstr "???????????? ???? ??????? ????"
 
 # tithi
 #, c-format
@@ -8567,27 +8513,25 @@ msgstr ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"??????? ??? ???? ????????? ???? ???? ????? ?????? ????, ??? %s ? ???? ???????? ?????? "
-"?????? ???"
+"??????? ??? ???? ????????? ????? ??? %s ?? ??????? ???? ???? ???????? ?????? ??? "
 
 msgid "New Conference"
 msgstr "???? ???????"
 
 # tithi
 msgid "Create"
-msgstr "???? ???? "
+msgstr "????"
 
-# tithi
 msgid "Available Conferences"
-msgstr "??????? ???????????"
+msgstr "???????? ???????"
 
 # tithi
 msgid "Create New Conference..."
-msgstr "???? ??????? ???? ????..."
+msgstr "???? ??????? ????..."
 
 # tithi
 msgid "Invite user to a conference"
-msgstr "????????????? ???????? ???????? ?????"
+msgstr "????????????? ???????? ????????"
 
 # tithi
 #, c-format
@@ -8596,28 +8540,28 @@ msgstr ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"%s ????????????? ???? ???????? ?????? ????? ?????? ???? ???? ??????? ???????? "
-"????? ???? ??? ?? ????????????? ???????? ?????? ???? ???? ??????? ???? ???? ??? "
-"??? \"???? ??????? ???? ????\" ???????? ?????"
+"%s ????????????? ???????? ?????? ????? ?????? ???? ???? ??????? ???????? ????? "
+"???? ??? ?? ????????????? ???? ???? ???????? ???????? ?????? ??? ??? \"???? "
+"??????? ????\" ???????? ?????"
 
 # tithi
 msgid "Invite to Conference"
-msgstr "???????? ???????? ?????"
+msgstr "???????? ????????"
 
 # tithi
 msgid "Invite to Conference..."
-msgstr "???????? ???????? ?????..."
+msgstr "???????? ????????..."
 
 # tithi
 msgid "Send TEST Announcement"
-msgstr "??????? ????? ?????"
+msgstr "?????????? ????? ??????"
 
 msgid "Topic:"
 msgstr "?????:"
 
 # tithi
 msgid "No Sametime Community Server specified"
-msgstr "???? ??????? ?????????? ??????? ?????? ??? ?????"
+msgstr "???? Sametime Community ??????? ?????? ??? ?????"
 
 # tithi
 #, c-format
@@ -8625,19 +8569,19 @@ msgstr ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"???????? %s ????????? ???? ???? ????? ?? ???? ?????? ??????? ??? ?????? ??????? ??? "
-"???? ??????? ????? ???? ???? ?????? ?????"
+"Meanwhile ??????? %s?? ???? ???? ????? ?? ???? ?????? ??????? ??? ?????? ??????? "
+"??? ???? ??????? ????? ???? ?? ???? ????"
 
 # tithi
 msgid "Meanwhile Connection Setup"
-msgstr "???????? ????? ???????? ????"
+msgstr "Meanwhile ????? ?????"
 
 # tithi
 msgid "No Sametime Community Server Specified"
-msgstr "???? ??????? ?????????? ??????? ???????? ??"
+msgstr "???? Sametime Community ??????? ???????? ??"
 
 msgid "Connect"
-msgstr "????? ???"
+msgstr "????? ??????"
 
 # tithi
 #, c-format
@@ -8645,18 +8589,18 @@ msgid "Last Known Client"
 msgstr "????? (0x%04x)<br>"
 
 msgid "Last Known Client"
-msgstr "??????? ?????? ??????"
+msgstr "??????? ???? ?????????"
 
 msgid "User Name"
 msgstr "???????????? ???"
 
 # tithi
 msgid "Sametime ID"
-msgstr "??????? ????"
+msgstr "Sametime ID"
 
 # tithi
 msgid "An ambiguous user ID was entered"
-msgstr "???? ???????? ??????????? ???? ?????? ??? ???????"
+msgstr "???? ??????????? ??????????? ID ?????? ??? ???????"
 
 # tithi
 #, c-format
@@ -8664,16 +8608,15 @@ msgstr ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"'%s' ?????????? ?????? ?????????? ?????? ????????????? ?????? ???? ????? ??????? "
-"??? ????? ?????? ???? ???? ??????????? ???????? ??? ????? ????? ???????? ??????? "
-"??? ?????"
+"'%s' ?????????? ?????? ????????????? ?????? ????? ??????? ??? ????? ?????? ???? "
+"???? ??????????? ???????? ??? ????? ????? ???????? ??? ?????"
 
 msgid "Select User"
-msgstr "??????????? ???????? ????"
+msgstr "??????????? ????????"
 
 # tithi
 msgid "Unable to add user: user not found"
-msgstr "??????????? ??? ???? ?????: ??????????? ????? ??????"
+msgstr "??????????? ??? ???? ??????: ??????????? ????? ????? ?????"
 
 # tithi
 #, c-format
@@ -8681,66 +8624,67 @@ msgstr ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"'%s' ?????????? ????? ??????? ???????????? ???? ???????????? ???? ?????? ??? ??? "
-"?? ????????? ????? ????? ?????? ???? ?????? ??? ???????"
+"'%s' ?????  Sametime ???????????? ???? ???????????? ???? ??????? ?? ????????? "
+"????? ????? ?????? ???? ?????? ??? ???????"
 
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"%1s ???? ?????? ??????: \n"
-"%2s\n"
+"%1$s ???? ?????? ??????: \n"
+"%2$s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "??? ??? ???????? ????? ??????"
+msgstr "???? ???????? ????? ??????"
 
 msgid "Buddy List Storage Mode"
-msgstr "????? ??????? ??????? ??????"
+msgstr "????? ?????? ??????? ??????"
 
 msgid "Local Buddy List Only"
 msgstr "????????? ???????? ????? ??????"
 
 # tithi
 msgid "Merge List from Server"
-msgstr "????????? ?????? ??????? ????"
+msgstr "????????? ?????? ?????????"
 
 # tithi
 msgid "Merge and Save List to Server"
-msgstr "???????? ?????? ??????? ??? ??????? ????"
+msgstr "???????? ?????? ????????? ? ???????"
 
 # tithi
 msgid "Synchronize List with Server"
-msgstr "????????? ????? ??????? ??????"
+msgstr "????????? ????? ?????? ?????? ??? ???"
 
 # tithi
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "%s ????????? ???? ??????? ?????? ?????? ????"
+msgstr "%s ????????? ???? Sametime ?????? ??????? ????"
 
 # tithi
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "%s ????????? ???? ??????? ?????? ??????? ????"
+msgstr "%s ????????? ???? Sametime ?????? ????????? ????"
 
 # tithi
 msgid "Unable to add group: group exists"
-msgstr "?? ??? ???? ?????: ?? ????????"
+msgstr "?? ??? ???? ??????: ?? ????????"
 
 # tithi
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "'%s' ????? ???? ?? ????? ????? ??????? ???????? ???????? ???????"
+msgstr "'%s' ????? ???? ?? ????? ????? ??????? ???????? ?????????"
 
 msgid "Unable to add group"
 msgstr "?? ??? ???? ??????"
 
 # tithi
 msgid "Possible Matches"
-msgstr "???????? ???????"
+msgstr "???????? ???"
 
+# ***
 msgid "Notes Address Book group results"
-msgstr "????? ?????? ????? ???? ?????"
+msgstr "Notes Address Book ???? ?????"
 
 # tithi
 #, c-format
@@ -8749,16 +8693,15 @@ msgstr ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"'%s' ?????????? ?????? ?????????? ??? ?????? ????? ???? ???????? ?????? ???? "
-"????? ??????? ??? ????? ?????? ???? ???? ????? ???????? ??? ????? ????? ??????? ??? "
-"??? ?????"
+"'%s' ?????????? ????? Notes Address Book ???? ?????? ????? ??????? ??? ????? "
+"?????? ???? ???? ?? ???????? ??? ????? ????? ??????? ??? ?????"
 
 msgid "Select Notes Address Book"
-msgstr "????? ?????? ?? ???????? ????"
+msgstr "Notes Address Book ????????"
 
 # tithi
 msgid "Unable to add group: group not found"
-msgstr "?? ??? ???? ?????: ?? ????? ??????"
+msgstr "?? ??? ???? ??????: ?? ????? ????? ?????"
 
 # tithi
 #, c-format
@@ -8766,23 +8709,23 @@ msgstr ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"'%s' ?????????? ????? ??????? ???????????? ???? ??? ?????? ????? ???? ???? ?????? "
-"??????"
+"'%s' ????? Sametime ???????????? ???? Notes Address Book ???? ???? ???????"
 
+# ***
 msgid "Notes Address Book Group"
-msgstr "????? ?????? ?????? ??"
+msgstr "Notes Address Book ??"
 
 # tithi
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
-"????? ???????? ????? ?????? ????? ??????? ??? ?????? ??? ????? ????? ??????? ?????? "
-"??? ?? ?????? ??? ?????"
+"????? ???????? Notes Address Book ???? ??? ?????? ??? ?? ??? ?? ???????? ????? "
+"????? ??????? ??? ?????"
 
 #, c-format
 msgid "Search results for '%s'"
-msgstr "'%s' ?? ?????? ?????"
+msgstr "'%s' ??????????? ?????"
 
 # tithi
 #, c-format
@@ -8791,9 +8734,9 @@ msgstr ""
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"'%s' ?????????? ?????? ?????????? ?????? ????????????? ?????? ???? ????? ???? "
-"?????? ????? ????? ????? ?????? ????? ????? ???????? ?? ??????????????? ??? ???? "
-"????? ?? ??????? ?????? ?????? ??????"
+"'%s' ?????????? ?????????? ?????? ????????????? ?????? ????? ???? ????? ????? "
+"???????? ?? ??????????????? ??? ???? ????? ?? ??????? ????? ????? ?????? ?????? "
+"?????? ??????"
 
 msgid "Search Results"
 msgstr "??????????? ?????"
@@ -8804,47 +8747,47 @@ msgid "The identifier '%s' did not match
 # tithi
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "'%s' ?????????? ????? ??????? ???????????? ???? ???????????? ???? ???????"
+msgstr "'%s' ?????????? ????? Sametime ???????????? ???? ???????????? ???? ???????"
 
 msgid "No Matches"
 msgstr "???? ??? ???"
 
 msgid "Search for a user"
-msgstr "???? ???????????? ???? ????????? ????"
+msgstr "??????????? ?????????"
 
 # tithi
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"????? ??????? ???????????? ????????? ???????????? ???? ????????? ???? ????? ???????? "
-"???? ??? ?? ????? ???? ?????? ?????"
+"????? Sametime ???????????? ??????????? ????????? ???? ????? ???????? ???? ??? ?? "
+"????? ID ????"
 
 msgid "User Search"
-msgstr "??????????? ????????? ????"
+msgstr "??????????? ?????????"
 
 # tithi
 msgid "Import Sametime List..."
-msgstr "??????? ?????? ?????? ????..."
+msgstr "Sametime ?????? ???????..."
 
 # tithi
 msgid "Export Sametime List..."
-msgstr "??????? ?????? ??????? ????..."
+msgstr "Sametime ?????? ?????????..."
 
 msgid "Add Notes Address Book Group..."
-msgstr "????? ?????? ?????? ?? ??? ????..."
+msgstr "Notes Address Book ?? ???..."
 
 msgid "User Search..."
-msgstr "??????????? ????????? ????..."
+msgstr "??????????? ?????????..."
 
 # tithi
 msgid "Force login (ignore server redirects)"
-msgstr "???? ????? ????  (????????? ???? ????????????? ??????? ????)"
+msgstr "???? ????? ??? ??? (????????? ????????????? ??????? ???)"
 
 # tithi
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr "?????? ?????? ???? ????"
+msgstr "??????????? ?????? ???? ??? ???"
 
 # tithi
 #, c-format
@@ -8856,42 +8799,42 @@ msgid "Cannot perform the key agreement"
 
 # tithi
 msgid "Cannot perform the key agreement"
-msgstr "??? ?????? ??????? ???? ???? ??"
+msgstr "??? ?????? ??????? ??? ????? ????"
 
 # tithi
 msgid "Error occurred during key agreement"
-msgstr "??? ??????? ???? ?????? ??????"
+msgstr "??? ??????? ???? ?????? ?????"
 
 # tithi
 msgid "Key Agreement failed"
-msgstr "??? ?????? ?????? ?????"
+msgstr "??? ?????? ?????? ?????"
 
 # tithi
 msgid "Timeout during key agreement"
-msgstr "??? ??????? ???? ????? ???????? ?????"
+msgstr "??? ??????? ???? ???????? ??? ????"
 
 # tithi
 msgid "Key agreement was aborted"
-msgstr "??? ?????? ????? ??? ??????"
+msgstr "??? ?????? ????? ??? ?????"
 
 # tithi
 msgid "Key agreement is already started"
-msgstr "??? ?????? ???????? ???? ??????"
+msgstr "??? ?????? ???????? ???? ??????"
 
 # tithi
 msgid "Key agreement cannot be started with yourself"
-msgstr "??? ?????? ????? ????? ???? ??? ??? ??"
+msgstr "??? ?????? ????? ????? ????? ???? ??? ???? ??"
 
 # tithi
 msgid "The remote user is not present in the network any more"
-msgstr "???????? ??????????? ?? ??????????? ??????? ????? ??"
+msgstr "???????? ??????????? ??????????? ?? ??????? ???"
 
 # tithi
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "??? ??????? ?????? %s ???? ????? ?????? ???? ?? ??? ?????? ??????? ???? ???????"
+msgstr "%s ???? ??? ??????? ?????? ????? ?????? ???? ?? ??? ?????? ??????? ???? ???????"
 
 #, c-format
 msgid ""
@@ -8908,35 +8851,35 @@ msgid "IM With Password"
 msgstr "??? ??????? ??????"
 
 msgid "IM With Password"
-msgstr "??????????? ????? ????"
+msgstr "????????? ????? IM"
 
 msgid "Cannot set IM key"
-msgstr "???? ?? ??????? ???? ???? ??"
+msgstr "IM ?? ??????? ???????? ??? ????? ????"
 
 msgid "Set IM Password"
-msgstr "???? ??????????? ??????? ????"
+msgstr "IM ????????? ????????"
 
 # tithi
 msgid "Get Public Key"
-msgstr "?????????? ?? ????? ????"
+msgstr "?????? ?? ????? ???"
 
 # tithi
 msgid "Cannot fetch the public key"
-msgstr "?????????? ?? ?????????? ???? ???? ??"
+msgstr "?????? ?? ??? ????? ????"
 
 # tithi
 msgid "Show Public Key"
-msgstr "?????????? ?? ?????"
+msgstr "?????? ?? ????????"
 
 # tithi
 msgid "Could not load public key"
-msgstr "?????????? ?? ??? ???? ??????"
+msgstr "?????? ?? ??? ??? ????? ????"
 
 msgid "User Information"
 msgstr "??????????? ????"
 
 msgid "Cannot get user information"
-msgstr "???????????? ???? ????? ???? ???? ??"
+msgstr "???????????? ???? ????? ?????"
 
 # fix me tithi
 #, c-format
@@ -8948,9 +8891,8 @@ msgstr ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"???? ?????? ??????? ?? ?????? ?????????? ?? ?????? ???? ?????? ??????? ??? ????????? "
-"????? ???? ????? ??? ???? ?????? ?? ????? ???? '?????? ?? ????? ????' ??????? "
-"??????? ???? ????? ???"
+"???? ?????? ??????? ?? ?????? ?????? ?? ??????? ????? ?????? ??????? ??? ????? ????? "
+"????? ??? ???? ?????? ?? ???? Get Public Key ???????? ??????? ???? ??????"
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8966,30 +8908,30 @@ msgstr ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"????? ??? ???? ?????? ?????? ??? ?????????? ?? ?????? ???? ???? ?????????? ?? "
-"?????? ???? '?????? ????' ??????"
+"????? ??? ???? ?????? ?????? ??? ?????? ?? ??????? ???? ???? ?????? ?? ??????? "
+"???? '???????' ??????"
 
 # tithi
 msgid "_Import..."
-msgstr "?????? ????... (_I)"
+msgstr "???????... (_I)"
 
 msgid "Select correct user"
-msgstr "???? ??????????? ???????? ????"
+msgstr "???? ??????????? ????????"
 
 # tithi
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"??? ?????????? ?? ?????? ?????? ???????????? ????? ????????? ????? ???????? ??? ???? "
-"?????? ???? ???? ??????????? ???????? ?????"
+"??? ?????? ?? ?? ?????? ??????????? ????? ????? ????? ???????? ??? ???? ?????? "
+"???? ???? ??????????? ???????? ?????"
 
 # tithi
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
-"??? ???? ?????? ???????????? ????? ????????? ????? ???????? ??? ???? ?????? ???? "
+"??? ???? ?????? ??????????? ????? ????? ????? ???????? ??? ???? ?????? ???? "
 "???? ??????????? ???????? ?????"
 
 # tithi
@@ -9002,11 +8944,11 @@ msgid "Wake Me Up"
 
 # tithi
 msgid "Wake Me Up"
-msgstr "????? ?????"
+msgstr "????? ??? ???? ?????"
 
 # tithi
 msgid "Hyper Active"
-msgstr "?????????? ???????"
+msgstr "??????????"
 
 msgid "Robot"
 msgstr "??????????"
@@ -9015,7 +8957,7 @@ msgid "Sad"
 msgstr "????"
 
 msgid "Sad"
-msgstr "??:??"
+msgstr "?????"
 
 msgid "Angry"
 msgstr "????"
@@ -9032,7 +8974,7 @@ msgid "In Love"
 
 # tithi
 msgid "In Love"
-msgstr "?????????"
+msgstr "???????"
 
 msgid "Sleepy"
 msgstr "??????"
@@ -9047,10 +8989,10 @@ msgid "User Modes"
 msgstr "????????"
 
 msgid "User Modes"
-msgstr "??????????? ????????????"
+msgstr "??????????? ???"
 
 msgid "Preferred Contact"
-msgstr "??????? ???????"
+msgstr "??????? ???????"
 
 msgid "Preferred Language"
 msgstr "??????? ????"
@@ -9060,7 +9002,7 @@ msgid "Timezone"
 msgstr "??????"
 
 msgid "Timezone"
-msgstr "????-?????"
+msgstr "???? ?????"
 
 # tithi
 msgid "Geolocation"
@@ -9068,30 +9010,30 @@ msgid "Reset IM Key"
 
 # tithi
 msgid "Reset IM Key"
-msgstr "IM ?? ???? ??????? ????"
+msgstr "IM ?? ????? ??? ???"
 
 # tithi
 msgid "IM with Key Exchange"
 msgstr "?? ??????? ?? IM"
 
 msgid "IM with Password"
-msgstr "??????????? ????? ????"
+msgstr "?????????????? IM"
 
 # tithi
 msgid "Get Public Key..."
-msgstr "?????????? ?? ????? ????..."
+msgstr "?????? ?? ????? ??? ???..."
 
 # tithi
 msgid "Kill User"
-msgstr "????????????? ???? ?????"
+msgstr "??????????? ????????? ????"
 
 # tithi
 msgid "Draw On Whiteboard"
-msgstr "????-?????? ???? ????"
+msgstr "???????????? ???? ????"
 
 # tithi
 msgid "_Passphrase:"
-msgstr "?????-????? (_P):"
+msgstr "???????? (_P):"
 
 # tithi
 #, c-format
@@ -9102,7 +9044,7 @@ msgid "Cannot get channel information"
 msgstr "??????? ????"
 
 msgid "Cannot get channel information"
-msgstr "????????? ???? ???? ??"
+msgstr "????????? ???? ????? ?????"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
@@ -9110,7 +9052,7 @@ msgid "<br><b>User Count:</b> %d"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>??????????? ???? ????:</b> %d"
+msgstr "<br><b>??? ???????????:</b> %d"
 
 # tithi
 #, c-format
@@ -9139,28 +9081,28 @@ msgid "<br><b>Founder Key Fingerprint:</
 # tithi
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b> ???????????? ??? ????????????-???:</b><br>%s"
+msgstr "<br><b> Founder ??? ??????????????:</b><br>%s"
 
 # tithi
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>???????????? ??? ?????????????:</b><br>%s"
+msgstr "<br><b>Founder ??? ?????????????:</b><br>%s"
 
 # tithi
 msgid "Add Channel Public Key"
-msgstr "????????? ?????????? ?? ????? ????"
+msgstr "????????? ?????? ?? ???"
 
 # tithi
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "?????????? ?? ?????..."
+msgstr "?????? ?? ?????..."
 
 # tithi
 msgid "Channel Passphrase"
-msgstr "????????? ?????-?????"
+msgstr "????????? ????????"
 
 msgid "Channel Public Keys List"
-msgstr "????????? ?????????? ?? ?? ??????"
+msgstr "????????? ?????? ?? ?? ??????"
 
 # tithi
 #, c-format
@@ -9171,33 +9113,33 @@ msgstr ""
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"??????? ?????????? ????????? ??????? ????? ?????? ???? ?????? ????? ??????? ??? "
-"???? ?????????? ?????? ?????????? ??? ????????? ???????? ???????? ??? ?????????? "
-"???????? ??? ???, ??? ?????? ???? ?????? ??? ???? ??? ????????? ?????????? ?? "
-"???????? ??? ??? ??? ????????? ?????????? ?? ????? ??????????? ????????????? ?????? "
-"???? ????? ????"
+"????????? ???????????? ?????? ???? ?????? ????? ??????? ?????????? ??????? ??? ???? "
+"?????????? ???????? ??? ????????? ???????? ??????? ??? ????? ??? ???????? ???????? "
+"??? ??? ???? ????? ?????? ???? ??? ?????? ???? ???? ??? ????????? ?????? ?? "
+"???????? ??? ???, ??? ????????? ???? ?????????????? ?????? ?? ??????????? ??? ???? "
+"?????? ???? ???????"
 
 # tithi
 msgid "Channel Authentication"
-msgstr "????????? ??????????"
+msgstr "??????? ??????????"
 
 msgid "Add / Remove"
-msgstr "??? / ????? ????"
+msgstr "??? / ??????"
 
 msgid "Group Name"
-msgstr "??????? ???"
+msgstr "???? ???"
 
 # tithi
 msgid "Passphrase"
-msgstr "?????-?????"
+msgstr "????????"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "??????? ??? %s ????????? ????????? ??????? ??? ? ?????-????? ?????? ?????"
+msgstr "??????? ??? %s ????????? ????????? ???? ??? ? ???????? ????"
 
 # tithi
 msgid "Add Channel Private Group"
-msgstr "????????? ????????? ????? ??? ????"
+msgstr "????????? ????????? ?? ???"
 
 msgid "User Limit"
 msgstr "???????????? ????"
@@ -9205,8 +9147,8 @@ msgstr ""
 # tithi
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"???????? ???????????? ???? ???????? ????? ??????????? ???? ???? ??????? ???? ?????? "
-"??????? ?????"
+"???????? ???????????? ???? ???????? ????? ??????????? ???? ???? ??????? ???? ????? "
+"???????? ?????"
 
 msgid "Invite List"
 msgstr "???????? ??????"
@@ -9215,65 +9157,63 @@ msgid "Add Private Group"
 msgstr "??????? ??????"
 
 msgid "Add Private Group"
-msgstr "????????? ?? ??? ????"
+msgstr "????????? ?? ???"
 
 # tithi
 msgid "Reset Permanent"
-msgstr "??????????? ??????? ??????? ????"
+msgstr "??????????? ?????"
 
 # tithi
 msgid "Set Permanent"
-msgstr "??????????? ??????? ????"
+msgstr "??????????? ???????"
 
 msgid "Set User Limit"
-msgstr "???????????? ???? ???????? ????"
+msgstr "???????????? ???? ????????"
 
 msgid "Reset Topic Restriction"
-msgstr "??????????? ?????????? ??????? ???????? ????"
+msgstr "?????????? ???????? ?????"
 
 # tithi
 msgid "Set Topic Restriction"
-msgstr "??????????? ?????????? ???????? ????"
+msgstr "?????????? ???????? ????????"
 
 # tithi
 msgid "Reset Private Channel"
-msgstr "????????? ??????? ??????? ???????? ????"
+msgstr "????????? ??????? ???????????? ????"
 
 # tithi
 msgid "Set Private Channel"
-msgstr "????????? ??????? ???????? ????"
+msgstr "????????? ??????? ????????"
 
 # tithi
 msgid "Reset Secret Channel"
-msgstr "???? ??????? ??????? ???????? ????"
+msgstr "???? ??????? ????????????"
 
 # tithi
 msgid "Set Secret Channel"
-msgstr "???? ??????? ???????? ????"
+msgstr "???? ??????? ????????"
 
 # tithi
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"???? ????????? ?????? ??????? ????? ????? ?????? ?????? ?????? %s ???????? ??? ???? "
-"???"
+msgstr "?????? ????????? ??? ???????? ?????? ?????? %s ???????? ??? ???? ???"
 
 msgid "Join Private Group"
-msgstr "????????? ?????? ??? ???"
+msgstr "????????? ??? ??? ???"
 
 # tithi
 msgid "Cannot join private group"
-msgstr "????????? ???????? ??? ???? ???? ??"
+msgstr "????????? ??? ??? ???? ????? ????"
 
 msgid "Call Command"
-msgstr "??????? ?? ????"
+msgstr "?????? ?? ????"
 
 msgid "Cannot call command"
-msgstr "??????? ?? ???? ???? ??"
+msgstr "?????? ?? ??? ????? ????"
 
 msgid "Unknown command"
-msgstr "????? ???????"
+msgstr "????? ??????"
 
 msgid "Secure File Transfer"
 msgstr "?????? ???? ??????????"
@@ -9286,7 +9226,7 @@ msgid "Permission denied"
 
 # tithi
 msgid "Permission denied"
-msgstr "?????? ????????"
+msgstr "?????? ????????????"
 
 # tithi
 msgid "Key agreement failed"
@@ -9294,72 +9234,72 @@ msgid "Connection timed out"
 
 # fix me tithi
 msgid "Connection timed out"
-msgstr "????? ???? ???"
+msgstr "??????? ???? ????????"
 
 msgid "Creating connection failed"
 msgstr "????? ?????? ??????"
 
 msgid "File transfer session does not exist"
-msgstr "???? ?????????? ??????? ???????? ??"
+msgstr "???? ?????????? ???? ???????? ??"
 
 msgid "No file transfer session active"
-msgstr "???? ???? ?????????? ??????? ??????? ??"
+msgstr "???? ???? ?????????? ???? ??????? ??"
 
 msgid "File transfer already started"
-msgstr "???? ?????????? ???????? ???? ??????"
+msgstr "???? ?????????? ???????? ???? ??????"
 
 # tithi
 msgid "Could not perform key agreement for file transfer"
-msgstr "???? ???????????? ???? ??? ?????? ??????? ???? ???? ??"
+msgstr "???? ???????????? ??? ?????? ??????? ??? ????? ????"
 
 msgid "Could not start the file transfer"
-msgstr "???? ?????????? ???? ?????"
+msgstr "???? ?????????? ???? ??? ????? ????"
 
 msgid "Cannot send file"
-msgstr "???? ?????? ???? ??"
+msgstr "???? ?????? ????? ????"
 
 msgid "Error occurred"
-msgstr "?????? ?????? ?????"
+msgstr "?????? ?????"
 
 # tithi
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%1s <I>%2s</I> ?? ?????????? ???????? ?????: %3s"
+msgstr "%1$s <I>%2$s</I> ?? ?????????? ???????? ?????, ??? ??: %3$s"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> ??????? <I>%s</I> ??????? ???????? ???: %s"
+msgstr "<I>%1$s</I> ????????? <I>%2$s</I> ??? ???????? ?????: %3$s"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> ????? ??????? <I>%s</I> ??????? ?????? ?????"
+msgstr "<I>%1$s</I> ????? ????????? <I>%2$s</I> ??? ?????? ?????"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> ??? <I> %s</I> ???????? ???: %s-?"
+msgstr "<I>%2$s?</I> ??? <I>%1$s</I> ???????? ?????: %3$s"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s's</I> ?? <I>%s</I> ??????? ?????? ?????"
+msgstr "<I>%2$s?</I> ?? ??? <I>%1$s</I> ?????? ?????"
 
 # tithi
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "???? <I>%s</I> (%s) ?????? <I>%s</I> ??????????? ?????"
+msgstr "???? <I>%2$s</I> (%3$s) ?????? <I>%1$s</I> ???? ???????? ??????"
 
 # tithi
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "?????? %1s (%2s) ?????? ?????? ??? ?????"
+msgstr "%1$s (%2$s) ?????? ????????? ??? ??????"
 
 # tithi
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr "%1s (%2s) ?????? ?????? ??? ?????"
+msgstr "%1$s (%2$s) ?????? ????????? ??? ?????"
 
 msgid "Server signoff"
 msgstr "??????? ????-??"
@@ -9372,13 +9312,13 @@ msgid "Job Role"
 
 # tithi
 msgid "Job Role"
-msgstr "???? ??????"
+msgstr "????? ??????"
 
 msgid "Organization"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Unit"
-msgstr "???"
+msgstr "?????"
 
 msgid "Join Chat"
 msgstr "??????? ??? ???"
@@ -9391,57 +9331,57 @@ msgid "Channel founder on <I>%s</I> is <
 # tithi
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> ?? ??????? ??????????? ??? <I>%s</I>"
+msgstr "<I>%s</I> ????????? ??????????? ??? <I>%s</I>"
 
 msgid "Real Name"
 msgstr "??? ???"
 
 msgid "Status Text"
-msgstr "?????? ???"
+msgstr "?????? ??????"
 
 # tithi
 msgid "Public Key Fingerprint"
-msgstr "?????????? ??-?? ????????????-???"
+msgstr "?????? ?? ??????????????"
 
 # tithi
 msgid "Public Key Babbleprint"
-msgstr "?????????? ??-?? ?????????????"
+msgstr "?????? ?? ?????????????"
 
 msgid "_More..."
 msgstr "???... (_M)"
 
 # tithi
 msgid "Detach From Server"
-msgstr "??????? ???? ?????????"
+msgstr "??????? ???? ????????????"
 
 # tithi
 msgid "Cannot detach"
-msgstr "????????? ??? ???? ??"
+msgstr "????????? ??? ????? ????? ??"
 
 msgid "Cannot set topic"
-msgstr "?????????? ??? ???? ???? ??"
+msgstr "?????????? ??? ??? ?????? ??"
 
 msgid "Failed to change nickname"
 msgstr "?????? ???????? ???? ??????"
 
 msgid "Roomlist"
-msgstr "???-??????"
+msgstr "?????-??????"
 
 msgid "Cannot get room list"
-msgstr "???-?????? ?????? ?????? ??"
+msgstr "?????-?????? ?????? ?????"
 
 msgid "Network is empty"
 msgstr "?????????? ????"
 
 # tithi
 msgid "No public key was received"
-msgstr "???? ?????????? ?? ????? ??????"
+msgstr "???? ?????? ?? ????? ????? ?????"
 
 msgid "Server Information"
 msgstr "????????? ????"
 
 msgid "Cannot get server information"
-msgstr "????????? ???? ????? ???? ???? ??"
+msgstr "????????? ???? ????? ????? ?????"
 
 msgid "Server Statistics"
 msgstr "????????? ??????????"
@@ -9467,59 +9407,59 @@ msgstr ""
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"???????? ????????? ?????????? ????: %1s\n"
-"???????? ????????? ??????: %2s\n"
-"???????? ????????? ????????: %3d\n"
-"???????? ????????? ???????????: %4d\n"
-"???????? ????????? ?????????: %5d\n"
-"???????? ???????? ?????????: %6d\n"
-"???????? ?????????? ????????: %7d\n"
-"???????? ?????????? ???????????: %8d\n"
-"???????? ?????????? ???????: %9d\n"
-"??? ?????: %10d\n"
-"??? ???????: %11d\n"
-"??? ???????: %12d\n"
-"??? ??????: %13d\n"
-"??? ????????? ?????????: %14d\n"
-"??? ???????? ?????????: %15d\n"
+"???????? ????????? ????? ????: %1$s\n"
+"???????? ????????? ??????: %2$s\n"
+"???????? ????????? ?????????: %3$d\n"
+"???????? ????????? ???????: %4$d\n"
+"???????? ????????? ???????: %5$d\n"
+"???????? ???????? ???????: %6$d\n"
+"???????? ??? ?????????: %7$d\n"
+"???????? ??? ???????: %8$d\n"
+"???????? ??? ???????: %9$d\n"
+"??? ?????: %10$d\n"
+"??? ???????: %11$d\n"
+"??? ???????: %12$d\n"
+"??? ??????: %13$d\n"
+"??? ????????? ???????: %14$d\n"
+"??? ???????? ???????: %15$d\n"
 
 msgid "Network Statistics"
 msgstr "?????????? ??????????"
 
 msgid "Ping"
-msgstr "????? ????"
+msgstr "??? ????"
 
 msgid "Ping failed"
-msgstr "????? ??????"
+msgstr "??? ??????"
 
 msgid "Ping reply received from server"
-msgstr "??????? ???? ????? ?? ????? ????? ??? ??????"
+msgstr "??????? ???? ??? ?? ????? ????? ??? ??????"
 
 # tithi
 msgid "Could not kill user"
-msgstr "????????????? ????????? ??? ????? ????? ??"
+msgstr "????????????? ????????? ??? ????? ????"
 
 # tithi
 msgid "WATCH"
-msgstr "?????????? ????"
+msgstr "??????????"
 
 msgid "Cannot watch user"
-msgstr "????????????? ?????????? ???? ????? ??"
+msgstr "????????????? ?????????? ??? ????? ????? ??"
 
 # tithi
 msgid "Resuming session"
-msgstr "??????? ??????? ???? ????"
+msgstr "???? ??????? ???? ??? ?????"
 
 # tithi
 msgid "Authenticating connection"
-msgstr "????? ?????? ????"
+msgstr "????? ?????????? ????"
 
 msgid "Verifying server public key"
-msgstr "????????? ?????????? ?? ??????? ????"
+msgstr "????????? ?????? ??? ?????? ????? ??? ?????"
 
 # tithi
 msgid "Passphrase required"
-msgstr "?????-????? ????????"
+msgstr "???????? ????????"
 
 # tithi
 #, c-format
@@ -9527,14 +9467,13 @@ msgstr ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"%s ?? ?????????? ?? ????? ?????? ????? ??????? ??????? ?? ?? ?? ???? ???? ??? "
-"???? ?? ?????? ?? ?????????? ?? ?????? ???????"
+"%s ?? ?????? ?? ????? ????? ????? ??????? ??????? ?? ?? ?? ???? ???? ??? ???? "
+"?? ???? ?? ?????? ?? ?????? ???????"
 
 # tithi
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
-"%s ?? ?????????? ?? ????? ?????? ???? ?? ?????? ?? ?????????? ?? ?????? ???????"
+msgstr "%s ?? ?????? ?? ????? ????? ???? ?? ?? ?????? ?? ?????? ???????"
 
 # tithi
 #, c-format
@@ -9544,28 +9483,27 @@ msgstr ""
 "%s\n"
 "%s\n"
 msgstr ""
-"%1s ?? ?? ???? ???????????? ??? ? ????????????? ???:\n"
+"%1$s ?? ?? ???? ?????????????? ? ????????????? ???:\n"
 "\n"
-"%2s\n"
-"%3s\n"
+"%2$s\n"
+"%3$s\n"
 
 msgid "Verify Public Key"
-msgstr "?????????? ?? ????? ????"
+msgstr "?????? ?? ????????"
 
 msgid "_View..."
-msgstr "???????? ????... (_V)"
+msgstr "????????... (_V)"
 
 # tithi
 msgid "Unsupported public key type"
-msgstr "???????? ?????????? ?? ?? ???"
+msgstr "???????? ????? ?????? ??"
 
 msgid "Disconnected by server"
 msgstr "??????? ?????? ?????????"
 
 # tithi
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "SILC ???????? ??????? ??? ??????"
+msgstr "SILC ???????? ???????? ??????"
 
 # tithi
 msgid "Key Exchange failed"
@@ -9575,35 +9513,28 @@ msgstr ""
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"????????? ????????? ??????? ???? ???? ?????? ?????? ??????? ??? ???? ????? ???? ???? "
-"'??????? ?????' ??????"
+"????????? ?????? ??????? ???? ???? ??????? ??????? ??? ???? ????? ???? ???? '?????????' "
+"??????"
 
 # tithi
 msgid "Performing key exchange"
-msgstr "?? ??????? ??????? ????"
+msgstr "?? ??????? ??? ?????"
 
 # tithi
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "SILC ?? ???? ??? ???? ??????"
+msgstr "SILC ?? ???? ??? ??? ????? ????"
 
 # tithi
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "SILC ???????? ????? ????"
+msgstr "SILC ???????? ????? ??? ?????"
 
-# tithi
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "SILC ?? ???? ??? ???? ??????"
-
 msgid "Out of memory"
-msgstr "??????? ?????"
+msgstr "????? ????????"
 
 # tithi
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "SILC ??????? ???? ???? ???? ??"
+msgstr "SILC ???????? ???? ???? ??????"
 
 # tithi
 msgid "Error loading SILC key pair"
@@ -9611,17 +9542,17 @@ msgid "Download %s: %s"
 
 #, c-format
 msgid "Download %s: %s"
-msgstr "%1s ??????? ????: %2s"
+msgstr "%1$s ??????? ????: %2$s"
 
 msgid "Your Current Mood"
-msgstr "????? ??????? ??????"
+msgstr "????? ??????? ???????"
 
 #, c-format
 msgid "Normal"
 msgstr "?????????"
 
 msgid "In love"
-msgstr "?????????"
+msgstr "???????"
 
 # tithi
 msgid ""
@@ -9629,16 +9560,16 @@ msgstr ""
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"?????? ??????? ??????? ?????? ????"
+"?????? ??????? ??????? ??????"
 
 msgid "SMS"
-msgstr "??????"
+msgstr "SMS"
 
 msgid "MMS"
-msgstr "??????"
+msgstr "MMS"
 
 msgid "Video conferencing"
-msgstr "????? ??????? ????"
+msgstr "????? ???????"
 
 msgid "Your Current Status"
 msgstr "????? ??????? ??????"
@@ -9648,17 +9579,17 @@ msgid "Let others see what services you 
 
 # tithi
 msgid "Let others see what services you are using"
-msgstr "???? ?? ???????? ??????? ????? ?? ??????? ????? ???"
+msgstr "???? ?? ?? ???? ??????? ????? ?? ??????? ????? ???"
 
 # tithi
 msgid "Let others see what computer you are using"
 msgstr "???? ?? ????????? ??????? ????? ?? ??????? ????? ???"
 
 msgid "Your VCard File"
-msgstr "????? ??-????? ????"
+msgstr "????? VCard ????"
 
 msgid "Timezone (UTC)"
-msgstr "????-????? (??????)"
+msgstr "????-????? (UTC)"
 
 # tithi
 msgid "User Online Status Attributes"
@@ -9675,50 +9606,50 @@ msgid "Message of the Day"
 "?? ???? ?????"
 
 msgid "Message of the Day"
-msgstr "????? ??????"
+msgstr "????? ??????"
 
 msgid "No Message of the Day available"
-msgstr "????? ????? ???? ?????? ??????? ??"
+msgstr "????? ???? ????? ?????? ???"
 
 # tithi
 msgid "There is no Message of the Day associated with this connection"
-msgstr "?? ??????? ???? ????????? ????? ????? ???? ?????? ???"
+msgstr "?? ??????? ???? ????????? ???? ????? ?????? ???"
 
 # tithi
 msgid "Create New SILC Key Pair"
 msgstr "???? SILC ?? ???? ???? ????"
 
 msgid "Passphrases do not match"
-msgstr "?????-????? ???? ??"
+msgstr "???????? ????? ??"
 
 msgid "Key Pair Generation failed"
-msgstr "?? ????? ???? ???? ?????? ?????"
+msgstr "?? ???? ???? ???? ??????"
 
 msgid "Key length"
 msgstr "??-?? ???????"
 
 msgid "Public key file"
-msgstr "?????????? ?? ????"
+msgstr "?????? ?? ????"
 
 msgid "Private key file"
-msgstr "???????? ?? ????"
+msgstr "???????? ?? ????"
 
 msgid "Passphrase (retype)"
-msgstr "?????-????? (??????? ???? ????)"
+msgstr "???????? (??????? ???? ????)"
 
 # tithi
 msgid "Generate Key Pair"
-msgstr "?? ???? ???? ????"
+msgstr "?? ???? ????"
 
 msgid "Online Status"
 msgstr "?????? ??????"
 
 msgid "View Message of the Day"
-msgstr "????? ???????? ???????? ????"
+msgstr "????? ?????? ????????"
 
 # tithi
 msgid "Create SILC Key Pair..."
-msgstr "SILC ?? ???? ???? ????..."
+msgstr "SILC ?? ???? ????..."
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -9736,7 +9667,7 @@ msgid "channel modes for %s: %s"
 
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "%1s-?? ??????? ???: %2s"
+msgstr "%1$s-?? ??????? ???: %2$s"
 
 # tithi
 #, c-format
@@ -9745,150 +9676,141 @@ msgid "Failed to set cmodes for %s"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "%s-?? ???? ??-??? ???????? ???? ??????"
+msgstr "%s-?? ???? cmodes ???????? ???? ??????"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "????? ???????: %s, (?????? ??? ???? ?????????? ??????)"
+msgstr "????? ??????: %s, (?????? ??? ?????????? ??????)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "??? [???????]:  ????? ????? ????"
+msgstr "part [channel]:  ????? ????? ????"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "????? ???? [???????]:  ????? ????? ????"
+msgstr "leave [channel]:  ????? ????? ????"
 
 # tithi
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "????????? [&1lt;???? ????????? &2gt;]: ????????? ????? ?? ???????? ????"
+msgstr "topic [&lt;new topic&gt;]: ???? ????? ?? ???????? ????"
 
 # tithi
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"????? ??? &1lt;???????&2gt; [&3lt;???????????&4gt;]:  ?? ???????????? ???? ??????? ??? "
-"???"
+"join &lt;channel&gt; [&lt;password&gt;]:  ?? ???????????? ???? ??????? ??? ???"
 
 msgid "list:  List channels on this network"
-msgstr "??????:  ?? ???????????? ????????????? ?????? ???? ????"
+msgstr "list:  ?? ???????????? ????????? ?????? ???? ???"
 
 # fix -me tithi
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "?? &1lt;??????&2gt;:  ???????? ???? ?????"
+msgstr "whois &lt;nick&gt;: ?? ????? ???????? ???? ?????"
 
 # tithi
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"?????? &1lt;??????&2gt; &3lt;??????&4gt;:  ????????????? ???? ????????? ?????? "
-"?????"
+"msg &lt;nick&gt; &lt;message&gt;:  ????????????? ???? ????????? ?????? ?????"
 
 # tithi
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"???????? &1lt;??????&2gt; [&3lt;??????&4gt;]:  ????????????? ???? ????????? ?????? "
-"?????"
+"query &lt;nick&gt; [&lt;message&gt;]:  ????????????? ???? ????????? ?????? ?????"
 
 # tithi
 msgid "motd:  View the server's Message Of The Day"
-msgstr "????? ???? ??????:  ????????? '????? ???? ??????' ?????"
+msgstr "motd:  ????????? ????? ?????? ?????"
 
 # tithi
 msgid "detach:  Detach this session"
-msgstr "?????????:  ??????????? ????????? ????"
+msgstr "detach:  ???????? ????????? ???"
 
 # tithi
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "????? ???? [??????]:  ???? ?????? ??????? ??, ??????? ??? ????????? ????"
+msgstr "quit [message]:  ???? ?????? ?????? ??, ??????? ???? ????????? ???"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "?? ???? &1lt;???????&2gt;:  ?????? silc ???????????? ??????? ?? ????"
+msgstr "call &lt;command&gt;:  ?????? silc ???????????? ?????? ?? ????"
 
 # tithi
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"???? ????? &1lt;??????&2gt; [-??????????-??|&3lt;????&4gt;]:  ?????? ???? ?????"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  ?? ??? ????????? ????"
 
 # ??????
 # tithi
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "?????? &1lt;???? ??????&2gt;:  ????? ?????? ???????? ????"
+msgstr "nick &lt;newnick&gt;:  ????? ?????? ???????? ????"
 
 # tithi
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "?? ??? &1lt;??????&2gt;:  ???????? ???? ?????"
+msgstr "whowas &lt;nick&gt;:  ?? ????? ???????? ???? ?????"
 
 # tithi
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"??-??? &1lt;???????&2gt; [+|-&3lt;???????&4gt;] [??????]:  ????????? ??????? "
-"???????? ???? ?? ???????? ????"
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  ????????? ??? ???????? "
+"???? ?? ???????? ????"
 
 # tithi
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"??-??-??? &1lt;???????&2gt; +|-&3lt;???????&4gt; &5lt;??????&6gt;:  ???????? "
-"???????? ??????? ???????? ????"
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  ???????? ?? ????? "
+"???????? ??? ???????? ????"
 
 # tithi
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"??-??? &1lt;????????????-???????&2gt;:  ??????????? ????? ??????? ???????? ????"
+msgstr "umode &lt;usermodes&gt;:  ??????????? ????? ??? ???????? ????"
 
 # tithi
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-"??????? &1lt;??????&2gt; [-??????????-??]:  ??????? ????????? ????????????? ????? "
-"????"
+msgstr "oper &lt;nick&gt; [-pubkey]:  ??????? ????????? ????????????? ????? ????"
 
 # tithi
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"???????? &1lt;???????&2gt; [-|+]&3lt;??????&4gt;:  ??????? ???????? ????? ?? "
-"????????? ???????? ?????? ???? ??? ????/???? ?????"
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  ?? ???????? ????????? ???????? ????? "
+"?? ????????? ???????? ?????? ???? ??? ????/???? ?????"
 
 # tithi
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"?????? ???? &1lt;???????&2gt; &3lt;??????&4gt; [???????]:  ??????? ???? ???????? "
-"?????? ????"
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  ??????? ???? ??????????? ???????? "
+"????"
 
 # tithi
 msgid "info [server]:  View server administrative details"
-msgstr "???? [???????]: ????????? ????????? ????? ?????"
+msgstr "info [server]: ????????? ????????? ????? ?????"
 
 # tithi
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
-"??????? [&1lt;???????&2gt; +|-&3lt;??????&4gt;]:  ??????? ??? ???????? ??????? ????"
+"ban [&lt;channel&gt; +|-&lt;nick&gt;]:  ??????? ???? ??????????? ??????? ????"
 
 # tithi
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"??-????? ???? &1lt;?????? ???????&2gt;:  ?????? ?? ????????? ?????????? ?? ?????????? "
-"????"
+msgstr "getkey &lt;nick|server&gt;:  ????????? ?? ????????? ?????? ?? ?????? ????"
 
 # tithi
 msgid "stats:  View server and network statistics"
-msgstr "??????????: ??????? ??? ???????????? ?????????? ?????"
+msgstr "stats: ??????? ??? ???????????? ?????????? ?????"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "?????:  ??????? ???????? ???? ????? ?????"
+msgstr "ping:  ??????? ???????? ???? ??? ?????"
 
 # tithi
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "????????????? &1lt;???????&2gt;:  ??????? ???????????? ?????? ????"
+msgstr "users &lt;channel&gt;:  ??????? ?????????????? ?????? ????"
 
 # tithi
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"??????? [-????|-???|-???-???|-????????|-?????????] &1lt;???????(????)&2gt;:  ???????"
-"(????) ?? ???????? ?????????????? ?????? ????"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  ???????"
+"(????) ???? ????????? ?????????????? ?????? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -9900,21 +9822,21 @@ msgid "SILC Protocol Plugin"
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC ??????? ???????"
+msgstr "SILC ???????? ???????"
 
 # tithi
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "?????????? ?????? ???????? ???? ?????? (SILC) ???????"
+msgstr "Secure Internet Live Conferencing (SILC) ????????"
 
 msgid "Network"
 msgstr "??????????"
 
 msgid "Public Key file"
-msgstr "?????????? ?? ????"
+msgstr "?????? ?? ????"
 
 msgid "Private Key file"
-msgstr "????????? ?? ????"
+msgstr "???????? ?? ????"
 
 msgid "Cipher"
 msgstr "??????"
@@ -9924,36 +9846,35 @@ msgid "Use Perfect Forward Secrecy"
 
 # tithi
 msgid "Use Perfect Forward Secrecy"
-msgstr "?????? ???????? ????????? ??????? ????"
+msgstr "Perfect Forward Secrecy ???????"
 
 # tithi
 msgid "Public key authentication"
-msgstr "?????????? ?? ??????????"
+msgstr "?????? ?? ??????????"
 
 # tithi
 msgid "Block IMs without Key Exchange"
-msgstr "?? ??????? ?????? IM ?????? ???? ????"
+msgstr "?? ??????? ?????? IM ?????? ???? ??? ???"
 
 # Fixme
 # block = ????? - tithi
 msgid "Block messages to whiteboard"
-msgstr "???????????? ?????????? ???? ????"
+msgstr "????????????? ?????????? ???? ??? ???"
 
 # tithi
 msgid "Automatically open whiteboard"
-msgstr "???????????????? ??????????? ?????"
+msgstr "???????????????? ??????????? ???? ???"
 
 # tithi
 msgid "Digitally sign and verify all messages"
-msgstr "??? ?????? ??????? ???????? ???? ??? ????? ????"
+msgstr "?? ?????? ??????? ?????????? ??? ??? ?????? ????? ??? ???"
 
 # tithi
 msgid "Creating SILC key pair..."
-msgstr "SILC ?? ???? ???? ????..."
+msgstr "SILC ?? ???? ???? ??? ?????..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "SILC ?? ???? ???? ???? ???? ??\n"
+msgstr "SILC ?? ???? ???? ??? ????? ????"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9968,7 +9889,7 @@ msgid "Email: \t\t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "?-????: \t\t%s\n"
+msgstr "?????: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -9984,7 +9905,7 @@ msgid "Algorithm: \t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "????????: \t%s\n"
+msgstr "?????????: \t%s\n"
 
 # tithi
 #, c-format
@@ -10002,7 +9923,7 @@ msgstr ""
 "%s\n"
 "\n"
 msgstr ""
-"?????????? ?? ?? ???????????? ???:\n"
+"?????? ?? ??????????????:\n"
 "%s\n"
 "\n"
 
@@ -10012,23 +9933,23 @@ msgstr ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"?????????? ?? ?? ??????-???????:\n"
+"?????? ?? ?? ?????????????:\n"
 "%s"
 
 msgid "Public Key Information"
-msgstr "?????????? ?? ?? ????"
+msgstr "?????? ?? ?? ????"
 
 msgid "Paging"
 msgstr "?????"
 
 msgid "Video Conferencing"
-msgstr "????? ?????? ??? ????"
+msgstr "????? ???????"
 
 msgid "Computer"
 msgstr "?????????"
 
 msgid "PDA"
-msgstr "?????"
+msgstr "PDA"
 
 msgid "Terminal"
 msgstr "?????????"
@@ -10044,95 +9965,93 @@ msgstr ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-"%2s ????????? ???????????? %1s ?????? ??????????? ???? ?? ????????????? ????? ???????"
+"%2$s ????????? ???????????? %1$s ?????? ??????????? ???? ?? ????????????? ????? "
+"???????"
 
 msgid "Whiteboard"
-msgstr "???????-?????"
+msgstr "????????????"
 
 msgid "No server statistics available"
-msgstr "???? ??????? ?????????? ??????? ??"
+msgstr "???? ??????? ?????????? ???"
 
 # tithi
 msgid "Error during connecting to SILC Server"
-msgstr "SILC ???????? ??????? ??? ??????"
+msgstr "SILC ???????? ?????????? ??????"
 
 # tithi
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "????????: ??????? ????, ????? ?????????? ??????? ????"
+msgstr "??????: ???????? ????, ????? ?????????? ???????? ????"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "????????: ????? ????? ??????????? ?? ???????/?????? ??? ??"
+msgstr "??????: ????? ????? ?????? ?? ???????/?????? ??? ??"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "??????: ????? ?????????? ??? ????? ?????? ??? ??"
+msgstr "??????: ????? ?????????? KE ????? ?????? ??? ??"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "??????: ????? ?????????? ?????? ?????? ??? ??"
+msgstr "??????: ????? ?????????? ?????? ?????? ??? ??"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "??????: ????? ?????????? ???????? ?????? ??? ??"
+msgstr "??????: ????? ?????????? PKCS ?????? ??? ??"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "??????: ????? ?????????? ????? ????? ?????? ??? ??"
+msgstr "??????: ????? ?????????? ????? ????? ?????? ??? ??"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "??????: ????? ?????????? ???????? ?????? ??? ??"
+msgstr "??????: ????? ?????????? HMAC ?????? ??? ??"
 
 # tithi
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "????????: ??? ????????"
+msgstr "??????: ??? ????????"
 
 # tithi
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "????????: ???? ????"
+msgstr "??????: ???????? ????"
 
 # tithi
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "????????: ?????????? ?????? ??????"
+msgstr "??????: ?????????? ?????? ??????"
 
 # tithi
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "SILC ?????????? ????? ???????????? ???????? ???? ???? ??"
+msgstr "SILC ?????????? ????? ????? ??? ????? ????? ??"
 
 # fix me tithi
 msgid "John Noname"
-msgstr "?? ?????"
+msgstr "???? ??????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "SILC ?? ???? ??? ???? ??????: %s"
+msgstr "SILC ?? ???? ??? ??? ????? ????: %s"
 
 msgid "Unable to create connection"
-msgstr "????? ???? ???? ?????? ?????"
+msgstr "????? ???? ???? ??????"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "????? ??????? ??????"
+msgstr "????? ??????? ?????"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "???? ???? ???? ?????"
+msgstr "????? ???? ???? ???? ??????"
 
 # tihi
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP ?? ???????????-??????? ?????-????? ?? @ ????? ???? ???? ???? ??"
+msgstr "SIP ?? ??????????? ????????? ??????????? ???? @ ????? ????? ????? ??"
 
 msgid "SIP connect server not specified"
 msgstr "SIP ????? ??????? ??????????? ??"
@@ -10147,43 +10066,43 @@ msgid "SIP/SIMPLE Protocol Plugin"
 #. *< name
 #. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/?????? ??????? ???????"
+msgstr "SIP/SIMPLE ???????? ???????"
 
 # tithi
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/?????? ??????? ???????"
+msgstr "SIP/SIMPLE ???????? ???????"
 
 # tithi
 msgid "Publish status (note: everyone may watch you)"
-msgstr "?????? ?????? (???: ?????? ???? ?????????? ???? ????)"
+msgstr "?????? ?????? (???: ?????? ?? ??? ?????????? ???? ????)"
 
 msgid "Use UDP"
-msgstr "UDP ??????? ????"
+msgstr "UDP ??????? ??? ???"
 
 msgid "Use proxy"
-msgstr "??????? ??????? ????"
+msgstr "??????? ??????? ??? ???"
 
 msgid "Proxy"
 msgstr "???????"
 
 msgid "Auth User"
-msgstr "??????? ???????????"
+msgstr "???????? ??????????? "
 
 msgid "Auth Domain"
-msgstr "??????? ??????"
+msgstr "???????? ??????"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "??? ??? &1lt;???&2gt;:  ?????? ???????????? ???? ?????? ???? ??? ???"
+msgstr "join &lt;room&gt;:  ?????? ???????????? ???? ?????? ???? ??? ???"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "??????: ?????? ??????????? ????? ?????? ????"
+msgstr "list: ?????? ??????????? ????? ?????? ???"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr "????????: ????????????? ???? ???????? ??????? ???? ???? ?????? ????"
+msgstr "doodle: ????????????? ???? Doodle ???? ???? ???? ?????? ????"
 
 msgid "Yahoo ID..."
-msgstr "?????? ????..."
+msgstr "?????? ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10195,15 +10114,14 @@ msgstr "?????? ????.
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "?????? ??????? ???????"
+msgstr "??????! ???????? ???????"
 
 msgid "Pager server"
-msgstr "????? ???????"
+msgstr "?????? ???????"
 
 msgid "Pager port"
-msgstr "????? ?????"
+msgstr "?????? ?????"
 
 msgid "File transfer server"
 msgstr "???? ?????????? ???????"
@@ -10212,14 +10130,14 @@ msgid "Chat room locale"
 msgstr "???? ?????????? ?????"
 
 msgid "Chat room locale"
-msgstr "????? ????? ??????"
+msgstr "?????? ????? ???????"
 
 # tithi
 msgid "Ignore conference and chatroom invitations"
-msgstr "?????? ??? ??? ??????-????? ???????? ???????? ????"
+msgstr "??????? ??? ?????? ????? ???????? ???????? ??? ???"
 
 msgid "Chat room list URL"
-msgstr "?????? ??? ??????? ??????"
+msgstr "?????? ????? ??????? URL"
 
 msgid "Yahoo Chat server"
 msgstr "?????? ????? ???????"
@@ -10227,9 +10145,8 @@ msgstr "?????? ?????msgid "Yahoo Chat port"
 msgstr "?????? ?????? ?????"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "?????? ????..."
+msgstr "?????? ????? ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10241,12 +10158,11 @@ msgstr "?????? ????.
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "?????? ??????? ???????"
+msgstr "??????! ????? ???????? ???????"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "????? SMS ?????? ??? ?????"
 
 # tithi
 msgid "Your Yahoo! message did not get sent."
@@ -10262,42 +10178,40 @@ msgstr ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (?????????) ?????????? ?????? ???? ????? ???????? ????? ??? ???? ????? "
-"?????? ????? ?????: %s?"
+"%s (?????????) ?? ????? ????? ???????? ????? ??? ???? ?????? ???????????? ?????: "
+"%s?"
 
 # tithi
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s (?????????) ????? ???????? ????? ??? ???? ????? ?????? ????? ??????"
+msgstr "%s (?????????) ????? ???????? ????? ??? ???? ?????? ???????????? ??????"
 
 msgid "Add buddy rejected"
-msgstr "????? ??? ???????????? ?????"
+msgstr "????? ??? ???????????? ??? ?????"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "????????? ???? ??????? ???????? ???? ?????? ????? ??????"
+msgstr "???????? ???? ????? ??????"
 
 # tithi
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "????? ?????? ??????? %d? ??????! ????? ????? ???? ???? ??? ??? ??? ??? ?????"
+msgstr ""
+"??????? ?????: ?????????? ???? ???? ?????? ??????? ??????! ?? ???? ???? ???? ??? ??? "
+"????"
 
 # tithi
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "????? ?????? ??????? %d? ??????! ????? ????? ???? ???? ??? ??? ??? ??? ?????"
+msgstr "??????? ?????: ????? ????? ??????! ?? ???? ???? ???? ??? ??? ????"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "??? ???????????? ??? ?? ??????????"
+msgstr "???????????? ??? ???? ????????? ?????????"
 
 # tithi
 #, c-format
@@ -10306,12 +10220,12 @@ msgstr ""
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"?????? ??????? ???? ?????????? ?????????? ??????????? ??????? ?????? ??????  ???? ?????? "
-"???????? ??????? ????? ??? ?????? ???  ?????????????? ???? %s ??????? ?????"
+"?????? ??????? ???? ????? ?????????? ??????????? ??????? ?????? ?????? ???? ?????? "
+"???????? ??????? ???? ???? ?????? ??? ?????????? ???? %s ??????"
 
 # tithi
 msgid "Failed Yahoo! Authentication"
-msgstr "??????! ?????????? ?????? ?????"
+msgstr "??????! ?????????? ??????"
 
 #, c-format
 msgid ""
@@ -10322,47 +10236,41 @@ msgid "Ignore buddy?"
 "\"?????\" ????? ???? ????? ????? ??????? ??? ??? ???????? ??? ????"
 
 msgid "Ignore buddy?"
-msgstr "????? ?? ???????? ??????"
+msgstr "??????? ???????? ??????"
 
 # tithi
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "????? ??????? ????, ??????? ??? ??????! ?????????? ???? ?????"
+msgstr "????? ????????? ?????, ??????? ??? ??????! ?????????? ???? ?????"
 
 # tithi
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "????? ?????? ??????? %d? ??????! ????? ????? ???? ???? ??? ??? ??? ??? ?????"
+msgstr "????? ?????? ?????? %d? ??????! ????? ????? ???? ???? ??? ??? ??? ??? ?????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "%3s ????????? ??????? ???????? %2s ?????? %1s ??????? ??? ???? ???????"
+msgstr "%3$s ????????? ??????? ???????? %2$s  ??? %1$s ?? ??? ??? ????? ?????"
 
 # tithi
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "??????? ??????? ????? ??? ???? ???????"
+msgstr "??????? ??????? ????? ??? ??? ????? ????"
 
 # tithi
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ ?????????? %1s/%2s/%3s.swf ] %4s"
+msgstr "[ ?????????? %1$s/%2$s/%3$s.swf ] %4$s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "??????? ???? ??????????? ????????? ????? ???????"
+msgstr "??????? ???? ??????????? HTTP ????? ????? ????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"%1s ?? ???? ????? ????????:\n"
-"%2s"
+msgstr "%1$s ?? ???? ????? ?????????: %2$s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"????????? ???? ????? ?????? ???? ???? ??:\n"
-"%s"
+msgstr "%1$s ?? ???? ????? ??????? ??????: %2$s"
 
 msgid "Not at Home"
 msgstr "?????? ???"
@@ -10378,53 +10286,53 @@ msgid "Stepped Out"
 
 # fix me tithi
 msgid "Stepped Out"
-msgstr "??? ????"
+msgstr "??? ??? ??????"
 
 msgid "Not on server list"
 msgstr "??????? ???????? ???"
 
 # tithi
 msgid "Appear Online"
-msgstr "??????? ????"
+msgstr "??????? ?????"
 
 # tithi
 msgid "Appear Permanently Offline"
-msgstr "??????????? ??????? ????"
+msgstr "??????????? ??????? ?????"
 
 msgid "Presence"
 msgstr "????????"
 
 msgid "Appear Offline"
-msgstr "??????? ???????"
+msgstr "??????? ?????"
 
 # tithi
 msgid "Don't Appear Permanently Offline"
-msgstr "??????? ??????????? ????? ??"
+msgstr "??????????? ??????? ?????? ??? ??"
 
 msgid "Join in Chat"
 msgstr "??????? ??? ???"
 
 msgid "Initiate Conference"
-msgstr "?????? ??? ???? ????"
+msgstr "??????? ???? ????"
 
 msgid "Presence Settings"
-msgstr "????????? ????????????"
+msgstr "???????? ?????"
 
 # tithi
 msgid "Start Doodling"
-msgstr "???????? ??? ???? ????"
+msgstr "Doodle ??? ???? ????"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "???? ?? ID ?? ?????? ???? ??? ?? ???????? ????"
 
 msgid "Join whom in chat?"
 msgstr "??? ???? ??????? ??? ???? ????"
 
 msgid "Activate ID..."
-msgstr "???? ??????? ????..."
+msgstr "ID ??????????..."
 
 msgid "Join User in Chat..."
-msgstr "????????????? ??????? ??? ????..."
+msgstr "????????????? ??????? ???..."
 
 msgid "Open Inbox"
 msgstr "?????? ?????"
@@ -10439,14 +10347,14 @@ msgid "Unable to establish file descript
 msgstr "??????? ???? ???????"
 
 msgid "Unable to establish file descriptor."
-msgstr "???? ?????????? ?????? ???? ??????"
+msgstr "???? ?????????? ?????? ???? ???????"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s ?????? %d ?????? ???? ????? ??????? ?????? ?????\n"
+msgstr "%s ?????? %d ?? ???? ?????? ??????? ?????? ?????\n"
 
 msgid "Write Error"
-msgstr "???? ??????"
+msgstr "????? ??????"
 
 msgid "Yahoo! Japan Profile"
 msgstr "??????! ????? ????????"
@@ -10458,142 +10366,134 @@ msgid ""
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr ""
-"??????, ???????????? ????????????? ?????? ???????? ?????? ??????? ????? ????? ??? "
-"??? ??????? ???"
+msgstr "??????, ????????????? ?????? ???????? ???????????? ???? ??????? ???"
 
 # tithi
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"???? ??? ?? ??????????? ????? ???, ?????? ????? ????? ?????????? ?? ?????? "
-"???????? ???? ???:"
+"???? ??? ?? ?????????? ????? ???, ?????? ????? ?????????? ?? ?????? ???????? "
+"???? ???:"
 
 msgid "Yahoo! ID"
-msgstr "??????! ????"
+msgstr "??????! ID"
 
 msgid "Hobbies"
 msgstr "??"
 
 msgid "Latest News"
-msgstr "?????????? ???"
+msgstr "??????? ???"
 
 msgid "Home Page"
-msgstr "??? ???"
+msgstr "???????"
 
 msgid "Cool Link 1"
-msgstr "??? ???? ?"
+msgstr "????? ???? ?"
 
 msgid "Cool Link 2"
-msgstr "??? ???? ?"
+msgstr "????? ???? ?"
 
 msgid "Cool Link 3"
-msgstr "??? ???? ?"
+msgstr "????? ???? ?"
 
 msgid "Last Update"
-msgstr "??????? ????????"
+msgstr "??????? ????????"
 
 # tithi
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "?? ??????????? ??? ???? ????? ?? ???????? ?? ??? ??????? ???"
+msgstr "?? ?????????? ??? ???? ????? ?? ???????? ?? ???? ??????? ???"
 
 # tithi
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"???????????? ????????? ?????? ???? ?????? ??? ??????? ???? ???????? ???????-????????? "
-"??????? ??????? ??? ????????? ???? ?????? ?????"
+"???????????? ???????? ?????? ??? ????? ????? ??? ??????? ???? ???????? ???????-"
+"????????? ??????? ??????? ??? ????????? ???? ?????? ?????"
 
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
-"???????????? ????????? ?????? ???? ??????? ???? ???? ??? ?? ??????????? ???????? "
-"???; ??? ???, ????????! ????? ???????????? ????????? ????? ???? ?????? ???? ???? ??? "
-"????? ?? ??????????? ????????, ??????? ??? ????????? ???? ?????? ?????"
+"???????????? ???????? ?????? ??? ????? ????? ???? ???? ??? ???? ?? ??????????? "
+"???????? ???;  ???, ????????! ????????? ???????????? ???????? ????? ???? ?????? ???? "
+"???? ??? ????? ?? ?? ??????????? ????, ??????? ??? ????????? ???? ?????? ?????"
 
 msgid "The user's profile is empty."
 msgstr "???????????? ???????? ??????"
 
-# tithi
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"\"%3s\" ?? ????? %1s \"%2s\" ???? ????? ?????? ???? ???????? ???????? ???????"
+msgid "%s has declined to join."
+msgstr "%s ??? ???? ?????????"
 
-msgid "Invitation Rejected"
-msgstr "???????? ???????????? ??? ??????"
-
 msgid "Failed to join chat"
 msgstr "??????? ??? ???? ??????"
 
 #. -6
 msgid "Unknown room"
-msgstr "????? ???"
+msgstr "????? ???"
 
 #. -15
 msgid "Maybe the room is full"
-msgstr "?????? ????? ?????"
+msgstr "?????? ????? ?????"
 
 #. -35
 msgid "Not available"
-msgstr "???????? ???"
+msgstr "?????????"
 
 # tithi
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"????? ??????? ???? ?????-???? ??????? ???????? ?????? ?????? ?????? ?? ??? ???? ??? "
-"??? ???? ????? ??????? ???? ????"
+"????? ??????? ???? ?????? ???? ??????? ??? ???? ??? ?????? ?????? ?? ??? ??? ???? "
+"????? ??????? ???? ????"
 
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "???? ??? %s-? ????? ????????"
 
 msgid "Failed to join buddy in chat"
-msgstr "??????? ??????? ???????? ????? ?????? ?????"
+msgstr "??????? ??????? ???????? ????? ??????"
 
 msgid "Maybe they're not in a chat?"
 msgstr "?????? ???? ??????? ????"
 
 msgid "Fetching the room list failed."
-msgstr "????? ?????? ?????? ?????? ??????"
+msgstr "????? ?????? ????? ???? ???????"
 
 msgid "Voices"
-msgstr "????????????"
+msgstr "????"
 
 msgid "Webcams"
-msgstr "??????????????"
+msgstr "??????????"
 
 msgid "Connection problem"
-msgstr "????? ??????"
+msgstr "?????? ??????"
 
 msgid "Unable to fetch room list."
-msgstr "????? ?????? ?????? ??????"
+msgstr "????? ?????? ????? ???? ???????"
 
 msgid "User Rooms"
-msgstr "???????????? ???"
+msgstr "???????????? ???"
 
 # tithi
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "YCHT ????????? ???? ?????? ???????"
+msgstr "YCHT ????????? ???? ?????? ??????"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(?? ???????? ????????? ???? ?????? ????                      ??????? ???????? "
-"'?????????' ????? ??????? ????)"
+"(?? ???????? ????????? ?????? ??????             ??????????? ???????? '???????' ?????? "
+"?????)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "%1s,%2s,%3s ??????? ?????? ????? ???"
+msgstr "%1$s,%2$s,%3$s ??????? ?????? ???????"
 
 msgid "Hidden or not logged-in"
 msgstr "?????? ?? ???? ???????? ???"
@@ -10601,7 +10501,7 @@ msgid "<br>At %s since %s"
 # tithi
 #, c-format
 msgid "<br>At %s since %s"
-msgstr "<br>%s ??? %s ?"
+msgstr "<br>%1$s ?? %2$s ????"
 
 msgid "Anyone"
 msgstr "?? ???"
@@ -10611,81 +10511,81 @@ msgid "_Instance:"
 
 # tithi
 msgid "_Instance:"
-msgstr "????: (_I)"
+msgstr "??????????? (_I):"
 
 msgid "_Recipient:"
-msgstr "??????: (_R)"
+msgstr "?????? (_R):"
 
 # tithi
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "%1s,%2s,%3s ?? ?????? ???? ?????? ?????? ??????"
+msgstr "%1$s,%2$s,%3$s ? ??????????? ???? ?????? ?????? ??????"
 
 # tithi
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "z-??????? ???? &1lt;??????&2gt;: ??????????? ??????? ????"
+msgstr "zlocate &lt;nick&gt;: ???????????? ??????? ???????? ????"
 
 # tithi
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;??????&gt;: ??????????? ??????? ????"
+msgstr "zl &lt;nick&gt;: ???????????? ??????? ???????? ????"
 
 # tithi
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "????????? &1lt;?????????&2gt;: ?? ???????? ????????? ???? ????????? ???????? ????"
+msgstr "instance &lt;instance&gt;: ?? ?????? ????????? ???? ??????????? ???????? ????"
 
 # tithi
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "????????? &1lt;?????????&2gt;: ?? ???????? ????????? ???? ????????? ???????? ????"
+msgstr "inst &lt;instance&gt;: ?? ?????? ????????? ???? ??????????? ???????? ????"
 
 # tithi
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "????????? &1lt;?????????&2gt;: ?? ???????? ????????? ???? ????????? ???????? ????"
+msgstr "topic &lt;instance&gt;: ?? ?????? ????????? ???? ??????????? ???????? ????"
 
 # tithi
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"???? &1lt;??????&2gt; &3lt;?????????&4gt; &5lt;??????&6gt;: ???? ???? ??????? "
-"???????? ????"
+"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: ???? ???? ??????? ???????? "
+"????"
 
 # tithi
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &1lt;?????????&2gt;; ???? ?????? ????? &3It;??????,<i>?????????</i>,*&4gt;"
+msgstr ""
+"zi &lt;instance&gt;:  &lt;message,<i>instance</i>,*&gt; ? ???? ?????? ?????"
 
-# fix-me tithi
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &1lt;??????&2gt; &3lt;?????????&4gt;: ???? ?????? ????? &5lt;<i>??????</i>,"
-"<i>?????????</i>,*&6gt;"
+"zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</i>,*&gt; ? "
+"???? ?????? ?????"
 
 # fix-me tithi
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir &1lt;??????&2gt; &3lt;?????????&4gt; &5lt;??????&6gt;: ???? ?????? ????? &7lt;"
-"<i>??????</i>,<i>?????????</i>,<i>??????</i>&8gt;"
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: &lt;<i>class</i>,"
+"<i>instance</i>,<i>recipient</i>&gt; ? ???? ?????? ?????"
 
 # fix-me tithi
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir &1lt;?????????&2gt; &3lt;??????&4gt;: ???? ?????? ????? &5lt;??????,<i>?????????</"
-"i>,<i>??????</i>&6gt;"
+"zir &lt;instance&gt; &lt;recipient&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt; ? ???? ?????? ?????"
 
 # fix-me tithi
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &1lt;??????&2gt;: ???? ?????? ????? &3lt;<i>??????</i>,?????????,*&4gt;"
+msgstr "zc &lt;class&gt;:  &lt;<i>class</i>,PERSONAL,*&gt; ? ???? ?????? ?????"
 
 msgid "Resubscribe"
 msgstr "??????? ?????? ???"
 
 # fix me tithi
 msgid "Retrieve subscriptions from server"
-msgstr "??????? ???? ????????? ?????? ????"
+msgstr "??????? ???? ???????????? ??? ??? ????"
 
 # fix me tithi
 #. *< type
@@ -10699,52 +10599,52 @@ msgid "Zephyr Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr ??????? ???????"
+msgstr "Zephyr ???????? ???????"
 
 msgid "Use tzc"
-msgstr "tzc ??????? ????"
+msgstr "tzc ???????"
 
 msgid "tzc command"
-msgstr "tzc ???????"
+msgstr "tzc ??????"
 
 # tithi
 msgid "Export to .anyone"
-msgstr ".?????? ???? ??????? ????"
+msgstr ".anyone ? ?????????"
 
 msgid "Export to .zephyr.subs"
-msgstr ".zephyr.subs ? ??????? ????"
+msgstr ".zephyr.subs ? ?????????"
 
 # tithi
 msgid "Import from .anyone"
-msgstr ".?????? ??? ???? ?????? ????"
+msgstr ".anyone ???? ??????? ??? ???"
 
 # fix me tithi
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs ???? ?????? ????"
+msgstr ".zephyr.subs ???? ??????? ??? ???"
 
 msgid "Realm"
 msgstr "?????"
 
 # tithi
 msgid "Exposure"
-msgstr "?????????"
+msgstr "??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "HTTP ??????? ???? ???? ????? ???? ?????: %s\n"
+msgstr "HTTP ??????? ???? ????? ????? ???? ??????: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "????????? ??????? ??????? %d ??????"
+msgstr "HTTP ??????? ?????? ?????? %d"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "?????? ?????: HTTP ??????? ??????? %d ????? ????????? ???? ?????"
+msgstr "?????? ?????????: HTTP ??????? ??????? %d ?????? ????? ???? ???? ?????"
 
 #, c-format
 msgid "Error resolving %s"
-msgstr "%s ????????? ??????"
+msgstr "%s ??????? ??????"
 
 # tithi
 #, c-format
@@ -10769,42 +10669,42 @@ msgid "_Accept"
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
 msgid "_Accept"
-msgstr "????? ???? (_A)"
+msgstr "????? (_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr "?? ???????? ??? ????? ???"
+msgstr "?? ???????? ??? ????? ???"
 
 msgid "saved statuses"
-msgstr "???????? ??????????"
+msgstr "???????? ??????"
 
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%1s ??? %2s ???? ???????\n"
+msgstr "%1$s ??? %2$s ???? ???????\n"
 
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%1s %2s ?? %3s ?????? ???? ???????? ??????????:\n"
-"%4s"
+"%1$s %2$s ?? %3$s ?????? ???? ???????? ?????????:\n"
+"%4$s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%1s %2s ?? %3s ?????? ???? ???????? ??????????\n"
+msgstr "%1$s %2$s ?? %3$s ?????? ???? ???????? ?????????\n"
 
 msgid "Accept chat invitation?"
-msgstr "?????? ???????? ?? ????? ??????"
+msgstr "?????? ???????? ????? ??????"
 
 #. Shortcut
 msgid "Shortcut"
 msgstr "???????"
 
 msgid "The text-shortcut for the smiley"
-msgstr "???????? ???? ???-???????"
+msgstr "???????? ???? ??????-???????"
 
 #. Stored Image
 msgid "Stored Image"
@@ -10812,7 +10712,7 @@ msgid "Stored Image. (that'll have to do
 
 # tithi
 msgid "Stored Image. (that'll have to do for now)"
-msgstr "???????? ???? (??? ?? ?????? ???? ???? ???)"
+msgstr "???????? ???? (??? ?? ?????? ???? ???? ??????)"
 
 msgid "SSL Connection Failed"
 msgstr "SSL ????? ?????? ??????"
@@ -10822,52 +10722,52 @@ msgid "SSL peer presented an invalid cer
 
 # tithi
 msgid "SSL peer presented an invalid certificate"
-msgstr "SSL ???? ???? ???? ???????????? ???????? ??????"
+msgstr "SSL ????? ???? ???????? ??????????? ???????? ?????"
 
 msgid "Unknown SSL error"
 msgstr "????? SSL ??????"
 
 msgid "Unset"
-msgstr "????????? ????"
+msgstr "????????? ??? ??????"
 
 msgid "Do not disturb"
 msgstr "?????? ????? ??"
 
 # fix me tithi
 msgid "Extended away"
-msgstr "???? ??????"
+msgstr "???????? ???? ???????"
 
 # tithi
 msgid "Listening to music"
-msgstr "??? ?????"
+msgstr "??? ?????"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%1s (%2s) ?????? %4s ???? %3s ?? ???????? ?????"
+msgstr "%1$s (%2$s) ?????? %3$s ???? %4$s ?? ???????? ?????"
 
 #, c-format
 msgid "%s (%s) is now %s"
-msgstr "%1s (%2s) ??? %3s"
+msgstr "%1$s (%2$s) ??? %3$s"
 
 #, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%1s (%2s) ?? %3s ????? ??"
+msgstr "%1$s (%2$s) ?? %3$s ???"
 
 #, c-format
 msgid "%s became idle"
-msgstr "%s ??? ???"
+msgstr "%s ??? ?????????"
 
 #, c-format
 msgid "%s became unidle"
-msgstr "%s ??? ??? ??"
+msgstr "%s ??? ????????? ??"
 
 #, c-format
 msgid "+++ %s became idle"
-msgstr "+++ %s ??? ?????"
+msgstr "+++ %s ??? ?????????"
 
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ %s ??? ????"
+msgstr "+++ %s ??? ????????? ??"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -10895,44 +10795,44 @@ msgstr[0] "%d ???"
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ???"
-msgstr[1] "%d ???? ???"
+msgstr[1] "%d ???"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d ?????"
-msgstr[1] "%s, %d ???? ?????"
+msgstr[1] "%s, %d ?????"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ?????"
-msgstr[1] "%d ???? ?????"
+msgstr[1] "%d ?????"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d ?????"
-msgstr[1] "%s, %d ???? ?????"
+msgstr[1] "%s, %d ?????"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d ?????"
-msgstr[1] "%d ???? ?????"
+msgstr[1] "%d ?????"
 
 # tithi
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr "%s ????? ??????: ??????? ??????????? ??? ??????"
+msgstr "%s ????? ??????: ??????? ????????? ??? ??????"
 
 #, c-format
 msgid "Unable to connect to %s"
-msgstr "%s ? ????? ???? ?????? ?????"
+msgstr "%s ? ??????? ??? ??????"
 
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "%s ???? ?????? ??????: ?????????? ???? ??????? (%d ?????? ????)"
+msgstr "%s ???? ?????? ??????: ???? ????? ????? (???? %d ????)"
 
 # fix-me tithi
 #, c-format
@@ -10940,20 +10840,20 @@ msgstr ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-"%s ?? ?????????? ???? ???? ??? ?????? ?????? ?????? ???? ??????  ????? ??????? "
-"???????????? ???? ???? ?????? ???? ?????"
+"%s ?? ????????? ???? ???? ??? ????? ?????? ???? ??????? ????? ????????? ?????? "
+"???????????? ???? ???? ?????? ?????"
 
 #, c-format
 msgid "Error reading from %s: %s"
-msgstr "%1s ???? ?????? ??????: %2s"
+msgstr "%1$s ???? ?????? ??????: %2$s"
 
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr "%1s ? ?????? ??????: %2s"
+msgstr "%1$s ? ?????? ??????: %2$s"
 
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "%1s ?? ???? ?????? ??????: %2s"
+msgstr "%1$s ?? ???? ????? ??????? ??????: %2$s"
 
 # tithi
 #, c-format
@@ -10968,7 +10868,7 @@ msgid "Connection interrupted by other s
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr "????? ??????????? ???? ??????????? ?????? ?????? ?????????? ?????? "
+msgstr "????? ??????????? ???????? ?????????? ?????? ????? ?????????? ?????? "
 
 #. 10054
 #, c-format
@@ -10979,30 +10879,30 @@ msgid "Connection timed out."
 #. 10060
 #, c-format
 msgid "Connection timed out."
-msgstr "????? ??? ???????? ??????"
+msgstr "??????? ??????????? ??? ?????"
 
 #. 10061
 #, c-format
 msgid "Connection refused."
-msgstr "?????? ?????????? ??? ?????"
+msgstr "????? ?????????? ?????"
 
 #. 10048
 #, c-format
 msgid "Address already in use."
-msgstr "???????? ???????? ??????? ??????"
+msgstr "???????? ???????? ??????? ??????"
 
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s ?????? ??????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"????? %s ????? ???? ???? ??????? ???? ????????  ??????? ??? ??? ?????, ??? ????? "
-"?????? %s~ ? ???????? ??? ???????"
+"????? %1$s ????? ???? ???? ??????? ???? ??????? ?????? ??? ??? ?????, ??? ????? "
+"?????? %2$s~ ? ???????? ??? ???????"
 
 msgid "Internet Messenger"
 msgstr "????????? ??????????"
@@ -11012,50 +10912,51 @@ msgid "Send instant messages over multip
 
 # tithi
 msgid "Send instant messages over multiple protocols"
-msgstr "?????? ??????? ????? ????????? ?????????? ?????? ????"
+msgstr "?????? ???????? ????? ????????? ?????? ?????? ????"
 
+# page orientation
 msgid "Orientation"
-msgstr "??????? ????"
+msgstr "?????????"
 
 msgid "The orientation of the tray."
-msgstr "???? ?????????? ???"
+msgstr "????? ??????????"
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "?????? ?????????"
+msgstr "?????? ????"
 
 msgid "Pro_tocol:"
 msgstr "??????? (_t):"
 
 msgid "_Username:"
-msgstr "??????????????? (_U):"
+msgstr "???????????? ??? (_U):"
 
 msgid "Remember pass_word"
-msgstr "?????????? ????? ????? (_w)"
+msgstr "????????? ????? ???? ??? (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
-msgstr "???????????? ?????????"
+msgstr "???????????? ????"
 
 msgid "_Local alias:"
-msgstr "???????? ?????? (_L):"
+msgstr "???????? ????? (_L):"
 
 msgid "New _mail notifications"
-msgstr "???? ?????? ????????? (_m)"
+msgstr "???? ?????? ????? (_m)"
 
 # tithi
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "?? ????????? ???? ?? ????? ???? ??????? ???? (_i):"
+msgstr "?? ????????? ???? ?? ????? ???? ??????? ??? ??? (_i):"
 
-msgid "_Advanced"
-msgstr "???????? (_A)"
+msgid "Ad_vanced"
+msgstr "?????????? (_v)"
 
 msgid "Use GNOME Proxy Settings"
-msgstr "GNOME ??????? ???????????? ??????? ????"
+msgstr "GNOME ??????? ????? ??????? ??? ???"
 
 msgid "Use Global Proxy Settings"
-msgstr "???????? ??????? ???????????? ??????? ????"
+msgstr "??????? ??????? ????? ??????? ??? ???"
 
 msgid "No Proxy"
 msgstr "??????? ???"
@@ -11064,13 +10965,13 @@ msgid "SOCKS 4"
 msgstr "HTTP"
 
 msgid "SOCKS 4"
-msgstr "SOCKS ?"
+msgstr "SOCKS 4"
 
 msgid "SOCKS 5"
-msgstr "SOCKS ?"
+msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
-msgstr "????????????? ???????????? ??????? ????"
+msgstr "?????????????? ????? ??????? ??? ???"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
@@ -11094,34 +10995,33 @@ msgid "Pa_ssword:"
 msgstr "????? (_P):"
 
 msgid "Pa_ssword:"
-msgstr "?????????? (_s):"
+msgstr "????????? (_s):"
 
 msgid "Unable to save new account"
-msgstr "???? ??????? ???????? ?????"
+msgstr "???? ??????? ???????? ??????"
 
 # tithi
 msgid "An account already exists with the specified criteria."
 msgstr "???????? ??????????? ???? ??????? ???????? ?????????"
 
 msgid "Add Account"
-msgstr "??????? ??? ????"
+msgstr "??????? ???"
 
 msgid "_Basic"
 msgstr "????? (_B)"
 
 # tithi
 msgid "Create _this new account on the server"
-msgstr "???????? ?? ???? ????????? ???? ???? (_t)"
+msgstr "???????? ?? ???? ????????? ???? ??? ??? (_t)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "???????"
+msgid "P_roxy"
+msgstr "??????? (_r)"
 
 msgid "Enabled"
 msgstr "???????"
 
 msgid "Protocol"
-msgstr "???????"
+msgstr "????????"
 
 # tithi
 #, c-format
@@ -11136,119 +11036,113 @@ msgstr ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span size='larger' weight='bold'>??????? %s!</span>\n"
+"<span size='larger' weight='bold'>%s ? ???????!</span>\n"
 "\n"
-"????? ????????? ?????? ??????? ??????? ??? ???? %s ?? ???? ????? ????  <b>Add..."
-"</b> ???? ????? ??? ????? ????? ??????? ??????? ????? ??? ???? ?????? IM "
-"????????? %s ?? ???? ??????? ???? ??? ??? ???????? ??????? ??????? ???? <b>Add...</"
-"b> ???? ??????\n"
+"????? ????????? ?????? ??????? ??????? ??? ???? %s ?? ???? ????? ????  <b>"
+"\"???...\"</b> ????? ????? ??? ????? ????? ????????? ??????? ????? ??? ???? %s "
+"?? ??????? ?????? IM ???????? ??????? ??? ??? ??? ???????? ??????? ???? ?????? <b>"
+"\"???...\"</b> ????? ??????\n"
 "\n"
-"???? ??????? ?? ???????? ???? ???? ????? ??? ????? ?????? ????????  ??????? ?????? "
-"<b>Accounts->??????? ?????? ??????? ????</b> ?? ????????  ?????, ???????? ???? ?? "
-"???? ????? ?????"
+"???? ??????? ?? ???????? ???? ???? ????? ??? \"???????????\" ????? \"??????? ?????????"
+"\" ?????? ???? ???? ??????? ???, ???????? ?? ?????? ???? ??????"
 
 # tithi
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] "????? %1d-?? %2s ?????  ??????? ???? ???? ?? ????? ??????? ???? ????"
+msgstr[0] ""
+"????? %1$d-?? %2$s ????? ??????? ???? ???? ?? ????? ??????? ???? ????"
 msgstr[1] ""
-"????? ???????? %1d???? %2s ????? ??????? ???? ???? ?? ????? ??????? ???? ????"
+"????? ???????? %1$d?? %2$s ????? ??????? ???? ???? ?? ????? ??????? ???? ????"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
-"?? ??????????? ??????? ???? ????? ???? ??? ????????? ????? ???????? ????? ???? ??? "
-"??? ???? ??? ??????? ?????? ??????? ????? ???? ????????? ??????? ?????? ???? "
-"'???????' ????? ???? ??????? ??????? ??????? ????? ???? ?????"
+"?? ??????????? ??????? ???? ????? ???????? ????? ??? ?????? ?????? ?????? ??? ??? "
+"???? ???? ???? ??????? ?????? ??????? ??? ???? ???? ???????? ??????????-???? ???? "
+"'????????' ???????? ??? ??????? ??????? ????? ???? ??????"
 
 # tithi
 msgid "Please update the necessary fields."
 msgstr "??????? ??? ??????????? ??????????? ???????? ?????"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "???????"
+msgstr "??????? (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr ""
-"??????? ??? ???? ?? ??????? ??? ???? ??? ??? ???????? ????? ???? ?????? ?????\n"
+msgstr "??????? ??? ???? ?? ??????? ??? ???? ??? ??? ???????? ????? ???? ????\n"
 
 msgid "Room _List"
-msgstr "????? ?????? (_L)"
+msgstr "????? ?????? (_L)"
 
 msgid "_Block"
-msgstr "???? ???? (_B)"
+msgstr "???? (_B)"
 
 msgid "Un_block"
-msgstr "???? ???? (_b)"
+msgstr "?????? (_b)"
 
 # tithi
 msgid "Move to"
 msgstr "????"
 
 msgid "Get _Info"
-msgstr "???? ?????? ???? (_I)"
+msgstr "???? ?????? (_I)"
 
 msgid "I_M"
-msgstr "???? (_M)"
+msgstr "I_M"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "????? ??? ???? (_A)"
+msgstr "???? ?? (_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "????/????? ?? (_V)"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "????? ?????"
+msgstr "????? ?? (_V)"
 
 msgid "_Send File..."
-msgstr "???? ?????... (_S)"
+msgstr "???? ??????... (_S)"
 
 msgid "Add Buddy _Pounce..."
-msgstr "????? ?????? ??? ????... (_P)"
+msgstr "????? ?????? ???... (_P)"
 
 msgid "View _Log"
-msgstr "?? ???????? ???? (_L)"
+msgstr "?? ???????? (_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "??????? ????? ?????? ?????"
+msgstr "?????? ??? ???? ??? ???"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "??????? ????? ???????? ????"
+msgstr "?????? ??? ???????? ??? ???"
 
 msgid "_Alias..."
 msgstr "?????... (_A)"
 
 msgid "_Remove"
-msgstr "?????? ???? (_R)"
+msgstr "?????? (_R)"
 
 msgid "Set Custom Icon"
-msgstr "??????? ???? ???????? ????"
+msgstr "???????????? ???? ????????"
 
 msgid "Remove Custom Icon"
-msgstr "??????? ???? ?????? ????"
+msgstr "???????????? ???? ??????"
 
 msgid "Add _Buddy..."
-msgstr "????? ??? ????... (_B)"
+msgstr "????? ???... (_B)"
 
 msgid "Add C_hat..."
-msgstr "????? ??? ????...(_h)"
+msgstr "????? ???...(_h)"
 
 msgid "_Delete Group"
-msgstr "????? ???? ????? (_D)"
+msgstr "?? ???? ???? ??? (_D)"
 
 msgid "_Rename"
-msgstr "??????? ?????? ???? (_R)"
+msgstr "???????? (_R)"
 
 #. join button
 msgid "_Join"
@@ -11258,19 +11152,19 @@ msgid "Persistent"
 msgstr "??????-??? ???"
 
 msgid "Persistent"
-msgstr "??????? ??????"
+msgstr "???????? ??????"
 
 msgid "_Edit Settings..."
-msgstr "???????????? ???????? ????... (_E)"
+msgstr "????? ????????... (_E)"
 
 msgid "_Collapse"
 msgstr "?????? ????? (_C)"
 
 msgid "_Expand"
-msgstr "?????? ???? (_E)"
+msgstr "???????? (_E)"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/???????/?????? ???? ?????"
+msgstr "/???/???? ????"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11288,104 +11182,103 @@ msgid "/Buddies/New Instant _Message..."
 msgstr "/??????? (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/???????/???? ????????? ??????... (_M)"
+msgstr "/???????/???? ??????... (_M)"
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/???????/??????? ?????? ????... (_C)"
+msgstr "/???????/??????? ??????... (_C)"
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/???????/???????????? ???? ?????? ????... (_I)"
+msgstr "/???????/???????????? ????... (_I)"
 
 msgid "/Buddies/View User _Log..."
-msgstr "/???????/??????????? ?? ???????? ????... (_L)"
+msgstr "/???????/???????????? ?? ????????... (_L)"
 
 msgid "/Buddies/Sh_ow"
-msgstr "/???????/????? (_o)"
+msgstr "/???????/???????? (_O)"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/???????/?????/?????? ??????? (_O)"
+msgstr "/???????/????????/?????? ??????? (_O)"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/???????/?????/????? ????????? (_E)"
+msgstr "/???????/????????/????? ?? (_E)"
 
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/???????/?????/?????? ????? (_D)"
+msgstr "/???????/????????/?????? ????? (_D)"
 
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/???????/?????/??? ??? (_T)"
+msgstr "/???????/????????/????????? ??? (_T)"
 
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/???????/?????/??????? ???????? (_P)"
+msgstr "/???????/????????/???????? ???? (_P)"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/???????/???????? ??????????? ????? (_S)"
+msgstr "/???????/???????? ????? (_S)"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/???????/????? ??? ????... (_A)"
+msgstr "/???????/????? ???... (_A)"
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/???????/????? ??? ????... (_h)"
+msgstr "/???????/????? ???... (_h)"
 
 msgid "/Buddies/Add _Group..."
-msgstr "/???????/????? ??? ????... (_G)"
+msgstr "/???????/?? ??? (_G)..."
 
 msgid "/Buddies/_Quit"
-msgstr "/???????/???????? ???? (_Q)"
+msgstr "/???????/???????? (_Q)"
 
 #. Accounts menu
 msgid "/_Accounts"
 msgstr "/??????????? (_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/???????????/??????????? ????????? ????"
+msgstr "/???????????/??????? ?????????"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/??????? (_T)"
+msgstr "/??? (_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/???????/????? ?????????? (_P)"
+msgstr "/???/????? ?????? (_P)"
 
 msgid "/Tools/_Certificates"
-msgstr "/???????/???????????????? (_C)"
+msgstr "/???/??????????? (_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/???????/??????? (_y)"
+msgstr "/???/???????????? ??????? (_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/???????/?????-?????? (_g)"
+msgstr "/???/??????? (_G)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/???????/????????????? (_e)"
+msgstr "/???/????????? (_E)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/???????/???????? (_i)"
+msgstr "/???/?????? (_I)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/???????/???? ?????????? ??? (_F)"
+msgstr "/???/???? ?????????? (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/???????/????? ?????? (_o)"
+msgstr "/???/????? ?????? (_O)"
 
 msgid "/Tools/System _Log"
-msgstr "/???????/????????? ??????????? (_L)"
+msgstr "/???/??????? ?? (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/???????/?????? ???? ????? (_S)"
+msgstr "/???/???? ???? (_S)"
 
 #. Help
 msgid "/_Help"
-msgstr "/???????? (_H)"
+msgstr "/??????? (_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/????????/?????? ???????? (_H)"
+msgstr "/???????/?????? ???????? (_H)"
 
 msgid "/Help/_Debug Window"
-msgstr "/????????/????? ?????? (_D)"
+msgstr "/???????/????? ?????? (_D)"
 
 msgid "/Help/_About"
-msgstr "/????????/??????? (_A)"
+msgstr "/???????/??????? (_A)"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11397,7 +11290,7 @@ msgstr ""
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>????:</b> %d"
+"<b>?????????:</b> %d"
 
 #, c-format
 msgid ""
@@ -11421,7 +11314,7 @@ msgid "Spooky"
 
 # fix me tithi
 msgid "Spooky"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Awesome"
 msgstr "?????"
@@ -11436,54 +11329,54 @@ msgid "Idle %dd %dh %02dm"
 # fix me tithi
 #, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "%dd %dh %02dm ???"
+msgstr "%dd %dh %02dm ???? ?????????"
 
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "%dh %02dm ???"
+msgstr "%dh %02dm ???? ?????????"
 
 #, c-format
 msgid "Idle %dm"
-msgstr "%dm ???"
+msgstr "%dm ???? ?????????"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/???????/???? ????????? ??????..."
+msgstr "/???????/???? ??????..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/???????/??????? ?????? ????..."
+msgstr "/???????/??????? ??????..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/???????/???????????? ???? ????? ????..."
+msgstr "/???????/???????????? ????..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/???????/????? ??? ????..."
+msgstr "/???????/????? ???..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/???????/????? ??? ????..."
+msgstr "/???????/????? ???..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/???????/????? ??? ????..."
+msgstr "/???????/?? ???..."
 
 msgid "/Tools/Privacy"
-msgstr "/???????/????????"
+msgstr "/???/??????"
 
 msgid "/Tools/Room List"
-msgstr "/???????/????? ??????"
+msgstr "/???/????? ??????"
 
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%1d?? ????? ?????? %2s ???\n"
-msgstr[1] "%1d???? ????? ?????? %2s ???\n"
+msgstr[0] "%2$s ???? %1$d?? ????? ??????\n"
+msgstr[1] "%2$s ???? %1$d?? ????? ??????\n"
 
 msgid "Manually"
-msgstr "?????????????"
+msgstr "??? ????"
 
 msgid "By status"
 msgstr "?????? ???????"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "?????????? ?? ???????"
 
 #, c-format
 msgid "%s disconnected"
@@ -11494,13 +11387,13 @@ msgid "Reconnect"
 msgstr "%s ??????????"
 
 msgid "Reconnect"
-msgstr "??????? ????? ???"
+msgstr "????????? ??? ???"
 
 msgid "Re-enable"
-msgstr "?????? ??????? ????"
+msgstr "??????????? ??? ???"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQ"
 
 # tithi
 msgid "Welcome back!"
@@ -11510,21 +11403,22 @@ msgid_plural ""
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "???? ???? ???? ????? ???? ???? ?? ???? ????? %d ????????? ?????????? ???:"
+msgstr[0] ""
+"???? ???? ???? ????? ???? ???? ???? ????? %d ????????? ?????????? ??? ?????:"
 msgstr[1] ""
-"???? ???? ???? ????? ???? ???? ?? ???? ????? %d ??????????? ?????????? ???:"
+"???? ???? ???? ????? ???? ???? ???? ????? %d ??????????? ?????????? ??? ?????:"
 
 msgid "<b>Username:</b>"
-msgstr "<b>????????????-???:</b>"
+msgstr "<b>???????????? ???:</b>"
 
 msgid "<b>Password:</b>"
-msgstr "<b>??????????:</b>"
+msgstr "<b>?????????:</b>"
 
 msgid "_Login"
 msgstr "???? (_L)"
 
 msgid "/Accounts"
-msgstr "/???????????"
+msgstr "/???????"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -11537,225 +11431,210 @@ msgstr ""
 msgstr ""
 "<span weight='bold' size='larger'>%s ? ???????!</span>\n"
 "\n"
-"????? ??? ??????? ??????? ???? ????? ???? ??????????? <b>???????????->??????????? "
-"????????? ????</b> ?? <b>???????????</b> ?? ?????? ??? ??????? ????? ???? ??? ??????? "
-"????? ??????? ????, ???? ???? ??, ?????? ???????? ???? ??? ???????? ???? ??? ???? "
-"????? ?????"
+"????? ??? ??????? ??????? ???? \"???????????\" ????? \"??????? ?????????\" ?????? ???? "
+"????? IM ??????? ????? ??????? ????? ??????? ????, ???? ????, ?????? ???????? ??? "
+"???????? ???? ??? ???? ???????"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/???????/?????/?????? ???????"
+msgstr "/?????/????????/?????? ?????"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/???????/?????/????? ?????????"
+msgstr "/?????/????????/????? ??"
 
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/???????/?????/???????? ?????????"
+msgstr "/?????/????????/?????? ?????"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/???????/?????/??? ???"
+msgstr "/?????/????????/????????? ???"
 
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/???????/?????/??????? ????????"
+msgstr "/?????/????????/???????? ????"
 
 msgid "Add a buddy.\n"
 msgstr "????? ??? ?????\n"
 
 msgid "Buddy's _username:"
-msgstr "?????? ????????????-??? (_u):"
+msgstr "?????? ??? (_u):"
 
 # and this
 msgid "(Optional) A_lias:"
 msgstr "????? (??????) (_l):"
 
 msgid "Add buddy to _group:"
-msgstr "?????? ????? ??? ???? (_g):"
+msgstr "??????? ??? ??? ???? (_g):"
 
 msgid "This protocol does not support chat rooms."
-msgstr "?? ????????? ?????? ??????? ?????? ??? ???"
+msgstr "?? ???????? ?????? ??? ?????? ??? ???"
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "???? ???????? ?????? ????? ??? ???? ???????? ????? ?????"
+msgstr "???? ???????? ?????? ????? ???? ????????? ????? ???"
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"??????? ??? ???? ????? ????? ???????? ????? ???? ??? ??? ?????? ???? ??????,???  "
-"????? ???? ?????? ?????\n"
+"??????? ??? ???? ????? ????? ???????? ????? ???? ??? ??? ?????? ???? ?????,??? ????? "
+"???? ????\n"
 
 msgid "A_lias:"
 msgstr "????? (_l):"
 
 msgid "_Group:"
-msgstr "?????: (_G)"
+msgstr "?? (_G):"
 
 # tithi
 msgid "Auto_join when account becomes online."
-msgstr "??????? ??????? ????? ???????????? ???? ?????? ?????"
+msgstr "??????? ??????? ????? ???????????? ???? ?????? ??? ????"
 
 # tithi
 msgid "_Remain in chat after window is closed."
 msgstr "?????? ???? ???? ???? ??????? ????? (_R)?"
 
 msgid "Please enter the name of the group to be added."
-msgstr "??????? ??? ????? ???? ??? ??? ??????? ??? ?????? ?????"
+msgstr "??????? ??? ?? ???? ????? ???? ??? ??? ??? ????"
 
 msgid "Enable Account"
-msgstr "??????? ??????? ????"
+msgstr "??????? ??????? ??? ???"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/???????????/??????? ??????? ????"
+msgstr "<PurpleMain>/???????/??????? ??????????"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/???????????/"
+msgstr "<PurpleMain>/???????/"
 
 msgid "_Edit Account"
-msgstr "??????? ??????? ???? (_E)"
+msgstr "??????? ???????? (_E)"
 
 msgid "No actions available"
-msgstr "???? ??? ??????? ??"
+msgstr "???? ??????????? ???????? ???"
 
 msgid "_Disable"
 msgstr "?????????? (_D)"
 
 msgid "/Tools"
-msgstr "/???????"
+msgstr "/???"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/???????/???????? ??????????? ?????"
+msgstr "/?????/???????? ?????"
 
 #. Buddy List
 msgid "Background Color"
-msgstr "?????????? ??"
+msgstr "??????? ??"
 
 msgid "The background color for the buddy list"
-msgstr ""
+msgstr "????? ??????? ???? ??????? ??"
 
 # tithi
-#, fuzzy
 msgid "Layout"
-msgstr "???"
+msgstr "????????????"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "????, ??? ??? blist ?? ??????? ????????????"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "?????????? ??"
+msgstr "???????? ??????? ??"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "???? ???????? ??????? ?????? ?? "
 
-#, fuzzy
 msgid "Expanded Text"
-msgstr "?????? ???? (_E)"
+msgstr "???????? ??????"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "???? ?? ???????? ????? ??? ?????? ????"
 
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "?????????? ?? ???????? ????"
+msgstr "?????? ??????? ??"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "???? ?????? ???? ???? ??????? ??"
 
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "?????? ????? (_C)"
+msgstr "?????? ??????"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "???? ?? ??????? ??? ?????? ????"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "?????????? ?? ???????? ????"
+msgstr "???????/ ?????? ??????? ??"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "???? ??????? ???? ?????? ??????? ??"
 
-#, fuzzy
 msgid "Contact Text"
-msgstr "???????"
+msgstr "??????? ??????"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "??????? ????????? ??? ?????? ????"
 
-#, fuzzy
 msgid "On-line Text"
-msgstr "??????"
+msgstr "?????? ??????"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "????? ??????? ????? ??? ?????? ????"
 
-#, fuzzy
 msgid "Away Text"
-msgstr "????? ???"
+msgstr "??????? ??????? ??????"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "????? ??????? ????? ??? ?????? ????"
 
-#, fuzzy
 msgid "Off-line Text"
-msgstr "?????? "
+msgstr "?????? ??????? ??????"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
+msgstr "????? ??????? ????? ??? ?????? ????"
 
-#, fuzzy
 msgid "Idle Text"
-msgstr "??? ???"
+msgstr "????????? ??????? ??????"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "????? ????????? ????? ??? ?????? ????"
 
-#, fuzzy
 msgid "Message Text"
-msgstr "?????? ?????? ??????"
+msgstr "??????? ??????"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "?????? ????? ?????? ????? ?? ?????? ???? ?????"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "?????? (\"??????\" ??????) ??????"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
+msgstr "???? ????? ??????? ????? ??? ?????? ??? ??? ?? ???? ????????? ???"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "%s ?? ???? ??????????? ???? ???????? ????"
+msgstr "?????? ??????? ???? ?????? ???? "
 
 # tithi
-#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr "?? ??????????????? ????? ??? ???? ?????"
+msgstr "?? ????????????? ????? ??? ???? ?????"
 
 #. Widget creation function
 msgid "SSL Servers"
-msgstr "SSL ???????????"
+msgstr "SSL ???????"
 
 msgid "Unknown command."
-msgstr "????? ????????"
+msgstr "????? ???????"
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "? ??????? ?? ?????? ??? ??? ???????? ????"
+msgstr "??????? ?? ?????? ??? ????????? ????"
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "???? ???????? ??? ???? ???????? ????? ?? ?? ? ??????? ???????? ?????? ?????"
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "??????? ?????? ???? ???????? ?????"
+msgstr "??????? ?????? ???? ???????? ?????"
 
 msgid "_Buddy:"
 msgstr "????? (_B):"
@@ -11768,99 +11647,94 @@ msgid "Save Conversation"
 msgstr "<h1>%s-?? ????? ???????</h1>\n"
 
 msgid "Save Conversation"
-msgstr "??????? ??????? ????"
+msgstr "??????? ???????"
 
 msgid "Find"
 msgstr "??????"
 
 msgid "_Search for:"
-msgstr "?????? (_S):"
+msgstr "????????? (_S):"
 
 msgid "Un-Ignore"
-msgstr "???????? ????? ??"
+msgstr "???????? ??? ????? ??? ???"
 
 msgid "Ignore"
-msgstr "???????? ????"
+msgstr "????????"
 
 msgid "Get Away Message"
-msgstr "?????????? ?????? ????? ????"
+msgstr "??????? ??????? ?????? ????? ????"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "??????? ??? ??????"
+msgstr "??????? ?????"
 
 msgid "Unable to save icon file to disk."
-msgstr "?????? ???? ???? ??????? ???? ??????"
+msgstr "?????? ???? ???? ??????? ???? ???????"
 
 msgid "Save Icon"
-msgstr "???? ??????? ????"
+msgstr "???? ???????"
 
 msgid "Animate"
-msgstr "?????????"
+msgstr "?????????? ??? ???"
 
 msgid "Hide Icon"
-msgstr "???? ??????? ?????"
+msgstr "???? ??????? ???? ???"
 
 msgid "Save Icon As..."
-msgstr "????? ???? ??????? ????..."
+msgstr "???? ???? ???? ???????..."
 
 msgid "Set Custom Icon..."
-msgstr "??????? ???? ???????? ????..."
+msgstr "???????????? ???? ????????..."
 
 msgid "Change Size"
-msgstr "???? ???????? ????"
+msgstr "???? ???????? ??? ???"
 
 # tithi
 msgid "Show All"
-msgstr "?? ???????? ????"
+msgstr "?? ???????? ??? ???"
 
 #. Conversation menu
 msgid "/_Conversation"
 msgstr "/??????? (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/???????/???? ????????? ??????... (_M)"
+msgstr "/???????/???? ??????... (_M)"
 
 msgid "/Conversation/_Find..."
 msgstr "/???????/??????... (_F)"
 
 msgid "/Conversation/View _Log"
-msgstr "/???????/??????????? ???????? ???? (_L)"
+msgstr "/???????/?? ???????? (_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/???????/????? ??????? ????... (_S)"
+msgstr "/???????/???? ???? ???????... (_S)"
 
 # fix me tithi
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/???????/????????? ????? (_r)"
+msgstr "/???????/??????????? ?????? (_r)"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/???????/??? (_o)"
+msgstr "/???????/?????? (_e)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/???????/??? (_o)"
+msgstr "/???????/??????/???? ?? (_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/???????/??? (_o)"
+msgstr "/???????/??????/????? ?? (_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/???????/??????????? ???????? ???? (_L)"
+msgstr "/???????/??????/?????\\/????? ?? (_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/???????/???? ?????? ????... (_n)"
+msgstr "/???????/???? ??????... (_n)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/???????/????? ?????? ??? ????... (_P)"
+msgstr "/???????/????? ?????? ???... (_P)"
 
 msgid "/Conversation/_Get Info"
-msgstr "/???????/???? ?????? ???? (_G)"
+msgstr "/???????/???? ?????? (_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/???????/???????? ????... (_v)"
+msgstr "/???????/????????... (_v)"
 
 msgid "/Conversation/M_ore"
 msgstr "/???????/??? (_o)"
@@ -11869,47 +11743,47 @@ msgid "/Conversation/_Block..."
 msgstr "/???????/?????... (_i)"
 
 msgid "/Conversation/_Block..."
-msgstr "/???????/???? ????... (_B)"
+msgstr "/???????/????... (_B)"
 
 msgid "/Conversation/_Unblock..."
-msgstr "/???????/???? ????? ????... (_U)"
+msgstr "/???????/??????... (_U)"
 
 msgid "/Conversation/_Add..."
-msgstr "/???????/??? ????... (_A)"
+msgstr "/???????/???... (_A)"
 
 msgid "/Conversation/_Remove..."
-msgstr "/???????/?????? ????... (_R)"
+msgstr "/???????/??????... (_R)"
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/???????/????? ?????? ????... (_k)"
+msgstr "/???????/???? ?????? ????... (_k)"
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/???????/????? ?????? ????... (_e)"
+msgstr "/???????/????? ????????... (_e)"
 
 msgid "/Conversation/_Close"
-msgstr "/???????/???? ???? (_C)"
+msgstr "/???????/???? (_C)"
 
 #. Options
 msgid "/_Options"
-msgstr "/????????? (_O)"
+msgstr "/???? (_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/?????????/?? ??????? ???? (_L)"
+msgstr "/????/?? ?????????? (_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/?????????/???? ??????? ???? (_S)"
+msgstr "/????/???? ?????????? (_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/?????????/?????????? ?????????? ???????? ???? (_T)"
+msgstr "/????/??????? ?????? ???????? (_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/?????????/????-????????? ???????? ???? (_m)"
+msgstr "/????/????????????? ???????? (_m)"
 
 msgid "/Conversation/More"
 msgstr "/???????/???"
 
 msgid "/Options"
-msgstr "/?????????"
+msgstr "/????"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -11920,64 +11794,61 @@ msgid "/Conversation/View Log"
 msgstr "/???????"
 
 msgid "/Conversation/View Log"
-msgstr "/???????/??????????? ???????? ????"
+msgstr "/???????/?? ????????"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/???????/???"
+msgstr "/???????/??????/???? ??"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/???????/??????????? ???????? ????"
+msgstr "/???????/??????/????? ??"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/???????/???"
+msgstr "/???????/??????/?????\\/????? ??"
 
 msgid "/Conversation/Send File..."
-msgstr "/???????/???? ?????? ????..."
+msgstr "/???????/???? ??????..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/???????/????? ?????? ??? ????..."
+msgstr "/???????/????? ?????? ???..."
 
 msgid "/Conversation/Get Info"
-msgstr "/???????/???? ????? ????"
+msgstr "/???????/???? ?????"
 
 msgid "/Conversation/Invite..."
-msgstr "/???????/???????? ????..."
+msgstr "/???????/????????..."
 
 msgid "/Conversation/Alias..."
 msgstr "/???????/?????..."
 
 msgid "/Conversation/Block..."
-msgstr "/???????/???? ????..."
+msgstr "/???????/????..."
 
 msgid "/Conversation/Unblock..."
-msgstr "/???????/???? ????? ????..."
+msgstr "/???????/??????..."
 
 msgid "/Conversation/Add..."
-msgstr "/???????/??? ????..."
+msgstr "/???????/???..."
 
 msgid "/Conversation/Remove..."
-msgstr "/???????/?????? ????..."
+msgstr "/???????/??????..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/???????/????? ?????? ????..."
+msgstr "/???????/???? ?????? ????..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/???????/????? ?????? ????..."
+msgstr "/???????/????? ????????..."
 
 msgid "/Options/Enable Logging"
-msgstr "/?????????/?? ?????? ????"
+msgstr "/????/?? ??????????"
 
 msgid "/Options/Enable Sounds"
-msgstr "/?????????/???? ?????? ????"
+msgstr "/????/???? ????????? "
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/?????????/?????????? ?????????? ???????? ????"
+msgstr "/????/??????? ?????? ????????"
 
 msgid "/Options/Show Timestamps"
-msgstr "/?????????/????-????????? ???????? ????"
+msgstr "/????/????????????? ???????? "
 
 msgid "User is typing..."
 msgstr "??????????? ???? ????..."
@@ -11992,20 +11863,20 @@ msgid "S_end To"
 
 #. Build the Send To menu
 msgid "S_end To"
-msgstr "?????? ???? (_S)"
+msgstr "?????? (_e)"
 
 msgid "_Send"
-msgstr "?????? ???? (_S)"
+msgstr "?????? (_S)"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
-msgstr "???? ? ?? ??????? ???????"
+msgstr "???? ? ??????? ???????"
 
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "???? %d ?? ??????? ???????"
-msgstr[1] "???? %d ?? ??????? ???????"
+msgstr[0] "???? %d ?? ???????"
+msgstr[1] "???? %d ?? ???????"
 
 msgid "Typing"
 msgstr "???? ????"
@@ -12014,93 +11885,93 @@ msgid "Nick Said"
 msgstr "???? ??? ???? ?????"
 
 msgid "Nick Said"
-msgstr "??? ?????"
+msgstr "?????? ??? ?????"
 
 msgid "Unread Messages"
-msgstr "????? ??????????"
+msgstr "????? ??????"
 
 msgid "New Event"
 msgstr "???? ????"
 
 # fix me tithi
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "???? ?????: ?? ????????? ????????? ???? ??????"
+msgstr "clear: ?? ????????? ??????????? ???? ???? ????"
 
 msgid "Confirm close"
-msgstr "???? ??????? ????"
+msgstr "???? ??????????"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "????? ????? ?????? ???? ???? ?? ??????? ???? ???????? ???? ???? ????"
+msgstr "????? ????? ?????? ???? ???? ?? ??????????? ???????? ???? ???? ????"
 
 msgid "Close other tabs"
-msgstr "???????? ????????? ???? ????"
+msgstr "???????? ????????? ???? ??? ???"
 
 msgid "Close all tabs"
-msgstr "??? ????? ???? ????"
+msgstr "?? ????? ???? ??? ???"
 
 msgid "Detach this tab"
-msgstr "?? ??????? ????? ????"
+msgstr "?? ??????? ????? ??? ???"
 
 msgid "Close this tab"
-msgstr "?? ??????? ???? ????"
+msgstr "?? ??????? ???? ??? ???"
 
 msgid "Close conversation"
-msgstr "??????? ???? ????"
+msgstr "??????? ???? ??? ???"
 
 msgid "Last created window"
 msgstr "??????? ??????? ??????"
 
 msgid "Separate IM and Chat windows"
-msgstr "????????? ?????? ? ?????? ?????? ???? ????"
+msgstr "????????? ?????? ? ?????? ?????? ???? ??? ???"
 
 msgid "New window"
 msgstr "???? ??????"
 
 msgid "By group"
-msgstr "????? ???????"
+msgstr "?? ???????"
 
 msgid "By account"
 msgstr "??????? ???????"
 
 msgid "Save Debug Log"
-msgstr "????? ??????????? ??????? ????"
+msgstr "????? ?? ??????? ??? ???"
 
 msgid "Invert"
-msgstr "??????"
+msgstr "???????"
 
 msgid "Highlight matches"
-msgstr "?????????? ???????"
+msgstr "??????? ??????? ??? ???"
 
 msgid "_Icon Only"
 msgstr "????????? ???? (_I)"
 
 msgid "_Text Only"
-msgstr "????????? ??? (_T)"
+msgstr "????????? ?????? (_T)"
 
 msgid "_Both Icon & Text"
-msgstr "???? ? ??? ????? (_B)"
+msgstr "???? ? ?????? ????? (_B)"
 
 msgid "Filter"
-msgstr "?????????"
+msgstr "???????"
 
 msgid "Right click for more options."
-msgstr "??? ??????? ???? ??? ????? ?????"
+msgstr "??? ?????? ???? ??? ????? ?????"
 
 msgid "Level "
 msgstr "????"
 
 # tithi
 msgid "Select the debug filter level."
-msgstr "????? ????????? ???? ???????? ?????"
+msgstr "????? ????????? ???? ???????? ?????"
 
 msgid "All"
-msgstr "???"
+msgstr "??"
 
 msgid "Misc"
 msgstr "????????"
 
 msgid "Warning"
-msgstr "???????"
+msgstr "?????????"
 
 msgid "Error "
 msgstr "??????"
@@ -12121,10 +11992,11 @@ msgid "voice and video"
 msgstr "??-??? ????"
 
 msgid "voice and video"
-msgstr ""
+msgstr "???? ??? ?????"
 
+# as in contact * people
 msgid "support"
-msgstr "?????? ????"
+msgstr "??????"
 
 msgid "webmaster"
 msgstr "????????????"
@@ -12134,7 +12006,7 @@ msgid "win32 port"
 msgstr "??????? ????????????/QA"
 
 msgid "win32 port"
-msgstr "????? ?????"
+msgstr "win32 ?????"
 
 msgid "maintainer"
 msgstr "????????????"
@@ -12144,7 +12016,7 @@ msgid "hacker and designated driver [laz
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 msgid "hacker and designated driver [lazy bum]"
-msgstr "??????? ? ????????? ???????? [??????]"
+msgstr "??????? ? ????????? ???????? [lazy bum]"
 
 msgid "support/QA"
 msgstr "??????/QA"
@@ -12154,21 +12026,21 @@ msgid "original author"
 msgstr "XMPP"
 
 msgid "original author"
-msgstr "??? ????"
+msgstr "?????? ????"
 
 msgid "lead developer"
 msgstr "?????? ????????"
 
 # tithi
 msgid "Afrikaans"
-msgstr "??????????"
+msgstr "????????"
 
 msgid "Arabic"
-msgstr "??????"
+msgstr "????"
 
 # tithi
 msgid "Belarusian Latin"
-msgstr "???????????? ???????"
+msgstr "?????????? ???????"
 
 msgid "Bulgarian"
 msgstr "?????????"
@@ -12213,26 +12085,26 @@ msgid "Esperanto"
 
 # tithi
 msgid "Esperanto"
-msgstr "?????????"
+msgstr "?????????????"
 
 msgid "Spanish"
-msgstr "???????"
+msgstr "?????????"
 
 msgid "Estonian"
 msgstr "????????"
 
 # tithi
 msgid "Euskera(Basque)"
-msgstr "???????(?????)"
+msgstr "???????(?????)"
 
 msgid "Persian"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Finnish"
-msgstr "?????"
+msgstr "?????"
 
 msgid "French"
-msgstr "?????"
+msgstr "???????"
 
 msgid "Irish"
 msgstr "?????"
@@ -12246,7 +12118,7 @@ msgid "Gujarati Language Team"
 
 # tithi
 msgid "Gujarati Language Team"
-msgstr "??????? ????? ??"
+msgstr "??????? ????? ???"
 
 msgid "Hebrew"
 msgstr "??????"
@@ -12257,9 +12129,8 @@ msgstr "??????????"
 msgid "Hungarian"
 msgstr "??????????"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Indonesian"
 msgstr "???????????"
@@ -12274,11 +12145,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "???????"
 
 msgid "Ubuntu Georgian Translators"
-msgstr "???????? ????????? ????????????"
+msgstr "Ubuntu ?????? ????????????"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "????????"
+msgstr "?????"
 
 # fix me tithi
 msgid "Kannada"
@@ -12286,7 +12156,7 @@ msgid "Kannada Translation team"
 
 # tithi
 msgid "Kannada Translation team"
-msgstr "???????? ???????? ??"
+msgstr "???????? ?????? ???"
 
 msgid "Korean"
 msgstr "??????"
@@ -12304,13 +12174,12 @@ msgstr "??????????? msgid "Macedonian"
 msgstr "???????????"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "???????????"
+msgstr "????????"
 
 # fix me tithi
 msgid "Bokm?l Norwegian"
-msgstr "?????? ??????????"
+msgstr "?????? ?????????"
 
 msgid "Nepali"
 msgstr "??????"
@@ -12320,11 +12189,11 @@ msgid "Norwegian Nynorsk"
 
 # fix me tithi
 msgid "Norwegian Nynorsk"
-msgstr "?????????? ????????"
+msgstr "????????? ????????"
 
 # fix-me tithi
 msgid "Occitan"
-msgstr "??????"
+msgstr "????????"
 
 # tithi
 msgid "Punjabi"
@@ -12337,10 +12206,10 @@ msgid "Portuguese-Brazil"
 msgstr "????????"
 
 msgid "Portuguese-Brazil"
-msgstr "????????-???????"
+msgstr "????????-?????????"
 
 msgid "Pashto"
-msgstr "?????"
+msgstr "????"
 
 msgid "Romanian"
 msgstr "????????"
@@ -12352,22 +12221,22 @@ msgid "Slovenian"
 msgstr "???????"
 
 msgid "Slovenian"
-msgstr "??????????"
+msgstr "??????????"
 
 msgid "Albanian"
 msgstr "????????"
 
 msgid "Serbian"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Sinhala"
-msgstr "???????"
+msgstr "??????"
 
 msgid "Swedish"
 msgstr "??????"
 
 msgid "Swahili"
-msgstr ""
+msgstr "????????"
 
 msgid "Tamil"
 msgstr "?????"
@@ -12379,30 +12248,30 @@ msgid "Turkish"
 msgstr "???"
 
 msgid "Turkish"
-msgstr "???????"
+msgstr "??????"
 
 # tithi
 msgid "Urdu"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Vietnamese"
-msgstr "??????????"
+msgstr "??????????"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "??.??.???? ??? ???-????? ??"
+msgstr "??.??.???? ??? ??????-???? ???"
 
 msgid "Simplified Chinese"
-msgstr "???????? ????"
+msgstr "?????? ????"
 
 # tithi
 msgid "Hong Kong Chinese"
 msgstr "???? ????"
 
 msgid "Traditional Chinese"
-msgstr "?????????? ????"
+msgstr "????? ????"
 
 msgid "Amharic"
-msgstr "???????"
+msgstr "??????"
 
 #, c-format
 msgid "About %s"
@@ -12421,55 +12290,60 @@ msgstr ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"%s ???????? ??????? ??? ???? ???????? ??????? ????????? ?????? ?? AIM, MSN, "
+"%s ??? libpurple ??????? ??? ???? ?????????? ??????? ?????? ????????? ?? AIM, MSN, "
 "Yahoo!, XMPP, ICQ, IRC,SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, ??? QQ ?? ???? ????? ??????? ???? "
+"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, ??? QQ ?? ???? ?????? ??????? ??? "
 "??????  ??? GTK+ ??????? ??? ???? ???????<BR><BR>???? GPL ?? ????? (??????? ? ?? "
-"???????) ????? ????????????? ???????? ?? ??????? ???? ???? ??????  '??????? ?????' "
-"????? ??????? GPL ?? ???? ??????? %s ?? ???? ????? ??? ??????  %s ?? ???????? "
-"?????? ???????????? ????????? ???????????? ???????? ??????? ???? '???????????? ????????' "
-"???? ??????  ?? ???????????? ???? ???? ???? ????????? ?????? ??? ???<BR><BR>"
+"???????) ????? ????????????? ???????? ?? ??????? ???? ???? ?????? 'COPYING' ????? "
+"??????? GPL ?? ???? ??? %s ?? ???? ????? ??? ?????? ??????? ?????? %s ?? "
+"???????????? ????????? ????????? ???????? ??????? ???? 'COPYRIGHT' ?????? ?????? ?? "
+"???????????? ???? ???? ???? ????????? ?????? ??? ???<BR><BR>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support at pidgin.im"
 "\">support at pidgin.im</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">??????? ??????? ??????:</FONT> <A HREF=\"mailto:"
+"support at pidgin.im\">support at pidgin.im</A><BR/><BR/>"
 
 # fix me
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC ???????:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
 # fix me
-#, fuzzy, c-format
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "??????? ??????????"
 
 msgid "Crazy Patch Writers"
-msgstr "??????? ????? ??????"
+msgstr "?????????? ????? ????"
 
 msgid "Retired Developers"
 msgstr "??????????? ????????"
 
 msgid "Retired Crazy Patch Writers"
-msgstr "??????????? ??????? ????? ??????"
+msgstr "??????????? ?????????? ????? ????"
 
 msgid "Current Translators"
-msgstr "??????? ????????????"
+msgstr "??????? ???????"
 
 msgid "Past Translators"
-msgstr "????? ????????????"
+msgstr "????? ???????"
 
 msgid "Debugging Information"
 msgstr "???????? ????"
@@ -12481,36 +12355,35 @@ msgid "Get User Info"
 msgstr "??????? (_A)"
 
 msgid "Get User Info"
-msgstr "???????????? ???? ????? ????"
+msgstr "???????????? ????"
 
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"??????? ??? ???? ?? ???????? ???? ???????? ???? ??? ??? ???????????-??? ?? ????? "
-"?????? ?????"
+"??????? ??? ???? ?? ???????? ???? ???????? ???? ??? ??? ??????????? ??? ?? ????? ????"
 
 msgid "View User Log"
-msgstr "???????????? ??????????? ???????? ????"
+msgstr "???????????? ?? ????????"
 
 msgid "Alias Contact"
-msgstr "??????? ???????"
+msgstr "??????? ???????"
 
 msgid "Enter an alias for this contact."
-msgstr "?? ????????? ???? ????? ?????? ?????"
+msgstr "?? ?????? ???????? ???? ????? ????"
 
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "%s-?? ???? ????? ?????? ?????"
+msgstr "%s-?? ???? ????? ????"
 
 msgid "Alias Buddy"
-msgstr "????? ?????"
+msgstr "??????? ?????"
 
 msgid "Alias Chat"
 msgstr "??????? ?????"
 
 msgid "Enter an alias for this chat."
-msgstr "?? ?????? ???? ???? ????? ?????? ?????"
+msgstr "?? ?????? ???? ???? ????? ????"
 
 #, c-format
 msgid ""
@@ -12520,43 +12393,43 @@ msgstr[0] ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"???? ????? ????? ?????? ????  ???? %s ??? %d ?????? ???????? ??????? ?????? ???? "
-"?????? ???? ?? ??????? ????? ????"
+"???? ????? ????? ?????? ????  %s ??? ???? %d ?? ??????? ?????? ???? ???????? ???? "
+"?? ??????? ????? ????"
 msgstr[1] ""
-"???? ????? ????? ?????? ????  ???? %s ??? %d ????????? ???????? ??????? ?????? "
-"???? ?????? ???? ?? ??????? ????? ????"
+"???? ????? ????? ?????? ????  %s ??? ???? %d ?? ??????? ?????? ???? ???????? ???? "
+"?? ??????? ????? ????"
 
 msgid "Remove Contact"
-msgstr "??????? ?????? ????"
+msgstr "??????? ??????"
 
 msgid "_Remove Contact"
-msgstr "??????? ?????? ???? (_R)"
+msgstr "??????? ?????? (_R)"
 
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "???? %1s ????? ??????? %2s ?????? ??????? ?????? ???? ?? ??????? ????? ????"
+msgstr "???? %2$s ???? ???? %1$s ???? ??????? ???? ???????? ???? ?? ????????"
 
 msgid "Merge Groups"
-msgstr "????????? ??????? ????"
+msgstr "?????? ?????????"
 
 msgid "_Merge Groups"
-msgstr "????????? ??????? ???? (_M)"
+msgstr "?????? ????????? (_M)"
 
 #, 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 ""
-"???? %s ????? ? ?? ??? ??????? ????? ????? ?????? ???? ?????? ???? ?????? ???? ?? "
-"??????? ????? ????"
+"???? %s ???? ??? ?? ?? ??????? ????? ?????? ???? ?????? ???? ???????? ???? ?? "
+"????????"
 
 msgid "Remove Group"
-msgstr "????? ?????? ????"
+msgstr "?? ??????"
 
 msgid "_Remove Group"
-msgstr "????? ?????? ???? (_R)"
+msgstr "?? ?????? (_R)"
 
 #, c-format
 msgid ""
@@ -12566,65 +12439,65 @@ msgid "Remove Buddy"
 "????"
 
 msgid "Remove Buddy"
-msgstr "????? ?????? ????"
+msgstr "????? ??????"
 
 msgid "_Remove Buddy"
-msgstr "????? ????? ???? (_R)"
+msgstr "????? ?????? (_R)"
 
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"???? ????? ????? ?????? ??? %s ?????? ???? ??????  ???? ?? ??????? ????? ????"
+"???? ????? ????? ?????? ???? %s ?????? ???? ?????? ???? ?? ??????? ????? ????"
 
 msgid "Remove Chat"
-msgstr "????? ?????? ????"
+msgstr "????? ??????"
 
 msgid "_Remove Chat"
-msgstr "????? ?????? ???? (_R)"
+msgstr "????? ?????? (_R)"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "??? ????? ??????? ???? ??? ????? ????...\n"
+msgstr "??? ????? ??????? ???? ???-????? ????...\n"
 
 msgid "_Change Status"
-msgstr "?????? ???????? ???? (_C)"
+msgstr "?????? ???????? (_C)"
 
 msgid "Show Buddy _List"
-msgstr "????? ?????? ???????? ???? (_L)"
+msgstr "????? ?????? ???????? (_L)"
 
 msgid "_Unread Messages"
-msgstr "????? ?????????? (_U)"
+msgstr "????? ?????? (_U)"
 
 msgid "New _Message..."
 msgstr "???? ??????...(_M)"
 
 msgid "_Accounts"
-msgstr "??????????? (_A)"
+msgstr "??????? (_A)"
 
 msgid "Plu_gins"
 msgstr "??????? (_g)"
 
 msgid "Pr_eferences"
-msgstr "????????????? (_e)"
+msgstr "????????? (_e)"
 
 msgid "Mute _Sounds"
-msgstr "???? ???? ????? (_S)"
+msgstr "???? ???? (_S)"
 
 msgid "_Blink on New Message"
-msgstr "???? ???????? ??? ??? ???? (_B)"
+msgstr "???? ?????? ???? ???????? ?????? (_B)"
 
 msgid "_Quit"
-msgstr "???????? ???? (_Q)"
+msgstr "???????? (_Q)"
 
 msgid "Not started"
 msgstr "????? ?????"
 
 msgid "<b>Receiving As:</b>"
-msgstr "<b>?????? ????? ????:</b>"
+msgstr "<b>?????? ????? ??? ?????:</b>"
 
 msgid "<b>Receiving From:</b>"
-msgstr "<b>??? ???? ????? ????:</b>"
+msgstr "<b>??? ???? ????? ??? ?????:</b>"
 
 msgid "<b>Sending To:</b>"
 msgstr "<b>???? ?????? ?????:</b>"
@@ -12633,14 +12506,15 @@ msgid "There is no application configure
 msgstr "<b>?????? ?????? ?????:</b>"
 
 msgid "There is no application configured to open this type of file."
-msgstr "?? ????? ???? ????? ???? ???? ??????? ????????? ????"
+msgstr "?? ????? ???? ????? ???? ???? ???????????? ??????? ??? ????"
 
+# mark40
 msgid "An error occurred while opening the file."
-msgstr "?????? ????? ????? ???? ?????? ??????"
+msgstr "?????? ????? ????? ???? ?????? ??????"
 
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "%s ???????? ??????: %s"
+msgstr "%s ????? ???? ??????: %s"
 
 #, c-format
 msgid "Error running %s"
@@ -12648,10 +12522,10 @@ msgid "Process returned error code %d"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr "???????????? %d ?????? ??? ???? ?????????"
+msgstr "???????? %d ?????? ??? ???? ?????????"
 
 msgid "Filename:"
-msgstr "??????-???:"
+msgstr "?????? ???:"
 
 msgid "Local File:"
 msgstr "???????? ????:"
@@ -12666,10 +12540,10 @@ msgid "Close this window when all transf
 msgstr "??????? ????:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "??? ?????????? ??? ??? ?? ???????? ???? ???? (_f)"
+msgstr "?? ?????????? ??? ??? ?? ???????? ???? ??? ??? (_f)"
 
 msgid "C_lear finished transfers"
-msgstr "?????? ?????????? ???????? ???? (_l)"
+msgstr "?????????? ?????? ??? ?????? ???? ???? ???? ??? (_l)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
@@ -12681,55 +12555,54 @@ msgid "_Resume"
 
 #. Resume button
 msgid "_Resume"
-msgstr "??????? ???? ???? (_R)"
+msgstr "??????? ???? (_R)"
 
 msgid "Paste as Plain _Text"
-msgstr "??? ??? ?????? ????????? ???? (_T)"
+msgstr "??? ?????? ?????? ????????? (_T)"
 
 msgid "_Reset formatting"
-msgstr "?????????? ??????????? ???? (_R)"
+msgstr "??????? ????? (_R)"
 
 # tithi
 msgid "Disable _smileys in selected text"
-msgstr "????????? ???? ??????????? ?????????? ???? (_s)"
+msgstr "????????? ??????? ??????? ?????????? ??? ??? (_s)"
 
 msgid "Hyperlink color"
-msgstr "????????????? ??"
+msgstr "???????????? ??"
 
 msgid "Color to draw hyperlinks."
-msgstr "??????????? ????? ???"
+msgstr "?????????? ????? ???"
 
 # fix me
 msgid "Hyperlink visited color"
-msgstr "????????????? ????????? ??"
+msgstr "????????? ???????????? ??"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "??????????? ???????? (?? ???????) ???? ?? ??? ????? ???"
+msgstr "??????????? ???????? (?? ???????) ???? ?? ??? ????? ???"
 
 msgid "Hyperlink prelight color"
-msgstr "??????????? ?????-????? ??"
+msgstr "????????????? prelight ??"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "????????????? ??? ???? ????????? ??? ???? ??"
+msgstr "???????????? ??? ???? ????????? ??? ????? ??"
 
 msgid "Sent Message Name Color"
 msgstr "??????? ??????? ????? ??"
 
 # tithi
 msgid "Color to draw the name of a message you sent."
-msgstr "????? ??????? ???????????? ??? ???? ???"
+msgstr "????? ??????? ??????? ??? ????? ???"
 
 msgid "Received Message Name Color"
 msgstr "??????? ????? ?? ????? ??? ?????"
 
 # tithi
 msgid "Color to draw the name of a message you received."
-msgstr "????? ????? ???????????? ??? ???? ???"
+msgstr "????? ????? ??????? ??? ????? ???"
 
 # tithi
 msgid "\"Attention\" Name Color"
-msgstr "\"??????\" ?? ?? ???"
+msgstr "\"?????? ??????\" ?? ?? ???"
 
 # tithi
 msgid "Color to draw the name of a message you received containing your name."
@@ -12737,65 +12610,62 @@ msgid "Action Message Name Color"
 
 # tithi
 msgid "Action Message Name Color"
-msgstr "????? ?????? ????? ??"
+msgstr "??????????? ??????? ????? ??"
 
 # tithi
 msgid "Color to draw the name of an action message."
-msgstr "???? ???? ??????? ??? ???? ???"
+msgstr "???? ??????????? ??????? ????? ???"
 
 # fix me tithi
 msgid "Action Message Name Color for Whispered Message"
-msgstr "??????? ??????? ???? ????? ??????? ????? ??"
+msgstr "??????? ??????? ???? ??????????? ??????? ????? ??"
 
 # tithi
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "???? ???? ??????? ??? ???? ???"
+msgstr "???? ?????? ??????????? ??????? ??? ????? ???"
 
 # fix- me tithi
 msgid "Whisper Message Name Color"
 msgstr "??????? ??????? ????? ??"
 
 # tithi
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "???? ???? ??????? ??? ???? ???"
+msgstr "???? ?????? ??????? ??? ????? ???"
 
 msgid "Typing notification color"
-msgstr "????????? ?? ???? ????"
+msgstr "????? ???? ???? ??"
 
 # tithi
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "??????? ????????? ?????? ???? ????????? ??"
+msgstr "????? ???? ???? ?????? ???? ??????? ??"
 
 msgid "Typing notification font"
-msgstr "??????? ????????? ????"
+msgstr "????? ???? ???? ????"
 
 # tithi
 msgid "The font to use for the typing notification"
-msgstr "??????? ??????????? ???? ????????? ????4"
+msgstr "????? ???? ???? ???? ??????? ????"
 
 msgid "Enable typing notification"
-msgstr "??????? ????????? ??????? ????"
+msgstr "????? ???? ??????? ??? ???"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>?????????? ?????? ???</span>\n"
+"<span size='larger' weight='bold'>????? ?????? ???</span>\n"
 "\n"
-"PNG ?? ???????????????"
+"?????? ??? PNG ??????? ????"
 
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"?????????? ?????? ???\n"
+"????? ?????? ???\n"
 "\n"
-"PNG ?? ????????????????"
+"?????? ??? PNG ??????? ????"
 
 #, c-format
 msgid ""
@@ -12818,45 +12688,44 @@ msgid "Save Image"
 "%s"
 
 msgid "Save Image"
-msgstr "????? ??????? ????"
+msgstr "????? ???????"
 
 msgid "_Save Image..."
-msgstr "????? ??????? ????... (_S)"
+msgstr "????? ???????... (_S)"
 
 # tithi
 msgid "_Add Custom Smiley..."
-msgstr "??????? ??????? ??? ????... (_A)"
+msgstr "???????????? ??????? ???... (_A)"
 
 msgid "Select Font"
-msgstr "???? ???????? ????"
+msgstr "???? ????????"
 
 msgid "Select Text Color"
-msgstr "??? ?? ???????? ????"
+msgstr "???????? ?? ????????"
 
 msgid "Select Background Color"
-msgstr "?????????? ?? ???????? ????"
+msgstr "?????? ?? ????????"
 
 msgid "_URL"
-msgstr "?????? (_U)"
+msgstr "URL (_U)"
 
 msgid "_Description"
-msgstr "????? (_D)"
+msgstr "?????? (_D)"
 
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"??????? ??? ???? ?? ????? ?????? ????? ??? ??? ?????? ? ????? ?????? ????? ????? "
-"???????"
+"??????? ??? ???? ?? ???? ?????? ????? ??? ??? URL ??? ?????? ???? ?????? ???????"
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "??????? ??? ???? ?? ????? ?????? ????? ??? ??? ?????? ?????? ?????"
+msgstr "??????? ??? ???? ?? ???? ?????? ????? ??? ??? URL ????"
 
 msgid "Insert Link"
-msgstr "????? ?????? ????"
+msgstr "???? ?????? ????"
 
 msgid "_Insert"
-msgstr "?????? ???? (_I)"
+msgstr "?????? (_I)"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12871,7 +12740,8 @@ msgstr ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"?? ????????? ?????????? ???? ?? ?????????? ???? ???? ??????? ??????? ????????:\n"
+"?? ????????? ?????????? ???? ?? ?????????? ???? ???????? ???????????? ??????? "
+"????????:\n"
 "%s"
 
 msgid "Smile!"
@@ -12879,23 +12749,24 @@ msgid "_Manage custom smileys"
 
 # fix-me tithi
 msgid "_Manage custom smileys"
-msgstr "??????? ??????????? ????????? ???? (_M)"
+msgstr "???????????? ??????? ????????? (_M)"
 
 msgid "This theme has no available smileys."
-msgstr "?? ????? ???? ??????? ??????? ????"
+msgstr "?? ????? ???? ??????? ????"
 
 msgid "_Font"
 msgstr "???? (_F)"
 
+# ***
 msgid "Group Items"
-msgstr "??????? ?????????????"
+msgstr "????? ??????? ??? ???"
 
 # tithi
 msgid "Ungroup Items"
-msgstr "???????? ?????????????"
+msgstr "????? ????? ??? ???"
 
 msgid "Bold"
-msgstr "????"
+msgstr "???"
 
 msgid "Italic"
 msgstr "??????"
@@ -12909,24 +12780,24 @@ msgid "Increase Font Size"
 
 # tithi
 msgid "Increase Font Size"
-msgstr "?????? ???? ?????? ????"
+msgstr "?????? ???? ?????? ??? ???"
 
 # tithi
 msgid "Decrease Font Size"
-msgstr "?????? ???? ????? ????"
+msgstr "?????? ???? ????? ??? ???"
 
 msgid "Font Face"
-msgstr "?????? ???"
+msgstr "?????? ???"
 
 msgid "Foreground Color"
-msgstr "??????????? ??"
+msgstr "????????? ??"
 
 # tithi
 msgid "Reset Formatting"
-msgstr "?????????? ??????????? ????"
+msgstr "??????? ?????"
 
 msgid "Insert IM Image"
-msgstr "???? ????? ?????? ????"
+msgstr "IM ????? ?????? ????"
 
 msgid "Insert Smiley"
 msgstr "??????? ?????? ????"
@@ -12935,7 +12806,7 @@ msgid "<i>_Italic</i>"
 msgstr "<b>???? (_B)</b>"
 
 msgid "<i>_Italic</i>"
-msgstr "<i>?????? (_I)</i>"
+msgstr "?????? (_I) <i></i>"
 
 msgid "<u>_Underline</u>"
 msgstr "<u>????????? (_U)</u>"
@@ -12959,39 +12830,39 @@ msgid "_Font face"
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
 msgid "_Font face"
-msgstr "?????? ??? (_F)"
+msgstr "?????? ??? (_F)"
 
 msgid "Foreground _color"
-msgstr "??????????? ?? (_c)"
+msgstr "????????? ?? (_c)"
 
 msgid "Bac_kground color"
-msgstr "???????????? ?? (_k)"
+msgstr "??????? ?? (_k)"
 
 msgid "_Image"
 msgstr "????? (_I)"
 
 msgid "_Link"
-msgstr "????? (_L)"
+msgstr "???? (_L)"
 
 msgid "_Horizontal rule"
-msgstr "???????? ????? (_H)"
+msgstr "???????? ??????? (_H)"
 
 msgid "_Smile!"
 msgstr "????! (_S)"
 
 msgid "Log Deletion Failed"
-msgstr "??????????? ????????? ?????? ??????"
+msgstr "?? ?????? ??????"
 
 # tithi
 msgid "Check permissions and try again."
-msgstr "?????? ????? ???? ??? ???? ?????? ?????"
+msgstr "?????? ????? ??? ???? ?????? ?????"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"???? ?? ??????? ???? ?????????? %2s ?? ???? ????? ????????? ??????????? %1s ?? ???? "
+"???? ?? ??????????? %1$s ?? ???? %2$s ? ???? ????? ????????? ?? ?????????? ???? "
 "????? ????"
 
 #, c-format
@@ -12999,21 +12870,20 @@ msgstr ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
-"???? ?? ??????? ???? ?????????? %2s ?? ???? ????? ????????? ??????????? %1s ? ???? "
-"????? ????"
+"???? ?? ??????????? %1$s ? %2$s ? ???? ????? ????????? ?? ?????????? ???? ????? "
+"????"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr ""
-"???? ?? ??????? ???? ?????????? %1s ?? ???? ????? ??????? ??????????? ???? ????? ????"
+msgstr "???? ?? ??????????? %s ? ???? ????? ??????? ?? ?????????? ???? ????? ????"
 
 msgid "Delete Log?"
-msgstr "??????????? ?? ????? ????"
+msgstr "?? ????? ????"
 
 msgid "Delete Log..."
-msgstr "??????????? ?????..."
+msgstr "?? ??????..."
 
 # fix me
 #, c-format
@@ -13027,14 +12897,14 @@ msgid "_Browse logs folder"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "???????????? ??????? ?????? ???? (_B)"
+msgstr "?? ??????? ?????? (_B)"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%1s %2s? ??? ?????? ???? `%3s -h' ? ?????? ?????\n"
+msgstr "%1$s %2$s? ??? ?????? ???? `%3$s -h' ?????? ?????\n"
 
 # fix me
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -13052,22 +12922,23 @@ msgstr ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"???????: %s [?????]...\n"
+"???????: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    ??????? ?????? ???? DIR ??????? ????\n"
-"  -d, --debug         stdout ? ??????? ?????? ?????? ????\n"
-"  -h, --help          ?? ???????? ????? ? ????? ????\n"
-"  -m, --multiple      ??? ????????? ??????? ????? ??\n"
-"  -n, --nologin       ???????????????? ???? ????? ??\n"
-"  -l, --login[=NAME]  ??????????? ???????(????) ?????? ???? (??? ?????? ???? ?????? "
-"?????????? ???\n"
-"                        ????????? ???? ???????(????) ??????????? ???,\n"
-"                       ??? ?????? ????????? ????? ??????? ?????? ???)? \n"
-"  --display=DISPLAY   X ????????? ???? ???????? ????\n"
-"  -v, --version       ??????? ??????? ???????? ???? ??? ????? ????\n"
+"  -c, --config=DIR    ?????????? ?????? ???? DIR ??????? ??? ???\n"
+"  -d, --debug         stdout ? ??????? ?????? ??????? ??? ???\n"
+"  -f, --force-online  ?????? ??? ????? ????, ??????????? ?????? ??? ???\n"
+"  -h, --help          ?? ???????? ????? ? ???????? ????\n"
+"  -m, --multiple     ??? ??????????? ??????? ??? ??? ??\n"
+"  -n, --nologin       ???????????????? ???? ??? ??? ??\n"
+"  -l, --login[=NAME]  ????????? ???????(????) ?????? ??? ??? (NAME ????? ??? ?????? "
+"??????? ?????? ??????????\n"
+"                        ?? ???????(????) ????????? ???,\n"
+"                       ??? ?????? ????????? ????? ????????? ?????? ???)? \n"
+"  --display=DISPLAY   ?? X-??????? ??????? ??? ??? ?? ????????? ????\n"
+"  -v, --version       ??????? ??????? ???????? ??? ???????? ??? ???\n"
 
 # fix me
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -13084,18 +12955,19 @@ msgstr ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"???????: %s [?????]...\n"
+"???????: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    ??????? ?????? ???? DIR ??????? ????\n"
-"  -d, --debug         stdout ? ??????? ?????? ?????? ????\n"
-"  -h, --help          ?? ???????? ????? ? ????? ????\n"
-"  -m, --multiple      ??? ????????? ??????? ????? ??\n"
-"  -n, --nologin       ???????????????? ???? ????? ??\n"
-"  -l, --login[=NAME]  ??????????? ???????(????) ?????? ???? (??? ?????? ???? ?????? "
-"?????????? ???\n"
-"                        ????????? ???? ???????(????) ??????????? ???,\n"
-"                       ??? ?????? ????????? ????? ??????? ?????? ???)? \n"
-"  -v, --version       ??????? ??????? ???????? ???? ??? ????? ????\n"
+"  -c, --config=DIR    ?????????? ?????? ???? DIR ??????? ??? ???\n"
+"  -d, --debug         stdout ? ??????? ?????? ??????? ??? ???\n"
+"  -f, --force-online  ?????? ??? ????? ????, ??????????? ?????? ??? ???\n"
+"  -h, --help          ?? ???????? ????? ? ???????? ????\n"
+"  -m, --multiple     ??? ??????????? ??????? ??? ??? ??\n"
+"  -n, --nologin       ???????????????? ???? ??? ??? ??\n"
+"  -l, --login[=NAME]  ????????? ???????(????) ?????? ??? ??? (NAME ????? ??? ?????? "
+"??????? ?????? ??????????\n"
+"                        ?? ???????(????) ????????? ???,\n"
+"                       ??? ?????? ????????? ????? ????????? ?????? ???)?\n"
+"  -v, --version       ??????? ??????? ???????? ??? ???????? ??? ???\n"
 
 #, c-format
 msgid ""
@@ -13112,16 +12984,17 @@ msgstr ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"%s %s ???? ??? ?????? ???-???? ? ???? ???? ?????? ????????\n"
-"??? ???????????? ???? ??? ??? ????? ????? ???? ??? ?????? ?????? ????\n"
+"%s %s ???? ??? ?????? ???-???? ? ????? ???? ??????  ??????\n"
+"??? ???? ?????????? ??? ??? ????? ????? ???? ??? ?????? ?????? ???????\n"
 "\n"
-"???? ??? ??????? ??????? ????? ????, ???? ??? ??????????? ???????? ??????????? "
+"???? ??? ????????? ??????? ????? ?????, ???? ??? ????????? ???????? ??????????? "
 "???? ????:\n"
 "%ssimpleticket/\n"
 "\n"
-"??????? ??? ??????? ???? ?????? ???? ???? ?? ????? ?? ??????? ??? ??? ???? ??? ?? "
-"??? ????? ?????  ???? ??? ?? ????? ?????? ????? ???? ???, ??? ??????? ??? %swiki/"
-"GetABacktrace ?? ???????? ??? ????\n"
+"??????? ??? ??????????? ?????? ???? ???? ?? ????? ?? ??????? ??? ??? ???? ????\n"
+"?? backtrace ????? ????? ???? ??? ?? ????? ?????? backtrace ???? ???, ??? "
+"??????? ???\n"
+"%swiki/GetABacktrace ?? ????????? ??? ????\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -13130,96 +13003,93 @@ msgid "Exiting because another libpurple
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "???????? ???? ???? ?????? libpurple ????????? ???????? ?????\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/?????? (_M)"
 
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/??????/?? ??? ???? (_H)"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "???? ??? ?????..."
+msgstr "?? ??? ?????..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s ????? ???? ???? ????/????? ???? ???? ???? ????"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ????? ???? ???? ????? ???? ???? ???? ????"
 
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s-?? %d?? ???? ?????? ????"
-msgstr[1] "%s-??  %d???? ???? ?????? ????"
+msgstr[0] "%s-?? %d ?? ???? ?????? ????"
+msgstr[1] "%s-??  %d ?? ???? ?????? ????"
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] " <b>%d ?? ???? ?-?????</b>"
-msgstr[1] "<b>%d???? ???? ?-?????</b>"
+msgstr[0] "<b>%d ?? ???? ??????</b>"
+msgstr[1] "<b>%d ?? ???? ??????</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "???????? ??????? \"%s\" ?????"
+msgstr "???????? ?????? \"%s\" ?????????"
 
 msgid "Unable to open URL"
-msgstr "?????? ????? ????? ??"
+msgstr "URL ????? ??????"
 
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "\"%1s\" ???????? ??????: %2s"
+msgstr "\"%1$s\" ????? ???? ??????: %2$s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"'?????????????' ???????? ??????? ????? ??? ??????, ?????? ???? ??????? ???????? ??? "
+"'Manual'  ???????? ???????? ???????? ??? ??????, ?????? ???? ?????? ???????? ??? "
 "??????"
 
-#, fuzzy
 msgid "No message"
-msgstr "????? ??????"
+msgstr "??? ?????? ???"
 
 msgid "Open All Messages"
-msgstr "??? ?????? ?????"
+msgstr "?? ?????? ???? ???"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">????? ???? ???!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "???? ????? ?????? ????"
+msgstr "???? ??????"
 
+# context?
 msgid "Dismiss"
-msgstr ""
+msgstr "?????"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">????? ???? ???!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">???? ?????? ??????!</span>"
 
 # tithi
 msgid "The following plugins will be unloaded."
-msgstr "????????? ??????????? ??? ????? ??? ????"
+msgstr "????????? ??????????? ????? ??? ????"
 
 # tithi
 msgid "Multiple plugins will be unloaded."
-msgstr "?????? ??????????? ??? ????? ??? ????"
+msgstr "?????? ??????? ????? ??? ????"
 
 msgid "Unload Plugins"
-msgstr "??????? ??? ????? ????"
+msgstr "??????? ????? ??? ???"
 
 msgid "Could not unload plugin"
-msgstr "??????? ??? ????? ??? ??????"
+msgstr "??????? ????? ??? ??????"
 
 # tithi
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
-"?? ????????? ??? ??? ????? ??? ?????? ??, ?????? ??????? ?????? ?????????? ??? ????"
+"?? ????????? ??? ????? ??? ?????? ??, ?????? ????????? ????? ??? ?????????? ??? ????"
 
 # tithi
 #, c-format
@@ -13228,7 +13098,7 @@ msgstr ""
 "Check the plugin website for an update.</span>"
 msgstr ""
 "<span foreground=\"red\" weight=\"bold\">??????: %s\n"
-"?????????? ???? ??????? ????????? ??????? ?????</span>"
+"?????????? ???? ??????? ????????? ??????</span>"
 
 msgid "Author"
 msgstr "????"
@@ -13240,24 +13110,23 @@ msgid "<b>Filename:</b>"
 msgstr "<b>????? ????:</b>"
 
 msgid "<b>Filename:</b>"
-msgstr "<b>???????:</b>"
+msgstr "<b>?????? ???:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "??????? ??????? ??????? ???? (_u)"
+msgstr "??????? ?????????? (_u)"
 
 msgid "<b>Plugin Details</b>"
-msgstr "<b>????????? ??????</b>"
+msgstr "<b>????????? ?????</b>"
 
 msgid "Select a file"
 msgstr "???? ???? ???????? ????"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "????? ?????? ??????? ????"
+msgstr "????? ?????? ???????? ??? ???"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
-msgstr "???? ?????? ????"
+msgstr "???? ?????? ??? ???"
 
 msgid "_Account:"
 msgstr "??????? (_A):"
@@ -13266,136 +13135,133 @@ msgid "Si_gns on"
 msgstr "?????? ??? (_B):"
 
 msgid "Si_gns on"
-msgstr "???? ?? (_g)"
+msgstr "???? ??? (_g)"
 
 msgid "Signs o_ff"
-msgstr "???? ?? (_f)"
+msgstr "????? ??? (_f)"
 
 msgid "Goes a_way"
-msgstr "????????? (_w)"
+msgstr "????? ??? (_w)"
 
 msgid "Ret_urns from away"
-msgstr "????????? ?????? ???? ???? ????? (_u)"
+msgstr "??????? ?????? ???? ???? ??? (_u)"
 
 msgid "Becomes _idle"
-msgstr "??? ??? (_i)"
+msgstr "????????? ?? (_i)"
 
 msgid "Is no longer i_dle"
-msgstr "?? ??? ????? ?? (_d)"
+msgstr "?? ????????? ?? (_d)"
 
 msgid "Starts _typing"
-msgstr "???? ???? ????? (_t)"
+msgstr "???? ???? ??? (_t)"
 
 # tithi
 msgid "P_auses while typing"
-msgstr "?????? ???? ???? ????? (_a)"
+msgstr "???? ???? ??? ???? (_a)"
 
 msgid "Stops t_yping"
-msgstr "???? ???? ???? (_y)"
+msgstr "???? ???? ??? (_y)"
 
 msgid "Sends a _message"
 msgstr "?????? ?????? (_m)"
 
 msgid "Ope_n an IM window"
-msgstr "???? ???? ?????? ????? (_n)"
+msgstr "???? IM ?????? ???? ??? (_n)"
 
 msgid "_Pop up a notification"
-msgstr "???? ????????? ???? ???? (_P)"
+msgstr "???? ????? ???? ??? ??? (_P)"
 
 msgid "Send a _message"
-msgstr "???? ?????? ????? (_m)"
+msgstr "???? ?????? ?????? ??? (_m)"
 
 msgid "E_xecute a command"
-msgstr "???? ??????? ??????? ????  (_x)"
+msgstr "???? ?????? ??????? ??? ???  (_x)"
 
 msgid "P_lay a sound"
-msgstr "???? ????? (_l)"
+msgstr "???? ?????? ??? (_l)"
 
 msgid "Brows_e..."
-msgstr "?????? ????... (_e)"
+msgstr "??????... (_e)"
 
 msgid "Br_owse..."
-msgstr "?????? ????... (_o)"
+msgstr "??????... (_o)"
 
 msgid "Pre_view"
 msgstr "?????????? (_v)"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "???? ?????? ??? ??????? ?? ??? ?????? ???? (_o)"
+msgstr "???? ?????? ??? ????????? ??? ?????? ??? ??? (_o)"
 
 # tithi
 msgid "_Recurring"
-msgstr "?????????? ???? (_R)"
+msgstr "?????????? (_R)"
 
 msgid "Pounce Target"
 msgstr "???????? ??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "???? ???? ????"
+msgstr "???? ???? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
-msgstr "???? ???? ???? ????? ???"
+msgstr "???? ??? ????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
-msgstr "???? ??"
+msgstr "???? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%1s ??? ?????? ???? ???? ????? (%2s)"
+msgstr "????????? ?????? ???? ??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being away"
-msgstr "??? ??? ???? ???"
+msgstr "??????? ???? ???? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "???? ??? ???? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "???? ??"
+msgstr "????? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
-msgstr "??? ??? ???"
+msgstr "????????? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "??? ?????????"
+msgstr "??? ???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Sent a message"
-msgstr "???? ?????? ?????"
+msgstr "???? ?????? ?????? ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "????? ?????? ??????? ??????? ??? ??? ??????? ????!"
+msgstr "?????... ??????? ??? ??? ??????? ????!"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "??????? ??? ???????? ???? ?????? ?????"
+msgstr "??? ??????? ???? ?????? ??????"
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "??????? ??? ???????? ???? ?????? ?????"
+msgstr "??? ??? ???? ?????? ??????"
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "??????? ??? ???????? ???? ?????? ?????"
+msgstr "??? ??????? ???? ?????? ??????"
 
 # tithi
 msgid "Install Theme"
-msgstr "??? ???????? ????"
+msgstr "??? ?????? ????"
 
 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 ""
 "???? ?? ??????? ??? ??????? ???? ??? ?? ?????????? ?????? ???? ????? ????? ???? "
-"??? ????? ??????? ???? ? ????? ??????? ????? ???????? ???? ??????"
+"??? ??????? ???? ??? ???? ?????? ???? ??????"
 
 msgid "Icon"
 msgstr "????"
@@ -13405,45 +13271,43 @@ msgid "Cl_ose conversations with the Esc
 msgstr "??????? ???????"
 
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Escape ?? ?????? ??????????? ???? ???? (_o)"
+msgstr "Escape ?? ???? ??????? ???? ??? ???? (_o)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Buddy List"
+msgstr "????? ??????? ???"
 
 #. System Tray
 msgid "System Tray Icon"
-msgstr "??????? ???? ?? ????"
+msgstr "??????? ????? ????"
 
 msgid "_Show system tray icon:"
-msgstr "??????? ???? ?? ???? ???????? ???? (_S):"
+msgstr "??????? ????? ???? ???????? (_S):"
 
 msgid "On unread messages"
-msgstr "????? ???????????"
+msgstr "????? ?????? ?????"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "????????? ??????? ??????? ???????"
+msgstr "????????? ??????"
 
 msgid "_Hide new IM conversations:"
-msgstr "???? ??????? IM ??????? ????? (_H):"
+msgstr "???? IM ??????? ??????? ???? ??? (_H):"
 
 msgid "When away"
-msgstr "??? ?????????"
+msgstr "??? ???????"
 
 msgid "Minimi_ze new conversation windows"
-msgstr "???? ??????? ?????? ??????? ???? (_z)"
+msgstr "???? ??????? ?????? ??? ??? ??? (_z)"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr "?????????"
+msgstr "?????"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "???? ? ????????? ???????? ???????? ???????? ???? (_t)"
+msgstr "IM ? ????? ???????? ???????? ???????? ??? ??? (_t)"
 
 msgid "Show close b_utton on tabs"
-msgstr "?????? ???? ????? ???????? ???? (_u)"
+msgstr "?????? ???? ????? ???????? ??? ??? (_u)"
 
 msgid "_Placement:"
 msgstr "??????? (_P):"
@@ -13461,130 +13325,130 @@ msgid "Left Vertical"
 msgstr "???"
 
 msgid "Left Vertical"
-msgstr "??? ?????"
+msgstr "??? ???????"
 
 msgid "Right Vertical"
-msgstr "??? ?????"
+msgstr "??? ???????"
 
 msgid "N_ew conversations:"
 msgstr "???? ??????? (_e):"
 
 msgid "Show _formatting on incoming messages"
-msgstr "??? ??????????? ?????????? ???????? ???? (_f)"
+msgstr "??? ??????? ??????? ????????? ??? (_f)"
 
 # tithi
 msgid "Close IMs immediately when the tab is closed"
-msgstr "????? ???? ???? ??? IM ?????????????? ???? ????"
+msgstr "????? ???? ???? IM???? ?????????????? ???? ??? ???"
 
 msgid "Show _detailed information"
-msgstr "????????? ???? ???????? ???? (_d)"
+msgstr "????????? ???? ???????? (_d)"
 
 msgid "Enable buddy ic_on animation"
-msgstr "??????????? ?????? ???? ??????? ???? (_o)"
+msgstr "?????? ?????? ?????????? ??????? ??? ??? (_o)"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "???? ?? ???? ????? ?? ???????? ???? ???? (_N)"
+msgstr "???? ???? ????? ?? ???????? ???? ??? ??? (_N)"
 
 msgid "Highlight _misspelled words"
-msgstr "??? ??????? ???? ??????? ???? (_m)"
+msgstr "??? ????? ??????? ??? ??? (_m)"
 
 # tithi
 msgid "Use smooth-scrolling"
-msgstr "????-???????? ??????? ????"
+msgstr "????-???????? ??????? ??? ???"
 
 msgid "F_lash window when IMs are received"
-msgstr "???? ????? ???? ?????? ??????? ??? (_l)"
+msgstr "IM ????? ???? ?????? ?????? ??? (_l)"
 
 # tithi
 msgid "Minimum input area height in lines:"
-msgstr "?????? ??????? ????? ?????? ??????:"
+msgstr "????? ????? ?????? ????????? ??????:"
 
 msgid "Font"
 msgstr "????"
 
 # tithi
 msgid "Use document font from _theme"
-msgstr "??? ???? ???? ???? ??????? ???? (_t)"
+msgstr "??? ???? ???? ???? ??????? ??? ??? (_t)"
 
 # tithi
 msgid "Use font from _theme"
-msgstr "??? ???? ???? ??????? ???? (_t)"
+msgstr "??? ???? ???? ??????? ??? ??? (_t)"
 
 msgid "Conversation _font:"
 msgstr "??????? ???? (_f):"
 
 msgid "Default Formatting"
-msgstr "?????????????? ??????????"
+msgstr "?????????????? ???????"
 
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"???? ??? ?????????? ??????? ??????? ??????? ???? ??? ????? ???????? ??????? ??? "
-"??????? ??????? ????"
+"???? ??? ??????? ??????? ???????? ??????? ???? ??? ????? ???? ??????? ????????? "
+"????"
 
 # tithi
 msgid "Cannot start proxy configuration program."
-msgstr "??????? ???????? ????????? ???? ???? ???? ???"
+msgstr "??????? ?????????? ????????? ???? ??? ????? ?????"
 
 msgid "Cannot start browser configuration program."
-msgstr "?????????? ???????? ????????? ???? ???? ???? ???"
+msgstr "???????? ?????????? ????????? ???? ??? ????? ?????"
 
 # tithi
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">??????: ??????????????.????</span>"
+msgstr "??????: <span style=\"italic\">stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "??????-?????? ???? ?????? (_A)"
+msgstr "??????????????? ????????? IP ?????? ??????? ???? (_a): %s"
 
 msgid "Public _IP:"
-msgstr "?????????? ???? (_I):"
+msgstr "?????? _IP:"
 
 msgid "Ports"
-msgstr "?????????"
+msgstr "?????"
 
 # tithi
 msgid "_Enable automatic router port forwarding"
-msgstr "???????????? ?????? ????? ??????? ??????? ???? (_E)"
+msgstr "???????????? ?????? ????? ?????????? ??????? ??? ??? (_E)"
 
 msgid "_Manually specify range of ports to listen on"
-msgstr "????? ??????? ???? ????? ???? ?????? ???? (_M)"
+msgstr "???? ?????? ????? ??? ??? ??? ???? ??????????? (_M)"
 
 msgid "_Start port:"
 msgstr "????? ????? (_S):"
 
 msgid "_End port:"
-msgstr "??? ????? (_E):"
+msgstr "????? ????? (_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "???? ??????? (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "??????? ??????? &amp; ????????"
 
 # tithi
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>???????? ??????? ???????? ????????? ????? ?????? ???????</b>"
+msgstr "<b>???????? ?????????? ????????? ????? ?????? ???????</b>"
 
 # tithi
 msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>?????????? ??????? ???????? ????????? ????? ?????? ???????</b>"
+msgstr "<b>?????????? ?????????? ????????? ????? ?????? ???????</b>"
 
 # tithi
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
-"??????? ? ?????????? ????????????? \n"
-"GNOME ?????????????? ??????? ???????? ??? ?????"
+"??????? ? ?????????? ????????????? \n"
+"GNOME ?????????? ??????? ??? ?????"
 
 msgid "Configure _Proxy"
-msgstr "??????? ??????? ??????? ???? (_P)"
+msgstr "??????? ??????????  (_P)"
 
 msgid "Configure _Browser"
-msgstr "???????? ??????? ??????? ???? (_B)"
+msgstr "???????? ?????????? (_B)"
 
 msgid "Proxy Server"
 msgstr "??????? ???????"
@@ -13594,7 +13458,7 @@ msgid "Use remote DNS with SOCKS4 proxie
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "SOCKS4 ??????? ??????? ???????? DNS ??????? ???"
 
 msgid "_User:"
 msgstr "??????????? (_U):"
@@ -13613,13 +13477,13 @@ msgid "Konqueror"
 msgstr "?????"
 
 msgid "Konqueror"
-msgstr "?????????"
+msgstr "??????????"
 
 msgid "Desktop Default"
-msgstr "??????? ??????????????"
+msgstr "?????????????? ??????? "
 
 msgid "GNOME Default"
-msgstr "GNOME ??????????????"
+msgstr "?????????????? GNOME "
 
 msgid "Galeon"
 msgstr "????????"
@@ -13643,10 +13507,10 @@ msgid "_Open link in:"
 msgstr "???????? (_B):"
 
 msgid "_Open link in:"
-msgstr "????? ????? (_O):"
+msgstr "???? ????? (_O):"
 
 msgid "Browser default"
-msgstr "???????? ??????????????"
+msgstr "?????????????? ????????"
 
 msgid "Existing window"
 msgstr "???????? ??????"
@@ -13663,16 +13527,16 @@ msgid "Log _format:"
 "(URL ?? ???? %s)"
 
 msgid "Log _format:"
-msgstr "??????????? ??????? (_f):"
+msgstr "?? ??????? (_f):"
 
 msgid "Log all _instant messages"
-msgstr "?? ????????? ?????????? ?? ???? (_i)"
+msgstr "?? ????????? ?????? ??????? ??? ??? (_i)"
 
 msgid "Log all c_hats"
-msgstr "??? ????? ?? ???? (_h)"
+msgstr "?? ?????? ??????? ?? ??? ??? (_h)"
 
 msgid "Log all _status changes to system log"
-msgstr "?? ??????? ???????????? ????????? ????????????? ?? ???? (_s)"
+msgstr "?? ??????? ???????? ??????? ??? ???? ??? (_s)"
 
 msgid "Sound Selection"
 msgstr "???? ????????"
@@ -13699,7 +13563,7 @@ msgid "Loudest"
 
 #, c-format
 msgid "Loudest"
-msgstr "???? ????"
+msgstr "?????? ????"
 
 msgid "_Method:"
 msgstr "?????????? (_M):"
@@ -13715,184 +13579,183 @@ msgstr ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"?????? ??????? (_o):\n"
-"(????-????? ???? %s)"
+"?????? ?????? (_o):\n"
+"(?????? ????? ???? %s)"
 
 msgid "M_ute sounds"
-msgstr "???? ???? ???? (_u)"
+msgstr "???? ???? (_u)"
 
 msgid "Sounds when conversation has _focus"
-msgstr "??????? ????? ???? ????"
+msgstr "???????? ????? ???? ???? ???"
 
 msgid "_Enable sounds:"
-msgstr "???? ??????? ???? (_E):"
+msgstr "???? ??????? (_E):"
 
 msgid "V_olume:"
 msgstr "????? (_o):"
 
 msgid "Play"
-msgstr "?????"
+msgstr "?????? ???"
 
 msgid "_Browse..."
-msgstr "?????? ????... (_B)"
+msgstr "??????... (_B)"
 
 msgid "_Reset"
-msgstr "???? ??????? ???? (_R)"
+msgstr "????? (_R)"
 
 msgid "_Report idle time:"
-msgstr "??? ?????? ????????? ??? (_R)"
+msgstr "????????? ???? ?????? ??? (_R):"
 
 # tithi
 msgid "Based on keyboard or mouse use"
-msgstr "??????? ?? ???? ????????? ??? ?????? ???"
+msgstr "??????? ?? ?????? ????????? ??? ?????? ???"
 
 msgid "_Auto-reply:"
 msgstr "????????????-????? (_A):"
 
 msgid "When both away and idle"
-msgstr "??? ???? ????????? ??? ???"
+msgstr "??? ??????? ??? ?????????"
 
 #. Auto-away stuff
 msgid "Auto-away"
-msgstr "???????????????? ??????????"
+msgstr "???????????????? ???????"
 
 msgid "_Minutes before becoming idle:"
-msgstr "??? ????? ??????? ????? (_M):"
+msgstr "????????? ????? ?????????? ??? (_M):"
 
 msgid "Change status when _idle"
-msgstr "??? ????? ?????? ???????? ???? (_i)"
+msgstr "????????? ????? ?????? ???????? ??? ??? (_i)"
 
 msgid "Change _status to:"
-msgstr "?????? ???????? ???? (_s):"
+msgstr "?????? ???????? (_s):"
 
 # tithi
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr "?????? ??????"
+msgstr "????? ??????"
 
 # tithi
 msgid "Use status from last _exit at startup"
-msgstr "??????? ??????? ?????? ?????? ??????? ???? (_e)"
+msgstr "??????? ??? ??????? ?????????? ?????? ??????? ??? ??? (_e)"
 
 # tithi
 msgid "Status to a_pply at startup:"
-msgstr "??????? ??????? ???? ?????? (_p):"
+msgstr "?????? ??????? ???? ?????? (_p):"
 
 msgid "Interface"
 msgstr "?????????"
 
 msgid "Smiley Themes"
-msgstr "??????? ???????"
+msgstr "??????? ???"
 
 msgid "Browser"
 msgstr "????????"
 
 msgid "Status / Idle"
-msgstr "?????? / ???"
+msgstr "?????? / ?????????"
 
 msgid "Allow all users to contact me"
-msgstr "?? ????????????? ???? ???? ??????? ???? ?????? ???"
+msgstr "?? ????????????? ???? ???? ????????? ?????? ???? ???"
 
 msgid "Allow only the users on my buddy list"
-msgstr "????????? ???? ??????? ???????? ?????? ???"
+msgstr "????????? ???? ??????? ???????? ?????? ???? ???"
 
 msgid "Allow only the users below"
-msgstr "????????? ??????????? ?????????????? ?????? ???"
+msgstr "????????? ?????????? ?????????????? ?????? ???? ???"
 
 msgid "Block all users"
-msgstr "?? ?????????????? ???? ????"
+msgstr "?? ?????????????? ???? ??? ???"
 
 msgid "Block only the users below"
-msgstr "????????? ??????????? ?????????????? ???? ????"
+msgstr "????????? ?????????? ?????????????? ???? ??? ???"
 
 msgid "Privacy"
-msgstr "?????????"
+msgstr "??????"
 
 msgid "Changes to privacy settings take effect immediately."
-msgstr "????????? ????????????? ???????????? ?????????????? ??????? ????"
+msgstr "??????? ????????? ???????????? ?????????????? ??????? ????"
 
 msgid "Set privacy for:"
-msgstr "?? ???? ???????? ???????? ????:"
+msgstr "?? ???? ?????? ???????? ????:"
 
 #. Remove All button
 msgid "Remove Al_l"
-msgstr "?? ?????? ???? (_l)"
+msgstr "?? ?????? ??? ??? (_l)"
 
 msgid "Permit User"
-msgstr "????????????? ?????? ???"
+msgstr "????????????? ???????"
 
 msgid "Type a user you permit to contact you."
-msgstr "???? ?????? ??? ??? ????????????? ????? ???? ????????? ???? ???? ?????"
+msgstr "????? ???? ??????? ???? ???????? ???? ???????????? ??? ????"
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"??????? ??? ????? ???? ???????? ?????? ???? ??? ??? ???????????? ??? ?????? ?????"
+msgstr "??????? ??? ????? ???? ???????? ?????? ???? ??? ??? ???????????? ??? ????"
 
 msgid "_Permit"
-msgstr "?????? ??? (_P)"
+msgstr "??????? ???? (_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "????? ???? ????????? ????? %s ?? ?? ?????? ??????"
+msgstr "%s ?? ????? ???? ????????? ???? ?????? ???? ????"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "???? ?? ??????? ????  %s-?? ????? ???? ????????? ?????? ???? ????"
+msgstr "???? ?? ??????????? %s ?? ????? ???? ????????? ???? ?????? ???? ????"
 
 msgid "Block User"
-msgstr "????????????? ???? ???"
+msgstr "????????????? ???? ??? ???"
 
 msgid "Type a user to block."
-msgstr "???? ?????? ???? ????????????? ???? ?????"
+msgstr "???? ???? ???? ???????????? ??? ????"
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "??????? ??? ???? ?? ????????????? ???? ???? ??? ??? ??? ?????? ?????"
+msgstr "??????? ??? ???? ?? ????????????? ???? ???? ??? ??? ??? ????"
 
 #, c-format
 msgid "Block %s?"
-msgstr "%s ?? ?? ???? ??????"
+msgstr "%s ?? ???? ???? ????"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "???? ?? ??????? ???? %s-?? ???? ???? ????"
+msgstr "???? ?? ??????????? %s-?? ???? ???? ????"
 
 msgid "Apply"
-msgstr "??????? ????"
+msgstr "???????"
 
 msgid "That file already exists"
-msgstr "? ?????? ???????? ????????"
+msgstr "? ?????? ???????? ????????"
 
 msgid "Would you like to overwrite it?"
-msgstr "???? ?? ??? ???????? ???? ????"
+msgstr "???? ?? ???? ???????? ???? ????"
 
 # tithi
 msgid "Overwrite"
-msgstr "???????? ????"
+msgstr "????????"
 
 msgid "Choose New Name"
-msgstr "???? ??? ????? ????"
+msgstr "???? ??? ????????"
 
 msgid "Select Folder..."
-msgstr "??????? ???????? ????..."
+msgstr "??????? ????????..."
 
 #. list button
 msgid "_Get List"
-msgstr "?????? ?????? ???? (_G)"
+msgstr "?????? ?????? (_G)"
 
 #. add button
 msgid "_Add Chat"
-msgstr "????? ??? ???? (_A)"
+msgstr "????? ??? (_A)"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "???? ?? ??????? ???? ????????? ???????? ?????????? ???? ????? ????"
+msgstr "???? ?? ??????????? ????????? ???????? ?????? ???? ????? ????"
 
 #. Use button
 msgid "_Use"
-msgstr "??????? ???? (_U)"
+msgstr "??????? (_U)"
 
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
-"??????? ???????? ??????? ??????  ?????? ?????? ???? ????? ??????? ????? ???? ????"
+"??????? ???????? ??????? ?????? ?????? ?????? ???? ???????? ??????? ????? ???? ????"
 
 msgid "Different"
 msgstr "????"
@@ -13905,59 +13768,55 @@ msgid "Use a _different status for some 
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "???? ????????? ???? ???? ?????? ??????? ???? (_d)"
+msgstr "???? ????????? ???? ???? ?????? ??????? ??? ??? (_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "??????? ??? ??????? ???? (_v)"
+msgstr "??????? ??? ??????? (_V)"
 
 #, c-format
 msgid "Status for %s"
 msgstr "%s-?? ???? ??????"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"????????? ?????????? ???? ??????? ??????? ???????? ????????? ??????? ??? ???? ????? "
-"??????? ?????? ?????"
+"???? ???????????? ??????? '%s' ?? ???? ??????? ?????? ??????? ??? ???? ????? ??????? "
+"??????? ?????"
 
 msgid "Custom Smiley"
-msgstr "??????? ???????"
+msgstr "???????????? ???????"
 
 msgid "Duplicate Shortcut"
-msgstr "?????? ???????"
+msgstr "????? ??? ???????"
 
 msgid "Edit Smiley"
-msgstr "??????? ???????? ????"
+msgstr "??????? ????????"
 
 msgid "Add Smiley"
-msgstr "??????? ??? ????"
+msgstr "??????? ???"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "????? (_I)"
+msgstr "??? (_I):"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "???????"
+msgstr "??????? ?????? (_h):"
 
 msgid "Smiley"
-msgstr "???????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "???????"
+msgstr "??????? ??????"
 
 # tithi
 msgid "Custom Smiley Manager"
-msgstr "??????? ??????? ??????????"
+msgstr "???????????? ??????? ??????????"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "????? ???????? ????"
+msgstr "????? ???? ????????"
 
 # tithi
 msgid "Click to change your buddyicon for this account."
@@ -13968,13 +13827,13 @@ msgid "Waiting for network connection"
 msgstr "?? ????????? ???? ????? ?????-???? ???????? ???? ????? ?????"
 
 msgid "Waiting for network connection"
-msgstr "?????????? ??????? ???? ??????? ????"
+msgstr "?????????? ??????? ???? ??????? ??? ?????"
 
 msgid "New status..."
 msgstr "???? ??????..."
 
 msgid "Saved statuses..."
-msgstr "???????? ??????????..."
+msgstr "???????? ??????..."
 
 msgid "Status Selector"
 msgstr "?????? ????????"
@@ -13985,56 +13844,56 @@ msgid "The following error has occurred 
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "%1s ??? ???? ???? ????????? ?????? ?????? ?????: %2s"
+msgstr "%1$s ??? ???? ???? ????????? ?????? ?????? ?????: %2$s"
 
 msgid "Failed to load image"
-msgstr "????? ??? ???? ?????? ?????"
+msgstr "????? ??? ???? ??????"
 
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "%s ??????? ?????? ???? ???"
+msgstr "%s ??????? ?????? ????? ?????"
 
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"%s ??????? ?????????? ???? ???? ??? ?????? ??????? ???? ????????? ?????? ????"
+"%s ??????? ?????????? ??? ????? ????? ?????? ??????? ???? ????????? ?????? ????"
 
 msgid "You have dragged an image"
-msgstr "???? ???? ????? ???????"
+msgstr "???? ???? ????? ???? ??????"
 
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-"???? ?? ????? ???? ?????????? ?????? ?????? ?????, ????? ?? ??????? ???? ??????? "
-"??????? ????, ?? ????? ?? ???????????? ???? ????? ???? ?????? ??????? ?????"
+"???? ?? ????? ???? ???????????? ??????? ?????? ?????, ????? ?? ??????? ???? "
+"???????? ???? ?????, ???? ?? ???????????? ????? ???? ?????? ??????? ???? ??????"
 
 msgid "Set as buddy icon"
-msgstr "????? ???? ?????? ???????? ????"
+msgstr "????? ???? ?????? ???????? ??? ???"
 
 msgid "Send image file"
-msgstr "????? ???? ?????"
+msgstr "????? ???? ?????? ???"
 
 msgid "Insert in message"
-msgstr "???????? ?????? ????"
+msgstr "???????? ?????? ????? ???"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "???? ?? ????? ?? ???????????? ???? ????? ???? ?????? ???????? ???? ????"
+msgstr "???? ?? ????? ?? ???????????? ???? ????? ???? ?????? ???????? ???? ????"
 
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"???? ?? ??????? ???? ?????????? ?????? ?????? ?????, ?? ????? ?? ???????????? "
-"???? ????? ???? ?????? ??????? ???? ??????"
+"???? ?? ??????? ???? ?????????? ?????? ?????? ?????, ???? ????? ?? ???????????? "
+"????? ???? ?????? ??????? ???? ??????"
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"???? ?? ??????? ?? ????????? ???? ?????? ???? ?????, ?? ??? ?? ???????????? ???? "
+"???? ?? ??????? ?? ????????? ???? ?????? ????? ?????, ???? ??? ?? ???????????? "
 "????? ???? ?????? ??????? ???? ?????"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -14043,15 +13902,14 @@ msgid "Cannot send launcher"
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 msgid "Cannot send launcher"
-msgstr "??????? ?????? ???? ??"
+msgstr "?????? ?????? ????? ????"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
-"???? ???? ??????? ??????? ???? ??????? ?? ????????? ?????? ??????? ???? ???????? "
-"?? ?????? ??????? ??? ?????? ?????? ???? ?????? ????"
+"???? ???? ??????? ?????? ???? ??????? ???? ??????  ???????? ?? ??? ??? ???? "
+"??????? ??? ?? ?????? ????"
 
 #, c-format
 msgid ""
@@ -14059,108 +13917,120 @@ msgstr ""
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
-"<b>????:</b> %1s\n"
-"<b>?????? ????:</b> %2s\n"
-"<b>??????? ????:</b> %3dx%4d"
+"<b>????:</b> %1$s\n"
+"<b>?????? ????:</b> %2$s\n"
+"<b>??????? ????:</b> %3$dx%4$d"
 
 # tithi
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
-"'%1s' ?????? %2s ?? ???? ???? ???? ??????? ??? ?????????? ??? ????? ??????? ?????\n"
+"'%1$s' ?????? %2$s ?? ???? ???? ???? ??????? ??? ?????????? ??? ????? ??????? ?????\n"
 
 msgid "Icon Error"
 msgstr "???? ??????"
 
 msgid "Could not set icon"
-msgstr "???? ???????? ??? ?????"
+msgstr "???? ???????? ??? ??????"
 
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "'%1s' ?????? ????? ??????: %2s"
+msgstr "'%1$s' ?????? ????? ??????: %2$s"
 
 # tithi
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"'%s' ??????? ??? ???? ?????? ??????? ???? ???? ???, ?????? ???? ???? ??????? ????"
+"'%s' ??????? ??? ???? ?????? ??????? ???? ???? ???, ?????? ??????? ?????? ?????"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "????? ????? (_O):"
+msgstr "???? ???? ??? (_O)"
 
 msgid "_Copy Link Location"
-msgstr "????? ??????? ??????? ???? (_C)"
+msgstr "?????? ??????? ??????? (_C)"
 
 msgid "_Copy Email Address"
-msgstr "?-???? ?????? ??????? ???? (_C)"
+msgstr "????? ?????? ??????? (_C)"
 
+msgid "_Open File"
+msgstr "???? ?????... (_O)"
+
+msgid "Open _Containing Directory"
+msgstr "???????? ????????? ????? (_C)"
+
 msgid "Save File"
-msgstr "???? ??????? ????"
+msgstr "???? ???????"
 
+msgid "_Play Sound"
+msgstr "???? ?????? ??? (_P)"
+
+msgid "_Save File"
+msgstr "???? ??????? (_S)"
+
 msgid "Select color"
-msgstr "?? ???????? ????"
+msgstr "?? ????????"
 
 msgid "_Alias"
 msgstr "????? (_A)"
 
 msgid "Close _tabs"
-msgstr "????????? ???? ???? (_t)"
+msgstr "?? ????? ???? ??? ??? (_t)"
 
 msgid "_Get Info"
-msgstr "???? ?????? ???? (_G)"
+msgstr "???? ?????? ??? ??? (_G)"
 
 msgid "_Invite"
-msgstr "???????? ????? (_I)"
+msgstr "???????? (_I)"
 
 msgid "_Modify..."
-msgstr "???????? ????... (_M)"
+msgstr "????????... (_M)"
 
 msgid "_Add..."
-msgstr "??? ????... (_A)"
+msgstr "???... (_A)"
 
 msgid "_Open Mail"
 msgstr "???? ????? (_O)"
 
 msgid "_Edit"
-msgstr "???????? ???? (_E)"
+msgstr "???????? (_E)"
 
 msgid "Pidgin Tooltip"
-msgstr "????? ?????-??????"
+msgstr "????? ??????"
 
 # tithi
 msgid "Pidgin smileys"
-msgstr "????? ???????????"
+msgstr "????? ???????"
 
 # tithi
 msgid "Penguin Pimps"
-msgstr "???????? ?????????"
+msgstr "???????? ?????"
 
 # tithi
 msgid "Selecting this disables graphical emoticons."
-msgstr "?? ????????? ????????? ??????????-???? ???????? ?????"
+msgstr "??? ???????? ???? ????????? ???????????? ????????? ????"
 
 msgid "none"
-msgstr "????? ??"
+msgstr "????? ??"
 
+# mark50
 msgid "Small"
 msgstr "???"
 
 msgid "Smaller versions of the default smilies"
-msgstr "?????????????? ???????????? ?????????? ??? ???????"
+msgstr "?????? ???????????? ??? ???????"
 
 # tithi
 msgid "Response Probability:"
-msgstr "?????? ??????????:"
+msgstr "??????????? ??????? ????????:"
 
 msgid "Statistics Configuration"
-msgstr "?????????? ????????"
+msgstr "?????????? ??????????"
 
 # tithi
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr "???????? ?????? ??????????? ?????:"
+msgstr "???????????? ??? ?????????? ???????? ???:"
 
 msgid "minutes"
 msgstr "?????"
@@ -14183,124 +14053,111 @@ msgid "Contact Availability Prediction"
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr "??????? ?????????? ???????????"
+msgstr "?????? ???????? ????????? ????????????"
 
 # tithi
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "??????? ?????????? ???????????? ????????"
+msgstr "?????? ???????? ???????? ???????????? ????????"
 
 # tithi
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr "????? ???????? ?????????? ???????? ?????????? ????????? ???? ???????? ???"
+msgstr "????? ???????? ???????? ????????? ?????????? ???????? ???"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "????????? ??????"
+msgstr "??????? ????? ??????"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "???? ????????? ??????? ?????? ????"
+msgstr "???? XMPP ????????? ?????? ???"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "??????????? ???? ???? ????????? ??????? ?????? ????"
+msgstr "??????? ???? ???? XMPP ??????? ???????? ????"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "?????? ????????"
+msgstr "??????? ??????"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "????? ?????? ?????"
+msgstr "????? ??????? ???"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "?????????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Directory"
-msgstr "?? ??????????"
+msgstr "?????????"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "???? ????????"
+msgstr "PubSub ??????"
 
 # tithi
-#, fuzzy
 msgid "PubSub Leaf"
-msgstr "PubSub ????"
+msgstr "PubSub ???"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "?????"
+msgstr ""
+"\n"
+"<b>??????:</b> "
 
+# ***
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "???? ?????????? ????"
+msgstr "??????? ?????????"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "???????? (_B):"
+msgstr "?????? (_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "??????????? ???????? ??"
+msgstr "??????? ???????? ???"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "??????? ???????? ?????? ??? ??"
+msgstr "??????? ??????? ????????? ?????? ??? ??"
 
-#, fuzzy
+# ***
 msgid "XMPP Service Discovery"
-msgstr "???? ?????????? ????"
+msgstr "XMPP ??????? ?????????"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "??????? ?????? ??? ??????? ??? ??????? ????"
 
 # tithi
-#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "?? ????????? XMPP ??????? ?? ?????????? ????? ???? ???? ????????"
+msgstr "?? ?????????  ???????????? ???? XMPP ??????? ?????? ??????? ???? ???? ????????"
 
 msgid "Buddy is idle"
-msgstr "????? ???"
+msgstr "????? ?????????"
 
 msgid "Buddy is away"
-msgstr "????? ?????????"
+msgstr "????? ???????"
 
 # fix me tithi
 msgid "Buddy is \"extended\" away"
-msgstr "????? ????????? \"????????\":"
+msgstr "????? \"???????? ????\" ???????:"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "????? ???????"
+msgstr "????? ??????????"
 
 msgid "Buddy is offline"
 msgstr "????? ???????"
 
 msgid "Point values to use when..."
-msgstr "??????? ???? ??????? ??????? ???? ???..."
+msgstr "??????? ??????? ??? ??? ???..."
 
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr ""
-"<i>largest score</i> ??????? ????? ??? ??? ????? ??? ???????? ?????????? ??????\n"
+msgstr "<i>???????? ?????</i> ??????? ??????? ????????? ?????????? ?????\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "????? ???? ??? ??? ??????? ??????? ????"
+msgstr "????? ???? ??? ??????? ??????? ??????? ??? ???"
 
 msgid "Point values to use for account..."
-msgstr "??????? ????????? ???? ??????? ??????? ????..."
+msgstr "???????? ????????? ???? ??? ??????? ??? ???..."
 
 #. *< type
 #. *< ui_requirement
@@ -14309,43 +14166,43 @@ msgid "Contact Priority"
 #. *< priority
 #. *< id
 msgid "Contact Priority"
-msgstr "????????? ??????????"
+msgstr "???????? ??????????"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "??????? ?????? ??????? ???? ????????? ??????? ?????????? ???? ???? ?????? ????"
+msgstr "?????? ??????? ??????? ???? ????????? ??????? ?????????? ???? ????"
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"????????? ?????????? ???????? ???????? ???? ???/?????????/?????? ??????? ?????? ??????? "
-"???????? ???? ???? ??????? ????"
+"???????? ?????????? ???????? ???????? ?????????/???????/?????? ??????? ??????? ???????? "
+"???? ??????? ????"
 
 msgid "Conversation Colors"
-msgstr "??????? ??????"
+msgstr "????????? ??"
 
 msgid "Customize colors in the conversation window"
-msgstr "??????? ????????? ?? ??????? ??????? ????"
+msgstr "??????? ??????? ?? ??????????? ??? ???"
 
 msgid "Error Messages"
-msgstr "?????? ??????????"
+msgstr "?????? ??????"
 
 msgid "Highlighted Messages"
-msgstr "???????????? ??????????"
+msgstr "??????? ??? ??????"
 
 msgid "System Messages"
-msgstr "??????? ??????????"
+msgstr "??????? ??????"
 
 msgid "Sent Messages"
-msgstr "??????? ??????????"
+msgstr "??????? ??????"
 
 msgid "Received Messages"
-msgstr "????? ??????????"
+msgstr "????? ??????"
 
 #, c-format
 msgid "Select Color for %s"
@@ -14353,20 +14210,20 @@ msgid "Ignore incoming format"
 
 # tithi
 msgid "Ignore incoming format"
-msgstr "??? ??????? ??????? ????"
+msgstr "??? ??????? ??????? ??? ???"
 
 msgid "Apply in Chats"
-msgstr "??????? ??????? ????"
+msgstr "??????? ??????? ??? ???"
 
 # tithi
 msgid "Apply in IMs"
-msgstr "???? ?????? ??????? ????"
+msgstr "IM ?????? ??????? ??? ???"
 
 msgid "By conversation count"
-msgstr "??????? ???? ???????"
+msgstr "??? ??????? ???????"
 
 msgid "Conversation Placement"
-msgstr "??????? ???????????"
+msgstr "????????? ??????? ???????"
 
 # fix-me tithi
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
@@ -14374,14 +14231,14 @@ msgstr ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"???: \"???? ?????????????\" ????????? ?????? \"??????? ????? ????????\" ????????? "
-"????"
+"???: \"???? ???????\" ?? ????????? ?????? \"??? ????????? ????????\" ???????? "
+"???? ????"
 
 msgid "Number of conversations per window"
 msgstr "????? ???????? ????????? ??????"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "?????? ??????? ??????? ???? ???? ? ?????? ?????????? ????? ????"
+msgstr "?????? ??????? ??????? ???? IM ??? ?????? ?????????? ????? ??? ???"
 
 #. *< type
 #. *< ui_requirement
@@ -14395,19 +14252,18 @@ msgid "Extra conversation placement opti
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr "???????? ??????? ??????????? ??????????"
+msgstr "???????? ??????? ??????? ????????"
 
 #. *< summary
 #. *  description
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr ""
-"???? ??? ????? ?????????? ????? ???, ??????? ??????? ??????? ?????? ????? ?????"
+msgstr "????? ??????? ??????? ?????? ????? ??? ???, IM ??? ????? ????? ??? ???????"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr "?????? ??????? ???????? ????"
+msgstr "?????? ??????? ??????????"
 
 msgid "Middle mouse button"
 msgstr "?????? ????? ?????"
@@ -14419,7 +14275,7 @@ msgid "_Visual gesture display"
 # ???????? ??????? ???????? (_?)
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "?????? ???????? ???????? (_V)"
+msgstr "???????? ??????? ???????? (_V)"
 
 #. *< type
 #. *< ui_requirement
@@ -14434,7 +14290,7 @@ msgid "Provides support for mouse gestur
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "?????? ????????? ?????? ????"
+msgstr "?????? ??????? ?????? ????"
 
 #. *  description
 msgid ""
@@ -14444,23 +14300,24 @@ msgstr ""
 " o Drag up and then to the left to switch to the previous conversation.\n"
 " o Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"??????? ???????? ???? ???????? ???? ?????? ??????? ???? ?????? ????? ??????? "
-"???? ??????? ????? ???????? ????:\n"
+"??????? ???????? ???? ??????? ????????? ?????? ???? ?????? ????? ??????? ???? "
+"??????? ??? ??????? ????:\n"
 "\n"
-"o???? ??????? ???? ???? ???? ????? ??? ????? ???? ??????\n"
+"o???? ??????? ???? ???? ???? ??? ????? ???? ??????\n"
 "o?????????? ???????? ???????? ???? ???? ????? ??? ????? ???? ??????\n"
 "o??????? ??????? ???????? ???? ???? ????? ??? ????? ???? ??????"
 
 msgid "Instant Messaging"
-msgstr "????????? ??????????????"
+msgstr "????????? ?????? ????????"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
-"????????? ??????? ?? ???? ???? ????????? ???????? ????, ?? ???? ???? ??????? ??? ?????"
+"????????? ??????? ?? ???? ???? ????????? ???????? ????, ???? ???? ???? ??????? ??? "
+"?????"
 
 msgid "Group:"
-msgstr "?????:"
+msgstr "??:"
 
 #. "New Person" button
 msgid "New Person"
@@ -14468,15 +14325,15 @@ msgid "Select Buddy"
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "????? ???????? ????"
+msgstr "????? ????????"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"?? ??????? ??? ???? ????? ??????? ?? ???? ???? ??????? ???????? ????, ?? ???? ??????? "
-"???? ?????"
+"?? ??????? ??? ???? ????? ??????? ?? ???? ???? ??????? ???????? ????, ???? ???? "
+"???????? ?????? ???? ?????"
 
 #. Add the expander
 msgid "User _details"
@@ -14487,28 +14344,28 @@ msgid "Unable to send email"
 msgstr "???????? ????? (_A)"
 
 msgid "Unable to send email"
-msgstr "?-???? ?????? ??????"
+msgstr "????? ?????? ??????"
 
 msgid "The evolution executable was not found in the PATH."
-msgstr "??-?? ????? ???????????? ??????? ????? ?????? ???????"
+msgstr "PATH ? evolution ??????????????  ????? ?????? ???????"
 
 # tithi
 msgid "An email address was not found for this buddy."
-msgstr "?? ???????? ???? ???? ?-???? ?????? ????? ?????? ???????"
+msgstr "?? ???????? ??? ????? ?????? ????? ?????? ???????"
 
 msgid "Add to Address Book"
-msgstr "??????? ????? ??? ????"
+msgstr "??????? ????? ??? ??? ???"
 
 msgid "Send Email"
-msgstr "?-???? ?????"
+msgstr "????? ?????? ???"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "??????? ????????? ????????"
+msgstr "Evolution ????????? ??????????"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "???????????????? ?? ??????????? ???????? ???? ???? ??????? ?????-????? ????"
+msgstr "?? ??????????? ???????? ???? ???? ??????? ???????????????? ????? ????"
 
 #. *< type
 #. *< ui_requirement
@@ -14517,20 +14374,20 @@ msgid "Evolution Integration"
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr "??????? ?????????"
+msgstr "Evolution ??????"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides integration with Evolution."
-msgstr "????????? ????? ????????? ?????? ????"
+msgstr "Evolution ?? ????? ?????? ?????? ????"
 
 msgid "Please enter the person's information below."
-msgstr "??????? ??? ???????? ??????? ???? ?????? ?????"
+msgstr "??????? ??? ?????? ???????? ???? ????"
 
 msgid "Please enter the buddy's username and account type below."
-msgstr "??????? ??? ?????? ??????????? ??? ? ????????? ??? ???? ?????? ?????"
+msgstr "??????? ??? ?????? ?????? ??????????? ??? ? ????????? ??? ????"
 
 msgid "Account type:"
 msgstr "????????? ???:"
@@ -14556,14 +14413,14 @@ msgid "GTK Signals Test"
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr "GTK ???????? ???????"
+msgstr "GTK ???????? ???????"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "?? ???? ?????? ???????? ??? ???? ???? ?? ????? ???? ??????? ?????"
+msgstr "?? UI ?????? ???????? ??? ???? ???? ?? ??????? ??? ????"
 
 #, c-format
 msgid ""
@@ -14583,14 +14440,14 @@ msgid "Iconify on Away"
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr "????????? ??? ???? ?????? ??????? ????"
+msgstr "??????? ??? ???? ?????? ??????? ??? ???"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "????? ???????????? ????? ?????? ? ????? ??????? ???? ?????? ??????? ?????"
+msgstr "???? ??????? ??? ????? ?????? ? ????? ??????? ???? ?????? ??????? ??? ????"
 
 msgid "Mail Checker"
 msgstr "???? ???????"
@@ -14599,25 +14456,25 @@ msgid "Adds a small box to the buddy lis
 msgstr "???? ???????? ?????? ???? ??????? ????"
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "????? ??????? ???? ??? ????? ????? ??? ?? ????? ???? ???? ??? ???????? ????"
+msgstr "????? ??????? ???? ??? ????? ????? ??? ?? ????? ???? ???? ??? ???????? ????"
 
 msgid "Markerline"
-msgstr "????????????-????"
+msgstr "?????????? ????"
 
 # tithi
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "???????? ???? ?????????? ??????? ???? ???? ???? ??????"
+msgstr "???????? ???? ?????? ??????? ???? ???? ???? ???? ????"
 
 # fix me tithi
 msgid "Jump to markerline"
-msgstr "????????????-????? ??? ????"
+msgstr "?????????? ????? ????? ???"
 
 # tithi
 msgid "Draw Markerline in "
-msgstr "????????????-???? ?????"
+msgstr "?????????? ???? ???? ???"
 
 msgid "_IM windows"
-msgstr "???? ??????? (_I)"
+msgstr "IM ?????? (_I)"
 
 msgid "C_hat windows"
 msgstr "?????? ?????? (_h)"
@@ -14627,37 +14484,37 @@ msgstr ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"???? ????? ????????? ????????? ???? ?????? ??? ??????? ??????? ??? ????? ???? MM "
-"?????? ????? ?????"
+"???? ????? ??????? ???? ?????? ??? ??????? ??????? ??? MM ?????? ????? ??? ????? "
+"?????"
 
 # fix me
 msgid "Music messaging session confirmed."
-msgstr "????? ????????? ??????? ????????"
+msgstr "????? ??????? ???? ????????"
 
 # fix me
 msgid "Music Messaging"
-msgstr "????? ?????????"
+msgstr "????? ??????"
 
 # tithi
 msgid "There was a conflict in running the command:"
-msgstr "??????? ?????? ???? ???????? ???:"
+msgstr "?????? ?????? ???? ???????? ?????:"
 
 msgid "Error Running Editor"
 msgstr "??????? ?????? ??????"
 
 msgid "The following error has occurred:"
-msgstr "????????? ?????? ?????? ?????:"
+msgstr "????????? ?????? ?????:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
-msgstr "????? ????????? ????????"
+msgstr "????? ?????? ??????????"
 
 # tithifix me
 msgid "Score Editor Path"
-msgstr "??????? ??? ?????"
+msgstr "????? ????????? ??? "
 
 msgid "_Apply"
-msgstr "??????? ???? (_A)"
+msgstr "??????? (_A)"
 
 # tithi
 #. *< type
@@ -14669,57 +14526,54 @@ msgid "Music Messaging Plugin for collab
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "??????? ????? ???? ????? ????????? ??????? ?????"
+msgstr "???????? ????? ???? ????? ??????? ????????"
 
 # fix me tithi
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
-"????? ????????? ??????? ???? ?????? ??????????? ??????-?????? ???? ?????? ????? "
-"????????? ??????? ????????? ?? ???? ??????? ??? ??? ????"
+"????? ??????? ??????? ???? ?????? ????????????? ?????-????? ???? ?????? ????? "
+"????????? ??????? ??????? ???? ??????? ??? ??? ???? ??????? ????"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "?? ???? ?????????"
+msgstr "?????????"
 
 # fix me
 msgid "\t_Only when someone says your username"
-msgstr ""
-"                        ????????? ??? ??? ??? ???? ????? ???????????? ??? ???? "
-"(_O)"
+msgstr "\t????????? ???? ??? ??? ????? ???????????? ??? ?????? ??? (_O)"
 
 msgid "_Focused windows"
 msgstr "???????? ?????? (_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "????????? ??????"
+msgstr "????? ??????"
 
 msgid "Prepend _string into window title:"
-msgstr "??????? ???????? ??????? ??? ???? (_s):"
+msgstr "?????? ????????? ???????? ??????? ??? ??? ??? (_s):"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "??????? ???????? ???? ???????????? ?????? ?????? ???? (_o)"
+msgstr "??????? ???????? ???? ??????? ?????? ?????? ????? ??? (_o)"
 
 # fix me
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
-msgstr "X ?????????? ???? ???????????? ?????? ?????? ???? (_X)"
+msgstr "X-?? ?????????? ???? ??????? ?????? ?????? ????? ??? (_X)"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "?????? ?????????? \"?????\" ??????? ????????? ???? (_U)"
+msgstr "?????? ???????????? \"?????\" ?????? ???????? ??? ??? (_U)"
 
 msgid "_Flash window"
-msgstr "??????? ?????? (_F)"
+msgstr "?????? ?????? ??? (_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "??????? ?????? ?????? ???? (_a)"
+msgstr "??????? ?????? ???? ????? ??? (_a)"
 
 #. Present conversation method button
 msgid "_Present conversation window"
@@ -14727,27 +14581,27 @@ msgid "Notification Removal"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "????????? ??????"
+msgstr "????? ??????"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "??????? ???????? ????? ??? ??? ?????? ???? (_g)"
+msgstr "??????? ???????? ????? ??? ??? ?????? ??? ??? (_g)"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "??????? ???????? ????? ??? ??? ?????? ???? (_r)"
+msgstr "??????? ???????? ????? ??? ??? ?????? ??? ??? (_r)"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "??????? ???????? ???? ???? ??? ?????? ???? (_t)"
+msgstr "??????? ???????? ???? ???? ??? ?????? ??? ??? (_t)"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "???? ?????? ?????? ??? ?????? ???? (_m)"
+msgstr "???? ?????? ?????? ??? ?????? ??? ??? (_m)"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "??????? ?????? ?????????? ??? ?????? ???? (_b)"
+msgstr "??????? ?????? ?????????? ??? ?????? ??? ??? (_b)"
 
 #. *< type
 #. *< ui_requirement
@@ -14756,14 +14610,14 @@ msgid "Message Notification"
 #. *< priority
 #. *< id
 msgid "Message Notification"
-msgstr "??????? ?????????"
+msgstr "??????? ?????"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "?????? ????? ???????????? ??????? ????? ????????? ?????? ????"
+msgstr "??????????? ????? ??????? ????? ??????? ??????? ??? "
 
 #. *< type
 #. *< ui_requirement
@@ -14772,13 +14626,13 @@ msgid "Pidgin Demonstration Plugin"
 #. *< priority
 #. *< id
 msgid "Pidgin Demonstration Plugin"
-msgstr "????? ???????????? ???????? ???????"
+msgstr "??????? ???????????? ?????????? ???????"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
-msgstr "???? ??????? ??????? ?? ???? ???? ??? - ????? ??????"
+msgstr "???? ???? ??? ??? ???? ?????? ??????? - ?????? ??????"
 
 #. *  description
 msgid ""
@@ -14787,112 +14641,108 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"??? ?????? ??????? ?????-?? ?? ??? ???????:\n"
-"- ???? ???? ???? ??? ?????? ?????? ?? ?? ?? ??????????? ??????\n"
-"- ??? ?? ??? ??? ????? ???\n"
-"- ????? ??????????? ??????? ???? ?? ????? ??? ??????? ???? ?????? ??????"
+"??? ???? ??????? ?????-?? ?? ??? ???????:\n"
+"- ???? ???? ?????? ????? ?? ?? ?? ??????????? ??????\n"
+"- ??? ?? ?????? ????? ???\n"
+"- ????? ??????????? ??????? ???? ????? ??????? ???? ?????? ??????"
 
 msgid "Hyperlink Color"
-msgstr "????????????? ??"
+msgstr "???????????? ??"
 
 msgid "Visited Hyperlink Color"
-msgstr "???????????? ??????????? ??"
+msgstr "????????? ?????????? ??"
 
 msgid "Highlighted Message Name Color"
-msgstr "???????????? ??????? ????? ??"
+msgstr "?????????? ??????? ????? ??"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "????????? ?? ???? ????"
+msgstr "????? ???? ???? ?????? ??"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ???????? ??????"
 
 msgid "Conversation Entry"
-msgstr "??????? ?????"
+msgstr "??????? ??????"
 
 msgid "Request Dialog"
-msgstr "?????? ?????"
+msgstr "???????? ??????"
 
 msgid "Notify Dialog"
-msgstr "????????? ?????"
+msgstr "???????? ??????"
 
 msgid "Select Color"
-msgstr "?? ???????? ????"
+msgstr "?? ????????"
 
 #, c-format
 msgid "Select Interface Font"
-msgstr "??????????? ???? ???????? ????"
+msgstr "??????????? ???? ????????"
 
 #, c-format
 msgid "Select Font for %s"
-msgstr "%s-?? ???? ???? ???????? ????"
+msgstr "%s-?? ???? ???? ????????"
 
 msgid "GTK+ Interface Font"
 msgstr "GTK+ ??????????? ????"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ ??? ????????? ???"
+msgstr "GTK+ ?????? ????????? ???"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "??????? ????????? ??????? ????"
+msgstr "????? ???? ???? ?????? ????????? ????"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "????? GTK+ ??? ??????????"
+msgstr "GTK+ ??? ?????????? ?????"
 
-#, fuzzy
 msgid "Colors"
-msgstr "????"
+msgstr "??"
 
 msgid "Fonts"
-msgstr "????????"
+msgstr "????"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "?????"
 
 msgid "Gtkrc File Tools"
-msgstr "Gtkrc ?????? ???????"
+msgstr "Gtkrc ?????? ???"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "%s%sgtkrc-?.? ?  ???? ????????"
+msgstr "%s%sgtkrc-2.0 ? ????? ???? ???"
 
 msgid "Re-read gtkrc files"
-msgstr "gtkrc ???????? ??????? ?????"
+msgstr "gtkrc ???????? ??????? ???? ???"
 
 msgid "Pidgin GTK+ Theme Control"
 msgstr "????? GTK+ ??? ??????????"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "??????? ??????? gtkrc ????????????? ?????? ??????? ????"
+msgstr "??????? ??????? gtkrc ??????? ???? ??????? ????"
 
 msgid "Raw"
-msgstr "????"
+msgstr "??????"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "?????? ???-??????? ???????????? ???? ????? ?????? ????"
+msgstr "?????? ??????-??????? ????????? ?????? ????? ?????? ????"
 
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"?????? ???-??????? ???????????? (XMPP, MSN, IRC, TOC) ???? ????? ?????? ???? "
-"?????? ??? ??????? ??????? 'Enter' ?????? ????? ???????? ?????????? ?????"
+"?????? ??????-??????? ????????? (XMPP, MSN, IRC, TOC) ?????? ????? ?????? ???? "
+"?????? ??? ??????? ?????? 'Enter' ?????? ????? ???????? ?????????? ?????"
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr "???? ?? %s %s ? ??????? ???? ??????"
+msgstr "???? ?? %s %s ? ???????? ???? ??????"
 
 msgid "New Version Available"
-msgstr "???? ??????? ???????"
+msgstr "???? ??????? ??? ?????"
 
 msgid "Later"
 msgstr "?????????"
 
 msgid "Download Now"
-msgstr "??? ??????? ????"
+msgstr "??? ??????? ??? ???"
 
 #. *< type
 #. *< ui_requirement
@@ -14901,21 +14751,21 @@ msgid "Release Notification"
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "??????? ?????????"
+msgstr "????? ?????"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
-msgstr "???????????????? ???? ????????? ???? ??????? ?????"
+msgstr "????????? ??????? ?? ?? ???? ????????? ???? ??????? ????"
 
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"???????????????? ???? ????????? ???? ??????? ???? ??? ChangeLog ?????? ?????????????? "
-"???? ?????"
+"????????? ??????? ?? ?? ???? ????????? ???? ??????? ??? ??? ChangeLog ?????? "
+"?????????????? ???? ????"
 
 #. *< major version
 #. *< minor version
@@ -14926,7 +14776,7 @@ msgid "Send Button"
 #. *< priority
 #. *< id
 msgid "Send Button"
-msgstr "??????? ?????"
+msgstr "?????? ?????"
 
 #. *< name
 #. *< version
@@ -14934,25 +14784,24 @@ msgstr "??????? ????msgstr "??????? ??????? ?????? ?????"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
 msgstr ""
-"??????? ??????? ??????? ?????? ???? ?????? ????? ??? ????? ??? ???? ??????? ??????? "
-"??? ??? ??????????"
+"??????? ??????? ??????? ?????? ???? ?????? ????? ??? ????? ??? ???? ??????? ?????? "
+"??? ??????????? ????????? ??????????"
 
 msgid "Duplicate Correction"
-msgstr "?????? ??????"
+msgstr "??????? ??????"
 
 msgid "The specified word already exists in the correction list."
-msgstr "???????? ?????? ???????? ?????? ???????? ?????????"
+msgstr "???????? ?????? ???????? ?????? ???????? ?????????"
 
 msgid "Text Replacements"
-msgstr "??? ???????????"
+msgstr "?????? ???????????"
 
 msgid "You type"
-msgstr "???? ???? ????"
+msgstr "???? ???? ????"
 
 msgid "You send"
 msgstr "???? ?????"
@@ -14962,13 +14811,13 @@ msgid "Case sensitive"
 
 # tithi
 msgid "Case sensitive"
-msgstr "??? ?????????"
+msgstr "???? ?????????"
 
 msgid "Add a new text replacement"
-msgstr "???? ??? ??????????? ??? ????"
+msgstr "???? ?????? ??????????? ??? ??? ???"
 
 msgid "You _type:"
-msgstr "???? ???? ???? (_t):"
+msgstr "???? ???? ???? (_t):"
 
 msgid "You _send:"
 msgstr "???? ????? (_s):"
@@ -14976,114 +14825,100 @@ msgid "_Exact case match (uncheck for au
 # tithi
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "????? ??? ?????? (???????????? ??? ????????? ???? ????????? ?????) (_E)"
+msgstr ""
+"??????? ?????? ????? ??? (??????? ?????? ???????????????? ???????????? ???? ??? ????? ???? "
+"???) (_E)"
 
 msgid "Only replace _whole words"
-msgstr "????????? ????? ???? ??????????? ???? (_w)"
+msgstr "????????? ????? ???? ??????????? ??? ??? (_w)"
 
 msgid "General Text Replacement Options"
-msgstr "?????? ??? ??????????? ?????????"
+msgstr "?????? ?????? ??????????? ????"
 
 # tithi
 msgid "Enable replacement of last word on send"
-msgstr "??????? ??? ??? ?????? ??????????? ??????? ????"
+msgstr "??????? ??? ??? ?????? ??????????? ??????? ??? ???"
 
 msgid "Text replacement"
-msgstr "??? ???????????"
+msgstr "?????? ??????????? ??? ???"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "???????????-??????????? ???? ??????? ???????? ??????????? ??? ??????????? ????"
+msgstr "??????????? ????????? ???? ??????? ???????? ??????? ?????? ??????????? ????"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "???? ??? ????"
+msgstr "??????? ???? ?????"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "???? ??? ????"
+msgstr "??????? ????? ?????"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"???????? ????/\n"
+"??????? ???????? ????"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "??????? ??? ???"
+msgstr "?????? ????"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "???????? ????"
+msgstr "???????? ??? ?????"
 
-#, fuzzy
 msgid "Founder"
-msgstr "?????????? ????"
+msgstr "???????????"
 
-#, fuzzy
 msgid "Operator"
-msgstr "?????"
+msgstr "???????"
 
 msgid "Half Operator"
-msgstr ""
+msgstr "????? ???????"
 
 # tithi
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "????????????? ????? ?????"
+msgstr "??????? ??????"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "??????"
+msgstr "?????? ??????"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "????"
+msgstr "???? ??????"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "???? ??????"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "?????? ?????"
+msgstr "???????? ??????"
 
 # tithi
-#, fuzzy
 msgid "Warning dialog"
-msgstr "??????? ????"
+msgstr "????????? ??????"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "??? ?? ????? ???????"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "%s-?? ???? ??????"
+msgstr "?????? ????"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "????? ????? ??????"
+msgstr "?????? ????? ??????"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "???? ???????? ????"
+msgstr "?????? ????"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "????? GTK+ ??? ??????????"
+msgstr "????? ???? ??? ???????"
 
-#, fuzzy
 msgid "Contact"
-msgstr "????????? ????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Buddy List"
+msgstr "????? ????? ??????? ??? ???????"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "Buddy List"
+msgstr "????? ??????? ??? ????????"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "???? ??? ????????"
 
 #. *< type
 #. *< ui_requirement
@@ -15092,16 +14927,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "????? GTK+ ??? ??????????"
+msgstr "????? ??? ???????"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "????? GTK+ ??? ??????????"
+msgstr "????? ??? ????????"
 
 #. *< type
 #. *< ui_requirement
@@ -15110,7 +14943,7 @@ msgid "Buddy Ticker"
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "????? ???????????"
+msgstr "????? ????"
 
 #. *< name
 #. *< version
@@ -15120,7 +14953,7 @@ msgid "Display Timestamps Every"
 msgstr "???????????? ???? ???????? ???????? ????????"
 
 msgid "Display Timestamps Every"
-msgstr "???????? ??????????? ???????? ????"
+msgstr "????? ????????????? ???????? "
 
 #. *< type
 #. *< ui_requirement
@@ -15136,37 +14969,37 @@ msgid "Display iChat-style timestamps"
 #. *< version
 #. *  summary
 msgid "Display iChat-style timestamps"
-msgstr "??-?????-????? ????????????? ???????? ????"
+msgstr "iChat ????? ??? ????????????? ???????? ??? ???"
 
-# fix me 
+# fix me
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "????? N ????? ?? ??-?????-????? ????????????? ???????? ?????"
+msgstr "????? N ????? ?? iChat ????? ?? ????????????? ???????? ??? ????"
 
 # tithi
 msgid "Timestamp Format Options"
-msgstr "????????????? ????????? ?????????"
+msgstr "????????????? ????????? ????"
 
 # tithi
 #, c-format
 msgid "_Force 24-hour time format"
-msgstr "??-?????? ???? ??????? ???????? ???? (_F)"
+msgstr "??-????? ???? ??????? ?????? ??? (_F)"
 
 msgid "Show dates in..."
-msgstr "? ????? ???????? ????..."
+msgstr "????? ????????..."
 
 msgid "Co_nversations:"
 msgstr "??????? (_n):"
 
 msgid "For delayed messages"
-msgstr "???????? ???????????? ????"
+msgstr "???????? ??????? ????"
 
 # tithi
 msgid "For delayed messages and in chats"
-msgstr "???????? ???????????? ???? ??? ??????"
+msgstr "???????? ??????? ???? ??? ??????"
 
 msgid "_Message Logs:"
-msgstr "??????? ??????????? (_M):"
+msgstr "??????? ?? (_M):"
 
 # tithi
 #. *< type
@@ -15176,14 +15009,14 @@ msgid "Message Timestamp Formats"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "??????? ????????????? ???????????"
+msgstr "??????? ????????????? ???????"
 
 # tithi
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "??????? ??????????? ??????????? ??????? ??????? ????"
+msgstr "??????? ??????????????? ??????? ??????????? ???? ??????? ????"
 
 # tithi
 #. *  description
@@ -15191,27 +15024,27 @@ msgstr ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"?? ??????? ?????????????? ??????? ??? ???????? ??????? ??????????? ??????????? ??????? "
-"??????? ???? ?????? ????"
+"?? ??????? ????????????? ??????? ??? ??????? ????????????? ??????? ??????????? ???? "
+"?????? ????"
 
 msgid "Opacity:"
-msgstr "?????:"
+msgstr "?????????:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "????????? ??????? ??????? ???????"
+msgstr "IM ????????? ??????"
 
 msgid "_IM window transparency"
-msgstr "????????? ?????? ??????? ???????? (_I)"
+msgstr "IM ??????? ???????? (_I)"
 
 msgid "_Show slider bar in IM window"
-msgstr "????????? ??????? ???????? ???????? ??? ???????? ???? (_S)"
+msgstr "IM ???????? ???????? ??? ???????? ??? ??? (_S)"
 
 msgid "Remove IM window transparency on focus"
-msgstr "?????? ???? ??????? ???????? ?????? ????"
+msgstr "????? ???? IM ??????? ???????? ?????? ??? ???"
 
 msgid "Always on top"
-msgstr "?? ???? ????"
+msgstr "?????? ????"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
@@ -15221,7 +15054,7 @@ msgid "Remove Buddy List window transpar
 msgstr "????? ?????? ??????? ???????? (_B)"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "?????? ????? ??????? ??????? ???????? ?????? ????"
+msgstr "????? ???? ????? ??????? ??????? ???????? ?????? ??? ???"
 
 #. *< type
 #. *< ui_requirement
@@ -15236,7 +15069,7 @@ msgid "Variable Transparency for the bud
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "????? ?????? ? ????????? ???? ???????? ?????????"
+msgstr "????? ?????? ??? ????????? ??????????? ?????????"
 
 #. *  description
 msgid ""
@@ -15245,47 +15078,45 @@ msgstr ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"?? ??????? ????? ?????? ??? ??????? ???????? ???????? ???? ???????? ?????? ????\n"
+"?? ??????? ????? ?????? ??? ??????? ???????? ??????????? ???? ???????? ?????? ????\n"
 "\n"
-"* ???: ?? ??????? Win2000 ?? ?????????? ?????????"
+"* ???: ?? ????????? ???? Win2000 ???? ?????? ?????????"
 
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ ????? ???????"
+msgstr "GTK+ Runtime ???????"
 
 #. Autostart
 msgid "Startup"
-msgstr "?????"
+msgstr "?????"
 
 #, c-format
 msgid "_Start %s on Windows startup"
-msgstr "??????? ????? ???? %s ?? ???? ???? (_S)"
+msgstr "??????? ??????? ???? %s ???? ??? ??? (_S)"
 
 msgid "_Dockable Buddy List"
 msgstr "??????? ????? ?????? (_D)"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "????? ??????? ?????? ???? ????? (_K):"
+msgstr "????? ??????? ?????? ???? ???? ??? (_K):"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
 msgstr "????????? ??? ?? ???"
 
 msgid "Windows Pidgin Options"
-msgstr "????????? ????? ?????????"
+msgstr "??????? ??????? ????"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "????????? ???? ?????? ???????? ??????????"
+msgstr "??????? ??????? ???? ??????????? ?????"
 
 # fix me
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr ""
-"????????? ???? ?????? ???????? ????????? ?????? ??? , ???? ????? ?????? ???????"
+msgstr "??????? ??????? ???? ??????????? ???? ?????? ???, ???? ????? ?????? ?? ????"
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>?? ??? ??????</font>"
+msgstr "<font color='#777777'>?? ??? ??????</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15304,587 +15135,43 @@ msgid "Insert an <iq/> stanza."
 
 # tithi
 msgid "Insert an <iq/> stanza."
-msgstr "???? <iq/> ?????? ????? ?????"
+msgstr "???? <iq/> ????? ?????? ?????"
 
 # tithi
 msgid "Insert a <presence/> stanza."
-msgstr "???? <presence/> ?????? ?????? ?????"
+msgstr "???? <presence/> ????? ?????? ?????"
 
 msgid "Insert a <message/> stanza."
-msgstr "???? <message/> ?????? ?????? ?????"
+msgstr "???? <message/> ????? ?????? ?????"
 
 # tithi
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "???? XMPP ?????????? ????? ??? ????? ?????"
+msgstr "???? XMPP ????? ????? ??? ????? ?????"
 
 # tithi
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "?? ????????? XMPP ??????? ?? ?????????? ????? ???? ???? ????????"
+msgstr "?? ????????? XMPP ??????? ?? ?????????? ????? ???? ???? ????????"
 
-#~ msgid "Cannot open socket"
-#~ msgstr "???? ???? ?????? ??"
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "??????????? BOSH ????? ???????"
 
-#~ msgid "Could not listen on socket"
-#~ msgstr "???? ? ???? ?????? ??"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "???? ????? ??????"
-
-#~ msgid "Connection failed."
-#~ msgstr "????? ???????"
-
-#~ msgid "Server has disconnected"
-#~ msgstr "??????? ????????? ??????"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "???? ???? ??? ?????? ??"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "??????? ???? ??????? ??? ?????? ??"
-
-#~ msgid "Read error"
-#~ msgstr "?????? ??????"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "????????? ???? ????? ?????? ???? ???? ??:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "???? ??????"
-
 # tithi
-#~ msgid "Last Activity"
-#~ msgstr "??? ?????????"
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "SILC ?? ???? ??? ?? ??? ????? ????"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "???? ?????????? ????"
-
 # tithi
-#~ msgid "Service Discovery Items"
-#~ msgstr "???? ?????????? ?????????????"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "?????? ????????? ?????? ????"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "??????-??????????? ??????? ?????"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "??????-???????????? ?????? ???????? ????"
-
-# tithi
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "In-Band ????-??????"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Ad-Hoc ???????????"
-
-# tithi
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub ????"
-
-# tithi
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "SOCKS5 ????-??????"
-
-# tithi
-#~ msgid "Out of Band Data"
-#~ msgstr "??????? ?????? ?????"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "?? ??????? ???????"
-
-#~ msgid "User Location"
-#~ msgstr "???????????? ???????"
-
-# fix me tithi
-#~ msgid "User Avatar"
-#~ msgstr "??????????? ?????????"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "?????? ??????? ?????????"
-
-#~ msgid "Software Version"
-#~ msgstr "??????????? ???????"
-
-# fix me tithi
-#~ msgid "Stream Initiation"
-#~ msgstr "?????? ???? ????"
-
-#~ msgid "User Mood"
-#~ msgstr "???????????? ????????"
-
-#~ msgid "User Activity"
-#~ msgstr "???????????? ???????"
-
-# tithi
-#~ msgid "Entity Capabilities"
-#~ msgstr "?????? ???????"
-
-# tithi
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "?????????? ????????? ??????"
-
-#~ msgid "User Tune"
-#~ msgstr "???????????? ???"
-
-# tithi
-#~ msgid "Roster Item Exchange"
-#~ msgstr "??????? ????????? ???????? ????"
-
-#~ msgid "Reachability Address"
-#~ msgstr "???????? ??? ??????"
-
-#~ msgid "User Profile"
-#~ msgstr "???????????? ????????"
-
-#~ msgid "Jingle"
-#~ msgstr "????"
-
-# tithi
-#~ msgid "Jingle Audio"
-#~ msgstr "??????? ????"
-
-#~ msgid "User Nickname"
-#~ msgstr "???????????? ??????"
-
-# tithi
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "??????? ICE UDP"
-
-# tithi
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "???????  ICE TCP"
-
-# tithi
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "??????? Raw UDP"
-
-# tithi
-#~ msgid "Jingle Video"
-#~ msgstr "??????? ?????"
-
-# tithi
-#~ msgid "Jingle DTMF"
-#~ msgstr "??????? DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "?????? ????? ??? ??????"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "???????????? ?? ?????? ??? ?????"
-
-#~ msgid "User Chatting"
-#~ msgstr "??????????? ????? ??????"
-
-#~ msgid "User Browsing"
-#~ msgstr "?????????? ?????? ????"
-
-#~ msgid "User Gaming"
-#~ msgstr "????????????? ?????"
-
-#~ msgid "User Viewing"
-#~ msgstr "????????????? ?????"
-
-# tithi
-#~ msgid "Stanza Encryption"
-#~ msgstr "????????? ?????????"
-
-# tithi
-#~ msgid "Entity Time"
-#~ msgstr "???????? ????"
-
-# tithi
-#~ msgid "Delayed Delivery"
-#~ msgstr "???????? ??????"
-
-# tithi
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "?????? ?????? ???????"
-
-# tithi
-#~ msgid "File Repository and Sharing"
-#~ msgstr "???? ??????? ??? ????? ????"
-
-# tithi
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "?????????? ???? STUN ???? ????????"
-
-# tithi
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "???????? ?????????? ????????? ??????"
-
-# tithi
-#~ msgid "Hop Check"
-#~ msgstr "?? ??????? ????"
-
-#~ msgid "Read Error"
-#~ msgstr "??? ??????"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "???????? ????? ???? ?????? ???????"
-
-# tithi
-#~ msgid "Read buffer full (2)"
-#~ msgstr "??? ????? ????? (?)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "????? ?????? ??????"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "??????? ???? ??????? ??? ??????: %1s (%2d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "???? ?????? ?????? (%s)?"
-
-# tithi
 #~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "?????? ???????? ????? ???? ???? ???? ???? ???????-??????? ??????? ???????"
-
-# tithi
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "??????? SSL ?????? ????????? ???"
-
-#~ msgid "Incorrect password."
-#~ msgstr "??? ???????????"
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
 #~ msgstr ""
-#~ "BOS ????????? ???? ??????? ??? ?????:\n"
-#~ "%s"
+#~ "\"%3$s\" ?? ????? \"%2$s\" ???? %1$s ????? ????????? ???????? ???????????? "
+#~ "???????"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "???? ?????????? ????????? ????? ??????  ?????????? ???? %s ??????? ?????"
+#~ msgid "Invitation Rejected"
+#~ msgstr "???????? ???????????? ??? ??????"
 
-#~ msgid "Could Not Connect"
-#~ msgstr "????? ???? ???? ??"
-
-#~ msgid "Invalid username."
-#~ msgstr "???? ???????????? ????"
-
-# fix me tithi
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "??????? ???? ?????????? ???? ??????"
-
-#~ msgid "Connection lost"
-#~ msgstr "????? ??????? ????"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "????? ?????? ??? ????? ?????"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "????? ???? ??? ????? (?????)"
-
-#~ msgid "Connection reset"
-#~ msgstr "????? ??????? ??????? ????"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "???? ???? ?????? ??????: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "??????? ???? ?????? ??????"
-
-#~ msgid "Could not write"
-#~ msgstr "????? ??????"
-
-#~ msgid "Could not connect"
-#~ msgstr "????? ???? ??????"
-
-# tithi
-#~ msgid "Could not create listen socket"
-#~ msgstr "????? ???? ???? ???? ??????"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "?????-??? ????? ??? ?????"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "??? ????????????"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%1s ?? ???? ????? ?????? ???? ??????:\n"
-#~ "%2s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "?????? ?????"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "?????? ????? ???????"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "????? ???? ?????????? ???????"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "????????? ???? ????? ????????\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "??????? ??? ????? ??? ?????"
-
-# tithi
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "????????? ???? ???? ???? TSL/SSL ??????,  ???? TLS/SSL ?????? ????? ????? ??????"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "??????? ?????? ??????? ?????"
-
-# tithi
-#~ msgid "More Data needed"
-#~ msgstr "??? ???? ????????"
-
-# tithi
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "??????? ??? ???????? ???? ????????? ???? ???? ??????? ?????? ?????"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "??????? ??? ?????????? ???? ???? ????? ???????? ?????"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "??? ???? ??????? ??? ????"
-
-#~ msgid "Cursor Color"
-#~ msgstr "????????? ??"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "??? ????????? ??"
-
-#~ msgid "Interface colors"
-#~ msgstr "??????????? ??"
-
-# tithi
-#~ msgid "Widget Sizes"
-#~ msgstr "????? ????????"
-
-#~ msgid "Invite message"
-#~ msgstr "???????? ??????"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "???? ?????? ???????? ??????? ????,\n"
-#~ "??????? ??? ???? ?? ????????????? ???????? ???? ??? ??? ????? ?????? ?????"
-
-#~ msgid "Looking up %s"
-#~ msgstr "%s ????? ?????"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "%s-?? ???? ????? ???? ?????? ?????"
-
-#~ msgid "Signon: %s"
-#~ msgstr "??????: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "%s ????? ????? ?????? ??????"
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "%s ????? ????? ?????? ??????"
-
-# tithi
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "???????? ??? ?????, ??? %s ???? ??? ????? ???????"
-
-# tithi
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s ???????? ???? ????"
-
-# tithi
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "%s ?? ??????? ???????? ???"
-
-# tithi
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr "???? ?????? ??? ???? ?????, ???? ????????? ??? ???? ??????? ??????"
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "%s-? ????? ??????? ???"
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "???? %s ? ??? ????? ?????? ??????????"
-
-# tithi
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "???? %s ???? ???? ????????? ?????? ????? ???? ??? ??? ??? ????"
-
-# tithi
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr ""
-#~ "???? %s ???? ???? ????????? ?????? ????? ???? ??? ??? ????? ?????? ????????"
-
-#~ msgid "Failure."
-#~ msgstr "?????????"
-
-# tithi
-#~ msgid "Too many matches."
-#~ msgstr "???? ???? ????"
-
-# tithi
-#~ msgid "Need more qualifiers."
-#~ msgstr "??? ????????????? ?????????"
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "?????????? ???? ?????????? ????????"
-
-# tithi
-#~ msgid "Email lookup restricted."
-#~ msgstr "?-???? ????????? ????????"
-
-# tithi
-#~ msgid "Keyword ignored."
-#~ msgstr "???-???? ???????? ??? ???????"
-
-#~ msgid "No keywords."
-#~ msgstr "???? ???-???? ????"
-
-#~ msgid "User has no directory information."
-#~ msgstr "???????????? ???? ?????????? ???? ????"
-
-#~ msgid "Country not supported."
-#~ msgstr "????? ??????? ????"
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "???????? ?????: %s?"
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "??? ????????????-??? ?? ???????????"
-
-# tithi
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "?????? ??????????? ?????????"
-
-# tithi
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "????? ??????? ???? ???? ???? ???? ???????? ??? ?????"
-
-# tithi
-#~ 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 ""
-#~ "???? ??????? ??????? ??? ????????? ???????  ?? ????? ??????? ???? ??? ??????? ?????? "
-#~ "????? ???? ??? ?????? ??????? ?????, ?????? ????? ???? ??????? ???? ??? ?????"
-
-# tithi
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "???? ????? ?????? ?????? ?????? ?????: %s?"
-
-#  tithi
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "???? ????? ??????, %d, ?????? ??????  ????: %s"
-
-# tithi
-#~ msgid "Invalid Groupname"
-#~ msgstr "???? ????????"
-
-#~ msgid "Connection Closed"
-#~ msgstr "????? ???? ??? ?????? "
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "??????? ?????????..."
-
-# tithi
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC ??????? ??? ??????? ???? ??? ??????? ?????? ?????? ??????"
-
-#~ msgid "Password Change Successful"
-#~ msgstr "?????????? ???????? ??? ?????"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "?????????? ???? ????? ????"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "?????????? ???? ???????? ????"
-
-# tithi
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "????? ???? %s ????? ??????!"
-
-# tithi
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr "???? ?????????? ?????? ?????; ???? ??? ?????? ????? ???????"
-
-# tithi
-#~ msgid "Could not connect for transfer."
-#~ msgstr "???????????? ???? ????? ???? ???????"
-
-# tithi
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "???? ??????? ????? ???????  ???? ?????????? ??? ??? ???"
-
-#~ msgid "Save As..."
-#~ msgstr "????? ??????? ????..."
-
-# tithi
-#~ 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] ""
-#~ " %1s %2s-??  %3d ?????? ????? ???? ?????? ???: %4s (%.2f %5s)%6s%7s"
-#~ msgstr[1] "%1s %2s-?? %3d ???????? ????? ???? ?????? ???: %4s (%.2f %5s)%6s%7s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s ?????? ???? ???? ?????? ?????? ??????"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "TOC ??????? ???????"
-
-#~ msgid "%s Options"
-#~ msgstr "%s ?????????"
-
-#~ msgid "Proxy Options"
-#~ msgstr "???????? ?????????"
-
-#~ msgid "By log size"
-#~ msgstr "???? ???? ???????"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "????????? ????? ????? (_O)"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN ??????? (_U):"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "???????? ????? (_I)"
-
-# tithi
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "???????? ??????? (_S)"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "MSN ?????? ?? ??????????? ?????? ??????"
-
-# fix me
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "?????? ?????????? ????? ???? ?????? ??????? ??? (_F)"
-
-# tithi
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "???? ?????????? ????????? ????? ??????  ???? ???? ???????? ?? ??? ??????? ??? "
-#~ "??????? ???? ????? ?????? ?????????? ???? %s ??????? ?????"
+#~ msgid "Cannot open socket"
+#~ msgstr "???? ???? ?????? ??"


More information about the Commits mailing list