diff po/[e-mail] @ 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/[e-mail]	Sun May 25 17:39:29 2008 +0000
+++ b/po/[e-mail]	Sun May 25 21:56:36 2008 +0000
@@ -3586,7 +3586,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
+msgid "Email"
 msgstr "Adreça electrònica"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
@@ -3618,16 +3618,6 @@
 msgid "Purple Person"
 msgstr "Persona Purple"
 
-#: ../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
-msgid "E-mail"
-msgstr "Adreça electrònica"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -5328,7 +5318,7 @@
 #: ../libpurple/protocols/novell/novell.c:1488
 #: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Adreça electrònica"
 
 #: ../libpurple/protocols/jabber/buddy.c:2410
@@ -6404,7 +6394,7 @@
 
 #: ../libpurple/protocols/msn/error.c:46
 #, c-format
-msgid "Invalid e-mail address"
+msgid "Invalid email address"
 msgstr "L'adreça electrònica no és vàlida"
 
 #: ../libpurple/protocols/msn/error.c:49
@@ -6946,7 +6936,7 @@
 msgstr "Fax de casa"
 
 #: ../libpurple/protocols/msn/msn.c:1656
-msgid "Personal E-Mail"
+msgid "Personal Email"
 msgstr "Adreça electrònica personal"
 
 #: ../libpurple/protocols/msn/msn.c:1657
@@ -7009,7 +6999,7 @@
 msgstr "Fax faena"
 
 #: ../libpurple/protocols/msn/msn.c:1687
-msgid "Work E-Mail"
+msgid "Work Email"
 msgstr "Adreça electrònica faena"
 
 #: ../libpurple/protocols/msn/msn.c:1688
@@ -8704,7 +8694,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"
@@ -8892,12 +8882,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 "No s'han obtingut resultats per a l'adreça electrònica %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 "Hauríeu de rebre un correu demanant-vos confirmar %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:3971
@@ -8936,7 +8926,7 @@
 #: ../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 ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça electrònica perquè ja hi ha una "
@@ -8945,7 +8935,7 @@
 #: ../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 ""
 "Error 0x%04x: no s'ha pogut canviar l'adreça electrònica perquè l'adreça "
@@ -8954,7 +8944,7 @@
 #: ../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 ""
 "Error 0x%04x: No s'ha pogut canviar l'adreça electrònica perquè l'adreça "
@@ -8967,7 +8957,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 "L'adreça electrònica per a %s és %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:4035
@@ -9246,15 +9236,15 @@
 "amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
 #: ../libpurple/protocols/oscar/oscar.c:6231
-msgid "Find Buddy by E-Mail"
+msgid "Find Buddy by Email"
 msgstr "Troba un amic per l'adreça electrònica"
 
 #: ../libpurple/protocols/oscar/oscar.c:6232
-msgid "Search for a buddy by e-mail address"
+msgid "Search for a buddy by email address"
 msgstr "Cerca un amic per l'adreça electrònica"
 
 #: ../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 "Escriviu l'adreça electrònica de l'amic que estigueu cercant."
 
 #: ../libpurple/protocols/oscar/oscar.c:6236
@@ -9284,11 +9274,11 @@
 msgstr "Confirma el compte"
 
 #: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Display Currently Registered E-Mail Address"
+msgid "Display Currently Registered Email Address"
 msgstr "Mostra l'adreça actualment registrada"
 
 #: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Change Currently Registered E-Mail Address..."
+msgid "Change Currently Registered Email Address..."
 msgstr "Canvia l'adreça actualment registrada..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6441
@@ -9296,7 +9286,7 @@
 msgstr "Mostra els amics pendents d'autorització"
 
 #: ../libpurple/protocols/oscar/oscar.c:6447
-msgid "Search for Buddy by E-Mail Address..."
+msgid "Search for Buddy by Email Address..."
 msgstr "Cerca un amic per l'adreça electrònica..."
 
 #: ../libpurple/protocols/oscar/oscar.c:6452
@@ -9387,10 +9377,6 @@
 msgid "College"
 msgstr "Col·legi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
-msgid "Email"
-msgstr "Adreça electrònica"
-
 #: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Codi postal"
@@ -12153,7 +12139,7 @@
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
-msgid "E-Mail: \t\t%s\n"
+msgid "Email: \t\t%s\n"
 msgstr "Adreça electrònica: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:364
@@ -12498,7 +12484,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:530
 #, c-format
-msgid "E-mail lookup restricted."
+msgid "Email lookup restricted."
 msgstr "La consulta d'adreces electròniques està restringida."
 
 #: ../libpurple/protocols/toc/toc.c:533
@@ -15421,7 +15407,7 @@
 "sobre."
 
 #: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
+msgid "_Copy Email Address"
 msgstr "_Copia l'adreça electrònica"
 
 #: ../pidgin/gtkimhtml.c:1610
@@ -15869,8 +15855,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>Teniu %d correu electrònic nou.</b>"
 msgstr[1] "<b>Teniu %d correus electrònics nous.</b>"
 
@@ -17128,7 +17114,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 "No s'ha pogut enviar el correu electrònic."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
@@ -17137,7 +17123,7 @@
 "No s'ha trobat l'executable de l'Evolution a la variable d'entorn PATH."
 
 #: ../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 "No s'ha trobat cap adreça electrònica per a este amic."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
@@ -17145,7 +17131,7 @@
 msgstr "Afig a la llibreta d'adreces"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
+msgid "Send Email"
 msgstr "Envia un correu"
 
 #. Configuration frame
@@ -17204,7 +17190,7 @@
 msgstr "Cognoms:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
+msgid "Email:"
 msgstr "Adreça electrònica:"
 
 #. *< type