changeset 13545:cfc2f7fcb3dd

[gaim-migrate @ 15922] Way more changes that I initially thought I was going to make. I apologize for the commit message spam. These changes bring a lot of consistency to our capitalization and punctuation, especially of words like "e-mail". For reference, I've used these rules (after discussing in #gaim): e-mail, a case of two words joined: "e-mail" - in the middle of a sentence caps context "E-mail" - start of text in a sentence caps context "E-Mail" - in a header (title) caps context re-enable, a single word, would be: "re-enable", "Re-enable", and "Re-enable" (respectively) The reason this changeset exploded is that, as I went through and verified these changes, I realized we were using improper capitalization (e.g. header instead of sentence) in a number of dialogs. I fixed a number of these cases before, and this corrects another pile. This looks like I've made a LOT of work for the translators, but the impact is significantly mitigated by three factors: 1) Many of these changes use strings that already exist, or change one string in many places. 2) I've used sed to correct the .po files where possible. 3) The actual changes are extremely trivial. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 21 Mar 2006 04:32:45 +0000
parents 46559ab11aed
children 0d56b8f83a9d
files po/am.po po/az.po po/bg.po po/bn.po po/bs.po po/ca.po po/ca_ES@valencian.po po/cs.po po/da.po po/de.po po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/es.po po/et.po po/fa.po po/fi.po po/fr.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po po/it.po po/ja.po po/ka.po po/ko.po po/ku.po po/lt.po po/mk.po po/my_MM.po po/nb.po po/nl.po po/nn.po po/pa.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sq.po po/sr.po po/sr@Latn.po po/sv.po po/ta.po po/te.po po/tr.po po/uk.po po/vi.po po/xh.po po/zh_CN.po po/zh_TW.po src/gtkblist.c src/protocols/bonjour/bonjour.c src/protocols/gg/gg.c src/protocols/irc/msgs.c src/protocols/jabber/buddy.c src/protocols/jabber/jabber.c src/protocols/msn/error.c src/protocols/novell/novell.c src/protocols/oscar/oscar.c src/protocols/silc/ops.c src/protocols/silc/silc.c src/protocols/silc/util.c src/protocols/toc/toc.c src/protocols/yahoo/yahoo_profile.c
diffstat 69 files changed, 1055 insertions(+), 1055 deletions(-) [+]
line wrap: on
line diff
--- a/po/am.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/am.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2255,7 +2255,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6407,7 +6407,7 @@
 
 #: src/protocols/msn/error.c:42
 #, fuzzy
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "ኢሜያል አድራሻ"
 
 #: src/protocols/msn/error.c:45
@@ -8048,7 +8048,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8270,12 +8270,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8308,21 +8308,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8344,7 +8344,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8588,7 +8588,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8649,7 +8649,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10047,7 +10047,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -10169,7 +10169,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:527
--- a/po/az.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/az.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2259,7 +2259,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6347,7 +6347,7 @@
 msgstr ""
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr ""
 
 #: src/protocols/msn/error.c:45
@@ -7957,7 +7957,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8168,12 +8168,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8206,21 +8206,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8242,7 +8242,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8482,7 +8482,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8541,7 +8541,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8280
@@ -9898,7 +9898,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -10017,7 +10017,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:527
@@ -10869,7 +10869,7 @@
 #~ msgid "%s (%d new/%d total)"
 #~ msgstr "%s (%d yeni/%d toplam)"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Poçtu hər X saniyədə bir yoxla.\n"
 
 #~ msgid "Auto-login"
--- a/po/bg.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/bg.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2903,7 +2903,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 
 #: ../src/gtkconv.c:364
@@ -7415,7 +7415,7 @@
 msgstr "Синтактична грешка (вероятно бъг в Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Неправилен адрес на е-поща"
 
 #: ../src/protocols/msn/error.c:45
@@ -9081,7 +9081,7 @@
 #: ../src/protocols/oscar/oscar.c:4759
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9299,12 +9299,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6286
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Няма резултати за електронен адрес %s"
 
 #: ../src/protocols/oscar/oscar.c:6307
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 "Трябва да получите електронно съобщение, в което се иска да потвърдите %s."
 
@@ -9341,21 +9341,21 @@
 #: ../src/protocols/oscar/oscar.c:6352
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6355
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6358
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Грешка 0x%04x: Електронният адрес не може да бъде сменен, тъй като "
@@ -9379,7 +9379,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6377
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Е-пощата на %s е %s"
 
 #: ../src/protocols/oscar/oscar.c:6449
@@ -9629,7 +9629,7 @@
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:8301
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Търсене потребител по електронен адрес"
 
 #: ../src/protocols/oscar/oscar.c:8302
@@ -9681,7 +9681,7 @@
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:8453
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Търсене на потребител по електронен адрес..."
 
 #: ../src/protocols/oscar/oscar.c:8458
@@ -11215,17 +11215,17 @@
 
 #: ../src/protocols/silc/silc.c:920
 #, fuzzy
-msgid "Key Length"
+msgid "Key length"
 msgstr "Дължина на ключ: \t%d бита\n"
 
 #: ../src/protocols/silc/silc.c:922
 #, fuzzy
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Файл с публичния ключ"
 
 #: ../src/protocols/silc/silc.c:924
 #, fuzzy
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Файл с частния ключ"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11526,7 +11526,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Дължина на ключ: \t%d бита\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11725,7 +11725,7 @@
 msgstr ""
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/bn.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/bn.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2666,7 +2666,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 "কোনো ত্রুটির কারনে %s এর সংযোগ বিচ্ছিন্ন হয়েছিল। %s অ্যাকাউন্টটি নিস্ক্রিয় করা "
 "হয়েছে। ত্রুটিমুক্ত করে অ্যাকাউন্টটি পুনরায় সক্রিয় করে সংযোগ স্থাপন করুন। "
@@ -6957,7 +6957,7 @@
 msgstr ""
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr ""
 
 #: src/protocols/msn/error.c:45
@@ -8553,7 +8553,7 @@
 #: src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8758,12 +8758,12 @@
 
 #: src/protocols/oscar/oscar.c:6195
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6216
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6218
@@ -8796,21 +8796,21 @@
 #: src/protocols/oscar/oscar.c:6261
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6264
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6267
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8832,7 +8832,7 @@
 
 #: src/protocols/oscar/oscar.c:6286
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6353
@@ -9069,7 +9069,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8193
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8194
@@ -9120,7 +9120,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8345
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8350
@@ -10528,16 +10528,16 @@
 
 #: src/protocols/silc/silc.c:910
 #, fuzzy
-msgid "Key Length"
+msgid "Key length"
 msgstr "মূল চুক্তি"
 
 #: src/protocols/silc/silc.c:912
 #, fuzzy
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "পাবলিক কী সংক্রান্ত তথ্য"
 
 #: src/protocols/silc/silc.c:914
-msgid "Private Key File"
+msgid "Private key file"
 msgstr ""
 
 #: src/protocols/silc/silc.c:923
@@ -10834,7 +10834,7 @@
 
 #: src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:328
@@ -11018,7 +11018,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:527
--- a/po/bs.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/bs.po	Tue Mar 21 04:32:45 2006 +0000
@@ -64,7 +64,7 @@
 msgstr "Provjeri mail"
 
 #: plugins/chkmail.c:203
-msgid "Check email every X seconds.\n"
+msgid "Check e-mail every X seconds.\n"
 msgstr "Provjeri mail svakih X sekundi.\n"
 
 #: plugins/contact_priority.c:84
@@ -3476,7 +3476,7 @@
 
 #: src/gtkimhtml.c:1296
 msgid "_Copy E-Mail Address"
-msgstr "_Kopiraj email adresu"
+msgstr "_Kopiraj e-mail adresu"
 
 #: src/gtkimhtml.c:1308
 msgid "_Copy Link Location"
@@ -6572,8 +6572,8 @@
 msgstr "Sintaksna greška (vjerovatno Gaim bug)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Pogrešna email adresa"
+msgid "Invalid e-mail address"
+msgstr "Pogrešna e-mail adresa"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8208,12 +8208,12 @@
 #: src/protocols/oscar/oscar.c:3841
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Primili ste ICQ email od %s [%s]\n"
+"Primili ste ICQ e-mail od %s [%s]\n"
 "\n"
 "Poruka je:\n"
 "%s"
@@ -8439,13 +8439,13 @@
 
 #: src/protocols/oscar/oscar.c:5273
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Nema pronadenih rezultata za email adresu %s"
+msgid "No results found for e-mail address %s"
+msgstr "Nema pronadenih rezultata za e-mail adresu %s"
 
 #: src/protocols/oscar/oscar.c:5294
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Trebali biste dobiti email da potvrdite %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Trebali biste dobiti e-mail da potvrdite %s."
 
 #: src/protocols/oscar/oscar.c:5296
 msgid "Account Confirmation Requested"
@@ -8484,28 +8484,28 @@
 #: src/protocols/oscar/oscar.c:5339
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Greška 0x%04x: Nije moguce promjeniti email adresu, jer vec postoji zahtjev "
+"Greška 0x%04x: Nije moguce promjeniti e-mail adresu, jer vec postoji zahtjev "
 "u toku za ovo ime."
 
 #: src/protocols/oscar/oscar.c:5342
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Greška 0x%04x: Nije moguce promjeniti email adresu, jer data adresa ima "
+"Greška 0x%04x: Nije moguce promjeniti e-mail adresu, jer data adresa ima "
 "i suviše imena asociranih s njom."
 
 #: src/protocols/oscar/oscar.c:5345
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Greška 0x%04x: Nije moguce promjeniti email adresu, jer je data adresa pogrešna."
+"Greška 0x%04x: Nije moguce promjeniti e-mail adresu, jer je data adresa pogrešna."
 
 #: src/protocols/oscar/oscar.c:5348
 #, c-format
@@ -8527,7 +8527,7 @@
 
 #: src/protocols/oscar/oscar.c:5364
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Email adresa za %s je %s"
 
 #: src/protocols/oscar/oscar.c:5429
@@ -8785,16 +8785,16 @@
 "cete na njih desno-kliknuti i izabrati \"Ponovni zahtjev autorizacije.\""
 
 #: src/protocols/oscar/oscar.c:7166
-msgid "Find Buddy by E-mail"
-msgstr "Potražite prijatelja preko emaila"
+msgid "Find Buddy by E-Mail"
+msgstr "Potražite prijatelja preko e-maila"
 
 #: src/protocols/oscar/oscar.c:7167
 msgid "Search for a buddy by e-mail address"
-msgstr "Pretraga za prijateljem preko email adrese"
+msgstr "Pretraga za prijateljem preko e-mail adrese"
 
 #: src/protocols/oscar/oscar.c:7168
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Ukucajte email adresu prijatelja, kojeg tražite."
+msgstr "Ukucajte e-mail adresu prijatelja, kojeg tražite."
 
 #: src/protocols/oscar/oscar.c:7185
 msgid "Available Message:"
@@ -8849,8 +8849,8 @@
 msgstr "Prikaži ocekujuce autorizacije prijatelja"
 
 #: src/protocols/oscar/oscar.c:7326
-msgid "Search for Buddy by Email..."
-msgstr "Traži prijatelja preko emaila..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Traži prijatelja preko e-maila..."
 
 #: src/protocols/oscar/oscar.c:7331
 msgid "Search for Buddy by Information"
@@ -10138,7 +10138,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Dužina kljuca: \t%d bita\n"
 
 #: src/protocols/silc/util.c:327
@@ -10257,8 +10257,8 @@
 msgstr "Dir servis trenutno nedostupan."
 
 #: src/protocols/toc/toc.c:522
-msgid "Email lookup restricted."
-msgstr "Pregledanje emaila zabranjeno."
+msgid "E-mail lookup restricted."
+msgstr "Pregledanje e-maila zabranjeno."
 
 #: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
--- a/po/ca.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ca.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2912,7 +2912,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "Atès que s'ha produït un error, %s s'ha desconnectat: %s\n"
 "El Gaim no intentarà connectar de nou aquest compte fins que no corregiu "
@@ -7450,7 +7450,7 @@
 msgstr "Error de sintaxi (probablement errada al Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "L'adreça de correu no és vàlida"
 
 #: ../src/protocols/msn/error.c:45
@@ -9163,7 +9163,7 @@
 #: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9381,12 +9381,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6301
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "No s'han obtingut resultats per a l'adreça de correu %s"
 
 #: ../src/protocols/oscar/oscar.c:6322
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Hauríeu de rebre un correu demanant-vos confirmar %s."
 
 #: ../src/protocols/oscar/oscar.c:6324
@@ -9424,7 +9424,7 @@
 #: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè ja "
@@ -9433,7 +9433,7 @@
 #: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça de correu electrònic perquè "
@@ -9442,7 +9442,7 @@
 #: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: No s'ha pogut canviar l'adreça de correu perquè l'adreça "
@@ -9468,7 +9468,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "L'adreça de correu per a %s és %s"
 
 #: ../src/protocols/oscar/oscar.c:6464
@@ -9726,7 +9726,7 @@
 "amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
 #: ../src/protocols/oscar/oscar.c:8315
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Troba un amic per l'adreça de correu"
 
 #: ../src/protocols/oscar/oscar.c:8316
@@ -9776,7 +9776,7 @@
 msgstr "Mostra els amics pendents d'autorització"
 
 #: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
 #: ../src/protocols/oscar/oscar.c:8472
@@ -11298,15 +11298,15 @@
 msgstr "Ha fallat la generació del parell de claus"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Longitud de la clau"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Fitxer de la clau pública"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Fitxer de la clau privada"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11617,7 +11617,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Longitud de la clau: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11828,7 +11828,7 @@
 msgstr "Servei de directori no disponible temporalment."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Recerca per adreça de correu electrònic restringida."
 
 #: ../src/protocols/toc/toc.c:527
@@ -13277,7 +13277,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Comprova el correu"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Comprova el correu electrònic cada X segons.\n"
 
 #~ msgid "Auto-login"
--- a/po/ca_ES@valencian.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ca_ES@valencian.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2886,7 +2886,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "Es desconectà %s degut a un erro: %s\n"
 "Gaim no intentarà reconectar-se ad este conte fins que corrigga l'erro i reactive el conte."
@@ -7462,7 +7462,7 @@
 msgstr "Erro de sintaxis (probablement un erro del Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "La direccio de correu no es valida"
 
 #: ../src/protocols/msn/error.c:45
@@ -9132,7 +9132,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9344,12 +9344,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "No s'han obtingut resultats per a la direccio de correu %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Hauries de rebre un correu demanant-te confirmar %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9377,17 +9377,17 @@
 
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Erro 0x%04x: no s'ha pogut canviar la direccio de correu electronic perque ya hi ha una peticio pendent per ad este nom d'usuari."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Erro 0x%04x: no s'ha pogut canviar la direccio de correu electronic perque la direccio donada ya te massa noms d'usuari associats."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Erro 0x%04x: No s'ha pogut canviar la direccio de correu perque la direccio indicada no es valida."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9411,7 +9411,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "La direccio de correu per a %s es %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9616,7 +9616,7 @@
 msgstr "Pots tornar a demanar l'autorisacio d'estos amics fent clic damunt en el boto dret del ratoli, i seleccionant \"Tornar a demanar l'autorisacio\"."
 
 #: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Trobar un amic per a la direccio de correu"
 
 #: ../src/protocols/oscar/oscar.c:8387
@@ -9666,7 +9666,7 @@
 msgstr "Mostrar els amics pendents d'autorisacio"
 
 #: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Buscar un amic per la direccio de correu..."
 
 #: ../src/protocols/oscar/oscar.c:8543
@@ -11167,15 +11167,15 @@
 msgstr "Fallà la generacio de claus"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Llongitut de la clau"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Archiu de la clau publica"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Archiu de la clau privada"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11464,7 +11464,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Llongitut de la clau: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11673,7 +11673,7 @@
 msgstr "Servici de directori no disponible temporalment."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Busca per direccio de correu electronic restringida."
 
 #: ../src/protocols/toc/toc.c:527
@@ -12583,7 +12583,7 @@
 #~ msgstr "%s (%d nous/%d total)"
 #~ msgid "Check Mail"
 #~ msgstr "Comprovar el correu"
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Comprovar el correu electronic cada X segons.\n"
 #~ msgid "Use last matching buddy"
 #~ msgstr "Usar l'ultim amic que concorde en la busca"
--- a/po/cs.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/cs.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2761,7 +2761,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s byl odpojen kvůli chybě: %s\n"
 "Gaim se nepokusí znovu připojit k účtu, dokud chybu neopravíte a účet znovu nepovolíte."
@@ -3795,7 +3795,7 @@
 
 #: ../src/gtkimhtml.c:1554
 msgid "_Copy E-Mail Address"
-msgstr "_Kopírovat emailovou adresu"
+msgstr "_Kopírovat e-mailovou adresu"
 
 #: ../src/gtkimhtml.c:1566
 msgid "_Open Link in Browser"
@@ -7245,7 +7245,7 @@
 msgstr "Syntaktická chyba (pravděpodobně chyba v Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Neplatná e-mailová adresa"
 
 #: ../src/protocols/msn/error.c:45
@@ -8928,12 +8928,12 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Přijali jste email ICQ od %s [%s]\n"
+"Přijali jste e-mail ICQ od %s [%s]\n"
 "\n"
 "Zpráva je:\n"
 "%s"
