QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 22:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflict merge.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-10-25 18:34:07 +02:00
parent 426f9fcf55
commit fb7686bfdd
18 changed files with 283 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/lang/en/index.js
View File

@@ -211,7 +211,7 @@ export default {
once_delete_this_item_you_will_able_to_restore_it: `Once you delete this item, you won\'t be able to restore the item later. Are you sure you want to delete ?<br /><br />If you're not sure, you can inactivate it instead.`,
the_item_has_been_successfully_deleted:
'The item has been successfully deleted.',
the_item_has_been_successfully_edited:
the_item_has_been_successfully_edited:
'The item #{number} has been successfully edited.',
the_item_category_has_been_successfully_created:
'The item category has been successfully created.',
@@ -777,4 +777,5 @@ export default {
prefix: 'Prefix',
next_number: 'Next Number',
journal_number_settings: 'Journal number settings',
bill_number_settings: 'Bill number settings',
};