change "E-mail" to be "email" (#116)

application/language/de-CH/sales_lang.php

@@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Ändern";
 $lang["sales_edit_item"] = "Ändere Art.";
 $lang["sales_edit_sale"] = "Auftrag ändern";
-$lang["sales_email_receipt"] = "Quittung per E-Mail";
+$lang["sales_email_receipt"] = "Quittung per Email";
 $lang["sales_employee"] = "Mitarbeiter";
 $lang["sales_error_editing_item"] = "Fehler beim Ändern des Artikels";
 $lang["sales_find_or_scan_item"] = "Finde/Scanne Artikel";

application/language/en/common_lang.php

@@ -12,8 +12,8 @@ $lang["common_delete"] = "Delete";
 $lang["common_print"] = "Print";
 $lang["common_det"] = "details";
 $lang["common_edit"] = "edit";
-$lang["common_email"] = "E-Mail";
-$lang["common_email_invalid_format"] = "The e-mail address is not in the proper format";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "The email address is not in the proper format";
 $lang["common_fields_required_message"] = "Fields in red are required";
 $lang["common_first_name"] = "First Name";
 $lang["common_first_name_required"] = "The first name is a required field.";

application/language/en/sales_lang.php

@@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Edit";
 $lang["sales_edit_item"] = "Edit Item";
 $lang["sales_edit_sale"] = "Edit Sale";
-$lang["sales_email_receipt"] = "E-Mail Receipt";
+$lang["sales_email_receipt"] = "Email Receipt";
 $lang["sales_employee"] = "Employee";
 $lang["sales_error_editing_item"] = "Error editing item";
 $lang["sales_find_or_scan_item"] = "Find/Scan Item";

application/language/es/common_lang.php

@@ -12,8 +12,8 @@ $lang["common_delete"] = "Borrar";
 $lang["common_print"] = "Print";
 $lang["common_det"] = "detalles";
 $lang["common_edit"] = "editar";
-$lang["common_email"] = "E-Mail";
-$lang["common_email_invalid_format"] = "El e-mail no está en el formato requerido";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "El email no está en el formato requerido";
 $lang["common_fields_required_message"] = "Los campos en rojo son requeridos";
 $lang["common_first_name"] = "Nombre";
 $lang["common_first_name_required"] = "Nombre es un campo requerido";

application/language/fr/common_lang.php

@@ -12,7 +12,7 @@ $lang["common_delete"] = "Effacer";
 $lang["common_print"] = "Imprimer";
 $lang["common_det"] = "détails";
 $lang["common_edit"] = "éditer";
-$lang["common_email"] = "E-Mail";
+$lang["common_email"] = "Email";
 $lang["common_email_invalid_format"] = "Le format de l\'adresse électronique est incorrect";
 $lang["common_fields_required_message"] = "Les champs en rouge sont requis";
 $lang["common_first_name"] = "Prénom";

application/language/fr/sales_lang.php

@@ -35,9 +35,9 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Éditer";
 $lang["sales_edit_item"] = "Éditer Item";
 $lang["sales_edit_sale"] = "Éditer Vente";
-$lang["sales_email_receipt"] = "Recu par E-Mail";
+$lang["sales_email_receipt"] = "Recu par Email";
 $lang["sales_employee"] = "Employé";
-$lang["sales_error_editing_item"] = "Érreur lors de l\'édition";
+$lang["sales_error_editing_item"] = "Érreur lors de l'édition";
 $lang["sales_find_or_scan_item"] = "Trouver/Scanner Item";
 $lang["sales_find_or_scan_item_or_receipt"] = "Trouver/Scanner Item OU Recu";
 $lang["sales_giftcard"] = "Carte Cadeau";

application/language/id/common_lang.php

@@ -12,8 +12,8 @@ $lang["common_delete"] = "Hapus";
 $lang["common_print"] = "Print";
 $lang["common_det"] = "Detail";
 $lang["common_edit"] = "Ubah";
-$lang["common_email"] = "E-Mail";
-$lang["common_email_invalid_format"] = "Format alamat e-mail tidak benar";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "Format alamat email tidak benar";
 $lang["common_fields_required_message"] = "Bagian yang ditandai warna merah wajib diisi";
 $lang["common_first_name"] = "Nama Depan";
 $lang["common_first_name_required"] = "Nama depan wajib diisi.";

application/language/id/sales_lang.php

@@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Ubah";
 $lang["sales_edit_item"] = "Ubah Item";
 $lang["sales_edit_sale"] = "Ubah Penjualan";
-$lang["sales_email_receipt"] = "e-Mail Faktur";
+$lang["sales_email_receipt"] = "email Faktur";
 $lang["sales_employee"] = "Karyawan";
 $lang["sales_error_editing_item"] = "mengubah item salah";
 $lang["sales_find_or_scan_item"] = "Cari/Scan Item";

application/language/nl-BE/sales_lang.php

@@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Bewerk";
 $lang["sales_edit_item"] = "Bewaar";
 $lang["sales_edit_sale"] = "Bewerk Ticket";
-$lang["sales_email_receipt"] = "E-Mail Ticket";
+$lang["sales_email_receipt"] = "Email Ticket";
 $lang["sales_employee"] = "Werknemer";
 $lang["sales_error_editing_item"] = "Fout bij bewerken";
 $lang["sales_find_or_scan_item"] = "Zoek/Scan Product";

application/language/ru/sales_lang.php

@@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "редактировать";
 $lang["sales_edit_item"] = "Редактировать Товар";
 $lang["sales_edit_sale"] = "Редактировать продажи";
-$lang["sales_email_receipt"] = "послать квитанция по E-Mail";
+$lang["sales_email_receipt"] = "послать квитанция по Email";
 $lang["sales_employee"] = "сотрудник";
 $lang["sales_error_editing_item"] = "Ошибка редактирования товара";
 $lang["sales_find_or_scan_item"] = "Найти/Сканировать Товара";

application/language/th/common_lang.php

@@ -12,8 +12,8 @@ $lang["common_delete"] = "ลบ";
 $lang["common_print"] = "พิมพ์";
 $lang["common_det"] = "สรุป";
 $lang["common_edit"] = "แก้ไข";
-$lang["common_email"] = "E-Mail";
-$lang["common_email_invalid_format"] = "e-mail address ไม่ถูกต้อง";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "email address ไม่ถูกต้อง";
 $lang["common_fields_required_message"] = "ช่องสีแดงต้องกรอก";
 $lang["common_first_name"] = "ชื่อ";
 $lang["common_first_name_required"] = "ชื่อต้องกรอก";

application/language/zh/common_lang.php

@@ -12,8 +12,8 @@ $lang["common_delete"] = "刪除";
 $lang["common_print"] = "Print";
 $lang["common_det"] = "更多";
 $lang["common_edit"] = "編輯";
-$lang["common_email"] = "E-Mail";
-$lang["common_email_invalid_format"] = "E-mail格式錯誤";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "Email格式錯誤";
 $lang["common_fields_required_message"] = "紅色欄位為必填";
 $lang["common_first_name"] = "名";
 $lang["common_first_name_required"] = "名為必填";

application/language/zh/sales_lang.php

@@ -35,7 +35,7 @@ $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "編輯";
 $lang["sales_edit_item"] = "編輯產品";
 $lang["sales_edit_sale"] = "編輯銷售資料";
-$lang["sales_email_receipt"] = "E-Mail 銷售單";
+$lang["sales_email_receipt"] = "Email 銷售單";
 $lang["sales_employee"] = "員工";
 $lang["sales_error_editing_item"] = "編輯產品錯誤";
 $lang["sales_find_or_scan_item"] = "查找/掃描商品";

dist/opensourcepos.js

@@ -51321,7 +51321,7 @@ function reinit_row(checkbox_id)
 	//Re-init some stuff as we replaced row
 	update_sortable_table();
 	dialog_support.init(new_row.find("a.modal-dlg"));
-	//re-enable e-mail
+	//re-enable email
 	new_checkbox.click(checkbox_click);	
 }
 