@@ -9155,12 +9155,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Pro e-mailovou adresu %s nebyly nalezeny žádné výsledky"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Měli byste dostat e-mail žádající o potvrzení %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9197,28 +9197,28 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Chyba 0x%04x: Nemohu změnit emailovou adresu, protože pro toto jméno "
+"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože pro toto jméno "
 "uživatele již existuje požadavek."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa má "
+"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa má "
 "asociováno příliš mnoho jmen uživatelů."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa je "
+"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa je "
 "neplatná."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9241,7 +9241,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Emailová adresa pro %s je %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9495,12 +9495,12 @@
 "tlačítkem a zvolením \"Znovu požádat o autorizaci.\""
 
 #: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-mail"
-msgstr "Hledat kamaráda podle emailu"
+msgid "Find Buddy by E-Mail"
+msgstr "Hledat kamaráda podle e-mailu"
 
 #: ../src/protocols/oscar/oscar.c:8387
 msgid "Search for a buddy by e-mail address"
-msgstr "Hledat kamaráda podle emailové adresy"
+msgstr "Hledat kamaráda podle e-mailové adresy"
 
 #: ../src/protocols/oscar/oscar.c:8388
 msgid "Type the e-mail address of the buddy you are searching for."
@@ -9545,8 +9545,8 @@
 msgstr "Zobrazit kamarády čekající na autorizaci"
 
 #: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by Email..."
-msgstr "Hledat kamaráda podle emailu..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Hledat kamaráda podle e-mailu..."
 
 #: ../src/protocols/oscar/oscar.c:8543
 msgid "Search for Buddy by Information"
@@ -11031,15 +11031,15 @@
 msgstr "Generování páru klíčů selhalo"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Délka klíče"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Soubor veřejného klíče"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Soubor soukromého klíče"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11346,7 +11346,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Délka klíče: \t%d bitů\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11553,8 +11553,8 @@
 msgstr "Adresářová služba momentálně není k dispozici."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Vyhledávání podle emailu omezeno."
+msgid "E-mail lookup restricted."
+msgstr "Vyhledávání podle e-mailu omezeno."
 
 #: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
--- a/po/da.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/da.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2812,7 +2812,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s blev afbrudt pga. en fejl: %s\n"
 "Gaim vil ikke prøve at forbinde igen til kontoen før du retter fejlen og re-"
@@ -7329,7 +7329,7 @@
 msgstr "Syntaks fejl (sikkert en Gaim fejl)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Ugyldig e-mail adresse"
 
 #: ../src/protocols/msn/error.c:45
@@ -9015,12 +9015,12 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Du har modtaget en ICQ email fra %s [%s]\n"
+"Du har modtaget en ICQ e-mail fra %s [%s]\n"
 "\n"
 "Beskeden er:\n"
 "%s"
@@ -9235,13 +9235,13 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Ingen resultater fundet for post-adressen %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Du bør modtage en email for at acceptere %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Du bør modtage en e-mail for at acceptere %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9277,7 +9277,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Fejl 0x%04x: UDe i stand til at ændre e-post adresse, fordi der allerede er "
@@ -9286,7 +9286,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Fejl 0x%04x: Ikke i stand til at ændre e-post adresse, fordi den angivne "
@@ -9295,7 +9295,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Fejl 0x%04x: Ikke i stand til at ændre e-post adresse, fordi den angivne "
@@ -9321,7 +9321,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s's post-adresse er %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9578,7 +9578,7 @@
 "og vælge \"Anmod om ny godkendelse\"."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Find ven udfra e-post adresse"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9628,7 +9628,7 @@
 msgstr "Vis venner der afventer godkendelse"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Søg efter ven udfra e-post adresse..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11144,15 +11144,15 @@
 msgstr "Nøglepar generering fejlede"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Nøglelængde"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Offentlig nøgle fil"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Privat nøgle fil"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11458,7 +11458,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Nøgle længde: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11666,7 +11666,7 @@
 msgstr "Søgetjeneste midlertidigt utilgængelig."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-post søgning er begrænset."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/de.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/de.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2831,7 +2831,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s wurde aufgrund eines Fehlers getrennt: %s\n"
 "Gaim wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
@@ -7410,7 +7410,7 @@
 msgstr "Syntaxfehler (wahrscheinlich ein Gaim Bug)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Ungültige E-Mailadresse"
 
 #: ../src/protocols/msn/error.c:45
@@ -9132,7 +9132,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9362,12 +9362,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Keine Ergebnisse für die E-Mail Adresse %s gefunden"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 "Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
 "bestätigen."
@@ -9408,7 +9408,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Error 0x%04x: Kann den Benutzernamen nicht formatieren, weil er schon durch "
@@ -9417,7 +9417,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Fehler 0x%04x: Kann die E-Mailadresse nicht ändern, weil es schon zu viele E-"
@@ -9426,7 +9426,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Fehler 0x%04x: Kann die E-Mailadresse nicht ändern, weil die angegebene "
@@ -9452,7 +9452,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Die E-Mail-Adresse für %s ist %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9717,7 +9717,7 @@
 "fragen“ auswählen."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail Adresse"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9767,7 +9767,7 @@
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Suche Buddys nach Email-Adresse..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11305,15 +11305,15 @@
 msgstr "Schlüsselerzeugung ist fehlgeschlagen"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Schlüssellänge"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Öffentlicher Schlüssel (Datei)"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Privater Schlüssel (Datei)"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11627,7 +11627,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Schlüssellänge: \t%d Bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11842,7 +11842,7 @@
 msgstr "Verzeichnis-Dienst ist zur Zeit nicht verfügbar."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-Mail-Suche eingeschränkt."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/el.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/el.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2891,7 +2891,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "Ο %s αποσυνδέθηκε λόγω σφάλματος: %s\n"
 "Το Gaim δε θα επιχειρήσει να επανασυνδεθεί σε αυτό το λογαριασμό μέχρι να διορθώσετε "
@@ -7407,8 +7407,8 @@
 msgstr "Σφάλμα σύνταξης (πιθανώς bug του Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Μη έγκυρη διεύθυνση email"
+msgid "Invalid e-mail address"
+msgstr "Μη έγκυρη διεύθυνση e-mail"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -9110,12 +9110,12 @@
 #: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Λάβατε ένα ICQ email από τον %s [%s]\n"
+"Λάβατε ένα ICQ e-mail από τον %s [%s]\n"
 "\n"
 "Το μήνυμα είναι:\n"
 "%s"
@@ -9326,13 +9326,13 @@
 
 #: ../src/protocols/oscar/oscar.c:6301
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Δε βρέθηκαν αποτελέσματα για τη διεύθυνση email %s"
+msgid "No results found for e-mail address %s"
+msgstr "Δε βρέθηκαν αποτελέσματα για τη διεύθυνση e-mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6322
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Πρέπει να λάβετε ένα email επιβεβαίωσης του %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Πρέπει να λάβετε ένα e-mail επιβεβαίωσης του %s."
 
 #: ../src/protocols/oscar/oscar.c:6324
 msgid "Account Confirmation Requested"
@@ -9370,7 +9370,7 @@
 #: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Σφάλμα 0x%04x: Αδυναμία αλλαγής της ηλ. διεύθυνσης επειδή υπάρχει μία αίτηση "
@@ -9379,7 +9379,7 @@
 #: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Σφάλμα 0x%04x: Αδυναμία αλλαγής της ηλ. διεύθυνσης επειδή η διεύθυνση που "
@@ -9388,7 +9388,7 @@
 #: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: Αδυναμία αλλαγής της ηλ. διεύθυνσης επειδή η διεύθυνση που "
@@ -9414,7 +9414,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Η ηλ. διεύθυνση του %s είναι %s"
 
 #: ../src/protocols/oscar/oscar.c:6464
@@ -9676,7 +9676,7 @@
 "απάνω τους και επιλέγοντας \"Αίτηση έγκρισης (ξανά).\""
 
 #: ../src/protocols/oscar/oscar.c:8315
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Εύρεση φίλου μέσω ηλ.διεύθυνσης"
 
 #: ../src/protocols/oscar/oscar.c:8316
@@ -9726,7 +9726,7 @@
 msgstr "Εμφάνιση φίλων που αναμένουν έγκριση"
 
 #: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Αναζήτηση φίλου με ηλ.διεύθυνση..."
 
 #: ../src/protocols/oscar/oscar.c:8472
@@ -11241,15 +11241,15 @@
 msgstr "Αποτυχία δημιουργίας ζεύγους κλειδιών"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Μήκος Κλειδιού"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Αρχείο δημόσιου κλειδιού"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Αρχείο ιδιωτικού κλειδιού"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11564,7 +11564,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Μήκος κλειδιού: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11769,7 +11769,7 @@
 msgstr "Η υπηρεσία καταλόγου είναι προσωρινά μη διαθέσιμη."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Εύρεση με ηλ.ταχυδρομείο περιορίστηκε."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/en_AU.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/en_AU.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2318,7 +2318,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6532,8 +6532,8 @@
 msgstr "Syntax Error (probably a Gaim bug)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Invalid email address"
+msgid "Invalid e-mail address"
+msgstr "Invalid e-mail address"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8215,12 +8215,12 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8433,13 +8433,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
-msgstr "No results found for email address %s"
+msgid "No results found for e-mail address %s"
+msgstr "No results found for e-mail address %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "You should receive an e-mail asking to confirm %s."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8477,28 +8477,28 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
 #: src/protocols/oscar/oscar.c:6215
@@ -8521,8 +8521,8 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
+msgstr "The e-mail address for %s is %s"
 
 #: src/protocols/oscar/oscar.c:6298
 msgid ""
@@ -8802,8 +8802,8 @@
 "them and selecting \"Re-request Authorisation.\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
-msgstr "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
+msgstr "Find Buddy by E-Mail"
 
 #: src/protocols/oscar/oscar.c:8124
 msgid "Search for a buddy by e-mail address"
@@ -8861,8 +8861,8 @@
 msgstr "Show Buddies Awaiting Authorisation"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
-msgstr "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Search for Buddy by E-Mail..."
 
 #: src/protocols/oscar/oscar.c:8280
 msgid "Search for Buddy by Information"
@@ -10200,12 +10200,12 @@
 #: src/protocols/silc/silc.c:1600
 #, fuzzy
 msgid "Public Key file"
-msgstr "Public Key File"
+msgstr "Public key file"
 
 #: src/protocols/silc/silc.c:1604
 #, fuzzy
 msgid "Private Key file"
-msgstr "Private Key File"
+msgstr "Private key file"
 
 #: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
@@ -10271,8 +10271,8 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
+msgstr "Key length: \t%d bits\n"
 
 #: src/protocols/silc/util.c:327
 #, c-format
@@ -10395,8 +10395,8 @@
 msgstr "Dir service temporarily unavailable."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
+msgid "E-mail lookup restricted."
+msgstr "E-mail lookup restricted."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11312,8 +11312,8 @@
 #~ msgid "Check Mail"
 #~ msgstr "Check Mail"
 
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
+#~ msgstr "Check e-mail every X seconds.\n"
 
 #~ msgid "Auto-login"
 #~ msgstr "Auto-login"
--- a/po/en_CA.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/en_CA.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2314,7 +2314,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6526,8 +6526,8 @@
 msgstr "Syntax Error (probably a Gaim bug)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Invalid email address"
+msgid "Invalid e-mail address"
+msgstr "Invalid e-mail address"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8197,12 +8197,12 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8417,13 +8417,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
-msgstr "No results found for email address %s"
+msgid "No results found for e-mail address %s"
+msgstr "No results found for e-mail address %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "You should receive an e-mail asking to confirm %s."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8461,28 +8461,28 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
 #: src/protocols/oscar/oscar.c:6215
@@ -8505,8 +8505,8 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
+msgstr "The e-mail address for %s is %s"
 
 #: src/protocols/oscar/oscar.c:6298
 msgid ""
@@ -8782,8 +8782,8 @@
 "them and selecting \"Re-request Authorization.\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
-msgstr "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
+msgstr "Find Buddy by E-Mail"
 
 #: src/protocols/oscar/oscar.c:8124
 msgid "Search for a buddy by e-mail address"
@@ -8841,8 +8841,8 @@
 msgstr "Show Buddies Awaiting Authorization"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
-msgstr "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Search for Buddy by E-Mail..."
 
 #: src/protocols/oscar/oscar.c:8280
 msgid "Search for Buddy by Information"
@@ -10180,12 +10180,12 @@
 #: src/protocols/silc/silc.c:1600
 #, fuzzy
 msgid "Public Key file"
-msgstr "Public Key File"
+msgstr "Public key file"
 
 #: src/protocols/silc/silc.c:1604
 #, fuzzy
 msgid "Private Key file"
-msgstr "Private Key File"
+msgstr "Private key file"
 
 #: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
@@ -10251,8 +10251,8 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
+msgstr "Key length: \t%d bits\n"
 
 #: src/protocols/silc/util.c:327
 #, c-format
@@ -10375,8 +10375,8 @@
 msgstr "Dir service temporarily unavailable."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
+msgid "E-mail lookup restricted."
+msgstr "E-mail lookup restricted."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11292,8 +11292,8 @@
 #~ msgid "Check Mail"
 #~ msgstr "Check Mail"
 
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
+#~ msgstr "Check e-mail every X seconds.\n"
 
 #~ msgid "Auto-login"
 #~ msgstr "Auto-login"
--- a/po/en_GB.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/en_GB.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2796,7 +2796,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s was disconnected due to an error. %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
@@ -7321,8 +7321,8 @@
 msgstr "Syntax Error (probably a Gaim bug)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Invalid email address"
+msgid "Invalid e-mail address"
+msgstr "Invalid e-mail address"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -9011,12 +9011,12 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9230,13 +9230,13 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
-msgstr "No results found for email address %s"
+msgid "No results found for e-mail address %s"
+msgstr "No results found for e-mail address %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "You should receive an e-mail asking to confirm %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9272,28 +9272,28 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9316,8 +9316,8 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
+msgstr "The e-mail address for %s is %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
 msgid ""
@@ -9571,8 +9571,8 @@
 "them and selecting \"Re-request Authorisation.\""
 
 #: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-mail"
-msgstr "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
+msgstr "Find Buddy by E-Mail"
 
 #: ../src/protocols/oscar/oscar.c:8387
 msgid "Search for a buddy by e-mail address"
@@ -9621,8 +9621,8 @@
 msgstr "Show Buddies Awaiting Authorisation"
 
 #: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by Email..."
-msgstr "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Search for Buddy by E-Mail..."
 
 #: ../src/protocols/oscar/oscar.c:8543
 msgid "Search for Buddy by Information"
@@ -11138,16 +11138,16 @@
 msgstr "Key Pair Generation failed"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
-msgstr "Key Length"
+msgid "Key length"
+msgstr "Key length"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
-msgstr "Public Key File"
+msgid "Public key file"
+msgstr "Public key file"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
-msgstr "Private Key File"
+msgid "Private key file"
+msgstr "Private key file"
 
 #: ../src/protocols/silc/silc.c:937
 msgid "Real Name"
@@ -11450,8 +11450,8 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
+msgstr "Key length: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
 #, c-format
@@ -11659,8 +11659,8 @@
 msgstr "Dir service temporarily unavailable."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
+msgid "E-mail lookup restricted."
+msgstr "E-mail lookup restricted."
 
 #: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
--- a/po/es.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/es.po	Tue Mar 21 04:32:45 2006 +0000
@@ -3178,7 +3178,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "Se desconectó %s debido a un error: %s \n"
 "Gaim no intentará reconectarse a esta cuenta hasta que corrija el error y reactive la cuenta."
@@ -7981,7 +7981,7 @@
 msgstr "Error de sintaxis (probablemente un error de Gaim)"
 
 #: ../src/protocols/msn/error.c:42 src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Dirección de correo electrónico inválida"
 
 #: ../src/protocols/msn/error.c:45 src/protocols/msn/error.c:45
@@ -9779,7 +9779,7 @@
 #: ../src/protocols/oscar/oscar.c:4782 src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -10006,12 +10006,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6301 src/protocols/oscar/oscar.c:6195
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
 #: ../src/protocols/oscar/oscar.c:6322 src/protocols/oscar/oscar.c:6216
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
 #: ../src/protocols/oscar/oscar.c:6324 src/protocols/oscar/oscar.c:6218
@@ -10050,7 +10050,7 @@
 #: ../src/protocols/oscar/oscar.c:6367 src/protocols/oscar/oscar.c:6261
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
@@ -10059,7 +10059,7 @@
 #: ../src/protocols/oscar/oscar.c:6370 src/protocols/oscar/oscar.c:6264
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
@@ -10068,7 +10068,7 @@
 #: ../src/protocols/oscar/oscar.c:6373 src/protocols/oscar/oscar.c:6267
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
@@ -10095,7 +10095,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6286
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "La dirección de correo electrónico de %s es %s"
 
 #: ../src/protocols/oscar/oscar.c:6464 src/protocols/oscar/oscar.c:6353
@@ -10363,7 +10363,7 @@
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
 #: ../src/protocols/oscar/oscar.c:8315 src/protocols/oscar/oscar.c:8193
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
 #: ../src/protocols/oscar/oscar.c:8316 src/protocols/oscar/oscar.c:8194
