Merge branch 'master' of github.com:webnotes/erpnext into edge

Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt

hr/doctype/leave_allocation/leave_allocation.txt

@@ -1,12 +1,13 @@
 [
  {
-  "creation": "2013-01-10 16:34:14", 
+  "creation": "2013-02-20 19:10:38", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:56:04", 
+  "modified": "2013-02-20 19:11:03", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
  {
+  "allow_import": 1, 
   "autoname": "LAL/.#####", 
   "doctype": "DocType", 
   "is_submittable": 1, 

hr/doctype/leave_application/locale/_messages_doc.json

@@ -2,6 +2,7 @@
  "HR", 
  "To Date", 
  "Leave Approver", 
+ "Follow via Email", 
  "Employee", 
  "Employee Name", 
  "Status", 
@@ -9,6 +10,7 @@
  "Apply / Approve Leaves", 
  "Rejected", 
  "Reason", 
+ "File List", 
  "Half Day", 
  "More Info", 
  "Approved", 

hr/doctype/leave_application/locale/_messages_py.json

@@ -5,6 +5,7 @@
  "Leave by", 
  "Employee", 
  "Leave Blocked", 
+ "Holiday", 
  " (Half Day)", 
  "Leave Application"
 ]

hr/doctype/leave_block_list/locale/_messages_doc.json

@@ -3,13 +3,13 @@
  "Block Holidays on important days.", 
  "Block Days", 
  "HR", 
+ "Allow the following users to approve Leave Applications for block days.", 
  "Company", 
  "Leave Block List", 
  "Stop users from making Leave Applications on following days.", 
  "Applies to Company", 
  "Year", 
  "If not checked, the list will have to be added to each Department where it has to be applied.", 
- "Allow the following users to make Leave Applications for block days.", 
  "Leave Block List Name", 
  "Leave Block List Allowed", 
  "Leave Block List Dates"