import_customers.csv

@@ -1,2 +1,2 @@
-First Name,Last Name,Gender,E-Mail,Phone Number,Address 1,Address2,City,State,Zip,Country,Comments,Account Number,Taxable
+First Name,Last Name,Gender,Email,Phone Number,Address 1,Address2,City,State,Zip,Country,Comments,Account Number,Taxable
 Bob,Smith,1,bsmith@nowhere.com,585-555-1111,123 Nowhere Street,Apt 4,Awesome,NY,11111,USA,Awesome guy,,y

js/manage_tables.js

@@ -354,7 +354,7 @@ function reinit_row(checkbox_id)
 	//Re-init some stuff as we replaced row
 	update_sortable_table();
 	dialog_support.init(new_row.find("a.modal-dlg"));
-	//re-enable e-mail
+	//re-enable email
 	new_checkbox.click(checkbox_click);	
 }
 

system/language/nl-BE/email_lang.php

@@ -1,6 +1,6 @@
 <?php
 $lang['email_must_be_array'] = 'De email validatie methode moet een array als argument krijgen.';
-$lang['email_invalid_address'] = 'Ongeldig e-mailadres: %s';
+$lang['email_invalid_address'] = 'Ongeldig emailadres: %s';
 $lang['email_attachment_missing'] = 'De volgende bijlage kon niet worden gevonden: %s';
 $lang['email_attachment_unreadable'] = 'Kan deze bijlage niet openen: %s';
 $lang['email_no_recipients'] = 'U moet ontvangers specificeren in: To, Cc, of Bcc';