@@ -10414,7 +10414,7 @@
 msgstr "Mostrar amigos pendientes de autorización"
 
 #: ../src/protocols/oscar/oscar.c:8467 src/protocols/oscar/oscar.c:8345
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Buscar amigo por correo electrónico..."
 
 #: ../src/protocols/oscar/oscar.c:8472 src/protocols/oscar/oscar.c:8350
@@ -12040,15 +12040,15 @@
 msgstr "Falló la generación de claves"
 
 #: src/protocols/silc/silc.c:910
-msgid "Key Length"
+msgid "Key length"
 msgstr "Longitud de clave"
 
 #: src/protocols/silc/silc.c:912
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Archivo de clave pública"
 
 #: src/protocols/silc/silc.c:914
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Archivo de clave privada"
 
 #: src/protocols/silc/silc.c:923
@@ -12362,7 +12362,7 @@
 
 #: ../src/protocols/silc/util.c:326 src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328 src/protocols/silc/util.c:328
@@ -12573,7 +12573,7 @@
 msgstr "Servicio de directorio temporalmente no disponible."
 
 #: ../src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Búsqueda de direcciones de correo electrónico restringida."
 
 #: ../src/protocols/toc/toc.c:527 src/protocols/toc/toc.c:527
@@ -13721,7 +13721,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 "%s fue desconectado debido a un error. %s La cuenta ha sido deshabilitada. "
 "Corrija el error y rehabilite la cuenta para conectarse."
@@ -14119,7 +14119,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Comprobar correo"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Comprobar correo cada X segundos.\n"
 
 #~ msgid "Auto-login"
--- a/po/et.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/et.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2264,7 +2264,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6406,7 +6406,7 @@
 msgstr "Süntaksi viga (arvatavasti Gaim'i probleem)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Vigane e-posti aadress"
 
 #: src/protocols/msn/error.c:45
@@ -8012,7 +8012,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8222,12 +8222,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8260,21 +8260,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8296,7 +8296,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8538,7 +8538,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8597,7 +8597,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8280
@@ -9949,7 +9949,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Võtme pikkus: \t%d bitti\n"
 
 #: src/protocols/silc/util.c:327
@@ -10071,7 +10071,7 @@
 msgstr "Kataloogiteenus pole ajutiselt saadaval."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:527
@@ -10920,7 +10920,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "E-posti kontrollimine"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "E-posti kontrollimine iga X sekundi tagant.\n"
 
 #~ msgid "Auto-login"
--- a/po/fa.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/fa.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2863,7 +2863,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 
 #: ../src/gtkconv.c:364
@@ -7334,7 +7334,7 @@
 msgstr "خطای نحوی (احتمالاً اشکالی در گیم)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "نشانی پست الکترونیکی نامعتبر"
 
 #: ../src/protocols/msn/error.c:45
@@ -9010,7 +9010,7 @@
 #: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9217,12 +9217,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6301
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "نتیجه‌ای برای نشانی پست الکترونیکی %s پیدا نشد"
 
 #: ../src/protocols/oscar/oscar.c:6322
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "شما باید یک نامه‌ی الکترونیکی برای تأیید %s دریافت کنید."
 
 #: ../src/protocols/oscar/oscar.c:6324
@@ -9259,7 +9259,7 @@
 #: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون یک درخواست معلق دیگر "
@@ -9268,7 +9268,7 @@
 #: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون نشانی داده شده با "
@@ -9277,7 +9277,7 @@
 #: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون نشانی داده شده نامعتبر "
@@ -9303,7 +9303,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "نشانی پست الکترونیکی %s، %s است"
 
 #: ../src/protocols/oscar/oscar.c:6464
@@ -9555,7 +9555,7 @@
 "اجازه» را انتخاب کنید."
 
 #: ../src/protocols/oscar/oscar.c:8315
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "پیدا کردن رفیق از روی پست الکترونیکی"
 
 #: ../src/protocols/oscar/oscar.c:8316
@@ -9605,7 +9605,7 @@
 msgstr "نمایش رفقای در انتظار اجازه"
 
 #: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "جستجو به دنبال رفیق از روی پست الکترونیکی..."
 
 #: ../src/protocols/oscar/oscar.c:8472
@@ -11111,15 +11111,15 @@
 msgstr "تولید زوج کلید شکست خورد"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "طول کلید"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "پرونده‌ی کلید عمومی"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "پرونده‌ی کلید خصوصی"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11422,7 +11422,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "طول کلید : \t%Id بیت \n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11630,7 +11630,7 @@
 msgstr "سرویس دفترچه‌ی راهنمای کاربران به طور موقت قابل دسترسی نیست."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "گشتن به دنبال نشانی پست الکترونیکی محدود شده است."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/fi.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/fi.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2811,7 +2811,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "Katkaistiin yhteys %s virheen vuoksi: %s\n"
 "Gaim ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
@@ -7337,7 +7337,7 @@
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe Gaimissa)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Epäkelpo sähköpostiosoite"
 
 #: ../src/protocols/msn/error.c:45
@@ -9025,7 +9025,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9242,12 +9242,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9286,7 +9286,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
@@ -9295,7 +9295,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
@@ -9304,7 +9304,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
@@ -9330,7 +9330,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9585,7 +9585,7 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9635,7 +9635,7 @@
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11153,15 +11153,15 @@
 msgstr "Avainparin luonti epäonnistui"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Avaimen pituus"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11466,7 +11466,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Avaimen pituus:\t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11676,7 +11676,7 @@
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
 #: ../src/protocols/toc/toc.c:527
@@ -13280,7 +13280,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Tarkista posti"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Tarkista posti x sekunnin välein.\n"
 
 #~ msgid "Auto-login"
--- a/po/fr.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/fr.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2834,7 +2834,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "La déconnexion de %s est due à une erreur : %s\n"
 "Gaim n'essaiera pas de se reconnecter avec ce compte tant que cette erreur "
@@ -7404,7 +7404,7 @@
 msgstr "Erreur de syntaxe (probablement un bug de Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Adresse de courrier électronique non valide"
 
 #: ../src/protocols/msn/error.c:45
@@ -9110,7 +9110,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9330,12 +9330,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9374,7 +9374,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
@@ -9383,7 +9383,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
@@ -9392,7 +9392,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
@@ -9418,7 +9418,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9681,7 +9681,7 @@
 "« Redemander autorisation » sur un clic-droit du contact."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Chercher un contact par adresse électronique"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9731,7 +9731,7 @@
 msgstr "Afficher les demandes d'autorisation"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Chercher par adresse électronique..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11254,15 +11254,15 @@
 msgstr "Échec de génération de la paire de clés"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Longueur de clé"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Fichier de clé publique"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Fichier de clé privée"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11575,7 +11575,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Longueur de clé : %d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11784,7 +11784,7 @@
 msgstr "L'annuaire est temporairement indisponible."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "La recherche par adresse électronique est restreinte."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/gl.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/gl.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2810,7 +2810,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "Desconectouse %s debido a un erro: %s\n"
 "Gaim non tentará reconectarse a esta conta ata que corrixa o erro e reactive "
@@ -7357,7 +7357,7 @@
 msgstr "Erro de sintase (probablemente un erro de Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Dirección de correo electrónico inválida"
 
 #: ../src/protocols/msn/error.c:45
@@ -9058,7 +9058,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9276,12 +9276,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Non se atoparon resultados para o enderezo de correo %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir unha mensaxe solicitando confirmación de %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9319,7 +9319,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
@@ -9328,7 +9328,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
@@ -9337,7 +9337,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Erro 0x%04x: Non es pode cambiar o enderezo de correo electrónico porque o "
@@ -9363,7 +9363,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "O enderezo de correo electrónico de %s é %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9622,7 +9622,7 @@
 "rato sobre eles e escollendo \"Solicitar autorización outra vez.\""
 
 #: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo polo correo electrónico"
 
 #: ../src/protocols/oscar/oscar.c:8387
@@ -9672,7 +9672,7 @@
 msgstr "Amosar amigos pendentes de autorización"
 
 #: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Buscar amigo por correo electrónico..."
 
 #: ../src/protocols/oscar/oscar.c:8543
@@ -11194,15 +11194,15 @@
 msgstr "Fallou a xeneración de claves"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Lonxitude da clave"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Ficheiro de clave pública"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Ficheiro de clave privada"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11513,7 +11513,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Lonxitude da clave: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11722,7 +11722,7 @@
 msgstr "Servizo de directorio temporalmente non dispoñible."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Busca de enderezos de correo electrónico restrinxida."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/gu.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/gu.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2299,7 +2299,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6499,7 +6499,7 @@
 msgstr "વાક્યરચના ભૂલ (સંભવિત રીતે Gaim ત્રુટિ)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "અયોગ્ય ઈમેઈલ સરનામું"
 
 #: src/protocols/msn/error.c:45
@@ -8158,7 +8158,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8374,12 +8374,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "ઈમેઈલ સરનામા %s માટે કોઈ પરિણામો મળ્યા નથી"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "તમે %s ની ખાતરી કરવા માટે પૂછતો ઈમેઈલ મેળવવો જોઈએ."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8416,7 +8416,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "ભૂલ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે આ સ્ક્રીન નામ માટેની અરજી "
@@ -8425,7 +8425,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "ભૂલ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે આપેલ સરનામાના ઘણા સ્ક્રીન નામો "
@@ -8434,7 +8434,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "ભૂલ 0x%04x: ઈમેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામું અગોગ્ય છે."
 
@@ -8458,7 +8458,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s માટેનું ઈમેઈલ સરનામું %s છે"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8731,7 +8731,7 @@
 "પુનઃ-અરજી કરો\" પસંદ કરીને."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "ઈ-મેઈલ દ્વારા વ્યક્તિ શોધો"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8790,7 +8790,7 @@
 msgstr "સત્તાધિકરણ માટે રાહ જોઈ રહલે વ્યક્તિઓ બતાવો"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "ઈમેઈલ દ્વારા વ્યક્તિ માટે શોધ કરો..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10194,7 +10194,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "કી લંબાઈ: \t%d bits\n"
 
 #: src/protocols/silc/util.c:327
@@ -10318,7 +10318,7 @@
 msgstr "ડિરેક્ટરી સેવા કામચલાઉ રીતે ઉપલબ્ધ નથી."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "ઈમેઈલ જોવાનું પ્રતિબંધિત છે."
 
 #: src/protocols/toc/toc.c:527
@@ -11225,7 +11225,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "મેઈલ ચકાસો"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "દર X સેકન્ડે મેઈલ ચકાસો.\n"
 
 #~ msgid "Auto-login"
--- a/po/he.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/he.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2769,7 +2769,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s נותק עקב שגיאה: %s\n"
 "גיים לא ינסה לחבר את החשבון מחדש עד אשר הבעיה תתוקן, והחשבון יופעל מחדש."
@@ -7235,7 +7235,7 @@
 msgstr "שגיאת תחביר (כנראה באג בגיים)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "כתובת דוא\"ל לא תקפה"
 
 #: ../src/protocols/msn/error.c:45
@@ -8901,7 +8901,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9116,12 +9116,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "לא נמצאו תוצאות עבור כתובת הדוא\"ל %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "ישלח דוא\"ל לאשר את %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9155,7 +9155,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
@@ -9164,7 +9164,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
@@ -9173,7 +9173,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
@@ -9198,7 +9198,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "כתובת הדוא\"ל של %s היא %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9442,7 +9442,7 @@
 "ולבחור \"בקש הרשאה שוב\"."
 
 #: ../src/protocols/oscar/oscar.c:8388
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
 #: ../src/protocols/oscar/oscar.c:8389
@@ -9492,7 +9492,7 @@
 msgstr "הצג את אנשי הקשר שמחכים לאישור"
 
 #: ../src/protocols/oscar/oscar.c:8540
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
 #: ../src/protocols/oscar/oscar.c:8545
@@ -10995,15 +10995,15 @@
 msgstr "כשל בעת יצירה של זוג מפתחות"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "אורך מפתח"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "קובץ מפתח ציבורי"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "קובץ מפתח פרטי"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11304,7 +11304,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "אורך מפתח: \t%d ביטים\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11511,7 +11511,7 @@
 msgstr "שירות המדריך אינו זמין זמנית."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "חיפוש הדוא\"ל מוגבל."
 
 #: ../src/protocols/toc/toc.c:527
@@ -13007,7 +13007,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "בדוק דואר"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "בדוק דואר כל מספר שניות. \n"
 
 #~ msgid "Auto-login"
--- a/po/hi.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/hi.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2503,7 +2503,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6800,7 +6800,7 @@
 msgstr "वाक्यविन्यास त्रुटी (शायद गेम में खोट है)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "अवैध इमेल पता"
 
 #: src/protocols/msn/error.c:45
@@ -8482,7 +8482,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8700,12 +8700,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "%s इमेल पते के लिए कोइ भी नतीजा नहीं मिला"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s को निश्चित करने के लिए एक ईमेल मिलेगा।"
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8744,7 +8744,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "त्रुटी 0x%04x: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से एक आवेदन है।"
@@ -8752,7 +8752,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "त्रुटी 0x%04x: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से बहुत से स्क्रीन-"
@@ -8761,7 +8761,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "त्रुटी 0x%04x:  ईमेल बदलने में असमर्थ क्योंकि दिया गया ईमेल पता अवैध है।"
 
@@ -8786,7 +8786,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s के लिए ईमेल पता है %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -9050,7 +9050,7 @@
 "लिए अनुरोध कर सकतें हैं।"
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "ईमेल के द्वारा बड्डी को ढूंढें"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -9110,7 +9110,7 @@
 msgstr "प्रमाणिकरन कि प्रतीक्षा कर रहे बड्डी दिखायें"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "बड्डी की खोज ईमेल द्वारा करें..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10527,7 +10527,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "कुंजी की लम्बाई: \t%d बिट\n"
 
 #: src/protocols/silc/util.c:327
@@ -10651,7 +10651,7 @@
 msgstr "डिर सेवा अस्थाई रुप से उपलब्ध नहीं है।"
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "इमेल का देखना सीमाबद्ध किया गया।"
 
 #: src/protocols/toc/toc.c:527
@@ -11559,7 +11559,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "डाक देखें"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "हर X सेकण्ड मे डाक देखें.\n"
 
 #~ msgid "Auto-login"
--- a/po/hu.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/hu.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2887,7 +2887,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s kapcsolata bontva a következő hiba miatt: %s\n"
 "A Gaim nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a hibát és nem engedélyezi újra a fiókot."
@@ -7466,7 +7466,7 @@
 msgstr "Szintaktikai hiba (valószínűleg Gaim hiba)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Érvénytelen e-mail cím"
 
 #: ../src/protocols/msn/error.c:45
@@ -9135,7 +9135,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9351,12 +9351,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Nem található eredmény a(z) %s e-mail címre"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Kapnia kell egy %s jóváhagyását kérő levelet."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9384,17 +9384,17 @@
 
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Hiba 0x%04x: Nem sikerült a fiók azonosítót megformázni, mert egy kérés már függőben van erre a felhasználóazonosítóra."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím túl sok felhasználóazonosítóval van társítva."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím érvénytelen."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9418,7 +9418,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s e-mail címe a következő: %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9623,7 +9623,7 @@
 msgstr "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
 
 #: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Partnerek keresése e-mail cím szerint"
 
 #: ../src/protocols/oscar/oscar.c:8387
@@ -9673,7 +9673,7 @@
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
 #: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Partner keresése e-mail cím szerint..."
 
 #: ../src/protocols/oscar/oscar.c:8543
@@ -11175,15 +11175,15 @@
 msgstr "A kulcselőállítás meghiúsult"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Kulcs hossza"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Nyilvános kulcs fájlja"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Személyes kulcs fájlja"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11472,7 +11472,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Kulcs hossza: \t%d bit\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11681,7 +11681,7 @@
 msgstr "Könyvtárszolgáltatás átmenetileg nem érhető el."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-mail keresés korlátozva."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/it.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/it.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2343,7 +2343,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -3339,7 +3339,7 @@
 
 #: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
-msgstr "_Copia l'indirizzo email"
+msgstr "_Copia l'indirizzo e-mail"
 
 #: src/gtkimhtml.c:1549
 msgid "_Open Link in Browser"
@@ -5876,12 +5876,12 @@
 
 #: src/protocols/jabber/buddy.c:1346
 msgid "E-Mail Address"
-msgstr "Indirizzo email"
+msgstr "Indirizzo e-mail"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
 msgid "Search for Jabber users"
-msgstr "Cerca un contatto attraverso il suo indirizzo email"
+msgstr "Cerca un contatto attraverso il suo indirizzo e-mail"
 
 #: src/protocols/jabber/buddy.c:1370
 #, fuzzy
@@ -6581,8 +6581,8 @@
 msgstr "Errore di sintassi (probabilmente un bug di Gaim)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Indirizzo email non valido"
+msgid "Invalid e-mail address"
+msgstr "Indirizzo e-mail non valido"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -7609,7 +7609,7 @@
 #: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
 #: src/protocols/oscar/oscar.c:5972
 msgid "Email Address"
-msgstr "Indirizzo email"
+msgstr "Indirizzo e-mail"
 
 #: src/protocols/novell/novell.c:1480
 msgid "User ID"
@@ -8268,12 +8268,12 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Hai ricevuto un'email ICQ da %s [%s]\n"
+"Hai ricevuto un'e-mail ICQ da %s [%s]\n"
 "\n"
 "Il messaggio :\n"
 "%s"
