Merge pull request #549 from volp1s/language-suggestions

Suggested improvements to labels and translations

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');

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

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

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

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',

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

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

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',
     /*
       |------------------------------------------------
       |Гостевая-Страница Пользователя

resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{ Lang::get('lang.staffs')}} </h1>
+<h1>{{ Lang::get('lang.agents')}} </h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->

resources/views/themes/default1/admin/helpdesk/agent/groups/index.blade.php

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.groups')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -31,7 +31,7 @@ class="active"
     <div class="col-md-12">
         <div class="box box-primary">
             <div class="box-header">
-                <h2 class="box-title">{!! Lang::get('lang.groups') !!}</h2><a href="{{route('groups.create')}}" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-plus"></span> &nbsp;{{Lang::get('lang.create_group')}}</a></div>
+                <h2 class="box-title">{!! Lang::get('lang.list_of_groups') !!}</h2><a href="{{route('groups.create')}}" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-plus"></span> &nbsp;{{Lang::get('lang.create_group')}}</a></div>
             <div class="box-body table-responsive">
                 <!-- check whether success or not -->
                 @if(Session::has('success'))

resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php

@@ -366,7 +366,7 @@
             </div><!-- /.content-wrapper -->
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> 0.1
+                    <b>{!! Lang::get('lang.version') !!}</b> 0.1
                 </div>
                 <strong>Copyright &copy; 2014-2015 <a href="http://www.ladybirdweb.com">Ladybird Web Solution</a>.</strong> All rights reserved.
             </footer>

resources/views/themes/default1/admin/helpdesk/tickets/timeline.blade.php

@@ -583,7 +583,7 @@
             </div><!-- /.content-wrapper -->
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> 2.0
+                    <b>{!! Lang::get('lang.version') !!}</b> 2.0
                 </div>
                 <strong>Copyright &copy; 2014-2015 <a href="http://www.ladybirdweb.com">Ladybird Web Solution</a>.</strong> All rights reserved.
             </footer>

resources/views/themes/default1/admin/kb/article/layout.blade.php

@@ -197,7 +197,7 @@
 
       <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> {{$settings->version}}
+                    <b>{!! Lang::get('lang.version') !!}</b> {{$settings->version}}
                 </div>
                  <strong>Copyright &copy; {{date("Y")}} <a href="{{$settings->website}}"> {{$settings->company_name}}</a>.  Powered By <a href="http://www.faveohelpdesk.com">Faveo</a>.</strong>
             </footer>

resources/views/themes/default1/admin/layout/admin.blade.php

@@ -367,7 +367,7 @@
             </div>
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> {!! Config::get('app.version') !!}
+                    <b>{!! Lang::get('lang.version') !!}</b> {!! Config::get('app.version') !!}
                 </div>
                 <?php
                 $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();

resources/views/themes/default1/agent/layout/agent.blade.php

@@ -379,7 +379,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->first(
             </div>
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> {!! Config::get('app.version') !!}
+                    <b>{!! Lang::get('lang.version') !!}</b> {!! Config::get('app.version') !!}
                 </div>
                 <strong>{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}" target="_blank">{!! $company->company_name !!}</a>.</strong> {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/" target="_blank">Faveo</a>
             </footer>

resources/views/themes/default1/agent/layout/agentold.blade.php

@@ -459,7 +459,7 @@
             </div>
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> {!! Config::get('app.version') !!}
+                    <b>{!! Lang::get('lang.version') !!}</b> {!! Config::get('app.version') !!}
                 </div>
                 <strong>{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}" target="_blank">{!! $company->company_name !!}</a>.</strong> {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/" target="_blank">Faveo</a>
             </footer>

resources/views/themes/default1/agent/layout/kb.blade.php

@@ -233,7 +233,7 @@
             </div>
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Version</b> {{$settings->version}}
+                    <b>{!! Lang::get('lang.version') !!}</b> {{$settings->version}}
                 </div>
                 <strong>Copyright &copy; {{date("Y")}} <a href="{{$settings->website}}"> {{$settings->company_name}}</a>.  Powered By <a href="http://www.faveohelpdesk.com">Faveo</a>.</strong>
             </footer>

resources/views/themes/default1/layouts/admin.blade.php

@@ -255,7 +255,7 @@
                             </div>
                             <footer class="main-footer">
                                 <div class="pull-right hidden-xs">
-                                    <b>Version</b> 0.1
+                                    <b>{!! Lang::get('lang.version') !!}</b> 0.1
                                 </div>
                                 <?php
                                 $company = App\Model\helpdesk\Settings\Company::where('id','=','1')->first();

resources/views/themes/default1/layouts/agent.blade.php

@@ -309,7 +309,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('name', '=', $agent_group)->wher
                         </div>
                         <footer class="main-footer">
                             <div class="pull-right hidden-xs">
-                                <b>Version</b> 0.1
+                                <b>{!! Lang::get('lang.version') !!}</b> 0.1
                             </div>
             <strong>Copyright &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> All rights reserved. Powered by <a href="http://www.faveohelpdesk.com/">Faveo</a>
                         </footer>

resources/views/themes/default1/layouts/blank.blade.php

@@ -119,7 +119,7 @@
                             </div>
                             <footer class="main-footer">
                                 <div class="pull-right hidden-xs">
-                                    <b>Version</b> 0.1
+                                    <b>{!! Lang::get('lang.version') !!}</b> 0.1
                                 </div>
                            <strong>Copyright &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> All rights reserved. Powered by <a href="http://www.faveohelpdesk.com/">Faveo</a>
                             </footer>

resources/views/themes/default1/layouts/guest.blade.php

@@ -372,7 +372,7 @@
 
       <footer class="main-footer">
         <div class="pull-right hidden-xs">
-          <b>Version</b> 2.0
+          <b>{!! Lang::get('lang.version') !!}</b> 2.0
         </div>
         <strong>Copyright &copy; 2014-{!! date('Y') !!} <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved.
       </footer>

resources/views/themes/default1/layouts/kb.blade.php

@@ -184,7 +184,7 @@ if ($company != null) {
                         </div>
                         <footer class="main-footer">
                             <div class="pull-right hidden-xs">
-                                <b>Version</b> 0.1
+                                <b>{!! Lang::get('lang.version') !!}</b> 0.1
                             </div>
             <strong>Copyright &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> All rights reserved. Powered by <a href="http://www.faveohelpdesk.com/">Faveo</a>
                         </footer>