fix the conflict

This commit is contained in:
hastichavda
2019-11-12 11:04:55 +05:30
18 changed files with 121 additions and 94 deletions

View File

@ -49,7 +49,8 @@ export default {
all: 'All',
select_all: 'Select All',
choose_file: 'Click here to choose a file',
choose_template: 'Choose',
choose_template: 'Choose a template',
choose: 'Choose',
remove: 'Remove',
powered_by: 'Powered by',
bytefury: 'Bytefury',
@ -600,6 +601,7 @@ export default {
},
tax_types: {
title: 'Tax Types',
add_tax: 'Add Tax',
description: 'You can add or Remove Taxes as you please. Crater supports Taxes on Individual Items as well as on the invoice.',
add_new_tax: 'Add New Tax',
tax_settings: 'Tax Settings',
@ -751,15 +753,14 @@ export default {
price_greater_than_zero: 'Price must be greater than zero.',
payment_greater_than_zero: 'Payment must be greater than zero.',
payment_greater_than_due_amount: 'Entered Payment is more than due amount of this invoice.',
quantity_maxlength: 'Quantity should not be greater than 10 characters.',
price_maxlength: 'Price should not be greater than 10 characters.',
price_minValue: 'Price should be greater than 0 digits',
amount_maxlength: 'Amount should not be greater than 10 characters.',
amount_minvalue: 'Amount should br greater than 0 digits',
quantity_maxlength: 'Quantity should not be greater than 10 digits.',
price_maxlength: 'Price should not be greater than 10 digits.',
amount_maxlength: 'Amount should not be greater than 10 digits.',
amount_minvalue: 'Amount should be greater than 0 digits',
description_maxlength: 'Description should not be greater than 255 characters.',
maximum_options_error: 'Maximum of {max} options selected. First remove a selected option to select another.',
notes_maxlength: 'Notes should not be greater than 255 characters.',
address_maxlength: 'Address should not be greater than 255 characters.',
ref_number_maxlength: 'Ref Number should not be greater than 10 characters'
ref_number_maxlength: 'Ref Number should not be greater than 10 digits'
}
}