@@ -8492,13 +8492,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Nessun risultato trovato per l'indirizzo email %s"
+msgid "No results found for e-mail address %s"
+msgstr "Nessun risultato trovato per l'indirizzo e-mail %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Dovresti ricevere un'email con la richiesta di conferma per %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Dovresti ricevere un'e-mail con la richiesta di conferma per %s."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8536,28 +8536,28 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Errore 0x%04x: Impossibile cambiare l'indirizzo email poich c' gi una "
+"Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poich c' gi una "
 "richiesta in corso per questo nome utente."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Errore 0x%04x: Impossibile cambiare l'indirizzo email poich l'indirizzo "
+"Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poich l'indirizzo "
 "fornito ha troppi nomi utente associati."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Errore 0x%04x: Impossibile cambiare l'indirizzo email poich l'indirizzo "
+"Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poich l'indirizzo "
 "fornito non  valido."
 
 #: src/protocols/oscar/oscar.c:6215
@@ -8580,8 +8580,8 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "L'indirizzo email di %s  %s"
+msgid "The e-mail address for %s is %s"
+msgstr "L'indirizzo e-mail di %s  %s"
 
 #: src/protocols/oscar/oscar.c:6298
 msgid ""
@@ -8865,16 +8865,16 @@
 "tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
-msgstr "Cerca un contatto per email"
+msgid "Find Buddy by E-Mail"
+msgstr "Cerca un contatto per e-mail"
 
 #: src/protocols/oscar/oscar.c:8124
 msgid "Search for a buddy by e-mail address"
-msgstr "Cerca un contatto attraverso il suo indirizzo email"
+msgstr "Cerca un contatto attraverso il suo indirizzo e-mail"
 
 #: src/protocols/oscar/oscar.c:8125
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Inserisci l'indirizzo email del contatto che stai cercando."
+msgstr "Inserisci l'indirizzo e-mail del contatto che stai cercando."
 
 #: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
 msgid "Set User Info..."
@@ -8924,8 +8924,8 @@
 msgstr "Mostra i contatti dai quali attendi autorizzazione"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
-msgstr "Cerca un contatto per email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Cerca un contatto per e-mail..."
 
 #: src/protocols/oscar/oscar.c:8280
 msgid "Search for Buddy by Information"
@@ -10348,7 +10348,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Lunghezza della chiave: \t%d bit\n"
 
 #: src/protocols/silc/util.c:327
@@ -10476,8 +10476,8 @@
 msgstr "Servizio di directory temporaneamente non disponibile."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Ricerca email limitata."
+msgid "E-mail lookup restricted."
+msgstr "Ricerca e-mail limitata."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11406,7 +11406,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Controlla la posta elettronica"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Controlla la posta elettronica ogni X secondi.\n"
 
 #~ msgid "Auto-login"
--- a/po/ja.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ja.po	Tue Mar 21 04:32:45 2006 +0000
@@ -1,5 +1,5 @@
 # gaim ja.po.
-# Copyright (C) 2002, Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>
+# Copyright (C) 2002, Ryosuke Kutsuna <ryosuke@cool.e-mail.ne.jp>
 # Copyright (C) 2002, Taku YASUI <tach@debian.or.jp>
 # Copyright (C) 2003, Junichi Uekawa <dancer@debian.org>
 # Copyright (C) 2003-2006, Takeshi AIHANA <aihana@gnome.gr.jp>
@@ -2855,7 +2855,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "エラーが発生したので %s さんとの接続を切りました: %s\n"
 "その問題を解決しアカウントをもう一度有効にして接続し直して下さい。"
@@ -7376,7 +7376,7 @@
 msgstr "文法エラー (おそらく Gaim のバグ)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "不正な E-メール・アドレス"
 
 #: ../src/protocols/msn/error.c:45
@@ -9055,12 +9055,12 @@
 #: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"ICQ emailを %s [%s] さんから受信しました\n"
+"ICQ e-mailを %s [%s] さんから受信しました\n"
 "\n"
 "メッセージは:\n"
 "%s"
@@ -9292,12 +9292,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6301
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "%s というメール・アドレスに対して結果がありませんでした"
 
 #: ../src/protocols/oscar/oscar.c:6322
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s さんを確認するための問い合わせメールを受信して下さい"
 
 #: ../src/protocols/oscar/oscar.c:6324
@@ -9332,7 +9332,7 @@
 #: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "エラー 0x%04x: このスクリーン名に対して既に要求がきているのでメールアドレスを"
@@ -9341,7 +9341,7 @@
 #: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "エラー 0x%04x: たくさんのスクリーン名に割り当てられているので、このメールアド"
@@ -9350,7 +9350,7 @@
 #: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "エラー 0x%04x: このアドレスは不正なので、このメールアドレスには変更できません"
@@ -9375,7 +9375,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s さんのメールアドレスは %s です"
 
 #: ../src/protocols/oscar/oscar.c:6464
@@ -9623,7 +9623,7 @@
 "求することができます。"
 
 #: ../src/protocols/oscar/oscar.c:8315
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "E-メールから仲間を捜す"
 
 #: ../src/protocols/oscar/oscar.c:8316
@@ -9673,7 +9673,7 @@
 msgstr "承認を待っている仲間を表示"
 
 #: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "メールで仲間の検索..."
 
 #: ../src/protocols/oscar/oscar.c:8472
@@ -11202,15 +11202,15 @@
 msgstr "鍵ペアの生成が失敗しました"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "鍵の長さ"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "公開鍵のファイル"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "秘密鍵のファイル"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11525,7 +11525,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "鍵の長さ: \t%d ビット\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11736,7 +11736,7 @@
 msgstr "一時的にディレクトリ・サービスが利用できません"
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-メール検索が拒否されました"
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/ka.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ka.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2796,7 +2796,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"The account has been disabled. Correct the error and reenable the account to "
+"The account has been disabled. Correct the error and re-enable the account to "
 "connect."
 msgstr ""
 
@@ -7168,8 +7168,8 @@
 msgstr ""
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "არასწორი email მისამართი"
+msgid "Invalid e-mail address"
+msgstr "არასწორი e-mail მისამართი"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8779,7 +8779,7 @@
 #: ../src/protocols/oscar/oscar.c:4759
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8972,12 +8972,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6286
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "ელ.ფოსტის ძიების შედეგები %s-თვის არაა ნაპოვნი"
 
 #: ../src/protocols/oscar/oscar.c:6307
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6309
@@ -9012,21 +9012,21 @@
 #: ../src/protocols/oscar/oscar.c:6352
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6355
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6358
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -9048,7 +9048,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6377
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "ელ.ფოსტის მისამართი %s-თვის არის  %s"
 
 #: ../src/protocols/oscar/oscar.c:6449
@@ -9271,7 +9271,7 @@
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:8301
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:8302
@@ -9321,7 +9321,7 @@
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:8453
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:8458
@@ -10778,15 +10778,15 @@
 msgstr ""
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "გასაღების სიგრძე"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr ""
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr ""
 
 #: ../src/protocols/silc/silc.c:933
@@ -11081,7 +11081,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "გასაღების სიგრძე: \t%d ბიტი\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11270,7 +11270,7 @@
 msgstr ""
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/ko.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ko.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2282,7 +2282,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6437,7 +6437,7 @@
 msgstr "구문 오류 (게임의 버그일 수 있음)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "잘못된 메일 주소"
 
 #: src/protocols/msn/error.c:45
@@ -8097,7 +8097,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8310,12 +8310,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "%s 주소로 찾은 결과가 없음"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8348,21 +8348,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8384,7 +8384,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8637,7 +8637,7 @@
 "수 있습니다."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "메일로 친구 찾기"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8696,7 +8696,7 @@
 msgstr "인증을 기다리고 있는 친구 보여주기"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "메일로 친구 찾기..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10122,7 +10122,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "키 길이: \t%d 비트\n"
 
 #: src/protocols/silc/util.c:327
@@ -10244,7 +10244,7 @@
 msgstr "디렉토리 서비스를 일시적으로 사용할 수 없습니다."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "메일 찾아보기가 금지되어 있습니다."
 
 #: src/protocols/toc/toc.c:527
@@ -11126,7 +11126,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "편지 확인"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "매 X 초마다 메일을 확인합니다.\n"
 
 #~ msgid "Auto-login"
--- a/po/ku.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ku.po	Tue Mar 21 04:32:45 2006 +0000
@@ -66,7 +66,7 @@
 msgstr "E-Peyaman kontrol bike"
 
 #: plugins/chkmail.c:203
-msgid "Check email every X seconds.\n"
+msgid "Check e-mail every X seconds.\n"
 msgstr "Di navbera her X çirkeyan de e-peyamê kontrol bike.\n"
 
 #: plugins/contact_priority.c:84
@@ -6249,7 +6249,7 @@
 msgstr ""
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr ""
 
 #: src/protocols/msn/error.c:45
@@ -7819,7 +7819,7 @@
 #: src/protocols/oscar/oscar.c:3957
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8036,12 +8036,12 @@
 
 #: src/protocols/oscar/oscar.c:5394
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5415
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5417
@@ -8076,21 +8076,21 @@
 #: src/protocols/oscar/oscar.c:5460
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5463
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5466
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8112,7 +8112,7 @@
 
 #: src/protocols/oscar/oscar.c:5485
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5550
@@ -8336,7 +8336,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:7306
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:7307
@@ -8400,7 +8400,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:7466
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:7471
@@ -9630,7 +9630,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -9744,7 +9744,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:522
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:525
--- a/po/lt.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/lt.po	Tue Mar 21 04:32:45 2006 +0000
@@ -3008,7 +3008,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s buvo atjungtas dėl klaidos: %s\n"
 "Gaim nebebandys prisijungti su šia paskyra, kol nepataisysite klaidos ir iš naujo neaktyvuosite paskyros."
@@ -7613,7 +7613,7 @@
 msgstr "Sintaksės klaida (greičiausiai Gaim riktas)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Neteisingas el. pašto adresas"
 
 #: ../src/protocols/msn/error.c:45
@@ -9317,7 +9317,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9561,12 +9561,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Pagal el. pašto adresą %s jokių rezultatų nerasta"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Jūs turėtumėte gauti el. laišką, prašantį patvirtinti %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9605,7 +9605,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi šiuo metu laukia "
@@ -9614,7 +9614,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
@@ -9623,7 +9623,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
@@ -9649,7 +9649,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Vartotojo %s el. pašto adresas yra %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9916,7 +9916,7 @@
 "paprašyti prieigos teisės“."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Surasti bičiulį pagal el. pašto adresą"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9966,7 +9966,7 @@
 msgstr "Parodyti bičiulius, laukiančius prieigos suteikimo"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Ieškoti bičiulio pagal el. pašto adresą..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11501,15 +11501,15 @@
 msgstr "Raktų poros sukūrimas nepavyko"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Rakto ilgis"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Viešojo rakto failas"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Privataus rakto failas"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11835,7 +11835,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Rakto ilgis, bitais: \t%d\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -12063,7 +12063,7 @@
 msgstr "Katalogo tarnyba laikinai neprieinama."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "El. pašto adresų paieška apribota."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/mk.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/mk.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2262,7 +2262,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6351,7 +6351,7 @@
 msgstr ""
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr ""
 
 #: src/protocols/msn/error.c:45
@@ -7977,7 +7977,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8189,13 +8189,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Ќе добиете email за потврда на %s"
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Ќе добиете e-mail за потврда на %s"
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8227,21 +8227,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8263,7 +8263,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8508,7 +8508,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8567,7 +8567,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8280
@@ -9973,7 +9973,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -10093,7 +10093,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:527
@@ -10957,7 +10957,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Провери пошта"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Провери пошта на секои X секунди.\n"
 
 #~ msgid "Auto-login"
--- a/po/my_MM.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/my_MM.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2317,7 +2317,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6533,8 +6533,8 @@
 msgstr "Syntax Error (probably a Gaim bug)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Invalid email address"
+msgid "Invalid e-mail address"
+msgstr "Invalid e-mail address"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8212,12 +8212,12 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8432,13 +8432,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
-msgstr "No results found for email address %s"
+msgid "No results found for e-mail address %s"
+msgstr "No results found for e-mail address %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "You should receive an e-mail asking to confirm %s."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8476,28 +8476,28 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
 #: src/protocols/oscar/oscar.c:6215
@@ -8520,8 +8520,8 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
+msgstr "The e-mail address for %s is %s"
 
 #: src/protocols/oscar/oscar.c:6298
 msgid ""
@@ -8797,8 +8797,8 @@
 "them and selecting \"Re-request Authorisation.\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
-msgstr "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
+msgstr "Find Buddy by E-Mail"
 
 #: src/protocols/oscar/oscar.c:8124
 msgid "Search for a buddy by e-mail address"
@@ -8856,8 +8856,8 @@
 msgstr "Show Buddies Awaiting Authorisation"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
-msgstr "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Search for Buddy by E-Mail..."
 
 #: src/protocols/oscar/oscar.c:8280
 msgid "Search for Buddy by Information"
@@ -10195,12 +10195,12 @@
 #: src/protocols/silc/silc.c:1600
 #, fuzzy
 msgid "Public Key file"
-msgstr "Public Key File"
+msgstr "Public key file"
 
 #: src/protocols/silc/silc.c:1604
 #, fuzzy
 msgid "Private Key file"
-msgstr "Private Key File"
+msgstr "Private key file"
 
 #: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
@@ -10266,8 +10266,8 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
+msgstr "Key length: \t%d bits\n"
 
 #: src/protocols/silc/util.c:327
 #, c-format
@@ -10390,8 +10390,8 @@
 msgstr "Dir service temporarily unavailable."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
+msgid "E-mail lookup restricted."
+msgstr "E-mail lookup restricted."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11307,8 +11307,8 @@
 #~ msgid "Check Mail"
 #~ msgstr "Mail စစ္‌မယ္‌"
 
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "X စက္ကန့္တိုင္း email စစ္‌မယ္‌\n"
+#~ msgid "Check e-mail every X seconds.\n"
+#~ msgstr "X စက္ကန့္တိုင္း e-mail စစ္‌မယ္‌\n"
 
 #~ msgid "Auto-login"
 #~ msgstr "Auto-login"
--- a/po/nb.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/nb.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2367,7 +2367,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 # Lot "me" st, var usikker p om denne brukes "teknisk"
@@ -6586,7 +6586,7 @@
 msgstr "Syntaksfeil (sannsynligvis en Gaim-bug)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Ugyldig epostadresse"
 
 #: src/protocols/msn/error.c:45
@@ -8267,7 +8267,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8491,12 +8491,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Ingen resultater funnet for e-postadresse %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Du vil motta en e-post hvor du blir bedt om  bekrefte %s."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8535,7 +8535,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi det finnes en utestende "
@@ -8544,7 +8544,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen har "
@@ -8553,7 +8553,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er "
@@ -8579,7 +8579,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "E-postadressen for %s er %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8861,7 +8861,7 @@
 "p dem og velge \"Spr p nytt om godkjenning\"."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Finn kontakt etter e-post"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8920,7 +8920,7 @@
 msgstr "Vis kontakter som venter p godkjenning"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Vennesk etter e-postadresse"
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10359,7 +10359,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Nkkellengde: \t%d biter\n"
 
 #: src/protocols/silc/util.c:327
@@ -10481,7 +10481,7 @@
 msgstr "Katalogtjenesten er midlertidig utilgjengelig."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-postoppslag er begrenset."
 
 #: src/protocols/toc/toc.c:527
@@ -11397,7 +11397,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Sjekk e-post"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Sjekk e-post hvert Xte sekund.\n"
 
 #~ msgid "Auto-login"
--- a/po/nl.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/nl.po	Tue Mar 21 04:32:45 2006 +0000
@@ -3117,7 +3117,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "Ver binding van %s is verbroken: %s\n"
 "Gaim zal geen verbinding meer proberen te maken tot de fout is verholpen en het account weer is ingeschakeld."
@@ -7857,7 +7857,7 @@
 msgstr "Syntaxfout (waarschijnlijk een bug in Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Ongeldig e-mail adres"
 
 #: ../src/protocols/msn/error.c:45
@@ -9538,7 +9538,7 @@
 #: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9752,12 +9752,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6301
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Niets gevonden voor e-mail adres %s"
 
 #: ../src/protocols/oscar/oscar.c:6322
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "U zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
 
 #: ../src/protocols/oscar/oscar.c:6324
@@ -9785,17 +9785,17 @@
 
 #: ../src/protocols/oscar/oscar.c:6367
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres al is aangevraagd door een ander."
 
 #: ../src/protocols/oscar/oscar.c:6370
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres reeds te veel gebruikersnamen toegewezen heeft gekregen."
 
 #: ../src/protocols/oscar/oscar.c:6373
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres ongeldig is."
 
 #: ../src/protocols/oscar/oscar.c:6376
@@ -9819,7 +9819,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Het e-mail adres vor %s is %s"
 
 #: ../src/protocols/oscar/oscar.c:6464
@@ -10027,7 +10027,7 @@
 msgstr "U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
 
 #: ../src/protocols/oscar/oscar.c:8315
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Contact zoeken op e-mail adres"
 
 #: ../src/protocols/oscar/oscar.c:8316
