diff po/ka.po @ 23180:e0bcb8cfda74

Use "email" and "Email" consistently. This is potentially controversial, but here it is. For reference, Google and Yahoo call it "email" and dropping the hyphen on no-longer-new words is apparently standard practice.

--- a/po/ka.po	Sun May 25 17:39:29 2008 +0000
+++ b/po/ka.po	Sun May 25 21:56:36 2008 +0000
@@ -3550,8 +3550,8 @@
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
@@ -3585,17 +3585,6 @@
 msgid "Purple Person"
 msgstr "ახალი პერსონა"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
-#, fuzzy
-msgid "E-mail"
-msgstr "ელ-ფოსტა"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
@@ -5255,8 +5244,8 @@
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "E-Mail მისამართი"
+msgid "Email Address"
+msgstr "Email მისამართი"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/jabber/buddy.c:2411
@@ -6329,8 +6318,8 @@
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
-msgstr "არასწორი e-mail მისამართი"
+msgid "Invalid email address"
+msgstr "არასწორი email მისამართი"
 
 #: ../libpurple/protocols/msn/error.c:49
 #, c-format
@@ -6879,8 +6868,8 @@
 
 #: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
-msgid "Personal E-Mail"
-msgstr "გააგზავნე E-Mail-ი"
+msgid "Personal Email"
+msgstr "გააგზავნე Email-ი"
 
 #: ../libpurple/protocols/msn/msn.c:1657
 #, fuzzy
@@ -6947,8 +6936,8 @@
 
 #: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
-msgid "Work E-Mail"
-msgstr "E-Mail"
+msgid "Work Email"
+msgstr "Email"
 
 #: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
@@ -8558,7 +8547,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -8731,12 +8720,12 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
-msgid "No results found for e-mail address %s"
+msgid "No results found for email address %s"
 msgstr "ელ.ფოსტის ძიების შედეგები %s-თვის არაა ნაპოვნი"
 
 #: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
-msgid "You should receive an e-mail asking to confirm %s."
+msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8771,21 +8760,21 @@
 #: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
+"Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
+"Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
+"Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
@@ -8796,7 +8785,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
-msgid "The e-mail address for %s is %s"
+msgid "The email address for %s is %s"
 msgstr "ელ.ფოსტის მისამართი %s-თვის არის  %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9046,15 +9035,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6233
-msgid "Type the e-mail address of the buddy you are searching for."
+msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9085,11 +9074,11 @@
 msgstr "ანგარიშის დადასტურება"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9097,7 +9086,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9184,10 +9173,6 @@
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "ელ.ფოსტა"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 #, fuzzy
 msgid "Zipcode"
@@ -11901,8 +11886,8 @@
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail"
+msgid "Email: \t\t%s\n"
+msgstr "Email"
 
 #: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12241,7 +12226,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15106,8 +15091,8 @@
 msgstr "ლინკების ფერი მაუსის შეხებისას."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "_E-Mail მისამართის კოპირება"
+msgid "_Copy Email Address"
+msgstr "_Email მისამართის კოპირება"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
@@ -15496,8 +15481,8 @@
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>You have %d new email.</b>"
+msgid_plural "<b>You have %d new emails.</b>"
 msgstr[0] "<b>პლაგინის დეტალები</b>"
 
 #: ../pidgin/gtknotify.c:989
@@ -16744,7 +16729,7 @@
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
+msgid "Unable to send email"
 msgstr "ვერ ვაგზავნი ელ-ფოსტას"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -16752,7 +16737,7 @@
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
+msgid "An email address was not found for this buddy."
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -16760,8 +16745,8 @@
 msgstr "მისამართების წიგნში ჩამატება"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "გააგზავნე E-Mail-ი"
+msgid "Send Email"
+msgstr "გააგზავნე Email-ი"
 
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
@@ -16818,7 +16803,7 @@
 msgstr "გვარი"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "ელ-ფოსტა"
 
 #. *< type