Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

This commit is contained in:
Taras Machyshyn
2014-02-28 15:38:29 +02:00
5 changed files with 26 additions and 8 deletions

View File

@@ -3,8 +3,11 @@
"name": "Name",
"emailAddress": "Email",
"title": "Title",
"phone": "Phone",
"account": "Account",
"phone": "Phone",
"phoneOffice": "Phone (Office)",
"fax": "Fax",
"accountType": "Account Type",
"doNotCall": "Do Not Call",
"address": "Address",
"description": "Description"

View File

@@ -5,6 +5,8 @@
"title": "Title",
"website": "Website",
"phone": "Phone",
"phoneOffice": "Phone (Office)",
"fax": "Fax",
"accountName": "Account Name",
"doNotCall": "Do Not Call",
"address": "Address",

View File

@@ -6,6 +6,8 @@
"website": "Website",
"accountName": "Account Name",
"phone": "Phone",
"phoneOffice": "Phone (Office)",
"fax": "Fax",
"doNotCall": "Do Not Call",
"address": "Address",
"description": "Description"

View File

@@ -4,8 +4,7 @@
"detail": "Detail",
"listSmall": "List (Small)",
"detailSmall": "Detail (Small)",
"filters": "Search Filters (Text)",
"filtersAdvanced": "Search Filters (Advanced)",
"filtersAdvanced": "Search Filters",
"massUpdate": "Mass Update",
"relationships": "Relationships"
}

View File

@@ -44,23 +44,35 @@
},
"fields": {
"name": "Name",
"firstName": "First Name",
"lastName": "Last Name",
"salutationName": "Salutation",
"assignedUser": "Assigned User",
"teams": "Teams",
"createdAt": "Created At",
"modifiedAt": "Modified At",
"createdBy": "Created By",
"modifiedBy": "Modified At",
"modifiedBy": "Modified By",
"title": "Title",
"dateFrom": "Date From",
"dateTo": "Date To",
"autorefreshInterval": "Auto-refresh Interval",
"displayRecords": "Display Records",
"billingAddressCity": "City",
"billingAddressCountry": "Country",
"billingAddressPostalCode": "Postal Code",
"billingAddressCity": "City (Billing)",
"billingAddressCountry": "Country (Billing)",
"billingAddressPostalCode": "Postal Code (Billing)",
"billingAddressState": "State (Billing)",
"billingAddressStreet": "Street (Billing)",
"addressCity": "City",
"addressStreet": "Street",
"addressCountry": "Country",
"addressPostalCode": "Postal Code"
"addressState": "State",
"addressPostalCode": "Postal Code",
"shippingAddressCity": "City (Shipping)",
"shippingAddressStreet": "Street (Shipping)",
"shippingAddressCountry": "Country (Shipping)",
"shippingAddressState": "State (Shipping)",
"shippingAddressPostalCode": "Postal Code (Shipping)"
},
"dashlets": {
"Stream": "Stream"