@@ -10078,7 +10078,7 @@
 msgstr "Contacten weergeven die op toestemming wachten"
 
 #: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Contact zoeken door middel van e-mail..."
 
 #: ../src/protocols/oscar/oscar.c:8472
@@ -11661,17 +11661,17 @@
 
 #: ../src/protocols/silc/silc.c:920
 #, fuzzy
-msgid "Key Length"
+msgid "Key length"
 msgstr "Sleutellengte: \t%d bits\n"
 
 #: ../src/protocols/silc/silc.c:922
 #, fuzzy
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Bestand voor openbare sleutel"
 
 #: ../src/protocols/silc/silc.c:924
 #, fuzzy
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Bestand voor privésleutel"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11966,7 +11966,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Sleutellengte: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -12187,7 +12187,7 @@
 msgstr "Profielen service is momenteel niet toegankelijk."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Email zoekfunctie beperkt."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/nn.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/nn.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2315,7 +2315,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6527,7 +6527,7 @@
 msgstr "Syntaksfeil (Truleg ein feil i Gaim)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Ugyldig epostadresse"
 
 #: src/protocols/msn/error.c:45
@@ -8164,7 +8164,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8374,12 +8374,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8412,21 +8412,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8448,7 +8448,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8690,7 +8690,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8749,7 +8749,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10100,7 +10100,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -10219,7 +10219,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:527
@@ -11092,7 +11092,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Sjekk epost"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Sjekk epost kvart X sekund\n"
 
 #~ msgid "Auto-login"
--- a/po/pa.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/pa.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2281,7 +2281,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6455,7 +6455,7 @@
 msgstr ""
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "ਗਲਤ ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ"
 
 #: src/protocols/msn/error.c:45
@@ -8086,7 +8086,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8302,12 +8302,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ %s ਲਈ ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ ਹੈ"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "ਤੁਸੀਂ %s ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਇੱਕ ਈ-ਪੱਤਰ ਛੇਤੀ ਹੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ।"
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8341,7 +8341,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "ਗਲਤੀ 0x%04x: ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤਾ ਸਿਰਨਾਵੇਂ ਲਈ ਪਹਿਲਾਂ "
@@ -8350,7 +8350,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "ਗਲਤੀ 0x%04x: ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤੇ ਸਿਰਨਾਵਾਂ ਨਾਲ ਬਹੁਤ "
@@ -8359,7 +8359,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "ਗਲਤੀ 0x%04x: ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਤਬਦੀਲ ਕਰਨ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤਾ ਸਿਰਨਾਵਾਂ ਗਲਤ ਹੈ।"
@@ -8384,7 +8384,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s ਦਾ ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ %s ਹੈ"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8644,7 +8644,7 @@
 "ਬੇਨਤੀ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "ਈ-ਪੱਤਰ ਰਾਹੀਂ ਸਨੇਹੀ ਖੋਜ"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8703,7 +8703,7 @@
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਦੀ ਉਡੀਕ ਵਿੱਚ ਸਨੇਹੀ ਵੇਖਾਓ"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "ਈ-ਪੱਤਰ ਰਾਹੀਂ ਸਨੇਹੀ ਖੋਜ..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10098,7 +10098,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "ਕੁੰਜੀ ਲੰਬਾਈ: \t%d ਬਿੱਟ\n"
 
 #: src/protocols/silc/util.c:327
@@ -10222,7 +10222,7 @@
 msgstr "ਡਾਈ ਸੇਵਾ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "ਈ-ਪੱਤਰ ਖੋਜ ਪਾਬੰਦੀ ਹੈ।"
 
 #: src/protocols/toc/toc.c:527
@@ -11129,7 +11129,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "ਪੱਤਰ ਜਾਂਚ"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "ਹਰ X ਸਕਿੰਟ ਉਪਰੰਤ ਪੱਤਰ ਜਾਂਚ।\n"
 
 #~ msgid "Auto-login"
--- a/po/pl.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/pl.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2891,7 +2891,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s zosta rozczony z powodu nastpujcego bdu: %s\n"
 "Gaim nie bdzie prbowa ponownie nawiza poczenia dopki nie naprawisz bdu i nie wczysz ponownego logowania na to konto."
@@ -7376,7 +7376,7 @@
 msgstr "Bd skadni (prawdopodobnie bd w Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Niepoprawny adres e-mail"
 
 #: ../src/protocols/msn/error.c:45
@@ -9070,7 +9070,7 @@
 #: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9284,12 +9284,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6301
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Nie znaleziono adnych wynikw dla adresu e-mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6322
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Powinna/powiniene otrzyma e-mail proszcy o potwierdzenie %s."
 
 #: ../src/protocols/oscar/oscar.c:6324
@@ -9326,7 +9326,7 @@
 #: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Bd 0x%04x: Nie mona zmieni adresu e-mail, poniewa w kolejce czeka inna "
@@ -9335,7 +9335,7 @@
 #: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Bd 0x%04x: Nie mona zmieni adresu e-mail, poniewa podany adres jest "
@@ -9344,7 +9344,7 @@
 #: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Bd 0x%04x: Nie mona zmieni adresu e-mail, poniewa podany adres jest "
@@ -9370,7 +9370,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6392
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Adres e-mail dla %s to %s"
 
 #: ../src/protocols/oscar/oscar.c:6464
@@ -9630,7 +9630,7 @@
 "przyciskiem i wybierajc \"Ponownie popro o autoryzacj\"."
 
 #: ../src/protocols/oscar/oscar.c:8315
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Wyszukiwanie uytkownika wg adresu e-mail"
 
 #: ../src/protocols/oscar/oscar.c:8316
@@ -9680,7 +9680,7 @@
 msgstr "Pokazuj uytkownikw oczekujcych na autoryzacj"
 
 #: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Szukaj znajomych wedug adresu e-mail..."
 
 #: ../src/protocols/oscar/oscar.c:8472
@@ -11183,15 +11183,15 @@
 msgstr ""
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Dugo klucza"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Plik z kluczem publicznym"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Plik z kluczem prywatnym"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11504,7 +11504,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Dugo klucza: \t%d bitw\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11711,7 +11711,7 @@
 msgstr "Usuga katalogu tymczasowo niedostpna."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Zastrzeone wyszukiwanie e-mail."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/pt.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/pt.po	Tue Mar 21 04:32:45 2006 +0000
@@ -1046,11 +1046,11 @@
 
 #: ../plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr "Verificador de email"
+msgstr "Verificador de e-mail"
 
 #: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Verifica novos emails locais."
+msgstr "Verifica novos e-mails locais."
 
 #: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
@@ -2197,7 +2197,7 @@
 
 #: ../src/gtkaccount.c:932
 msgid "New mail notifications"
-msgstr "Novas notificações de email"
+msgstr "Novas notificações de e-mail"
 
 #: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
@@ -2820,7 +2820,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s foi desligado devido a um erro: %s\n"
 "O Gaim não vai tentar ligar a conta de novo até que corriga este erro e re-"
@@ -5209,7 +5209,7 @@
 
 #: ../src/gtkstock.c:145
 msgid "_Open Mail"
-msgstr "_Abrir email"
+msgstr "_Abrir e-mail"
 
 #: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
 #, c-format
@@ -6652,7 +6652,7 @@
 
 #: ../src/protocols/jabber/buddy.c:1407
 msgid "E-Mail Address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
 #: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
@@ -7359,8 +7359,8 @@
 msgstr "Erro de sintaxe (provavelmente um bug do Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Morada de email inválida"
+msgid "Invalid e-mail address"
+msgstr "Morada de e-mail inválida"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8403,7 +8403,7 @@
 #: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
 #: ../src/protocols/oscar/oscar.c:6185
 msgid "Email Address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
@@ -9060,12 +9060,12 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Recebeu um email do ICQ de %s [%s]\n"
+"Recebeu um e-mail do ICQ de %s [%s]\n"
 "\n"
 "A mensagem é: \n"
 "%s"
@@ -9279,13 +9279,13 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Nenhum resultado encontrado para o endereço de email %s"
+msgid "No results found for e-mail address %s"
+msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Deve receber um email pedindo para confirmar %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Deve receber um e-mail pedindo para confirmar %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9321,28 +9321,28 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Erro 0x%04x: Impossível mudar endereço de email porque já existe um pedido "
+"Erro 0x%04x: Impossível mudar endereço de e-mail porque já existe um pedido "
 "pendente para esse nome de utilizador."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Erro 0x%04x: Impossível mudar o endereço de email porque este já possui "
+"Erro 0x%04x: Impossível mudar o endereço de e-mail porque este já possui "
 "muitos nomes de utilizador associados a ele."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Erro 0x%04x: Impossível mudar o endereço de email porque este é inválido."
+"Erro 0x%04x: Impossível mudar o endereço de e-mail porque este é inválido."
 
 #: ../src/protocols/oscar/oscar.c:6441
 #, c-format
@@ -9364,8 +9364,8 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "O endereço de email de %s é %s"
+msgid "The e-mail address for %s is %s"
+msgstr "O endereço de e-mail de %s é %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
 msgid ""
@@ -9626,7 +9626,7 @@
 "neles e seleccionando \"Re-requisitar autorização.\""
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Encontrar Contacto por E-mail"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9676,7 +9676,7 @@
 msgstr "Mostrar contactos esperando autorização"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Procurar Contacto por Email..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11197,15 +11197,15 @@
 msgstr "Geração de Par de Chaves falhou"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Comprimento da Chave"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Ficheiro de Chave Pública"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Ficheiro de Chave Privada"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11515,7 +11515,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Comprimento da Chave: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11725,8 +11725,8 @@
 msgstr "Serviço de diretorio temporariamente indisponível."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Pesquisa por email restrita."
+msgid "E-mail lookup restricted."
+msgstr "Pesquisa por e-mail restrita."
 
 #: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
--- a/po/pt_BR.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/pt_BR.po	Tue Mar 21 04:32:45 2006 +0000
@@ -1052,17 +1052,17 @@
 
 #: ../plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr "Verificador de email"
+msgstr "Verificador de e-mail"
 
 #: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Verifica novos emails locais."
+msgstr "Verifica novos e-mails locais."
 
 #: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Adiciona uma pequena caixa à lista de amigos que mostra se você tem novos "
-"emails."
+"e-mails."
 
 #: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
@@ -2200,7 +2200,7 @@
 
 #: ../src/gtkaccount.c:932
 msgid "New mail notifications"
-msgstr "Novas notificações de email"
+msgstr "Novas notificações de e-mail"
 
 #: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
@@ -2824,7 +2824,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s foi desconectado devido a um erro: %s\n"
 "O Gaim não tentará reconectar esta conta até que você corrija o erro e "
@@ -3885,7 +3885,7 @@
 
 #: ../src/gtkimhtml.c:1554
 msgid "_Copy E-Mail Address"
-msgstr "_Copiar endereço de email"
+msgstr "_Copiar endereço de e-mail"
 
 #: ../src/gtkimhtml.c:1566
 msgid "_Open Link in Browser"
@@ -4179,7 +4179,7 @@
 
 #: ../src/gtknotify.c:327
 msgid "New Mail"
-msgstr "Novo email"
+msgstr "Novo e-mail"
 
 #: ../src/gtknotify.c:343
 msgid "Open All Messages"
@@ -4195,7 +4195,7 @@
 
 #: ../src/gtknotify.c:427
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Você tem email!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Você tem e-mail!</span>"
 
 #: ../src/gtknotify.c:493
 #, c-format
@@ -4211,7 +4211,7 @@
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Você tem email!</span>\n"
+"<span weight=\"bold\" size=\"larger\">Você tem e-mail!</span>\n"
 "\n"
 "%s"
 
@@ -5226,7 +5226,7 @@
 
 #: ../src/gtkstock.c:145
 msgid "_Open Mail"
-msgstr "_Abrir email"
+msgstr "_Abrir e-mail"
 
 #: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
 #, c-format
@@ -6679,7 +6679,7 @@
 
 #: ../src/protocols/jabber/buddy.c:1407
 msgid "E-Mail Address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
 #: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
@@ -7385,8 +7385,8 @@
 msgstr "Erro de sintaxe (provavelmente um bug do Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Endereço de email inválido"
+msgid "Invalid e-mail address"
+msgstr "Endereço de e-mail inválido"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8427,7 +8427,7 @@
 #: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
 #: ../src/protocols/oscar/oscar.c:6185
 msgid "Email Address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
@@ -9086,12 +9086,12 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Você recebeu um email do ICQ de %s [%s]\n"
+"Você recebeu um e-mail do ICQ de %s [%s]\n"
 "\n"
 "A mensagem é: \n"
 "%s"
@@ -9305,13 +9305,13 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Nenhum resultado encontrado para o endereço de email %s"
+msgid "No results found for e-mail address %s"
+msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Você deve receber um email pedindo para confirmar %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Você deve receber um e-mail pedindo para confirmar %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9347,28 +9347,28 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Erro 0x%04x: Impossível mudar endereço de email porque já existe um pedido "
+"Erro 0x%04x: Impossível mudar endereço de e-mail porque já existe um pedido "
 "pendente para esse nome de usuário."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Erro 0x%04x: Impossível mudar o endereço de email porque este já possui "
+"Erro 0x%04x: Impossível mudar o endereço de e-mail porque este já possui "
 "muitos nomes de usuário associados a ele."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Erro 0x%04x: Impossível mudar o endereço de email porque este é inválido."
+"Erro 0x%04x: Impossível mudar o endereço de e-mail porque este é inválido."
 
 #: ../src/protocols/oscar/oscar.c:6441
 #, c-format
@@ -9390,8 +9390,8 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "O endereço de email de %s é %s"
+msgid "The e-mail address for %s is %s"
+msgstr "O endereço de e-mail de %s é %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
 msgid ""
@@ -9652,16 +9652,16 @@
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
-msgstr "Encontrar amigo por email"
+msgid "Find Buddy by E-Mail"
+msgstr "Encontrar amigo por e-mail"
 
 #: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
-msgstr "Procurar por um amigo pelo endereço de email"
+msgstr "Procurar por um amigo pelo endereço de e-mail"
 
 #: ../src/protocols/oscar/oscar.c:8396
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Digite o endereço de email do amigo que você está procurando."
+msgstr "Digite o endereço de e-mail do amigo que você está procurando."
 
 #: ../src/protocols/oscar/oscar.c:8489
 msgid "Set User Info (URL)..."
@@ -9702,8 +9702,8 @@
 msgstr "Mostrar amigos esperando autorização"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
-msgstr "Procurar por amigos por email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Procurar por amigos por e-mail..."
 
 #: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
@@ -11221,15 +11221,15 @@
 msgstr "Falha ao gerar par de chaves"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Tamanho da chave"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Arquivo da chave pública"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Arquivo da chave privada"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11543,7 +11543,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Tamanho da chave: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11757,8 +11757,8 @@
 msgstr "Serviço de diretório temporariamente indisponível."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Pesquisa por email restrita."
+msgid "E-mail lookup restricted."
+msgstr "Pesquisa por e-mail restrita."
 
 #: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
--- a/po/ro.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ro.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2806,7 +2806,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 "%s a fost deconectat datorită unei erori: %s\n"
 "Pentru a reîncerca reconectarea cu acest cont trebuie să corectaţi eroarea "
@@ -7363,7 +7363,7 @@
 msgstr "Eroare de sintaxă (probabil o eroare Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Adresă de mail invalidă"
 
 #: ../src/protocols/msn/error.c:45
@@ -9064,7 +9064,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9293,12 +9293,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Nu s-a găsit nici un rezultat pentru adresa de mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Ar trebui să primiţi un mail care să vă ceară confirmarea %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9335,7 +9335,7 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că există deja o "
@@ -9344,7 +9344,7 @@
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
@@ -9353,7 +9353,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
@@ -9379,7 +9379,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Adresa de mail pentru %s este %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9644,7 +9644,7 @@
 "din nou autorizare” după un click dreapta pe nume în lista contactelor."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Căutare contact după adresa de mail"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9694,7 +9694,7 @@
 msgstr "Afişare contacte ce aşteaptă autorizarea"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Căutare contact după adresa de mail..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11218,15 +11218,15 @@
 msgstr "Generarea perechii de chei a eşuat"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Lungime cheie"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Fişier cheie publică"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Fişier cheie privată"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11540,7 +11540,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Lungime cheie: \t%d octeţi\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11750,7 +11750,7 @@
 msgstr "Serviciul „Dir” este temporar indisponibil."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Căutarea după adresa de mail este restricţionată."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/ru.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ru.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2803,7 +2803,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 
 #: ../src/gtkconv.c:373
@@ -7301,7 +7301,7 @@
 msgstr "Синтаксическая ошибка (вероятно, ошибка Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Неверный адрес e-mail"
 
 #: ../src/protocols/msn/error.c:45
@@ -8979,7 +8979,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9204,12 +9204,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9248,14 +9248,14 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
@@ -9264,7 +9264,7 @@
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
@@ -9290,7 +9290,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9546,7 +9546,7 @@
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9596,7 +9596,7 @@
 msgstr "Показать собеседников без авторизации"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Искать собеседника по e-mail..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11077,15 +11077,15 @@
 msgstr "Не удалось выполнить генерацию пары ключей"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Длина ключа"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Файл публичного ключа"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Файл личного ключа"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11400,7 +11400,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Длина ключа: \t%d бит\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11609,7 +11609,7 @@
 msgstr "Служба каталогов временно недоступна."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Поиск e-mail запрещён."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/sk.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/sk.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2369,7 +2369,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6752,7 +6752,7 @@
 
 #: src/protocols/msn/error.c:42
 #, fuzzy
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Nesprávne meno"
 
 #: src/protocols/msn/error.c:45
