cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into language-suggestions

Browse Source
This commit is contained in:
Manish Verma
2018-08-06 12:43:31 +05:30
committed by GitHub
parent d0fa55e426 188add3afe
commit faf28b8bf0
18 changed files with 1824 additions and 1366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/lang/en/lang.php
View File

@@ -51,7 +51,6 @@ return [
'password_confirmation' => 'Password confirmation',
'woops' => 'Whoops!',
'theirisproblem' => 'There were some problems with your input.',
'login' => 'Login',
'e-mail' => 'Email',
'reg_new_member' => 'Register a new membership',
'this_account_is_currently_inactive' => 'This account is currently inactive!',
@@ -756,7 +755,6 @@ return [
'edit' => 'Edit',
'departments' => 'Departments',
'groups' => 'Groups',
'select_a_time_zone' => 'Select a time zone',
'time_zones' => 'Time zones',
/*
|--------------------------------------
@@ -827,7 +825,6 @@ return [
'the_associated_helptopic_has_been_deactivated' => 'The associated helptopic has been deactivated',
'department_deleted_sucessfully' => 'Department deleted successfully',
'department_can_not_delete' => 'Department can not be deleted',
'select_a_department' => 'Select a department',
'make-default-department' => 'Make system\'s default department',
/*
|--------------------------------------
@@ -1361,7 +1358,6 @@ return [
'post_comment' => 'Post comment',
'plugin' => 'Plugin',
'edit_profile' => 'Edit profile',
'you_are_here' => 'You are here',
'Send' => 'SEND',
'no_article' => 'No article',
'profile_settings' => 'Profile settings',
@@ -1592,7 +1588,6 @@ return [
'banned-users' => 'Banned users',
'inactive-users' => 'Inactive users',
'all-users' => 'All users',
'search' => 'Search...',
//update 21-12-2016
'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
//updated 15-5-2017