diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index cef4a36c6..12ccac9fd 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -82,7 +82,7 @@ Breadcrumbs::register('emails.edit', function ($breadcrumbs) { Breadcrumbs::register('banlist.index', function ($breadcrumbs) { $breadcrumbs->parent('setting'); - $breadcrumbs->push(Lang::get('lang.banlists'), route('banlist.index')); + $breadcrumbs->push(Lang::get('lang.ban_lists'), route('banlist.index')); }); Breadcrumbs::register('banlist.create', function ($breadcrumbs) { $breadcrumbs->parent('banlist.index'); diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 09f569367..8a29231c7 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -812,6 +812,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Alle Rechte vorbehalten', 'powered_by' => 'Powered by', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index df908fa82..3cf039d08 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -170,7 +170,6 @@ return [ */ 'ban_lists' => 'Ban lists', 'ban_email' => 'Ban email', - 'banlists' => 'Ban lists', 'ban_status' => 'Ban status', 'list_of_banned_emails' => 'List of banned emails', 'edit_banned_email' => 'Edit banned email', @@ -883,6 +882,7 @@ return [ 'group_deleted_successfully' => 'Group deleted successfully', 'group_cannot_delete' => 'Group cannot delete', 'failed_to_load_the_page' => 'Failed to load the page', + 'list_of_groups' => 'List of groups', /* |-------------------------------------- | SMTP Page @@ -1161,6 +1161,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'All rights reserved', 'powered_by' => 'Powered by', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index cb2709695..888002e03 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -148,7 +148,6 @@ return [ */ 'ban_lists' => 'Ban lists', 'ban_email' => 'Ban email', - 'banlists' => 'Ban lists', 'ban_status' => 'Ban status', 'list_of_banned_emails' => 'List of banned emails', 'edit_banned_email' => 'Edit banned email', @@ -1124,6 +1123,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Tous droits réservés', 'powered_by' => 'Powered by', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 2386f42bd..8580ceddf 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -173,6 +173,7 @@ return [ 'ban_email' => 'Banna email', 'banlists' => 'Liste ban', 'ban_status' => 'Stato ban', + 'version' => 'Versione', 'list_of_banned_emails' => 'Lista email bannate', 'edit_banned_email' => 'Modifica email bannata', 'create_a_banned_email' => 'Crea ban email', @@ -877,6 +878,7 @@ return [ 'admin_notes' => 'Note amministratore', 'group_members' => 'Componenti del gruppo', 'group_name' => 'Nome gruppo', + 'list_of_groups' => 'Elenco gruppi', 'select_a_group' => 'Seleziona un gruppo', 'create_a_group' => 'Crea gruppo', 'edit_a_group' => 'Modificagruppo', diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 78f50247e..298a4cfba 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -181,7 +181,6 @@ return [ */ 'ban_lists' => 'Blokkeringslijst', 'ban_email' => 'Blokkeer E-mailadres', - 'banlists' => 'Blokkeringslijst', 'ban_status' => 'Blokkeringsstatus', 'list_of_banned_emails' => 'Lijst van geblokkeerde e-mailadressen', 'edit_banned_email' => 'Bewerk geblokkeerde e-mailadressen', @@ -1185,6 +1184,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Alle rechten voorbehouden', 'powered_by' => 'Mogelijk gemaakt door', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 6660b2f70..de1ece67f 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -159,7 +159,6 @@ return [ */ 'ban_lists' => 'Lista de bloqueio', 'ban_email' => 'E-mails bloqueados', - 'banlists' => 'Lista de bloqueio', 'ban_status' => 'Status de bloqueio', 'list_of_banned_emails' => 'Lista de E-mails bloqueados', 'edit_banned_email' => 'Editar um bloqueio de E-mails', @@ -1119,6 +1118,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Todos os direitos reservados', 'powered_by' => 'Distribuído por', + 'version' => 'Version', /* |------------------------------------------------ |Guest-User Page diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 542d90c27..cc63ccbcb 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -110,7 +110,6 @@ return [ */ 'ban_lists' => 'Лист запретов', 'ban_email' => 'Запрет Email', - 'banlists' => 'Листы запретов', 'ban_status' => 'Статус запретов', /* |-------------------------------------- @@ -720,6 +719,7 @@ return [ 'copyright' => 'Copyright', 'all_rights_reserved' => 'Все права защищены', 'powered_by' => 'Разработано на', + 'version' => 'Version', /* |------------------------------------------------ |Гостевая-Страница Пользователя diff --git a/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php index 50a10b3bd..b2deec39a 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php @@ -16,7 +16,7 @@ class="active" @stop @section('PageHeader') -

{{ Lang::get('lang.staffs')}}

+

{{ Lang::get('lang.agents')}}

@stop @@ -40,7 +40,7 @@ class="active"
- {{Session::get('success')}} + {{Session::get('success')}}
@endif @@ -116,4 +116,4 @@ class="active" -@stop \ No newline at end of file +@stop diff --git a/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php index 6734ede3b..94802437a 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php @@ -16,7 +16,7 @@ class="active" @stop @section('PageHeader') -

{{Lang::get('lang.staffs')}}

+

{{Lang::get('lang.groups')}}

@stop @@ -31,7 +31,7 @@ class="active"
-

{!! Lang::get('lang.groups') !!}

 {{Lang::get('lang.create_group')}}
+

{!! Lang::get('lang.list_of_groups') !!}

 {{Lang::get('lang.create_group')}}
@if(Session::has('success')) @@ -84,4 +84,4 @@ class="active"
-@stop \ No newline at end of file +@stop diff --git a/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php b/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php index 455c3b7da..e1dcf3a6b 100644 --- a/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php @@ -366,7 +366,7 @@ @@ -434,4 +434,4 @@ - \ No newline at end of file + diff --git a/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php b/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php index dcb104184..e9e59c663 100644 --- a/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php @@ -12,7 +12,7 @@ - @@ -22,7 +22,7 @@ - +
-
-
+
@@ -372,7 +372,7 @@
-
+
@@ -380,13 +380,13 @@
- +
- + @@ -416,7 +416,7 @@
- +
@@ -456,7 +456,7 @@
- +
@@ -583,7 +583,7 @@ diff --git a/resources/views/themes/default1/admin/kb/article/layout.blade.php b/resources/views/themes/default1/admin/kb/article/layout.blade.php index e042d1e74..de5745509 100644 --- a/resources/views/themes/default1/admin/kb/article/layout.blade.php +++ b/resources/views/themes/default1/admin/kb/article/layout.blade.php @@ -197,7 +197,7 @@ @@ -232,4 +232,4 @@ - \ No newline at end of file + diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php index bf6c51e1e..0e6c0b351 100644 --- a/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/resources/views/themes/default1/admin/layout/admin.blade.php @@ -5,7 +5,7 @@ Faveo | HELP DESK - + @@ -33,9 +33,9 @@ - + - + @@ -246,7 +246,7 @@
  • {!! Lang::get('lang.email-settings') !!}
  • {!! Lang::get('lang.queues') !!}
  • {!! Lang::get('lang.diagnostics') !!}
  • - + @@ -367,7 +367,7 @@