@@ -8476,7 +8476,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8702,12 +8702,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8741,21 +8741,21 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8778,7 +8778,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6298
@@ -9049,8 +9049,8 @@
 
 #: src/protocols/oscar/oscar.c:8123
 #, fuzzy
-msgid "Find Buddy by E-mail"
-msgstr "Gaim - Nájsť kamaráta podľa emailu"
+msgid "Find Buddy by E-Mail"
+msgstr "Gaim - Nájsť kamaráta podľa e-mailu"
 
 #: src/protocols/oscar/oscar.c:8124
 #, fuzzy
@@ -9116,7 +9116,7 @@
 
 #: src/protocols/oscar/oscar.c:8275
 #, fuzzy
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Nájsť kamaráta"
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10555,7 +10555,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -10678,8 +10678,8 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Vyhladávanie podla emailu je obmedzené."
+msgid "E-mail lookup restricted."
+msgstr "Vyhladávanie podla e-mailu je obmedzené."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -13408,10 +13408,10 @@
 
 #~ msgid ""
 #~ "contactinfo.php. If you can't get online and still need more assistance, "
-#~ "feel free to email us at gaim@marko.net. Thanks for using Gaim!"
+#~ "feel free to e-mail us at gaim@marko.net. Thanks for using Gaim!"
 #~ msgstr ""
 #~ "contactinfo.php. Ak sa nemožete pripojiť a stále potrebujete daľšiu "
-#~ "pomoc, bez obáv pošlite email na gaim@marko.net. Ďakujeme za používanie "
+#~ "pomoc, bez obáv pošlite e-mail na gaim@marko.net. Ďakujeme za používanie "
 #~ "Gaim-u!"
 
 #~ msgid "Help!"
--- a/po/sl.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/sl.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2919,7 +2919,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s je bil odjavljen zaradi napake: %s\n"
 "Gaim se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
@@ -7508,7 +7508,7 @@
 msgstr "Skladenjska napaka (verjetno hrošč v Gaimu)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Neveljaven naslov e-pošte"
 
 #: ../src/protocols/msn/error.c:45
@@ -9186,7 +9186,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9413,12 +9413,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Za dani elektronski naslov %s ni bilo rezultatov"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Prejeti bi morali elektronsko pošto, da potrdite %s. "
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9446,17 +9446,17 @@
 
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Napaka 0x%04x: Ni bilo mogoče spremeniti elektronskega naslova, ker je že en zahtevek v čakanju za to ime."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Napaka 0x%04x: Ni mogoče spremeniti elektronskega naslova ker ima podan naslov že preveč računov."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Napaka 0x%04x: Ni mogoče spremeniti elektronskega naslova ker je podan naslov neveljaven."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9480,7 +9480,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9689,7 +9689,7 @@
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
 #: ../src/protocols/oscar/oscar.c:8394
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
 #: ../src/protocols/oscar/oscar.c:8395
@@ -9739,7 +9739,7 @@
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
 #: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Išči prijatelja po e-pošti ..."
 
 #: ../src/protocols/oscar/oscar.c:8551
@@ -11242,15 +11242,15 @@
 msgstr "Ustvarjanje para ključev ni uspelo"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Key Length"
+msgid "Key length"
 msgstr "Dolžina ključa"
 
 #: ../src/protocols/silc/silc.c:926
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Datoteka z javnim ključem"
 
 #: ../src/protocols/silc/silc.c:928
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Datoteka z zasebnim ključem"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11539,7 +11539,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Dolžina ključa: \t%d bitov\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11748,7 +11748,7 @@
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/sq.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/sq.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2592,7 +2592,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6908,8 +6908,8 @@
 msgstr "Gabim Sintakse (mundet një e metë Gaim-i)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
-msgstr "Vendndodhje email e pavlefshme"
+msgid "Invalid e-mail address"
+msgstr "Vendndodhje e-mail e pavlefshme"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -8636,12 +8636,12 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
 msgstr ""
-"Keni marrë një email ICQ prej %s [%s]\n"
+"Keni marrë një e-mail ICQ prej %s [%s]\n"
 "\n"
 "Mesazhi thotë:\n"
 "%s"
@@ -8857,13 +8857,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Nuk u gjetën përfundime për vendndodhje email %s"
+msgid "No results found for e-mail address %s"
+msgstr "Nuk u gjetën përfundime për vendndodhje e-mail %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Duht t'ju vijë një email me kërkesën për ripohim të %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Duht t'ju vijë një e-mail me kërkesën për ripohim të %s."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8901,28 +8901,28 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse për këtë emër "
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse për këtë emër "
 "ekrani ka tashmë një kërkesë në pritje."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse vendndodhja e "
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e "
 "dhënë ka shumë emra ekrani shoqëruar asaj."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse vendndodhja e "
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e "
 "dhënë është e pavlefshme."
 
 #: src/protocols/oscar/oscar.c:6215
@@ -8945,8 +8945,8 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "Vendndodhja email për %s është %s"
+msgid "The e-mail address for %s is %s"
+msgstr "Vendndodhja e-mail për %s është %s"
 
 #: src/protocols/oscar/oscar.c:6298
 msgid ""
@@ -9229,7 +9229,7 @@
 "dhe përzgjedhur \"Rikërko Autorizim.\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Gjej Shok nga E-mail-i"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -9288,7 +9288,7 @@
 msgstr "Shfaq Shokë që Presin Autorizim"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Kërko për Shokë sipas E-mail-i..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10756,7 +10756,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Gjatësi Kyçi: \t%d bite\n"
 
 #: src/protocols/silc/util.c:327
@@ -10880,8 +10880,8 @@
 msgstr "Shërbim drejtorish përkohësisht i pamundur."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Kërkim email-i i ndaluar."
+msgid "E-mail lookup restricted."
+msgstr "Kërkim e-mail-i i ndaluar."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11846,7 +11846,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Kontrollo Postë"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Kontrollo postë çdo X sekonda.\n"
 
 #~ msgid "Auto-login"
--- a/po/sr.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/sr.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2266,7 +2266,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr "%s је прекинуо услед грешке %s Налог је онемогућен. Исправите грешку и поново омогућите налогу да се повезује."
 
 #: src/gtkconv.c:325
@@ -6369,7 +6369,7 @@
 msgstr "Синтаксна грешка (вероватно недостатак Гаима)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Неисправна ел. адреса"
 
 #: src/protocols/msn/error.c:45
@@ -8037,7 +8037,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8257,12 +8257,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Није пронађено нити једно поклапање за адресу е-поште %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Требате да примите е-пошту ради потврђивања %s."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8299,7 +8299,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је већ послат "
@@ -8308,7 +8308,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је превише "
@@ -8317,7 +8317,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је унета адреса "
@@ -8343,7 +8343,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Адреса е-поште за %s је %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8624,7 +8624,7 @@
 "избором „Понови захтев за овлашћење“."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Пронађи другара помоћу адресе е-поште"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8682,7 +8682,7 @@
 msgstr "Прикажи другаре за које се чека овлашћење"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Пронађи другара према е-адреси..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10073,7 +10073,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Дужина кључа: \t%d\n"
 
 #: src/protocols/silc/util.c:327
@@ -10198,7 +10198,7 @@
 msgstr "Услуге именика тренутно нису доступне."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Ограничена претрага према адреси е-поште."
 
 #: src/protocols/toc/toc.c:527
--- a/po/sr@Latn.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/sr@Latn.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2322,7 +2322,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6550,7 +6550,7 @@
 msgstr "Sintaksna greška (verovatno nedostatak Gaima)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Neispravna el. adresa"
 
 #: src/protocols/msn/error.c:45
@@ -8230,7 +8230,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8456,12 +8456,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Nije pronađeno niti jedno poklapanje za adresu e-pošte %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Trebate da primite e-poštu radi potvrđivanja %s."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8500,7 +8500,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je već poslat "
@@ -8509,7 +8509,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je previše "
@@ -8518,7 +8518,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je uneta adresa "
@@ -8544,7 +8544,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Adresa e-pošte za %s je %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8830,7 +8830,7 @@
 "izborom „Ponovi zahtev za ovlašćenje“."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Pronađi drugara pomoću adrese e-pošte"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8889,7 +8889,7 @@
 msgstr "Prikaži drugare za koje se čeka ovlašćenje"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Pronađi drugara prema e-adresi..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10304,7 +10304,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Dužina ključa: \t%d\n"
 
 #: src/protocols/silc/util.c:327
@@ -10429,7 +10429,7 @@
 msgstr "Usluge imenika trenutno nisu dostupne."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Ograničena pretraga prema adresi e-pošte."
 
 #: src/protocols/toc/toc.c:527
@@ -11352,7 +11352,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Proveri poštu"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Proveravaj e-poštu svakih N sekundi.\n"
 
 #~ msgid "Auto-login"
--- a/po/sv.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/sv.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2906,7 +2906,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and reenable the account."
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s kopplades ifrån på grund av ett fel. %s\n"
 "Gaim kommer inte försöka ansluta förrän du har korrekterat felt och återaktiverat kontot."
@@ -7509,7 +7509,7 @@
 msgstr "Syntaxfel (antagligen ett bug i Gaim)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Ogiltig e-postadress"
 
 #: ../src/protocols/msn/error.c:45
@@ -9178,7 +9178,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9390,12 +9390,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Inget resultat funnet för e-postadress %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Du borde få ett e-postmeddelande som ber dig bekräfta %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9423,17 +9423,17 @@
 
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Fel 0x%04x: Kan inte ändra e-postadressen eftersom det redan finns en begäran om ändring som väntar för detta användar-ID."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen har för många användar-IDn associerade med sig."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen inte är giltig."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9457,7 +9457,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "E-postaderssen för %s är %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9662,7 +9662,7 @@
 msgstr "Du kan begära auktorisering igen från dessa kompisar genom att högerkilcka på dem och välja \"Begär auktorisering igen.\""
 
 #: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Hitta kompis på e-postadress"
 
 #: ../src/protocols/oscar/oscar.c:8387
@@ -9712,7 +9712,7 @@
 msgstr "Visa kompisar som väntar på auktorisering"
 
 #: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Sök efter kompis på e-postadress..."
 
 #: ../src/protocols/oscar/oscar.c:8543
@@ -11214,15 +11214,15 @@
 msgstr "Genrerering av nyckelpar misslyckades"
 
 #: ../src/protocols/silc/silc.c:920
-msgid "Key Length"
+msgid "Key length"
 msgstr "Nyckellängd"
 
 #: ../src/protocols/silc/silc.c:922
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "Publik nyckelfil"
 
 #: ../src/protocols/silc/silc.c:924
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "Privat nyckelfil"
 
 #: ../src/protocols/silc/silc.c:933
@@ -11511,7 +11511,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Nyckellängd: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11720,7 +11720,7 @@
 msgstr "Katalogtjänsten är tillfälligt onåbar."
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-postuppslagning är begränsad."
 
 #: ../src/protocols/toc/toc.c:527
@@ -13123,7 +13123,7 @@
 #~ msgstr "%s (%d nya/%d totalt)"
 #~ msgid "Check Mail"
 #~ msgstr "Kolla e-post"
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Kolla e-post var X sekund.\n"
 #~ msgid "Auto-login"
 #~ msgstr "Logga in automatiskt"
--- a/po/ta.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/ta.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2680,7 +2680,7 @@
 
 #: src/gtkconn.c:192
 #, c-format
-msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and reenable the account to connect."
+msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and re-enable the account to connect."
 msgstr "பிழையால் %s துண்டிக்கப்பட்டது. %s இந்த கணக்கு இயலாமைபடுத்தப்பட்டது. இணைக்க, பிழையை சரிசெய்து கணக்கை மறு இயலுமை படுத்தவும்."
 
 #: src/gtkconv.c:331
@@ -7018,7 +7018,7 @@
 msgstr "இலக்கணப்பிழை (அனேகமாக கெய்மின் பிழையாக இருக்கலாம்)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "செல்லாத மின்னஞ்சல் முகவரி"
 
 #: src/protocols/msn/error.c:45
@@ -8633,7 +8633,7 @@
 #: src/protocols/oscar/oscar.c:4646
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8836,12 +8836,12 @@
 
 #: src/protocols/oscar/oscar.c:6189
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "மின்னஞ்சல் %s ற்கு எந்த முடிவும் இல்லை"
 
 #: src/protocols/oscar/oscar.c:6210
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6212
@@ -8869,17 +8869,17 @@
 
 #: src/protocols/oscar/oscar.c:6255
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "பிழை 0x%04x: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் இந்த திரைப்பயருக்கு ஏற்கனவே ஒரு கோரிக்கை கிடப்பில் உள்ளது."
 
 #: src/protocols/oscar/oscar.c:6258
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "பிழை 0x%04x: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் இந்த மின்னஞ்சலுக்கு நிறைய திரைப்பயர்கள் இணைப்பாக உள்ளது.ை."
 
 #: src/protocols/oscar/oscar.c:6261
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "பிழை 0x%04x: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் அந்த முகவரி செல்லாதது."
 
 #: src/protocols/oscar/oscar.c:6264
@@ -8901,7 +8901,7 @@
 
 #: src/protocols/oscar/oscar.c:6280
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:6347
@@ -9113,7 +9113,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:8157
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "தோழரை மின்னஞ்சல் கொண்டு தேடு"
 
 #: src/protocols/oscar/oscar.c:8158
@@ -9173,7 +9173,7 @@
 msgstr "உறுதியாக்கலுக்கு காத்திருக்கும் தோழர்களை காட்டு"
 
 #: src/protocols/oscar/oscar.c:8309
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "தோழரைடு மின்னஞ்ச மூலம் தேடு..ல்."
 
 #: src/protocols/oscar/oscar.c:8314
@@ -10615,15 +10615,15 @@
 msgstr ""
 
 #: src/protocols/silc/silc.c:890
-msgid "Key Length"
+msgid "Key length"
 msgstr ""
 
 #: src/protocols/silc/silc.c:892
-msgid "Public Key File"
+msgid "Public key file"
 msgstr ""
 
 #: src/protocols/silc/silc.c:894
-msgid "Private Key File"
+msgid "Private key file"
 msgstr ""
 
 #: src/protocols/silc/silc.c:901
@@ -10908,7 +10908,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -11093,7 +11093,7 @@
 msgstr ""
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "மின்னஞ்சலை பார்ப்பது தடைசெய்யப்பட்டது."
 
 #: src/protocols/toc/toc.c:527
--- a/po/te.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/te.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2502,7 +2502,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6789,7 +6789,7 @@
 msgstr "వాక్యవిన్యాసంలో పొరపాటు (గెయిమ్ పొరపాటు కావచ్చు)."
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "విలువలేని ఇ-మెయిల్ అడ్రస్ "
 
 #: src/protocols/msn/error.c:45
@@ -8472,7 +8472,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8692,12 +8692,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్‌కు ఫలితాలు కనిపించలేదు. "
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s నిర్ధారించమని కోరుతూ మీరు ఒక ఇ-మెయిల్‌ను స్వీకరించాలి. "
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8732,7 +8732,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇదే స్క్రీన్‌పేరును మరొకరు మీకంటే "
@@ -8741,7 +8741,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇచ్చిన అడ్రసుకు చాలా స్క్రీన్‌పేరులు "
@@ -8750,7 +8750,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "పొరపాటు 0x%04x:  ఈ-మెయిల్ అడ్రసును మార్చలేము, ఎందుకంటే ఇచ్చిన అడ్రసుకు విలువ లేదు."
 
@@ -8775,7 +8775,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్ %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -9041,7 +9041,7 @@
 "కోసం మరోసారి మనవి.\" ని సెలక్ట్ చేయండి. "
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "ఇ-మెయిల్ ద్వారా మిత్రుని కనుగొనండి. "
 
 #: src/protocols/oscar/oscar.c:8124
@@ -9101,7 +9101,7 @@
 msgstr "ఆథరైజేషన్‌ కోసం ఎదురుచూస్తూ మిత్రులను ప్రదర్శించుము."
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "ఇ-మెయిల్ ద్వారా మిత్రాన్వేషణ ..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10522,7 +10522,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "తాళం పొడవు: \t%d बिट\n"
 
 #: src/protocols/silc/util.c:327
@@ -10646,7 +10646,7 @@
 msgstr "డైరెక్టరీ సేవ తాత్కాలికంగా అలభ్యం. "
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "ఇ-మెయిల్‌ను చూడడం నియంత్రించబడింది. "
 
 #: src/protocols/toc/toc.c:527
@@ -11555,7 +11555,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "తపాలాను చూడండి. "
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "ప్రతి X సెకండ్లకు ఇ-మెయిల్ చూడండి.\n"
 
 #~ msgid "Auto-login"
--- a/po/tr.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/tr.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2344,7 +2344,7 @@
 
 #: src/gtkconn.c:191
 #, c-format
-msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and reenable the account to connect."
+msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and re-enable the account to connect."
 msgstr "%s bir hatadan dolay koptu. %s hesab kapatld. Hatay dzeltin ve hesab balanmak iin etkin hale getirin."
 
 #: src/gtkconv.c:325
