TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Mohit Panjwani
2019-11-14 19:46:55 +05:30
parent 0eb4d91086 b610577e79
commit 21cc2d7674
23 changed files with 185 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/plugins/en.js
View File

@ -611,8 +611,6 @@ export default {
estimate_viewed_desc: 'When your customer views the estimate sent via crater dashboard.',
save: 'Save',
email_save_message: 'Email saved successfully',
// invoice_viewed_message: 'Invoice viewed updated successfully',
// estimate_viewed_message: 'Estimate viewed updated successfully',
please_enter_email: 'Please Enter Email'
},
tax_types: {
@ -622,7 +620,6 @@ export default {
add_new_tax: 'Add New Tax',
tax_settings: 'Tax Settings',
tax_per_item: 'Tax Per Item',
// tax_per_item_switch: 'Tax Per Item updated successfully',
tax_name: 'Tax Name',
compound_tax: 'Compound Tax',
percent: 'Percent',
@ -660,7 +657,6 @@ export default {
preference: 'Preference | Preferences',
general_settings: 'Default preferences for the system.',
updated_message: 'Preferences updated successfully',
// set_discount_per_item_message: 'Discount set per item updated successfully',
select_language: 'select language',
select_time_zone: 'select Time Zone',
select_date_formate: 'select Date Formate',