system/language/nl-BE/form_validation_lang.php

@@ -1,8 +1,8 @@
 <?php
 $lang['required'] = 'Het "%s" veld mag niet leeg zijn.';
 $lang['isset'] = 'Het "%s" veld moet een waarde hebben.';
-$lang['valid_email'] = 'Het "%s" veld moet een geldig e-mail adres bevatten.';
-$lang['valid_emails'] = 'Het "%s" veld moet geldige e-mail adressen bevatten.';
+$lang['valid_email'] = 'Het "%s" veld moet een geldig email adres bevatten.';
+$lang['valid_emails'] = 'Het "%s" veld moet geldige email adressen bevatten.';
 $lang['valid_url'] = 'Het "%s" veld moet een correcte URL bevatten.';
 $lang['valid_ip'] = 'Het "%s" veld moet een correct IP adres bevatten.';
 $lang['min_length'] = 'Het "%s" veld moet tenminste %s tekens bevatten.';

system/libraries/Email.php

@@ -65,7 +65,7 @@ class CI_Email {
 	public $mailpath	= '/usr/sbin/sendmail';	// Sendmail path
 
 	/**
-	 * Which method to use for sending e-mails.
+	 * Which method to use for sending emails.
 	 *
 	 * @var	string	'mail', 'sendmail' or 'smtp'
 	 */
@@ -164,7 +164,7 @@ class CI_Email {
 	public $alt_message	= '';
 
 	/**
-	 * Whether to validate e-mail addresses.
+	 * Whether to validate email addresses.
 	 *
 	 * @var	bool
 	 */

translations/common_lang.csv

@@ -11,8 +11,8 @@ common_delete,Löschen,Verwijder,Borrar,Delete,Effacer,刪除,Удалить,ล
 common_print,Drucken,Print,Print,Print,Imprimer,Print,Print,พิมพ์,Print,Print
 common_det,Details,details,detalles,details,détails,更多,детали,สรุป,Detaylar,Detail
 common_edit,Ändern,bewerk,editar,edit,éditer,編輯,редактировать,แก้ไข,düzenle,Ubah
-common_email,Email,Email,E-Mail,E-Mail,E-Mail,E-Mail,Электронная почта,E-Mail,E-Posta,E-Mail
-common_email_invalid_format,Das Email Format ist nicht korrekt,Je moet een geldig email adres invullen.,El e-mail no está en el formato requerido,The e-mail address is not in the proper format,Le format de l\'adresse électronique est incorrect,E-mail格式錯誤,Это электронная почта не в нужный формат,e-mail address ไม่ถูกต้อง,E-Posta adresi doğru formatta değil,Format alamat e-mail tidak benar
+common_email,Email,Email,Email,Email,Email,Email,Электронная почта,Email,E-Posta,Email
+common_email_invalid_format,Das Email Format ist nicht korrekt,Je moet een geldig email adres invullen.,El email no está en el formato requerido,The email address is not in the proper format,Le format de l'adresse électronique est incorrect,Email格式錯誤,Это электронная почта не в нужный формат,email address ไม่ถูกต้อง,E-Posta adresi doğru formatta değil,Format alamat email tidak benar
 common_fields_required_message,Die Felder in rot sind erforderlich,Velden met een * moeten ingevuld worden,Los campos en rojo son requeridos,Fields in red are required,Les champs en rouge sont requis,紅色欄位為必填,Красные пробела обязательно,ช่องสีแดงต้องกรอก,Kırmızı alanlar zorunludur,Bagian yang ditandai warna merah wajib diisi
 common_first_name,Vorname,Voornaam,Nombre,First Name,Prénom,名,Имя,ชื่อ,İsim,Nama Depan
 common_first_name_required,Vorname ist erforderlich,De voornaam moet ingevuld worden.,Nombre es un campo requerido,The first name is a required field.,Le prénom est requis.,名為必填,Имя обязательный пробел,ชื่อต้องกรอก,İsim zorunlu alandır,Nama depan wajib diisi.

translations/sales_lang.csv

@@ -34,7 +34,7 @@ sales_discount_short,%,%,%,%,%,%,%,,%,%
 sales_edit,Ändern,Bewerk,Editar,Edit,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah
 sales_edit_item,Ändere Art.,Bewaar,Editar Artículo,Edit Item,Éditer Item,編輯產品,Редактировать Товар,แก้ไขสินค้า,Düzenle,Ubah Item
 sales_edit_sale,Auftrag ändern,Bewerk Ticket,Editar Venta,Edit Sale,Éditer Vente,編輯銷售資料,Редактировать продажи,แก้ไขการขาย,Satışı Düzenle,Ubah Penjualan
-sales_email_receipt,Quittung per E-Mail,E-Mail Ticket,Enviar Ticket,E-Mail Receipt,Recu par E-Mail,E-Mail 銷售單,послать квитанция по E-Mail,อีเมลบิล,E-Fatura,e-Mail Faktur
+sales_email_receipt,Quittung per Email,Email Ticket,Enviar Ticket,Email Receipt,Recu par Email,Email 銷售單,послать квитанция по Email,อีเมลบิล,E-Fatura,email Faktur
 sales_employee,Mitarbeiter,Werknemer,Empleado,Employee,Employé,員工,сотрудник,พนักงาน,Personel,Karyawan
 sales_error_editing_item,Fehler beim Ändern des Artikels,Fout bij bewerken,Error editando artículo,Error editing item,Érreur lors de l\'édition,編輯產品錯誤,Ошибка редактирования товара,แก้ไขสินค้าล้มเหลว,Ürün düzenleme hatası,mengubah item salah
 sales_find_or_scan_item,Finde/Scanne Artikel,Zoek/Scan Product,Encontrar/Escanear Artículo,Find/Scan Item,Trouver/Scanner Item,查找/掃描商品,Найти/Сканировать Товара,ค้นหาสินค้า,Ürün Bul/Oku,Cari/Scan Item