@@ -6548,7 +6548,7 @@
 msgstr "Szdizimi hatas (muhtemelen bir Gaim kodlama hatas)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Geersiz e-posta adresi"
 
 #: src/protocols/msn/error.c:45
@@ -8193,7 +8193,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8401,12 +8401,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "%s e-posta adresi iin sonu bulunamad"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s onay soracak bir e-posta almalsnz."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8434,17 +8434,17 @@
 
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Hata 0x%04x: E-posta adresi biimlendirilemiyor nk zaten bir grnt ad deitirmesi bekleniyor."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Hata 0x%04x: E-posta adresi biimlendirilemiyor nk birden fazla grnt ad bu adresle eletirilmi."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Hata 0x%04x: E-posta adresi biimlendirilemiyor nk geersiz."
 
 #: src/protocols/oscar/oscar.c:6215
@@ -8468,7 +8468,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s iin e-posta adresi %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8684,7 +8684,7 @@
 msgstr "Kullancya sa tklayp \"Yeniden zin ste\" ye tklayarak yeniden bu kullancdan izin isteyebilirsiniz."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "E-Posta ile Arkada Bul"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8744,7 +8744,7 @@
 msgstr "zin Bekleyen Kiileri Gster"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "E-Posta ile arkada ara"
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10154,7 +10154,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Anahtar uzunluu: \t%d bit\n"
 
 #: src/protocols/silc/util.c:327
@@ -10279,7 +10279,7 @@
 msgstr "Bu servis geici olarak hizmet ddr."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "E-posta aramas yasakland."
 
 #: src/protocols/toc/toc.c:527
@@ -11109,7 +11109,7 @@
 #~ msgstr "%s (%d yeni/%d toplam)"
 #~ msgid "Check Mail"
 #~ msgstr "Postay Kontrol Et"
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Her X saniyede postay kontrol et.\n"
 #~ msgid "Auto-login"
 #~ msgstr "Otomatik-balan"
--- a/po/uk.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/uk.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2328,7 +2328,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6553,7 +6553,7 @@
 msgstr "Синтаксична помилка (можливо, помилка у Gaim)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Неправильна електронна адреса"
 
 #: src/protocols/msn/error.c:45
@@ -8238,7 +8238,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8473,12 +8473,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Нічого не знайдено для ел.адреси %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Ви повинні отримати ел. пошту із проханням підтвердити %s."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8517,7 +8517,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Помилка 0x%04x: Не вдається змінити адресу ел. пошти, тому що вже є "
@@ -8526,7 +8526,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Помилка 0x%04x: Не вдається змінити адресу ел. пошти, тому що надана адреса "
@@ -8535,7 +8535,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Помилка 0x%04x: Не вдається змінити адресу ел. пошти назви облікового "
@@ -8561,7 +8561,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Адресою ел.пошти для %s є %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8840,7 +8840,7 @@
 "них правою кнопкою миші та вибравши \"Повторний запит авторизації\"."
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Знайти користувача за ел. поштою"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8899,7 +8899,7 @@
 msgstr "Показати контакти, що очікують авторизацію"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Шукати користувача за адресою ел.пошти..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10320,7 +10320,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Довжина ключа: \t%d біт\n"
 
 #: src/protocols/silc/util.c:327
@@ -10445,7 +10445,7 @@
 msgstr "Службі каталогів тимчасово недоступна."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Пошук ел.пошти обмежений."
 
 #: src/protocols/toc/toc.c:527
@@ -11349,7 +11349,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Перевірити пошту"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Перевіряти пошту кожні Х секунд.\n"
 
 #~ msgid "Auto-login"
--- a/po/vi.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/vi.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2345,7 +2345,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -3340,7 +3340,7 @@
 
 #: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
-msgstr "_Sao chép địa chỉ email"
+msgstr "_Sao chép địa chỉ e-mail"
 
 #: src/gtkimhtml.c:1549
 msgid "_Open Link in Browser"
@@ -5854,7 +5854,7 @@
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
 msgid "Search for Jabber users"
-msgstr "Tìm kiếm buddy bằng địa chỉ email"
+msgstr "Tìm kiếm buddy bằng địa chỉ e-mail"
 
 #: src/protocols/jabber/buddy.c:1370
 #, fuzzy
@@ -6574,7 +6574,7 @@
 
 #: src/protocols/msn/error.c:42
 #, fuzzy
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "Xử lý phòng không hợp lệ"
 
 #: src/protocols/msn/error.c:45
@@ -7610,7 +7610,7 @@
 #: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
 #: src/protocols/oscar/oscar.c:5972
 msgid "Email Address"
-msgstr "Địa chỉ email"
+msgstr "Địa chỉ e-mail"
 
 #: src/protocols/novell/novell.c:1480
 #, fuzzy
@@ -8270,7 +8270,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8491,13 +8491,13 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
-msgstr "Không tìm thấy người nào có điạ chỉ email %s"
+msgid "No results found for e-mail address %s"
+msgstr "Không tìm thấy người nào có điạ chỉ e-mail %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr "Bạn sẽ nhận được một email yêu cầu xác nhận %s."
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Bạn sẽ nhận được một e-mail yêu cầu xác nhận %s."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8531,28 +8531,28 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Lỗi 0x%04x: Không đổi được địa chỉ email vì đã có một yêu cầu được xử lý cho "
+"Lỗi 0x%04x: Không đổi được địa chỉ e-mail vì đã có một yêu cầu được xử lý cho "
 "tên hiển thị này."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Lỗi 0x%04x: Không đổi được địa chỉ email vì có quá nhiều tên hiển thị có "
+"Lỗi 0x%04x: Không đổi được địa chỉ e-mail vì có quá nhiều tên hiển thị có "
 "liên quan với địa chỉ này."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Lỗi 0x%04x: Không thay đổi được địa chỉ email vì địa chỉ đưa ra không hợp lệ."
+"Lỗi 0x%04x: Không thay đổi được địa chỉ e-mail vì địa chỉ đưa ra không hợp lệ."
 
 #: src/protocols/oscar/oscar.c:6215
 #, c-format
@@ -8574,8 +8574,8 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
-msgstr "Địa chỉ email của %s là %s"
+msgid "The e-mail address for %s is %s"
+msgstr "Địa chỉ e-mail của %s là %s"
 
 #: src/protocols/oscar/oscar.c:6298
 msgid ""
@@ -8846,16 +8846,16 @@
 "vào tên người đó và chọn \"Gửi lại yêu cầu xác thực.\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
-msgstr "Tìm Buddy dựa theo địa chỉ email"
+msgid "Find Buddy by E-Mail"
+msgstr "Tìm Buddy dựa theo địa chỉ e-mail"
 
 #: src/protocols/oscar/oscar.c:8124
 msgid "Search for a buddy by e-mail address"
-msgstr "Tìm kiếm buddy bằng địa chỉ email"
+msgstr "Tìm kiếm buddy bằng địa chỉ e-mail"
 
 #: src/protocols/oscar/oscar.c:8125
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Hãy nhập địa chỉ email của buddy mà bạn cần tìm."
+msgstr "Hãy nhập địa chỉ e-mail của buddy mà bạn cần tìm."
 
 #: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
 msgid "Set User Info..."
@@ -8907,13 +8907,13 @@
 msgstr "Hiển thị các buddy chờ xác thực"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
-msgstr "Tìm kiếm buddy theo email..."
+msgid "Search for Buddy by E-Mail..."
+msgstr "Tìm kiếm buddy theo e-mail..."
 
 #: src/protocols/oscar/oscar.c:8280
 #, fuzzy
 msgid "Search for Buddy by Information"
-msgstr "Tìm kiếm buddy theo email..."
+msgstr "Tìm kiếm buddy theo e-mail..."
 
 #: src/protocols/oscar/oscar.c:8350
 #, fuzzy
@@ -10362,7 +10362,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr ""
 
 #: src/protocols/silc/util.c:327
@@ -10486,8 +10486,8 @@
 msgstr "Tạm thời không có dịch vụ thư mục."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
-msgstr "Không cho phép tìm kiếm email."
+msgid "E-mail lookup restricted."
+msgstr "Không cho phép tìm kiếm e-mail."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -11395,7 +11395,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Kiểm tra thư"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Kiểm tra thư X giây một lần.\n"
 
 #~ msgid "Auto-login"
@@ -12388,7 +12388,7 @@
 
 #, fuzzy
 #~ msgid "Local Addressbook"
-#~ msgstr "Địa chỉ email"
+#~ msgstr "Địa chỉ e-mail"
 
 #, fuzzy
 #~ msgid "_Accounts"
--- a/po/xh.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/xh.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2330,7 +2330,7 @@
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
+"Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:325
@@ -6569,7 +6569,7 @@
 msgstr "Impazamo yokwakheka kwezivakalisi (mhlawumbi sisiphene sikaGaim)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "IDilesi ye-imeyile engasebenziyo"
 
 #: src/protocols/msn/error.c:45
@@ -8268,7 +8268,7 @@
 #: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8490,12 +8490,12 @@
 
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "Akukho ziphumo zifunyenweyo zedilesi ye-imeyile %s"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Uza kufumana i-imeyile ecela ukuba ungqine %s."
 
 #: src/protocols/oscar/oscar.c:6163
@@ -8534,7 +8534,7 @@
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 "Impazamo 0x%04x: Akukwazeki ukutshintsha idilesi ye-imeyile ngenxa yokuba "
@@ -8543,7 +8543,7 @@
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 "Impazamo 0x%04x: Akukwazeki ukutshintsha idilesi ye-imeyile ngenxa yokuba "
@@ -8552,7 +8552,7 @@
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 "Impazamo 0x%04x: Akukwazeki ukutshintsha idilesi ye-imeyile ngenxa yokuba "
@@ -8578,7 +8578,7 @@
 
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "Idilesi ye-imeyili ye %s yile %s"
 
 #: src/protocols/oscar/oscar.c:6298
@@ -8862,7 +8862,7 @@
 "nokukhetha \"Isicelo soGunyaziso Kwakhona.\""
 
 #: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "Fumana umHlobo ngeI-meyile"
 
 #: src/protocols/oscar/oscar.c:8124
@@ -8921,7 +8921,7 @@
 msgstr "Bonisa Abahlobo abaLindele uGunyaziso"
 
 #: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "Zingela umHlobo nge-Imeyile..."
 
 #: src/protocols/oscar/oscar.c:8280
@@ -10360,7 +10360,7 @@
 
 #: src/protocols/silc/util.c:325
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "Ubude obuPhambili: \t%d bits\n"
 
 #: src/protocols/silc/util.c:327
@@ -10484,7 +10484,7 @@
 msgstr "Inkonzo yovimba weefayili ayifumaneki okwethutyana."
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "Ukukhangela i-imeyile kunezithintelo."
 
 #: src/protocols/toc/toc.c:527
@@ -11414,7 +11414,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "Khangela iMeyile"
 
-#~ msgid "Check email every X seconds.\n"
+#~ msgid "Check e-mail every X seconds.\n"
 #~ msgstr "Khangela i-imeyile njalo ngemizuzwana X.\n"
 
 #~ msgid "Auto-login"
--- a/po/zh_CN.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/zh_CN.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2746,7 +2746,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 
 #: ../src/gtkconv.c:373
@@ -7198,7 +7198,7 @@
 msgstr "错误(可能是 Gaim 的 bug)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "无效的电子邮件地址"
 
 #: ../src/protocols/msn/error.c:45
@@ -8849,7 +8849,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9057,12 +9057,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9095,21 +9095,21 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
 
@@ -9133,7 +9133,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9371,7 +9371,7 @@
 "求认证”。"
 
 #: ../src/protocols/oscar/oscar.c:8388
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "按电子邮件查找好友"
 
 #: ../src/protocols/oscar/oscar.c:8389
@@ -9421,7 +9421,7 @@
 msgstr "显示正在等候认证的好友"
 
 #: ../src/protocols/oscar/oscar.c:8540
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "按电子邮件搜索好友..."
 
 #: ../src/protocols/oscar/oscar.c:8545
@@ -10914,17 +10914,17 @@
 
 #: ../src/protocols/silc/silc.c:924
 #, fuzzy
-msgid "Key Length"
+msgid "Key length"
 msgstr "密钥长度:\t%d 位\n"
 
 #: ../src/protocols/silc/silc.c:926
 #, fuzzy
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "公钥文件"
 
 #: ../src/protocols/silc/silc.c:928
 #, fuzzy
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "私钥文件"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11228,7 +11228,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11446,7 +11446,7 @@
 msgstr "目录服务暂时不可用。"
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
 #: ../src/protocols/toc/toc.c:527
--- a/po/zh_TW.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/zh_TW.po	Tue Mar 21 04:32:45 2006 +0000
@@ -688,7 +688,7 @@
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
-# NOTE (00:38:50) LSchiere: wing: the statement quotes only makes sense in terms of the realization that there is no inherent correlation between im of any type and email
+# NOTE (00:38:50) LSchiere: wing: the statement quotes only makes sense in terms of the realization that there is no inherent correlation between im of any type and e-mail
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
@@ -2844,7 +2844,7 @@
 
 #: src/gtkconn.c:227
 #, c-format
-msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and reenable the account to connect."
+msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and re-enable the account to connect."
 msgstr ""
 
 #: src/gtkconv.c:349
@@ -7514,7 +7514,7 @@
 msgstr "語法錯誤(可能是 Gaim 的 Bug)"
 
 #: src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "無效的電子郵件位址"
 
 #: src/protocols/msn/error.c:45
@@ -9217,7 +9217,7 @@
 #: src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9431,12 +9431,12 @@
 
 #: src/protocols/oscar/oscar.c:6195
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
 #: src/protocols/oscar/oscar.c:6216
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
 #: src/protocols/oscar/oscar.c:6218
@@ -9464,17 +9464,17 @@
 
 #: src/protocols/oscar/oscar.c:6261
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
 #: src/protocols/oscar/oscar.c:6264
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
 #: src/protocols/oscar/oscar.c:6267
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
 #: src/protocols/oscar/oscar.c:6270
@@ -9498,7 +9498,7 @@
 
 #: src/protocols/oscar/oscar.c:6286
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
 #: src/protocols/oscar/oscar.c:6353
@@ -9728,7 +9728,7 @@
 msgstr "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇「要求重新認證」。"
 
 #: src/protocols/oscar/oscar.c:8193
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
 #: src/protocols/oscar/oscar.c:8194
@@ -9779,7 +9779,7 @@
 msgstr "顯示等待認證的好友"
 
 #: src/protocols/oscar/oscar.c:8345
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "使用電子郵件地址搜尋好友..."
 
 #: src/protocols/oscar/oscar.c:8350
@@ -11309,15 +11309,15 @@
 msgstr "密鑰對產生失敗"
 
 #: src/protocols/silc/silc.c:910
-msgid "Key Length"
+msgid "Key length"
 msgstr "密鑰長度"
 
 #: src/protocols/silc/silc.c:912
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "公鑰檔案"
 
 #: src/protocols/silc/silc.c:914
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "私鑰檔案"
 
 #: src/protocols/silc/silc.c:923
@@ -11613,7 +11613,7 @@
 
 #: src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "密鑰長度: \t%d 個位元\n"
 
 #: src/protocols/silc/util.c:328
@@ -11805,7 +11805,7 @@
 msgstr "暫時無法使用目錄服務。"
 
 #: src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
 #: src/protocols/toc/toc.c:527
--- a/src/gtkblist.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/gtkblist.c	Tue Mar 21 04:32:45 2006 +0000
@@ -4571,7 +4571,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER(table), 0);
 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
-	label = gtk_label_new(_("Screen Name:"));
+	label = gtk_label_new(_("Screen name:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 
--- a/src/protocols/bonjour/bonjour.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/bonjour/bonjour.c	Tue Mar 21 04:32:45 2006 +0000
@@ -585,7 +585,7 @@
 	option = gaim_account_option_string_new(_("Last name"), "last", default_lastname);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = gaim_account_option_string_new(_("Email"), "email", "");
+	option = gaim_account_option_string_new(_("E-mail"), "email", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	my_protocol = plugin;
--- a/src/protocols/gg/gg.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/gg/gg.c	Tue Mar 21 04:32:45 2006 +0000
@@ -465,7 +465,7 @@
 	gaim_request_fields_add_group(fields, group);
 
 	field = gaim_request_field_string_new("email",
-			_("E-Mail"), "", FALSE);
+			_("E-mail"), "", FALSE);
 	gaim_request_field_string_set_masked(field, FALSE);
 	gaim_request_field_group_add_field(group, field);
 
--- a/src/protocols/irc/msgs.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/irc/msgs.c	Tue Mar 21 04:32:45 2006 +0000
@@ -227,7 +227,7 @@
 		tmp = g_markup_escape_text(irc->whois.name, strlen(irc->whois.name));
 		g_free(irc->whois.name);
 		g_string_append_printf(info, _("<b>%s:</b> %s<br>"), _("Username"), irc->whois.userhost);
-		g_string_append_printf(info, _("<b>%s:</b> %s<br>"), _("Realname"), tmp);
+		g_string_append_printf(info, _("<b>%s:</b> %s<br>"), _("Real name"), tmp);
 		g_free(irc->whois.userhost);
 		g_free(tmp);
 	}
--- a/src/protocols/jabber/buddy.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/jabber/buddy.c	Tue Mar 21 04:32:45 2006 +0000
@@ -258,7 +258,7 @@
 	{N_("Postal Code"),        NULL, TRUE, TRUE, "PCODE",     "ADR", NULL},
 	{N_("Country"),            NULL, TRUE, TRUE, "CTRY",      "ADR", NULL},
 	{N_("Telephone"),          NULL, TRUE, TRUE, "NUMBER",    "TEL",  NULL},
-	{N_("Email"),              NULL, TRUE, TRUE, "USERID",    "EMAIL",  "<A HREF=\"mailto:%s\">%s</A>"},
+	{N_("E-Mail"),             NULL, TRUE, TRUE, "USERID",    "EMAIL",  "<A HREF=\"mailto:%s\">%s</A>"},
 	{N_("Organization Name"),  NULL, TRUE, TRUE, "ORGNAME",   "ORG", NULL},
 	{N_("Organization Unit"),  NULL, TRUE, TRUE, "ORGUNIT",   "ORG", NULL},
 	{N_("Title"),              NULL, TRUE, TRUE, "TITLE",     NULL,  NULL},
@@ -776,7 +776,7 @@
 					if(userid) {
 						g_string_append_printf(info_text,
 								"<b>%s:</b> <a href='mailto:%s'>%s</a><br/>",
-								_("Email"), userid, userid);
+								_("E-Mail"), userid, userid);
 						g_free(userid);
 					}
 				} else if((userid = xmlnode_get_data(child))) {
@@ -784,7 +784,7 @@
 					 * out of spec */
 						g_string_append_printf(info_text,
 								"<b>%s:</b> <a href='mailto:%s'>%s</a><br/>",
-								_("Email"), userid, userid);
+								_("E-Mail"), userid, userid);
 					g_free(userid);
 				}
 			} else if(!strcmp(child->name, "ORG")) {
--- a/src/protocols/jabber/jabber.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/jabber/jabber.c	Tue Mar 21 04:32:45 2006 +0000
@@ -757,7 +757,7 @@
 			gaim_request_field_group_add_field(group, field);
 		}
 		if(xmlnode_get_child(query, "email")) {
-			field = gaim_request_field_string_new("email", _("E-Mail"),
+			field = gaim_request_field_string_new("email", _("E-mail"),
 					NULL, FALSE);
 			gaim_request_field_group_add_field(group, field);
 		}
@@ -767,12 +767,12 @@
 			gaim_request_field_group_add_field(group, field);
 		}
 		if(xmlnode_get_child(query, "first")) {
-			field = gaim_request_field_string_new("first", _("First Name"),
+			field = gaim_request_field_string_new("first", _("First name"),
 					NULL, FALSE);
 			gaim_request_field_group_add_field(group, field);
 		}
 		if(xmlnode_get_child(query, "last")) {
-			field = gaim_request_field_string_new("last", _("Last Name"),
+			field = gaim_request_field_string_new("last", _("Last name"),
 					NULL, FALSE);
 			gaim_request_field_group_add_field(group, field);
 		}
@@ -792,7 +792,7 @@
 			gaim_request_field_group_add_field(group, field);
 		}
 		if(xmlnode_get_child(query, "zip")) {
-			field = gaim_request_field_string_new("zip", _("Postal Code"),
+			field = gaim_request_field_string_new("zip", _("Postal code"),
 					NULL, FALSE);
 			gaim_request_field_group_add_field(group, field);
 		}
--- a/src/protocols/msn/error.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/msn/error.c	Tue Mar 21 04:32:45 2006 +0000
@@ -39,7 +39,7 @@
 			break;
 		case 201:
 			g_snprintf(msg, sizeof(msg),
-					   _("Invalid email address"));
+					   _("Invalid e-mail address"));
 			break;
 		case 205:
 			g_snprintf(msg, sizeof(msg), _("User does not exist"));
--- a/src/protocols/novell/novell.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/novell/novell.c	Tue Mar 21 04:32:45 2006 +0000
@@ -1487,7 +1487,7 @@
 	else if (strcmp(tag, "mailstop") == 0)
 		return _("Mailstop");
 	else if (strcmp(tag, "Internet EMail Address") == 0)
-		return _("Email Address");
+		return _("E-Mail Address");
 	else
 		return tag;
 }
--- a/src/protocols/oscar/oscar.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Mar 21 04:32:45 2006 +0000
@@ -2237,7 +2237,7 @@
 				 * Yes, it's a bit odd to ask the user to enable proxied file transfers
 				 * when it's a proxied transfer that timed out. It is possible that a
 				 * stage 1 or 2 proxied transfer might work when a stage 3 will not. */
-				msg = g_strdup_printf(_("Transfer of file %s timed out.\n Try enabling proxy servers for file transfers in Accounts->%s->Edit Account->Advanced."),
+				msg = g_strdup_printf(_("Transfer of file %s timed out.\n Try enabling proxy servers for file transfers in Accounts -> %s -> Edit Account -> Advanced."),
 					gaim_xfer_get_filename(xfer), gaim_account_get_username(account));
 				gaim_xfer_conversation_write(xfer, msg, TRUE);
 				g_free(msg);
@@ -2939,9 +2939,9 @@
 	gaim_debug_misc("oscar", "Reg status: %hu\n", info->regstatus);
 
 	if (info->email) {
-		gaim_debug_misc("oscar", "Email: %s\n", info->email);
+		gaim_debug_misc("oscar", "E-mail: %s\n", info->email);
 	} else {
-		gaim_debug_misc("oscar", "Email is NULL\n");
+		gaim_debug_misc("oscar", "E-mail is NULL\n");
 	}
 
 	gaim_debug_misc("oscar", "BOSIP: %s\n", info->bosip);
@@ -4844,8 +4844,8 @@
 
 		case 0x0e: { /* Someone has emailed you at your_uin@pager.icq.com */
 			if (i >= 6) {
-				gchar *dialog_msg = g_strdup_printf(_("You have received an ICQ email from %s [%s]\n\nMessage is:\n%s"), msg2[0], msg2[3], msg2[5]);
-				gaim_notify_info(gc, NULL, "ICQ Email", dialog_msg);
+				gchar *dialog_msg = g_strdup_printf(_("You have received an ICQ e-mail from %s [%s]\n\nMessage is:\n%s"), msg2[0], msg2[3], msg2[5]);
+				gaim_notify_info(gc, NULL, "ICQ E-Mail", dialog_msg);
 				g_free(dialog_msg);
 			}
 		} break;
@@ -6175,14 +6175,14 @@
 	oscar_string_append(gc->account, str, "\n<br>", _("First Name"), info->first);
 	oscar_string_append(gc->account, str, "\n<br>", _("Last Name"), info->last);
 	if (info->email && info->email[0] && (utf8 = oscar_utf8_try_convert(gc->account, info->email))) {
-		g_string_append_printf(str, "\n<br><b>%s:</b> <a href=\"mailto:%s\">%s</a>", _("Email Address"), utf8, utf8);
+		g_string_append_printf(str, "\n<br><b>%s:</b> <a href=\"mailto:%s\">%s</a>", _("E-Mail Address"), utf8, utf8);
 		g_free(utf8);
 	}
 	if (info->numaddresses && info->email2) {
 		int i;
 		for (i = 0; i < info->numaddresses; i++) {
 			if (info->email2[i] && info->email2[i][0] && (utf8 = oscar_utf8_try_convert(gc->account, info->email2[i]))) {
-				g_string_append_printf(str, "\n<br><b>%s:</b> <a href=\"mailto:%s\">%s</a>", _("Email Address"), utf8, utf8);
+				g_string_append_printf(str, "\n<br><b>%s:</b> <a href=\"mailto:%s\">%s</a>", _("E-Mail Address"), utf8, utf8);
 				g_free(utf8);
 			}
 		}
@@ -6363,7 +6363,7 @@
 	email = va_arg(ap, char *);
 	va_end(ap);
 
-	buf = g_strdup_printf(_("No results found for email address %s"), email);
+	buf = g_strdup_printf(_("No results found for e-mail address %s"), email);
 	gaim_notify_error(sess->aux_data, NULL, buf, NULL);
 	g_free(buf);
 
@@ -6384,7 +6384,7 @@
 			   "account confirmation returned status 0x%04x (%s)\n", status,
 			status ? "unknown" : "email sent");
 	if (!status) {
-		g_snprintf(msg, sizeof(msg), _("You should receive an email asking to confirm %s."),
+		g_snprintf(msg, sizeof(msg), _("You should receive an e-mail asking to confirm %s."),
 				gaim_account_get_username(gaim_connection_get_account(gc)));
 		gaim_notify_info(gc, NULL, _("Account Confirmation Requested"), msg);
 	}
@@ -6429,13 +6429,13 @@
 				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to format screen name because the requested screen name is too long."), err);
 			} break;
 			case 0x001d: {
-				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."), err);
+				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."), err);
 			} break;
 			case 0x0021: {
-				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."), err);
+				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."), err);
 			} break;
 			case 0x0023: {
-				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change email address because the given address is invalid."), err);
+				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unable to change e-mail address because the given address is invalid."), err);
 			} break;
 			default: {
 				dialog_msg = g_strdup_printf(_("Error 0x%04x: Unknown error."), err);
@@ -6454,7 +6454,7 @@
 	}
 
 	if (email != NULL) {
-		char *dialog_msg = g_strdup_printf(_("The email address for %s is %s"),
+		char *dialog_msg = g_strdup_printf(_("The e-mail address for %s is %s"),
 						   gaim_account_get_username(gaim_connection_get_account(gc)), email);
 		gaim_notify_info(gc, NULL, _("Account Info"), dialog_msg);
 		g_free(dialog_msg);
@@ -8391,7 +8391,7 @@
 static void oscar_show_find_email(GaimPluginAction *action)
 {
 	GaimConnection *gc = (GaimConnection *) action->context;
-	gaim_request_input(gc, _("Find Buddy by E-mail"),
+	gaim_request_input(gc, _("Find Buddy by E-Mail"),
 					   _("Search for a buddy by e-mail address"),
 					   _("Type the e-mail address of the buddy you are "
 						 "searching for."),
@@ -8543,7 +8543,7 @@
 
 	m = g_list_append(m, NULL);
 
-	act = gaim_plugin_action_new(_("Search for Buddy by Email..."),
+	act = gaim_plugin_action_new(_("Search for Buddy by E-Mail..."),
 			oscar_show_find_email);
 	m = g_list_append(m, act);
 
--- a/src/protocols/silc/ops.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/silc/ops.c	Tue Mar 21 04:32:45 2006 +0000
@@ -1072,7 +1072,7 @@
 			for (i = 0; i < vcard.num_emails; i++) {
 				if (vcard.emails[i].address)
 					g_string_append_printf(s, "%s:\t\t%s\n",
-							       _("EMail"),
+							       _("E-Mail"),
 							       vcard.emails[i].address);
 			}
 			if (vcard.note)
@@ -1180,7 +1180,7 @@
 			g_free(tmp2);
 			if (client_entry->realname) {
 				tmp2 = g_markup_escape_text(client_entry->realname, -1);
-				g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp2);
+				g_string_append_printf(s, "<br><b>%s:</b> %s", _("Real Name"), tmp2);
 				g_free(tmp2);
 			}
 			if (client_entry->username) {
@@ -1329,7 +1329,7 @@
 			g_free(tmp);
 			if (realname) {
 				tmp = g_markup_escape_text(realname, -1);
-				g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp);
+				g_string_append_printf(s, "<br><b>%s:</b> %s", _("Real Name"), tmp);
 				g_free(tmp);
 			}
 			if (username) {
--- a/src/protocols/silc/silc.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/silc/silc.c	Tue Mar 21 04:32:45 2006 +0000
@@ -681,7 +681,7 @@
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_bool_new("mood_invincible", _("Invincible"), minvincible);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_bool_new("mood_inlove", _("In Love"), minlove);
+	f = gaim_request_field_bool_new("mood_inlove", _("In love"), minlove);
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_bool_new("mood_sleepy", _("Sleepy"), msleepy);
 	gaim_request_field_group_add_field(g, f);
@@ -696,7 +696,7 @@
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_bool_new("contact_chat", _("Chat"), cchat);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_bool_new("contact_email", _("Email"), cemail);
+	f = gaim_request_field_bool_new("contact_email", _("E-mail"), cemail);
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_bool_new("contact_call", _("Phone"), ccall);
 	gaim_request_field_group_add_field(g, f);
@@ -704,7 +704,7 @@
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_bool_new("contact_mms", _("MMS"), cmms);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_bool_new("contact_video", _("Video Conferencing"), cvideo);
+	f = gaim_request_field_bool_new("contact_video", _("Video conferencing"), cvideo);
 	gaim_request_field_group_add_field(g, f);
 	gaim_request_fields_add_group(fields, g);
 
@@ -921,11 +921,11 @@
 	fields = gaim_request_fields_new();
 
 	g = gaim_request_field_group_new(NULL);
-	f = gaim_request_field_string_new("key", _("Key Length"), "2048", FALSE);
+	f = gaim_request_field_string_new("key", _("Key length"), "2048", FALSE);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_string_new("pkfile", _("Public Key File"), pkd, FALSE);
+	f = gaim_request_field_string_new("pkfile", _("Public key file"), pkd, FALSE);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_string_new("prfile", _("Private Key File"), prd, FALSE);
+	f = gaim_request_field_string_new("prfile", _("Private key file"), prd, FALSE);
 	gaim_request_field_group_add_field(g, f);
 	gaim_request_fields_add_group(fields, g);
 
@@ -934,9 +934,9 @@
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_string_new("hn", _("Hostname"), hostname ? hostname : "", FALSE);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_string_new("rn", _("Real Name"), realname ? realname : "", FALSE);
+	f = gaim_request_field_string_new("rn", _("Real name"), realname ? realname : "", FALSE);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_string_new("e", _("Email"), tmp, FALSE);
+	f = gaim_request_field_string_new("e", _("E-mail"), tmp, FALSE);
 	gaim_request_field_group_add_field(g, f);
 	f = gaim_request_field_string_new("o", _("Organization"), "", FALSE);
 	gaim_request_field_group_add_field(g, f);
@@ -948,7 +948,7 @@
 	f = gaim_request_field_string_new("pass1", _("Passphrase"), "", FALSE);
 	gaim_request_field_string_set_masked(f, TRUE);
 	gaim_request_field_group_add_field(g, f);
-	f = gaim_request_field_string_new("pass2", _("Re-type Passphrase"), "", FALSE);
+	f = gaim_request_field_string_new("pass2", _("Passphrase (retype)"), "", FALSE);
 	gaim_request_field_string_set_masked(f, TRUE);
 	gaim_request_field_group_add_field(g, f);
 	gaim_request_fields_add_group(fields, g);
--- a/src/protocols/silc/util.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/silc/util.c	Tue Mar 21 04:32:45 2006 +0000
@@ -315,7 +315,7 @@
 	if (ident->username)
 		g_string_append_printf(s, _("User Name: \t%s\n"), ident->username);
 	if (ident->email)
-		g_string_append_printf(s, _("EMail: \t\t%s\n"), ident->email);
+		g_string_append_printf(s, _("E-Mail: \t\t%s\n"), ident->email);
 	if (ident->host)
 		g_string_append_printf(s, _("Host Name: \t%s\n"), ident->host);
 	if (ident->org)
@@ -509,7 +509,7 @@
 		if (contact & SILC_ATTRIBUTE_CONTACT_CHAT)
 			g_string_append_printf(s, "[%s] ", _("Chat"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_EMAIL)
-			g_string_append_printf(s, "[%s] ", _("Email"));
+			g_string_append_printf(s, "[%s] ", _("E-Mail"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_CALL)
 			g_string_append_printf(s, "[%s] ", _("Phone"));
 		if (contact & SILC_ATTRIBUTE_CONTACT_PAGE)
--- a/src/protocols/toc/toc.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/toc/toc.c	Tue Mar 21 04:32:45 2006 +0000
@@ -521,7 +521,7 @@
 			g_snprintf(buf, sizeof(buf), _("Dir service temporarily unavailable."));
 			break;
 		case 974:
-			g_snprintf(buf, sizeof(buf), _("Email lookup restricted."));
+			g_snprintf(buf, sizeof(buf), _("E-mail lookup restricted."));
 			break;
 		case 975:
 			g_snprintf(buf, sizeof(buf), _("Keyword ignored."));
--- a/src/protocols/yahoo/yahoo_profile.c	Tue Mar 21 04:29:20 2006 +0000
+++ b/src/protocols/yahoo/yahoo_profile.c	Tue Mar 21 04:32:45 2006 +0000
@@ -1033,7 +1033,7 @@
 	/* extract their Email address and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, s,
 			strings->my_email_string, 1, " ", 0,
-			strings->private_string, _("Email"), 0, NULL, NULL);
+			strings->private_string, _("E-Mail"), 0, NULL, NULL);
 
 	/* extract the Nickname if it exists */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, s,
@@ -1043,7 +1043,7 @@
 	/* extract their RealName and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, s,
 			strings->realname_string, 1, "\n", '\n',
-			NULL, _("Realname"), 0, NULL, NULL);
+			NULL, _("Real Name"), 0, NULL, NULL);
 
 	/* extract their Location and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, s,