diff --git a/resources/views/about/index.blade.php b/resources/views/about/index.blade.php
index 2b4fc43069..e1af3282ec 100644
--- a/resources/views/about/index.blade.php
+++ b/resources/views/about/index.blade.php
@@ -8,7 +8,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">@lang('Local git log')</h4>
+                <h4 class="modal-title" id="myModalLabel">{{ __('Local git log') }}</h4>
             </div>
             <div class="modal-body">
                 <pre>{!! $git_log !!}</pre>
@@ -24,62 +24,62 @@
     <div class="row">
         <div class="col-md-6">
 
-            <h3>@lang('LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system')</h3>
+            <h3>{{ __('LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system') }}</h3>
             <table class='table table-condensed table-hover'>
                 <tr>
-                    <td><b>@lang('Version')</b></td>
+                    <td><b>{{ __('Version') }}</b></td>
                     <td><a target="_blank" href='https://www.librenms.org/changelog.html'>{{ $version_local }}<span id='version_date' style="display: none;">{{ $git_date }}</span></a></td>
                 </tr>
                 <tr>
-                    <td><b>@lang('Database Schema')</b></td>
+                    <td><b>{{ __('Database Schema') }}</b></td>
                     <td>{{ $db_schema }}</td>
                 </tr>
                 <tr>
-                    <td><b>@lang('Web Server')</b></td>
+                    <td><b>{{ __('Web Server') }}</b></td>
                     <td>{{ $version_webserver }}</td>
                 </tr>
                 <tr>
-                    <td><b>@lang('PHP')</b></td>
+                    <td><b>{{ __('PHP') }}</b></td>
                     <td>{{ $version_php }}</td>
                 </tr>
                 <tr>
-                    <td><b>@lang('Python')</b></td>
+                    <td><b>{{ __('Python') }}</b></td>
                     <td>{{ $version_python }}</td>
                 </tr>
                 <tr>
-                    <td><b>@lang('MySQL')</b></td>
+                    <td><b>{{ __('MySQL') }}</b></td>
                     <td>{{ $version_mysql }}</td>
                 </tr>
                 <tr>
-                    <td><a href="https://laravel.com/"><b>@lang('Laravel')</b></a></td>
+                    <td><a href="https://laravel.com/"><b>{{ __('Laravel') }}</b></a></td>
                     <td>{{ $version_laravel }}</td>
                 </tr>
                 <tr>
-                    <td><a href="https://oss.oetiker.ch/rrdtool/"><b>@lang('RRDtool')</b></a></td>
+                    <td><a href="https://oss.oetiker.ch/rrdtool/"><b>{{ __('RRDtool') }}</b></a></td>
                     <td>{{ $version_rrdtool }}</td>
                 </tr>
             </table>
 
-          <h3>@lang('LibreNMS is a community-based project')</h3>
+          <h3>{{ __('LibreNMS is a community-based project') }}</h3>
           <p>
-            @lang('Please feel free to join us and contribute code, documentation, and bug reports:')
+            {{ __('Please feel free to join us and contribute code, documentation, and bug reports:') }}
             <br />
-            <a target="_blank" href="https://www.librenms.org/">@lang('Web site')</a> |
-            <a target="_blank" href="https://docs.librenms.org/">@lang('Docs')</a> |
-            <a target="_blank" href="https://github.com/librenms/">@lang('GitHub')</a> |
-            <a target="_blank" href="https://community.librenms.org/c/help">@lang('Bug tracker')</a> |
-            <a target="_blank" href="https://www.librenms.org/shop">@lang('Merch Shop')</a> |
-            <a target="_blank" href="https://community.librenms.org">@lang('Community Forum')</a> |
-            <a target="_blank" href="https://twitter.com/librenms">@lang('Twitter')</a> |
-            <a target="_blank" href="https://www.librenms.org/changelog.html">@lang('Changelog')</a> |
-            <a href="#" data-toggle="modal" data-target="#git_log">@lang('Local git log')</a>
+            <a target="_blank" href="https://www.librenms.org/">{{ __('Web site') }}</a> |
+            <a target="_blank" href="https://docs.librenms.org/">{{ __('Docs') }}</a> |
+            <a target="_blank" href="https://github.com/librenms/">{{ __('GitHub') }}</a> |
+            <a target="_blank" href="https://community.librenms.org/c/help">{{ __('Bug tracker') }}</a> |
+            <a target="_blank" href="https://www.librenms.org/shop">{{ __('Merch Shop') }}</a> |
+            <a target="_blank" href="https://community.librenms.org">{{ __('Community Forum') }}</a> |
+            <a target="_blank" href="https://twitter.com/librenms">{{ __('Twitter') }}</a> |
+            <a target="_blank" href="https://www.librenms.org/changelog.html">{{ __('Changelog') }}</a> |
+            <a href="#" data-toggle="modal" data-target="#git_log">{{ __('Local git log') }}</a>
           </p>
 
-          <h3>@lang('Contributors')</h3>
+          <h3>{{ __('Contributors') }}</h3>
 
-          <p>@lang('See the <a href=":url">list of contributors</a> on GitHub.', ['url' => 'https://github.com/librenms/librenms/blob/master/AUTHORS.md'])</p>
+          <p>{{ __('See the <a href=":url">list of contributors</a> on GitHub.', ['url' => 'https://github.com/librenms/librenms/blob/master/AUTHORS.md']) }}</p>
 
-          <h3>@lang('Acknowledgements')</h3>
+          <h3>{{ __('Acknowledgements') }}</h3>
 
           <b>Bruno Pramont</b> Collectd code.<br />
           <b>Dennis de Houx</b> Application monitors for PowerDNS, Shoutcast, NTPD (Client, Server).<br />
@@ -90,7 +90,7 @@
       </div>
       <div class="col-md-6">
 
-        <h3>@lang('Statistics')</h3>
+        <h3>{{ __('Statistics') }}</h3>
 
         <table class='table table-condensed'>
 
@@ -98,86 +98,86 @@
             <tr>
                 <td colspan='4'>
                     <span class='bg-danger'>
-                        <label for="callback">@lang('Opt in to send anonymous usage statistics to LibreNMS?')</label><br />
+                        <label for="callback">{{ __('Opt in to send anonymous usage statistics to LibreNMS?') }}</label><br />
                     </span>
                     <input type="checkbox" id="callback" data-size="normal" name="statistics" @if($callback_status) checked @endif>
                     <br />
-                    @lang('Online stats:') <a target="_blank" href='https://stats.librenms.org/'>stats.librenms.org</a>
+                    {{ __('Online stats:') }} <a target="_blank" href='https://stats.librenms.org/'>stats.librenms.org</a>
                 </td>
             </tr>
 
             @isset($callback_uuid)
             <tr>
                 <td colspan='4'>
-                    <button class='btn btn-danger btn-xs' type='submit' name='clear-stats' id='clear-stats'>@lang('Clear remote stats')</button>
+                    <button class='btn btn-danger btn-xs' type='submit' name='clear-stats' id='clear-stats'>{{ __('Clear remote stats') }}</button>
                 </td>
             </tr>
             @endisset
             @endadmin
 
             <tr>
-                <td><i class='fa fa-fw fa-server fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Devices')</b></td>
+                <td><i class='fa fa-fw fa-server fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Devices') }}</b></td>
                 <td class='text-right'>{{ $stat_devices }}</td>
-                <td><i class='fa fa-fw fa-link fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Ports')</b></td>
+                <td><i class='fa fa-fw fa-link fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Ports') }}</b></td>
                 <td class='text-right'>{{ $stat_ports }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-battery-empty fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('IPv4 Addresses')</b></td>
+                <td><i class='fa fa-fw fa-battery-empty fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('IPv4 Addresses') }}</b></td>
                 <td class='text-right'>{{ $stat_ipv4_addy }}</td>
-                <td><i class='fa fa-fw fa-battery-empty fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('IPv4 Networks')</b></td>
+                <td><i class='fa fa-fw fa-battery-empty fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('IPv4 Networks') }}</b></td>
                 <td class='text-right'>{{ $stat_ipv4_nets }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-battery-full fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('IPv6 Addresses')</b></td>
+                <td><i class='fa fa-fw fa-battery-full fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('IPv6 Addresses') }}</b></td>
                 <td class='text-right'>{{ $stat_ipv6_addy }}</td>
-                <td><i class='fa fa-fw fa-battery-full fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('IPv6 Networks')</b></td>
+                <td><i class='fa fa-fw fa-battery-full fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('IPv6 Networks') }}</b></td>
                 <td class='text-right'>{{ $stat_ipv6_nets }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-cogs fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Services')</b></td>
+                <td><i class='fa fa-fw fa-cogs fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Services') }}</b></td>
                 <td class='text-right'>{{ $stat_services }}</td>
-                <td><i class='fa fa-fw fa-cubes fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Applications')</b></td>
+                <td><i class='fa fa-fw fa-cubes fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Applications') }}</b></td>
                 <td class='text-right'>{{ $stat_apps }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-microchip fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Processors')</b></td>
+                <td><i class='fa fa-fw fa-microchip fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Processors') }}</b></td>
                 <td class='text-right'>{{ $stat_processors }}</td>
-                <td><i class='fa fa-fw fa-braille fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Memory')</b></td>
+                <td><i class='fa fa-fw fa-braille fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Memory') }}</b></td>
                 <td class='text-right'>{{ $stat_memory }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-database fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Storage')</b></td>
+                <td><i class='fa fa-fw fa-database fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Storage') }}</b></td>
                 <td class='text-right'>{{ $stat_storage }}</td>
-                <td><i class='fa fa-fw fa-hdd-o fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Disk I/O')</b></td>
+                <td><i class='fa fa-fw fa-hdd-o fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Disk I/O') }}</b></td>
                 <td class='text-right'>{{ $stat_diskio }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-cube fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('HR-MIB')</b></td>
+                <td><i class='fa fa-fw fa-cube fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('HR-MIB') }}</b></td>
                 <td class='text-right'>{{ $stat_hrdev }}</td>
-                <td><i class='fa fa-fw fa-cube fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Entity-MIB')</b></td>
+                <td><i class='fa fa-fw fa-cube fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Entity-MIB') }}</b></td>
                 <td class='text-right'>{{ $stat_entphys }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-clone fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Syslog Entries')</b></td>
+                <td><i class='fa fa-fw fa-clone fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Syslog Entries') }}</b></td>
                 <td class='text-right'>{{ $stat_syslog }}</td>
-                <td><i class='fa fa-fw fa-bookmark fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Eventlog Entries')</b></td>
+                <td><i class='fa fa-fw fa-bookmark fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Eventlog Entries') }}</b></td>
                 <td class='text-right'>{{ $stat_events }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-dashboard fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('sensors.title')</b></td>
+                <td><i class='fa fa-fw fa-dashboard fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('sensors.title') }}</b></td>
                 <td class='text-right'>{{ $stat_sensors }}</td>
-                <td><i class='fa fa-fw fa-wifi fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Wireless Sensors')</b></td>
+                <td><i class='fa fa-fw fa-wifi fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Wireless Sensors') }}</b></td>
                 <td class='text-right'>{{ $stat_wireless }}</td>
             </tr>
             <tr>
-                <td><i class='fa fa-fw fa-print fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Toner')</b></td>
+                <td><i class='fa fa-fw fa-print fa-lg icon-theme' aria-hidden='true'></i> <b>{{ __('Toner') }}</b></td>
                 <td class='text-right'>{{ $stat_toner }}</td>
                 <td></td>
                 <td></td>
             </tr>
         </table>
 
-        <h3>@lang('License')</h3>
+        <h3>{{ __('License') }}</h3>
         <pre>
 Copyright (C) 2013-{{ date('Y') }} {{ $project_name }} Contributors
 Copyright (C) 2006-2012 Adam Armstrong
diff --git a/resources/views/alerts/modals/ack.blade.php b/resources/views/alerts/modals/ack.blade.php
index 6e7b9315f6..efb2c75618 100644
--- a/resources/views/alerts/modals/ack.blade.php
+++ b/resources/views/alerts/modals/ack.blade.php
@@ -5,17 +5,17 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h5 class="modal-title" id="alert_notes">@lang('Acknowledge Alert')</h5>
+                    <h5 class="modal-title" id="alert_notes">{{ __('Acknowledge Alert') }}</h5>
                 </div>
                 <div class="modal-body">
                     <div class='form-group'>
-                        <label for='ack_msg' class='col-sm-4 col-md-3 control-label' title="@lang('Add a message to the acknowledgement')">@lang('(Un)Acknowledgement note:')</label>
+                        <label for='ack_msg' class='col-sm-4 col-md-3 control-label' title="{{ __('Add a message to the acknowledgement') }}">{{ __('(Un) Acknowledgement note:') }}</label>
                         <div class="col-sm-8 col-md-9">
                             <input type='text' id='ack_msg' name='ack_msg' class='form-control' autofocus>
                         </div>
                     </div>
                     <div class="form-group" id="ack_section">
-                        <label for="ack_until_clear" class="col-sm-4 col-md-3 control-label" title="@lang('Acknowledge until alert clears')">@lang('Acknowledge until clear:')</label>
+                        <label for="ack_until_clear" class="col-sm-4 col-md-3 control-label" title="{{ __('Acknowledge until alert clears') }}">{{ __('Acknowledge until clear:') }}</label>
                         <div class="col-sm-8 col-md-9">
                             <input type='checkbox' name='ack_until_clear' id='ack_until_clear'>
                         </div>
@@ -24,7 +24,7 @@
                         <div class="col-sm-offset-4 col-md-offset-3 col-sm-3 col-md-2">
                             <input type="hidden" id="ack_alert_id" name="ack_alert_id" value="">
                             <input type="hidden" id="ack_alert_state" name="ack_alert_state" value="">
-                            <button class="btn btn-success" id="ack-alert" name="ack-alert">@lang('Ack alert')</button>
+                            <button class="btn btn-success" id="ack-alert" name="ack-alert">{{ __('Ack alert') }}</button>
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/alerts/modals/notes.blade.php b/resources/views/alerts/modals/notes.blade.php
index fe562ba02c..a98e1b90d0 100644
--- a/resources/views/alerts/modals/notes.blade.php
+++ b/resources/views/alerts/modals/notes.blade.php
@@ -5,7 +5,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h5 class="modal-title" id="alert_notes">@lang('Alert notes')</h5>
+                    <h5 class="modal-title" id="alert_notes">{{ __('Alert notes') }}</h5>
                 </div>
                 <div class="modal-body">
                     <div class="row">
@@ -19,7 +19,7 @@
                         <div class='col-sm-12'>
                             <div class="form-group">
                                 <input type="hidden" id="alert_id" name="alert_id" value="">
-                                    <button class="btn btn-success" id="save-alert-notes" name="save-alert-notes">@lang('Save notes')</button>
+                                    <button class="btn btn-success" id="save-alert-notes" name="save-alert-notes">{{ __('Save notes') }}</button>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/auth/2fa.blade.php b/resources/views/auth/2fa.blade.php
index 62fb600da9..c4d55a7e44 100644
--- a/resources/views/auth/2fa.blade.php
+++ b/resources/views/auth/2fa.blade.php
@@ -56,7 +56,7 @@
                                            class="form-control"
                                            autocomplete="off"
                                            aria-describedby="twoFactorErrors"
-                                           placeholder="@lang('Please enter auth token')"
+                                           placeholder="{{ __('Please enter auth token') }}"
                                            required autofocus>
                                     @endif
                                 </div>
@@ -65,7 +65,7 @@
                                 @if(!$errors->has('lockout'))
                                     <div class="col-md-12" style="margin:8px">
                                         <button type="submit" class="btn btn-primary btn-block" name="submit">
-                                            <i class="fa fa-btn fa-sign-in"></i> @lang('Submit')
+                                            <i class="fa fa-btn fa-sign-in"></i> {{ __('Submit') }}
                                         </button>
                                     </div>
                                 @endif
@@ -73,7 +73,7 @@
                                     <div class="col-md-12" style="margin:8px">
                                         <button type="submit" class="btn btn-default btn-block" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
                                             <i class="fa fa-btn fa-sign-out" aria-hidden="true"></i>
-                                            @lang('Logout')
+                                            {{ __('Logout') }}
                                         </button>
                                     </div>
                                 @endif
@@ -81,7 +81,7 @@
                                     <div class="col-md-12" style="margin:8px">
                                         <button type="submit" class="btn btn-danger btn-block" onclick="event.preventDefault(); document.getElementById('cancel-form').submit();">
                                             <i class="fa fa-btn fa-sign-out" aria-hidden="true"></i>
-                                            @lang('Cancel')
+                                            {{ __('Cancel') }}
                                         </button>
                                     </div>
                                 @endif
diff --git a/resources/views/auth/deny-demo.blade.php b/resources/views/auth/deny-demo.blade.php
index 36d189f17e..6cf602945e 100644
--- a/resources/views/auth/deny-demo.blade.php
+++ b/resources/views/auth/deny-demo.blade.php
@@ -4,7 +4,7 @@
     <div class="container">
         <div class="row">
             <div class="alert alert-danger col-md-6 col-md-offset-3"><i class="fa fa-fw fa-exclamation-circle" aria-hidden="true"></i>
-                @lang('You are logged in as a demo account, this page is not accessible to you')
+                {{ __('You are logged in as a demo account, this page is not accessible to you') }}
             </div>
         </div>
     </div>
diff --git a/resources/views/auth/login-form.blade.php b/resources/views/auth/login-form.blade.php
index 7ab60f2bac..93791aa72e 100644
--- a/resources/views/auth/login-form.blade.php
+++ b/resources/views/auth/login-form.blade.php
@@ -14,7 +14,7 @@
             {{ csrf_field() }}
             <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
                 <div class="col-md-12">
-                    <input type="text" name="username" id="username" value="{{ old('username') }}" class="form-control" placeholder="@lang('Username')" required autofocus />
+                    <input type="text" name="username" id="username" value="{{ old('username') }}" class="form-control" placeholder="{{ __('Username') }}" required autofocus />
                     @if ($errors->has('email'))
                         <span class="help-block">
                                     <strong>{{ $errors->first('username') }}</strong>
@@ -24,7 +24,7 @@
             </div>
             <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
                 <div class="col-md-12">
-                    <input type="password" name="password" id="password" autocomplete="off" class="form-control" placeholder="@lang('Password')" />
+                    <input type="password" name="password" id="password" autocomplete="off" class="form-control" placeholder="{{ __('Password') }}" />
                     @if ($errors->has('password'))
                         <span class="help-block">
                                     <strong>{{ $errors->first('password') }}</strong>
@@ -36,7 +36,7 @@
                 <div class="col-md-12">
                     <div class="checkbox">
                         <label>
-                            <input type="checkbox" name="remember" id="remember" /> @lang('Remember Me')
+                            <input type="checkbox" name="remember" id="remember" /> {{ __('Remember Me') }}
                         </label>
                     </div>
                 </div>
@@ -44,7 +44,7 @@
             <div class="form-group">
                 <div class="col-md-12">
                     <button type="submit" id="login" class="btn btn-primary btn-block" name="submit">
-                        <i class="fa fa-btn fa-sign-in"></i> @lang('Login')
+                        <i class="fa fa-btn fa-sign-in"></i> {{ __('Login') }}
                     </button>
                 </div>
             </div>
diff --git a/resources/views/auth/public-status.blade.php b/resources/views/auth/public-status.blade.php
index 680aae1c0b..8aaf6e794b 100644
--- a/resources/views/auth/public-status.blade.php
+++ b/resources/views/auth/public-status.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.librenmsv1')
 
 @section('title')
-    @lang('Public Devices')
+    {{ __('Public Devices') }}
 @append
 
 @section('content')
@@ -11,8 +11,8 @@
 
     <div id="public-status">
         <div class="well">
-            <div class="status-header">@lang('System Status')
-            <button class="btn btn-default pull-right" type="submit" id="ToggleLogon">@lang('Logon')</button>
+            <div class="status-header">{{ __('System Status') }}
+            <button class="btn btn-default pull-right" type="submit" id="ToggleLogon">{{ __('Logon') }}</button>
             </div>
         </div>
         <x-panel>
@@ -21,9 +21,9 @@
                     <tr>
                         <th></th>
                         <th id="icon-header"></th>
-                        <th>@lang('Device')</th>
-                        <th>@lang('Platform')</th>
-                        <th>@lang('Uptime')/@lang('Location')</th>
+                        <th>{{ __('Device') }}</th>
+                        <th>{{ __('Platform') }}</th>
+                        <th>{{ __('Uptime') }}/{{ __('Location') }}</th>
                     </tr>
 
                     @foreach($devices as $device)
@@ -42,8 +42,8 @@
 
     <div id="public-logon" style="display:none;">
         <div class="well">
-            <div class="status-header">@lang('Logon')
-                <button class="btn btn-default pull-right" type="submit" id="ToggleStatus">@lang('Status')</button>
+            <div class="status-header">{{ __('Logon') }}
+                <button class="btn btn-default pull-right" type="submit" id="ToggleStatus">{{ __('Status') }}</button>
             </div>
         </div>
         <div class="row">
diff --git a/resources/views/components/notification-subscription-status.blade.php b/resources/views/components/notification-subscription-status.blade.php
index 5720c9b014..23652065bf 100644
--- a/resources/views/components/notification-subscription-status.blade.php
+++ b/resources/views/components/notification-subscription-status.blade.php
@@ -1,20 +1,20 @@
 <div<div x-data="notificationSubscriptionStatus()">
-    <div x-show="! supported">@lang('components.notification-subscription-status.no-support')</div>
+    <div x-show="! supported">{{ __('components.notification-subscription-status.no-support') }}</div>
     @if($userHasTransport)
     <div x-show="supported">
         <div>
-            <span x-text="enabled ? '@lang('components.notification-subscription-status.enabled')' : '@lang('components.notification-subscription-status.disabled')'"></span>
-            <button x-on:click="toggle()" type="button" class="tw-float-right tw-border tw-border-gray-500 tw-text-gray-500 hover:tw-bg-gray-500 hover:tw-text-gray-100 tw-rounded tw-px-4 tw-py-2" x-text="enabled ? '@lang('components.notification-subscription-status.disable')' : '@lang('components.notification-subscription-status.enable')'"></button>
+            <span x-text="enabled ? '{{ __('components.notification-subscription-status.enabled') }}' : '{{ __('components.notification-subscription-status.disabled') }}'"></span>
+            <button x-on:click="toggle()" type="button" class="tw-float-right tw-border tw-border-gray-500 tw-text-gray-500 hover:tw-bg-gray-500 hover:tw-text-gray-100 tw-rounded tw-px-4 tw-py-2" x-text="enabled ? '{{ __('components.notification-subscription-status.disable') }}' : '{{ __('components.notification-subscription-status.enable') }}'"></button>
         </div>
     </div>
     @else
     <div x-show="supported">
         @admin
             <a href="{{ url('alert-transports') }}">
-                @lang('components.notification-subscription-status.no-transport')
+                {{ __('components.notification-subscription-status.no-transport') }}
             </a>
         @else
-            @lang('components.notification-subscription-status.no-transport')
+            {{ __('components.notification-subscription-status.no-transport') }}
         @endadmin
     </div>
     @endif
diff --git a/resources/views/device-group/create.blade.php b/resources/views/device-group/create.blade.php
index 4c82781034..0cc3acbb1b 100644
--- a/resources/views/device-group/create.blade.php
+++ b/resources/views/device-group/create.blade.php
@@ -7,16 +7,16 @@
         <div class="row">
             <form action="{{ route('device-groups.store') }}" method="POST" role="form"
                   class="form-horizontal device-group-form col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-sm-12">
-                <legend>@lang('Create Device Group')</legend>
+                <legend>{{ __('Create Device Group') }}</legend>
                 @csrf
 
                 @include('device-group.form')
 
                 <div class="form-group">
                     <div class="col-sm-9 col-sm-offset-3 col-md-10 col-sm-offset-2">
-                        <button type="submit" class="btn btn-primary">@lang('Save')</button>
+                        <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
                         <a type="button" class="btn btn-danger"
-                           href="{{ route('device-groups.index') }}">@lang('Cancel')</a>
+                           href="{{ route('device-groups.index') }}">{{ __('Cancel') }}</a>
                     </div>
                 </div>
             </form>
diff --git a/resources/views/device-group/edit.blade.php b/resources/views/device-group/edit.blade.php
index 762d4beb9d..61c5d9a3cc 100644
--- a/resources/views/device-group/edit.blade.php
+++ b/resources/views/device-group/edit.blade.php
@@ -7,7 +7,7 @@
         <div class="row">
             <form action="{{ route('device-groups.update', $device_group->id) }}" method="POST" role="form"
                   class="form-horizontal device-group-form col-md-10 col-md-offset-1 col-sm-12">
-                <legend>@lang('Edit Device Group'): {{ $device_group->name }}</legend>
+                <legend>{{ __('Edit Device Group') }}: {{ $device_group->name }}</legend>
                 {{ method_field('PUT') }}
                 @csrf
 
@@ -15,9 +15,9 @@
 
                 <div class="form-group">
                     <div class="col-sm-9 col-sm-offset-3 col-md-10 col-sm-offset-2">
-                        <button type="submit" class="btn btn-primary">@lang('Save')</button>
+                        <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
                         <a type="button" class="btn btn-danger"
-                           href="{{ route('device-groups.index') }}">@lang('Cancel')</a>
+                           href="{{ route('device-groups.index') }}">{{ __('Cancel') }}</a>
                     </div>
                 </div>
             </form>
diff --git a/resources/views/device-group/form.blade.php b/resources/views/device-group/form.blade.php
index 7c41ac1362..c4e13111d9 100644
--- a/resources/views/device-group/form.blade.php
+++ b/resources/views/device-group/form.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group @if($errors->has('name')) has-error @endif">
-    <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Name')</label>
+    <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Name') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="name" name="name" value="{{ old('name', $device_group->name) }}">
         <span class="help-block">{{ $errors->first('name') }}</span>
@@ -7,7 +7,7 @@
 </div>
 
 <div class="form-group @if($errors->has('desc')) has-error @endif">
-    <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Description')</label>
+    <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Description') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="desc" name="desc" value="{{ old('desc', $device_group->desc) }}">
         <span class="help-block">{{ $errors->first('desc') }}</span>
@@ -15,20 +15,20 @@
 </div>
 
 <div class="form-group @if($errors->has('type')) has-error @endif">
-    <label for="type" class="control-label col-sm-3 col-md-2">@lang('Type')</label>
+    <label for="type" class="control-label col-sm-3 col-md-2">{{ __('Type') }}</label>
     <div class="col-sm-9 col-md-10">
         <select class="form-control" id="type" name="type" onchange="change_dg_type(this)">
             <option value="dynamic"
-                    @if(old('type', $device_group->type) == 'dynamic') selected @endif>@lang('Dynamic')</option>
+                    @if(old('type', $device_group->type) == 'dynamic') selected @endif>{{ __('Dynamic') }}</option>
             <option value="static"
-                    @if(old('type', $device_group->type) == 'static') selected @endif>@lang('Static')</option>
+                    @if(old('type', $device_group->type) == 'static') selected @endif>{{ __('Static') }}</option>
         </select>
         <span class="help-block">{{ $errors->first('type') }}</span>
     </div>
 </div>
 
 <div id="dynamic-dg-form" class="form-group @if($errors->has('rules')) has-error @endif">
-    <label for="pattern" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Define Rules')</label>
+    <label for="pattern" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Define Rules') }}</label>
     <div class="col-sm-9 col-md-10">
         <div id="builder"></div>
         <span class="help-block">{{ $errors->first('rules') }}</span>
@@ -36,7 +36,7 @@
 </div>
 
 <div id="static-dg-form" class="form-group @if($errors->has('devices')) has-error @endif" style="display: none">
-    <label for="devices" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Select Devices')</label>
+    <label for="devices" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Select Devices') }}</label>
     <div class="col-sm-9 col-md-10">
         <select class="form-control" id="devices" name="devices[]" multiple>
             @foreach($device_group->devices as $device)
diff --git a/resources/views/device-group/index.blade.php b/resources/views/device-group/index.blade.php
index 5ce45d359c..83c76bc8a4 100644
--- a/resources/views/device-group/index.blade.php
+++ b/resources/views/device-group/index.blade.php
@@ -6,13 +6,13 @@
     <div class="container-fluid">
         <x-panel id="manage-device-groups-panel">
             <x-slot name="title">
-                <i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> @lang('Device Groups')
+                <i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> {{ __('Device Groups') }}
             </x-slot>
 
             <div class="row">
                 <div class="col-md-12">
                     <a type="button" class="btn btn-primary" href="{{ route('device-groups.create') }}">
-                        <i class="fa fa-plus"></i> @lang('New Device Group')
+                        <i class="fa fa-plus"></i> {{ __('New Device Group') }}
                     </a>
                 </div>
             </div>
@@ -20,12 +20,12 @@
                 <table id="manage-device-groups-table" class="table table-condensed table-hover">
                     <thead>
                     <tr>
-                        <th>@lang('Name')</th>
-                        <th>@lang('Description')</th>
-                        <th>@lang('Type')</th>
-                        <th>@lang('Devices')</th>
-                        <th>@lang('Pattern')</th>
-                        <th>@lang('Actions')</th>
+                        <th>{{ __('Name') }}</th>
+                        <th>{{ __('Description') }}</th>
+                        <th>{{ __('Type') }}</th>
+                        <th>{{ __('Devices') }}</th>
+                        <th>{{ __('Pattern') }}</th>
+                        <th>{{ __('Actions') }}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -39,14 +39,14 @@
                             </td>
                             <td>{{ $device_group->type == 'dynamic' ? $device_group->getParser()->toSql(false) : '' }}</td>
                             <td>
-                                <button type="button" title="@lang('Rediscover all Devices of Device Group')" class="btn btn-warning btn-sm" aria-label="@lang('Rediscover Group')"
+                                <button type="button" title="{{ __('Rediscover all Devices of Device Group') }}" class="btn btn-warning btn-sm" aria-label="{{ __('Rediscover Group') }}"
                                         onclick="discover_dg(this, '{{ $device_group->id }}')">
                                     <i
                                         class="fa fa-retweet" aria-hidden="true"></i></button>
-                                <a type="button" title="@lang('edit Device Group')" class="btn btn-primary btn-sm" aria-label="@lang('Edit')"
+                                <a type="button" title="{{ __('edit Device Group') }}" class="btn btn-primary btn-sm" aria-label="{{ __('Edit') }}"
                                    href="{{ route('device-groups.edit', $device_group->id) }}">
                                     <i class="fa fa-pencil" aria-hidden="true"></i></a>
-                                <button type="button" class="btn btn-danger btn-sm" title="@lang('delete Device Group')" aria-label="@lang('Delete')"
+                                <button type="button" class="btn btn-danger btn-sm" title="{{ __('delete Device Group') }}" aria-label="{{ __('Delete') }}"
                                         onclick="delete_dg(this, '{{ $device_group->name }}', '{{ route('device-groups.destroy', $device_group->id) }}')">
                                     <i
                                         class="fa fa-trash" aria-hidden="true"></i></button>
@@ -63,10 +63,10 @@
                 <table id="ungrouped-devices-table" class="table table-condensed table-hover">
                     <thead>
                     <tr>
-                        <th style="width:32px">@lang('Vendor')</th>
-                        <th>@lang('Device')</th>
-                        <th>@lang('Platform')</th>
-                        <th>@lang('Operating System')</th>
+                        <th style="width:32px">{{ __('Vendor') }}</th>
+                        <th>{{ __('Device') }}</th>
+                        <th>{{ __('Platform') }}</th>
+                        <th>{{ __('Operating System') }}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -90,7 +90,7 @@
         function delete_dg(button, name, url) {
             var index = button.parentNode.parentNode.rowIndex;
 
-            if (confirm('@lang('Are you sure you want to delete ')' + name + '?')) {
+            if (confirm('{{ __('Are you sure you want to delete ') }}' + name + '?')) {
                 $.ajax({
                     url: url,
                     type: 'DELETE',
@@ -99,7 +99,7 @@
                         toastr.success(msg);
                     },
                     error: function () {
-                        toastr.error('@lang('The device group could not be deleted')');
+                        toastr.error('{{ __('The device group could not be deleted') }}');
                     }
                 });
             }
diff --git a/resources/views/device/header.blade.php b/resources/views/device/header.blade.php
index 5fd95fee10..a90387926d 100644
--- a/resources/views/device/header.blade.php
+++ b/resources/views/device/header.blade.php
@@ -2,10 +2,10 @@
     <img src="{{ url($device->logo()) }}" title="{{ $device->logo() }}" class="device-icon-header pull-left" style="max-height: 100px">
     <div class="pull-left" style="margin-top: 5px;">
         @if($parent_id)
-            <a href="{{ route('device', $parent_id) }}" title="@lang('VM Host')"><i class="fa fa-server fa-fw fa-lg"></i></a>
+            <a href="{{ route('device', $parent_id) }}" title="{{ __('VM Host') }}"><i class="fa fa-server fa-fw fa-lg"></i></a>
         @endif
         @if($device->isUnderMaintenance())
-            <span title="@lang('Scheduled Maintenance')" class="fa fa-wrench fa-fw fa-lg"></span>
+            <span title="{{ __('Scheduled Maintenance') }}" class="fa fa-wrench fa-fw fa-lg"></span>
         @endif
         <span style="font-size: 20px;"><x-device-link :device="$device" /></span><br/>
         <a href="{{ url('/devices/location=' . urlencode($device->location)) }}">{{ $device->location }}</a>
diff --git a/resources/views/device/tabs/latency.blade.php b/resources/views/device/tabs/latency.blade.php
index 8ebeae8f5d..90131be498 100644
--- a/resources/views/device/tabs/latency.blade.php
+++ b/resources/views/device/tabs/latency.blade.php
@@ -5,14 +5,14 @@
         <x-panel class="with-nav-tabs">
             <x-slot name="heading">
                 @if(\LibreNMS\Config::get('smokeping.url'))
-                    <a href="{{ \LibreNMS\Config::get('smokeping.url') }}?target={{ $device->type }}.{{ str_replace('.','_',$device->hostname) }}" target="_blank"><span class="panel-title">@lang('Smokeping') <i class="glyphicon glyphicon-share-alt"></i></span></a>
+                    <a href="{{ \LibreNMS\Config::get('smokeping.url') }}?target={{ $device->type }}.{{ str_replace('.','_',$device->hostname) }}" target="_blank"><span class="panel-title">{{ __('Smokeping') }} <i class="glyphicon glyphicon-share-alt"></i></span></a>
                 @else
-                    <span class="panel-title">@lang('Smokeping')</span>
+                    <span class="panel-title">{{ __('Smokeping') }}</span>
                 @endif
 
                 <ul class="nav nav-tabs" style="display: inline-block">
                     @foreach($data['smokeping_tabs'] as $tab)
-                        <li @if($loop->first) class="active" @endif><a href="#{{ $tab }}" data-toggle="tab">@lang('smokeping.' . $tab)</a></li>
+                        <li @if($loop->first) class="active" @endif><a href="#{{ $tab }}" data-toggle="tab">{{ __('smokeping.' . $tab) }}</a></li>
                     @endforeach
                 </ul>
             </x-slot>
@@ -35,17 +35,17 @@
     @endif
     <x-panel title="{{ __('Performance') }}">
         <x-slot name="heading">
-            <span class="panel-title" style="line-height: 34px">@lang('Performance')</span>
+            <span class="panel-title" style="line-height: 34px">{{ __('Performance') }}</span>
                 <span style="text-align: center">
                     <form method="post" role="form" id="map" class="form-inline">
                             @csrf
                             <div class="form-group">
-                                <label for="dtpickerfrom">@lang('From')</label>
+                                <label for="dtpickerfrom">{{ __('From') }}</label>
                                 <input type="text" class="form-control" id="dtpickerfrom" name="dtpickerfrom" maxlength="16"
                                        value="{{ $data['dtpickerfrom'] }}" data-date-format="YYYY-MM-DD HH:mm">
                             </div>
                             <div class="form-group">
-                                <label for="dtpickerto">@lang('To')</label>
+                                <label for="dtpickerto">{{ __('To') }}</label>
                                 <input type="text" class="form-control" id="dtpickerto" name="dtpickerto" maxlength=16
                                        value="{{ $data['dtpickerto'] }} " data-date-format="YYYY-MM-DD HH:mm">
                             </div>
diff --git a/resources/views/device/tabs/vlans.blade.php b/resources/views/device/tabs/vlans.blade.php
index 4e94919bb4..532769040e 100644
--- a/resources/views/device/tabs/vlans.blade.php
+++ b/resources/views/device/tabs/vlans.blade.php
@@ -4,9 +4,9 @@
     <table class="table table-hover table-condensed table-striped">
         <thead>
             <tr>
-                <th style="width: 150px;">@lang('VLAN Number')</th>
-                <th style="width: 250px;">@lang('VLAN Name')</th>
-                <th>@lang('Ports')</th>
+                <th style="width: 150px;">{{ __('VLAN Number') }}</th>
+                <th style="width: 250px;">{{ __('VLAN Name') }}</th>
+                <th>{{ __('Ports') }}</th>
             </tr>
         </thead>
         <tbody>
diff --git a/resources/views/device/tabs/vm.blade.php b/resources/views/device/tabs/vm.blade.php
index d6b4b2ffd3..29c71329c0 100644
--- a/resources/views/device/tabs/vm.blade.php
+++ b/resources/views/device/tabs/vm.blade.php
@@ -4,11 +4,11 @@
     <table class="table table-hover table-condensed table-striped">
         <thead>
             <tr>
-                <th>@lang('Server Name')</th>
-                <th>@lang('Power Status')</th>
-                <th>@lang('Operating System')</th>
-                <th>@lang('Memory')</th>
-                <th>@lang('CPU')</th>
+                <th>{{ __('Server Name') }}</th>
+                <th>{{ __('Power Status') }}</th>
+                <th>{{ __('Operating System') }}</th>
+                <th>{{ __('Memory') }}</th>
+                <th>{{ __('CPU') }}</th>
             </tr>
         </thead>
         <tbody>
diff --git a/resources/views/errors/db_inconsistent.blade.php b/resources/views/errors/db_inconsistent.blade.php
index cc681110b6..672985d9c7 100644
--- a/resources/views/errors/db_inconsistent.blade.php
+++ b/resources/views/errors/db_inconsistent.blade.php
@@ -1,11 +1,11 @@
 @extends('layouts.error')
 
 @section('title')
-    @lang('exceptions.database_inconsistent.title')
+    {{ __('exceptions.database_inconsistent.title') }}
 @endsection
 
 @section('content')
-    <h3>@lang('exceptions.database_inconsistent.header')</h3>
+    <h3>{{ __('exceptions.database_inconsistent.header') }}</h3>
 
     <div class="message-block">
         @foreach($results as $result)
diff --git a/resources/views/errors/file_permissions.blade.php b/resources/views/errors/file_permissions.blade.php
index 78e77d6e28..bcef25a24b 100644
--- a/resources/views/errors/file_permissions.blade.php
+++ b/resources/views/errors/file_permissions.blade.php
@@ -1,11 +1,11 @@
 @extends('layouts.error')
 
 @section('title')
-    @lang('Whoops, the web server could not write required files to the filesystem.')
+    {{ __('Whoops, the web server could not write required files to the filesystem.') }}
 @endsection
 
 @section('content')
-    <h3>@lang('Running the following commands will fix the issue most of the time:')</h3>
+    <h3>{{ __('Running the following commands will fix the issue most of the time:') }}</h3>
 
     @foreach($commands as $command)
         <p>{{ $command }}</p>
diff --git a/resources/views/install/checks.blade.php b/resources/views/install/checks.blade.php
index 895ca2dca1..13df71b3f7 100644
--- a/resources/views/install/checks.blade.php
+++ b/resources/views/install/checks.blade.php
@@ -7,7 +7,7 @@
                 <div class="card-body">
                     <div class="row bg-light check-row">
                         <div class="col-7">
-                            PHP <small>(@lang('install.checks.php_required', ['version' => $php_required]))</small>
+                            PHP <small>({{ __('install.checks.php_required', ['version' => $php_required]) }})</small>
                         </div>
                         <div class="col-5 text-right text-nowrap @if($php_ok) text-success @else text-danger @endif">
                             {{ $php_version }}
diff --git a/resources/views/install/database.blade.php b/resources/views/install/database.blade.php
index 7750868496..49e1a06dcd 100644
--- a/resources/views/install/database.blade.php
+++ b/resources/views/install/database.blade.php
@@ -19,51 +19,51 @@
                             <i class="fa fa-lg fa-times-rectangle-o text-danger"></i>
                         @endif
                     </span>
-                    @lang('install.database.credentials')
+                    {{ __('install.database.credentials') }}
                     <i class="fa fa-lg fa-chevron-down rotate-if-collapsed fa-pull-right"></i>
                 </div>
                 <div id="db-form-container" class="card-body collapse @if(!$valid_credentials) show @endif">
                     <form id="database-form" class="form-horizontal" role="form" method="post" action="{{ route('install.acton.test-database') }}">
                         @csrf
                         <div class="form-row pb-3">
-                            <label for="host" class="col-4 col-form-label text-right">@lang('install.database.host')</label>
+                            <label for="host" class="col-4 col-form-label text-right">{{ __('install.database.host') }}</label>
                             <div class="col-6">
-                                <input type="text" class="form-control" name="host" id="host" value="{{ $host ?? 'localhost' }}" placeholder="@lang('install.database.host_placeholder')">
+                                <input type="text" class="form-control" name="host" id="host" value="{{ $host ?? 'localhost' }}" placeholder="{{ __('install.database.host_placeholder') }}">
                             </div>
                         </div>
                         <div class="form-row pb-3">
-                            <label for="port" class="col-4 col-form-label text-right">@lang('install.database.port')</label>
+                            <label for="port" class="col-4 col-form-label text-right">{{ __('install.database.port') }}</label>
                             <div class="col-6">
-                                <input type="text" class="form-control" name="port" id="port" value="{{ $port ?? 3306 }}" placeholder="@lang('install.database.port_placeholder')">
+                                <input type="text" class="form-control" name="port" id="port" value="{{ $port ?? 3306 }}" placeholder="{{ __('install.database.port_placeholder') }}">
                             </div>
                         </div>
                         <div class="form-row pb-3">
-                            <label for="unix_socket" class="col-4 col-form-label text-right">@lang('install.database.socket')</label>
+                            <label for="unix_socket" class="col-4 col-form-label text-right">{{ __('install.database.socket') }}</label>
                             <div class="col-6">
-                                <input type="text" class="form-control" name="unix_socket" id="unix_socket" value="{{ $unix_socket ?? '' }}" placeholder="@lang('install.database.socket_placeholder')">
+                                <input type="text" class="form-control" name="unix_socket" id="unix_socket" value="{{ $unix_socket ?? '' }}" placeholder="{{ __('install.database.socket_placeholder') }}">
                             </div>
                         </div>
                         <div class="form-row pb-3">
-                            <label for="username" class="col-4 col-form-label text-right">@lang('install.database.username')</label>
+                            <label for="username" class="col-4 col-form-label text-right">{{ __('install.database.username') }}</label>
                             <div class="col-6">
                                 <input type="text" class="form-control" name="username" id="username" value="{{ $username ?? 'librenms' }}">
                             </div>
                         </div>
                         <div class="form-row pb-3">
-                            <label for="password" class="col-4 col-form-label text-right">@lang('install.database.password')</label>
+                            <label for="password" class="col-4 col-form-label text-right">{{ __('install.database.password') }}</label>
                             <div class="col-6">
                                 <input type="password" class="form-control" name="password" id="password" value="{{ $password ?? '' }}">
                             </div>
                         </div>
                         <div class="form-row pb-3">
-                            <label for="database" class="col-4 col-form-label text-right">@lang('install.database.name')</label>
+                            <label for="database" class="col-4 col-form-label text-right">{{ __('install.database.name') }}</label>
                             <div class="col-6">
                                 <input type="text" class="form-control" name="database" id="database" value="{{ $database ?? 'librenms' }}">
                             </div>
                         </div>
                         <div class="row">
                             <div class="col-12">
-                                <button type="submit" class="btn btn-primary float-right">@lang('install.database.test')</button>
+                                <button type="submit" class="btn btn-primary float-right">{{ __('install.database.test') }}</button>
                             </div>
                         </div>
                     </form>
@@ -89,21 +89,21 @@
                             <i class="fa fa-lg fa-times-rectangle-o text-danger"></i>
                         @endif
                     </span>
-                    @lang('install.migrate.migrate')
+                    {{ __('install.migrate.migrate') }}
                     <i class="fa fa-lg fa-chevron-down rotate-if-collapsed fa-pull-right"></i>
                 </div>
                 <div id="migrate-container" class="card-body collapse @if(!$migrated) show @endif">
                     <div class="row">
                         <div class="col-md-8">
-                            <div id="migrate-warning" class="alert alert-warning">@lang('install.migrate.building_interrupt')</div>
+                            <div id="migrate-warning" class="alert alert-warning">{{ __('install.migrate.building_interrupt') }}</div>
                         </div>
                         <div class="col-md-4 text-right">
                             <button id="migrate-btn" type="button" class="btn btn-primary mt-1 mb-4">
-                                @lang('install.migrate.migrate')
+                                {{ __('install.migrate.migrate') }}
                             </button>
                         </div>
                     </div>
-                    <textarea readonly id="db-update" class="form-control" rows="20" placeholder="@lang('install.migrate.wait')"></textarea>
+                    <textarea readonly id="db-update" class="form-control" rows="20" placeholder="{{ __('install.migrate.wait') }}"></textarea>
                 </div>
             </div>
         </div>
@@ -156,14 +156,14 @@
                     // if error word in output, show the retry button
                     $('#migrate-warning').hide();
                     $('#migrate-status>i').attr('class', 'fa fa-lg fa-times-rectangle-o text-danger')
-                    $('#migrate-btn').prop('disabled', false).removeClass('disabled').text('@lang('install.migrate.retry')')
-                    $('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.error')</div>'));
+                    $('#migrate-btn').prop('disabled', false).removeClass('disabled').text('{{ __('install.migrate.retry') }}')
+                    $('#error-box').append($('<div class="alert alert-danger">{{ __('install.migrate.error') }}</div>'));
                 }
             };
             xhr.timeout = 240000; // if no response for 4m, allow the user to retry
             xhr.ontimeout = function (e) {
                 $('#migrate-warning').hide();
-                $('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.timeout')</div>'));
+                $('#error-box').append($('<div class="alert alert-danger">{{ __('install.migrate.timeout') }}</div>'));
             };
             xhr.onreadystatechange = function () {
                 if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200) {
diff --git a/resources/views/install/finish.blade.php b/resources/views/install/finish.blade.php
index 4909e72c85..e3c38ce747 100644
--- a/resources/views/install/finish.blade.php
+++ b/resources/views/install/finish.blade.php
@@ -13,9 +13,9 @@
   </div>
     @if($env)
     <div id="env-file-text" class="card-body collapse @if(!$success) show @endif">
-        <button class="btn btn-primary float-right" onclick="location.reload()">@lang('install.finish.retry')</button>
+        <button class="btn btn-primary float-right" onclick="location.reload()">{{ __('install.finish.retry') }}</button>
         <strong>
-            @lang('install.finish.env_manual', ['file' => base_path('.env')])
+            {{ __('install.finish.env_manual', ['file' => base_path('.env')]) }}
         </strong>
         <div class="text-right mt-3">
             <button
@@ -24,7 +24,7 @@
                 data-toggle="tooltip"
                 data-placement="bottom"
                 data-trigger="manual"
-                data-title="@lang('install.finish.copied')"
+                data-title="{{ __('install.finish.copied') }}"
             >
                 <i class="fa fa-clipboard"></i>
             </button>
@@ -42,7 +42,7 @@
     @if($config)
     <div id="config-file-text" class="card-body collapse">
         <strong>
-            @lang('install.finish.config_not_required')
+            {{ __('install.finish.config_not_required') }}
         </strong>
         <div class="text-right mt-3">
             <button
@@ -51,7 +51,7 @@
                 data-toggle="tooltip"
                 data-placement="bottom"
                 data-trigger="manual"
-                data-title="@lang('install.finish.copied')"
+                data-title="{{ __('install.finish.copied') }}"
             >
                 <i class="fa fa-clipboard"></i>
             </button>
@@ -64,16 +64,16 @@
 <div class="row">
     <div class="col-12">
         <div class="alert alert-warning">
-            <p>@lang('install.finish.not_finished')</p>
-            <p>@lang('install.finish.validate', ['validate' => '<a href="' . url('validate') . '">' . __('install.finish.validate_link') . '</a>'])</p>
+            <p>{{ __('install.finish.not_finished') }}</p>
+            <p>{{ __('install.finish.validate', ['validate' => '<a href="' . url('validate') . '">' . __('install.finish.validate_link') . '</a>']) }}</p>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-12">
         <div class="alert alert-success">
-            <p>@lang('install.finish.thanks')</p>
-            <p>@lang('install.finish.statistics', ['about' => '<a href="' . url('about') . '">' . __('install.finish.statistics_link') . '</a>'])</p>
+            <p>{{ __('install.finish.thanks') }}</p>
+            <p>{{ __('install.finish.statistics', ['about' => '<a href="' . url('about') . '">' . __('install.finish.statistics_link') . '</a>']) }}</p>
         </div>
     </div>
 </div>
@@ -91,7 +91,7 @@
     });
 
     clipboard.on('error', function(e) {
-        $(e.trigger).data('title', '@lang('install.finish.manual_copy')').tooltip('show');
+        $(e.trigger).data('title', '{{ __('install.finish.manual_copy') }}').tooltip('show');
         setTimeout(() => $(e.trigger).tooltip('hide'), 2000);
     });
 </script>
diff --git a/resources/views/install/make-user.blade.php b/resources/views/install/make-user.blade.php
index 9a05775b8c..640b21bf34 100644
--- a/resources/views/install/make-user.blade.php
+++ b/resources/views/install/make-user.blade.php
@@ -6,27 +6,27 @@
             <form class="form-horizontal" role="form" method="post" action="{{ route('install.action.user') }}">
                 @csrf
                 <div class="form-row pb-3">
-                    <label for="username" class="col-sm-4 col-form-label text-right">@lang('install.user.username')</label>
+                    <label for="username" class="col-sm-4 col-form-label text-right">{{ __('install.user.username') }}</label>
                     <div class="col-sm-6">
                         <input type="text" class="form-control @error('username') is-invalid @enderror" name="username" id="username" value="{{ old('username') }}">
                         @error('username')<div class="invalid-feedback">{{ $message }}</div>@enderror
                     </div>
                 </div>
                 <div class="form-row pb-3">
-                    <label for="password" class="col-sm-4 col-form-label text-right">@lang('install.user.password')</label>
+                    <label for="password" class="col-sm-4 col-form-label text-right">{{ __('install.user.password') }}</label>
                     <div class="col-sm-6">
                         <input type="password" class="form-control @error('password') is-invalid @enderror" name="password" id="password" value="{{ old('password') }}">
                         @error('password')<div class="invalid-feedback">{{ $message }}</div>@enderror
                     </div>
                 </div>
                 <div class="form-row pb-3">
-                    <label for="email" class="col-sm-4 col-form-label text-right">@lang('install.user.email')</label>
+                    <label for="email" class="col-sm-4 col-form-label text-right">{{ __('install.user.email') }}</label>
                     <div class="col-sm-6">
                         <input type="email" class="form-control @error('email') is-invalid @enderror" name="email" id="email" value="{{ old('email') }}">
                         @error('email')<div class="invalid-feedback">{{ $message }}</div>@enderror
                     </div>
                 </div>
-                <button type="submit" class="btn btn-primary float-right">@lang('install.user.button')</button>
+                <button type="submit" class="btn btn-primary float-right">{{ __('install.user.button') }}</button>
             </form>
         </div>
     </div>
diff --git a/resources/views/layouts/error.blade.php b/resources/views/layouts/error.blade.php
index 016872c372..9f6353f89c 100644
--- a/resources/views/layouts/error.blade.php
+++ b/resources/views/layouts/error.blade.php
@@ -72,9 +72,9 @@
     </div>
 
     <hr class="separator"/>
-    <p>@lang("Check your log for more details.") ({{ isset($log_file) ? $log_file : 'librenms.log' }})</p>
+    <p>{{ __("Check your log for more details.") }} ({{ isset($log_file) ? $log_file : 'librenms.log' }})</p>
 
-    <p>@lang("If you need additional help, you can find how to get help at") <a target="_blank" href="https://docs.librenms.org/Support">https://docs.librenms.org/Support</a>.</p>
+    <p>{{ __("If you need additional help, you can find how to get help at") }} <a target="_blank" href="https://docs.librenms.org/Support">https://docs.librenms.org/Support</a>.</p>
 </div>
 </body>
 </html>
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index 1d5c09f7ab..801dc5bdb4 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-    <title>@lang('install.title')</title>
+    <title>{{ __('install.title') }}</title>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -105,7 +105,7 @@
                            class="install-step btn btn-circle
                            @if($step === $name) btn-outline-info @else btn-info @endif
                            @if(!$controller->enabled()) disabled @endif"
-                           title="@lang("install.$name.title")"
+                           title="{{ __("install.$name.title") }}"
                         >
                             <i class="fa fa-lg {{ $controller->icon() }}"></i>
                         </a>
@@ -117,7 +117,7 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12 text-center">
-                    <h2 id="step-title">@lang("install.$step.title")</h2>
+                    <h2 id="step-title">{{ __("install.$step.title") }}</h2>
                 </div>
             </div>
             <div class="row">
diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php
index d3491abf1e..78a73a253c 100644
--- a/resources/views/layouts/menu.blade.php
+++ b/resources/views/layouts/menu.blade.php
@@ -2,7 +2,7 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navHeaderCollapse">
-                <span class="sr-only">@lang('Toggle navigation')</span>
+                <span class="sr-only">{{ __('Toggle navigation') }}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
@@ -23,10 +23,10 @@
                     <a href="{{ url('overview') }}" class="dropdown-toggle" data-hover="dropdown"
                        data-toggle="dropdown"><i class="fa fa-home fa-fw fa-lg fa-nav-icons hidden-md"
                                                  aria-hidden="true"></i> <span
-                            class="hidden-sm">@lang('Overview')</span></a>
+                            class="hidden-sm">{{ __('Overview') }}</span></a>
                     <ul class="dropdown-menu multi-level" role="menu">
                         <li class="dropdown-submenu">
-                            <a href="{{ route('overview') }}"><i class="fa fa-tv fa-fw fa-lg" aria-hidden="true"></i> @lang('Dashboard')</a>
+                            <a href="{{ route('overview') }}"><i class="fa fa-tv fa-fw fa-lg" aria-hidden="true"></i> {{ __('Dashboard') }}</a>
                             <ul class="dropdown-menu scrollable-menu">
                                 @foreach($dashboards as $dashboard)
                                 <li><a href="{{ route('overview', ['dashboard' => $dashboard->dashboard_id]) }}"><i class="fa fa-tv fa-fw fa-lg" aria-hidden="true"></i> {{ $dashboard->dashboard_name }}</a></li>
@@ -35,7 +35,7 @@
                                 <li>
                                     <a onclick="toggleDashboardEditor()">
                                         <i class="fa fa-bar-chart fa-fw fa-lg" aria-hidden="true"></i>
-                                        <span id="toggle-dashboard-editor-text">@if ($hide_dashboard_editor) @lang('Show Dashboard Editor') @else @lang('Hide Dashboard Editor')@endif</span>
+                                        <span id="toggle-dashboard-editor-text">@if ($hide_dashboard_editor) {{ __('Show Dashboard Editor') }} @else {{ __('Hide Dashboard Editor') }}@endif</span>
                                     </a>
                                 </li>
                             </ul>
@@ -43,16 +43,16 @@
                         <li role="presentation" class="divider"></li>
                         <li class="dropdown-submenu">
                             <a><i class="fa fa-map fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Maps')</a>
+                                                               aria-hidden="true"></i> {{ __('Maps') }}</a>
                             <ul class="dropdown-menu">
                                 <li><a href="{{ url('availability-map') }}"><i class="fa fa-arrow-circle-up fa-fw fa-lg"
-                                                                               aria-hidden="true"></i> @lang('Availability')
+                                                                               aria-hidden="true"></i> {{ __('Availability') }}
                                     </a></li>
                                 <li><a href="{{ url('maps/devicedependency') }}"><i class="fa fa-chain fa-fw fa-lg"
-                                                                  aria-hidden="true"></i> @lang('Device Dependency')</a></li>
+                                                                  aria-hidden="true"></i> {{ __('Device Dependency') }}</a></li>
                                 @if($device_groups->isNotEmpty())
                                     <li class="dropdown-submenu"><a><i class="fa fa-chain fa-fw fa-lg"
-                                                                                aria-hidden="true"></i> @lang('Device Groups Dependencies')
+                                                                                aria-hidden="true"></i> {{ __('Device Groups Dependencies') }}
                                         </a>
                                         <ul class="dropdown-menu scrollable-menu">
                                         @foreach($device_groups as $group)
@@ -63,10 +63,10 @@
                                     </ul></li>
                                 @endif
                                 <li><a href="{{ url('map') }}"><i class="fa fa-sitemap fa-fw fa-lg"
-                                                                  aria-hidden="true"></i> @lang('Network')</a></li>
+                                                                  aria-hidden="true"></i> {{ __('Network') }}</a></li>
                                 @if($device_groups->isNotEmpty())
                                     <li class="dropdown-submenu"><a><i class="fa fa-th fa-fw fa-lg"
-                                                                                aria-hidden="true"></i> @lang('Device Groups Maps')
+                                                                                aria-hidden="true"></i> {{ __('Device Groups Maps') }}
                                         </a>
                                         <ul class="dropdown-menu scrollable-menu">
                                         @foreach($device_groups as $group)
@@ -77,13 +77,13 @@
                                     </ul></li>
                                 @endif
                                 <li><a href="{{ url('fullscreenmap') }}"><i class="fa fa-expand fa-fw fa-lg"
-                                                                            aria-hidden="true"></i> @lang('Geographical')
+                                                                            aria-hidden="true"></i> {{ __('Geographical') }}
                                     </a></li>
                             </ul>
                         </li>
                         @if(auth()->user()->isAdmin() || $has_v1_plugins || $has_v2_plugins)
                         <li class="dropdown-submenu">
-                            <a><i class="fa fa-plug fa-fw fa-lg" aria-hidden="true"></i> @lang('Plugins')</a>
+                            <a><i class="fa fa-plug fa-fw fa-lg" aria-hidden="true"></i> {{ __('Plugins') }}</a>
                             <ul class="dropdown-menu">
                                 {!! $v1_plugin_menu !!}
                                 @foreach($menu_hooks as [$view, $data])
@@ -95,7 +95,7 @@
                                 @endif
                                 <li>
                                     <a href="{{ route('plugin.admin') }}">
-                                        <i class="fa fa-lock fa-fw fa-lg" aria-hidden="true"></i>@lang('Plugin Admin')
+                                        <i class="fa fa-lock fa-fw fa-lg" aria-hidden="true"></i>{{ __('Plugin Admin') }}
                                     </a>
                                 </li>
                                 @endadmin
@@ -104,65 +104,65 @@
                         @endif
                         <li class="dropdown-submenu">
                             <a><i class="fa fa-wrench fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Tools')</a>
+                                                               aria-hidden="true"></i> {{ __('Tools') }}</a>
                             <ul class="dropdown-menu">
                                 <li><a href="{{ url('ripenccapi') }}"><i class="fa fa-star fa-fw fa-lg"
-                                                                         aria-hidden="true"></i> @lang('RIPE NCC API')
+                                                                         aria-hidden="true"></i> {{ __('RIPE NCC API') }}
                                     </a></li>
                                 @config('smokeping.integration')
                                 <li><a href="{{ \LibreNMS\Config::get('smokeping.url') }}"><i class="fa fa-line-chart fa-fw fa-lg"
-                                                                       aria-hidden="true"></i> @lang('Smokeping')</a>
+                                                                       aria-hidden="true"></i> {{ __('Smokeping') }}</a>
                                 </li>
                                 @endconfig
                                 @config('oxidized.enabled')
                                 <li><a href="{{ url('oxidized') }}"><i class="fa fa-stack-overflow fa-fw fa-lg"
-                                                                       aria-hidden="true"></i> @lang('Oxidized')</a>
+                                                                       aria-hidden="true"></i> {{ __('Oxidized') }}</a>
                                 </li>
                                 @endconfig
                             </ul>
                         </li>
                         <li role="presentation" class="divider"></li>
                         <li><a href="{{ url('eventlog') }}"><i class="fa fa-bookmark fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Eventlog')</a></li>
+                                                               aria-hidden="true"></i> {{ __('Eventlog') }}</a></li>
                         @config('enable_syslog')
                         <li><a href="{{ url('syslog') }}"><i class="fa fa-clone fa-fw fa-lg"
-                                                             aria-hidden="true"></i> @lang('syslog.title')</a></li>
+                                                             aria-hidden="true"></i> {{ __('syslog.title') }}</a></li>
                         @endconfig
                         @config('graylog.server')
                         <li><a href="{{ url('graylog') }}"><i class="fa fa-clone fa-fw fa-lg"
-                                                              aria-hidden="true"></i> @lang('Graylog')</a></li>
+                                                              aria-hidden="true"></i> {{ __('Graylog') }}</a></li>
                         @endconfig
 
                         <li><a href="{{ url('inventory') }}"><i class="fa fa-cube fa-fw fa-lg"
-                                                                aria-hidden="true"></i> @lang('Inventory')</a></li>
+                                                                aria-hidden="true"></i> {{ __('Inventory') }}</a></li>
                         <li><a href="{{ url('outages') }}"><i class="fa fa-bar-chart fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Outages')</a></li>
+                                                               aria-hidden="true"></i> {{ __('Outages') }}</a></li>
                         @if($package_count)
                             <li><a href="{{ url('search/search=packages') }}"><i class="fa fa-archive fa-fw fa-lg"
-                                                                                 aria-hidden="true"></i> @lang('Packages')
+                                                                                 aria-hidden="true"></i> {{ __('Packages') }}
                                 </a></li>
                         @endif
 
                         <li role="presentation" class="divider"></li>
                         <li><a href="{{ url('search/search=ipv4') }}"><i class="fa fa-search fa-fw fa-lg"
-                                                                         aria-hidden="true"></i> @lang('IPv4 Address')
+                                                                         aria-hidden="true"></i> {{ __('IPv4 Address') }}
                             </a></li>
                         <li><a href="{{ url('search/search=ipv6') }}"><i class="fa fa-search fa-fw fa-lg"
-                                                                         aria-hidden="true"></i> @lang('IPv6 Address')
+                                                                         aria-hidden="true"></i> {{ __('IPv6 Address') }}
                             </a></li>
                         <li><a href="{{ url('search/search=mac') }}"><i class="fa fa-search fa-fw fa-lg"
-                                                                        aria-hidden="true"></i> @lang('MAC Address')</a>
+                                                                        aria-hidden="true"></i> {{ __('MAC Address') }}</a>
                         </li>
                         <li><a href="{{ url('search/search=arp') }}"><i class="fa fa-search fa-fw fa-lg"
-                                                                        aria-hidden="true"></i> @lang('ARP Tables')</a>
+                                                                        aria-hidden="true"></i> {{ __('ARP Tables') }}</a>
                         </li>
                         <li><a href="{{ url('search/search=fdb') }}"><i class="fa fa-search fa-fw fa-lg"
-                                                                        aria-hidden="true"></i> @lang('FDB Tables')</a>
+                                                                        aria-hidden="true"></i> {{ __('FDB Tables') }}</a>
                         </li>
                         @config('poller_modules.mib')
                             <li role="presentation" class="divider"></li>
                         <li><a href="{{ url('mibs') }}"><i class="fa fa-file-text-o fa-fw fa-lg"
-                                                           aria-hidden="true"></i> @lang('MIB definitions')</a></li>
+                                                           aria-hidden="true"></i> {{ __('MIB definitions') }}</a></li>
                         @endconfig
                     </ul>
                 </li>
@@ -170,24 +170,24 @@
                 <li class="dropdown">
                     <a href="{{ url('devices/') }}" class="dropdown-toggle" data-hover="dropdown"
                        data-toggle="dropdown"><i class="fa fa-server fa-fw fa-lg fa-nav-icons hidden-md"
-                                                 aria-hidden="true"></i> <span class="hidden-sm">@lang('Devices')</span></a>
+                                                 aria-hidden="true"></i> <span class="hidden-sm">{{ __('Devices') }}</span></a>
                     <ul class="dropdown-menu">
                     @if($device_types->isNotEmpty())
                         <li class="dropdown-submenu">
                             <a href="{{ url('devices') }}"><i class="fa fa-server fa-fw fa-lg"
-                                                              aria-hidden="true"></i> @lang('All Devices')</a>
+                                                              aria-hidden="true"></i> {{ __('All Devices') }}</a>
                             <ul class="dropdown-menu scrollable-menu">
                             @foreach($device_types as $type)
                                 <li><a href="{{ url("devices/type=$type") }}"><i class="fa fa-angle-double-right fa-fw fa-lg" aria-hidden="true"></i> {{ ucfirst($type) }}</a></li>
                             @endforeach
                         </ul></li>
                     @else
-                            <li class="dropdown-submenu"><a href="#">@lang('No devices')</a></li>
+                            <li class="dropdown-submenu"><a href="#">{{ __('No devices') }}</a></li>
                     @endif
 
                     @if($device_groups->isNotEmpty())
                             <li class="dropdown-submenu"><a><i class="fa fa-th fa-fw fa-lg"
-                                                                        aria-hidden="true"></i> @lang('Device Groups')
+                                                                        aria-hidden="true"></i> {{ __('Device Groups') }}
                                 </a>
                             <ul class="dropdown-menu scrollable-menu">
                             @foreach($device_groups as $group)
@@ -200,9 +200,9 @@
                     @if($locations->isNotEmpty())
                         <li role="presentation" class="divider"></li>
                         <li class="dropdown-submenu">
-                            <a href="{{ url('locations') }}"><i class="fa fa-map-marker fa-fw fa-lg" aria-hidden="true"></i> @lang('Geo Locations')</a>
+                            <a href="{{ url('locations') }}"><i class="fa fa-map-marker fa-fw fa-lg" aria-hidden="true"></i> {{ __('Geo Locations') }}</a>
                             <ul class="dropdown-menu scrollable-menu">
-                                <li><a href="{{ url('locations') }}"><i class="fa fa-map-marker fa-fw fa-lg" aria-hidden="true"></i> @lang('All Locations')</a></li>
+                                <li><a href="{{ url('locations') }}"><i class="fa fa-map-marker fa-fw fa-lg" aria-hidden="true"></i> {{ __('All Locations') }}</a></li>
                             @foreach($locations as $location)
                                     <li><a href="{{ url("devices/location=" . $location->id) }}"><i class="fa fa-building fa-fw fa-lg" aria-hidden="true"></i> {{ $location->display() }}</a></li>
                             @endforeach
@@ -213,19 +213,19 @@
                         <li role="presentation" class="divider"></li>
                         @can('manage', \App\Models\DeviceGroup::class)
                             <li><a href="{{ url('device-groups') }}"><i class="fa fa-th fa-fw fa-lg"
-                                                                        aria-hidden="true"></i> @lang('Manage Groups')
+                                                                        aria-hidden="true"></i> {{ __('Manage Groups') }}
                                 </a></li>
                         @endcan
-                        <li><a href="{{ url('device-dependencies') }}"><i class="fa fa-group fa-fw fa-lg"></i> @lang('Device Dependencies')</a></li>
+                        <li><a href="{{ url('device-dependencies') }}"><i class="fa fa-group fa-fw fa-lg"></i> {{ __('Device Dependencies') }}</a></li>
                         @if($show_vmwinfo)
                             <li><a href="{{ url('vminfo') }}"><i
-                                        class="fa fa-cog fa-fw fa-lg"></i> @lang('Virtual Machines')</a></li>
+                                        class="fa fa-cog fa-fw fa-lg"></i> {{ __('Virtual Machines') }}</a></li>
                         @endif
                         <li role="presentation" class="divider"></li>
                         <li><a href="{{ url('addhost') }}"><i class="fa fa-plus fa-fw fa-lg"
-                                                              aria-hidden="true"></i> @lang('Add Device')</a></li>
+                                                              aria-hidden="true"></i> {{ __('Add Device') }}</a></li>
                         <li><a href="{{ url('delhost') }}"><i class="fa fa-trash fa-fw fa-lg"
-                                                              aria-hidden="true"></i> @lang('Delete Device')</a></li>
+                                                              aria-hidden="true"></i> {{ __('Delete Device') }}</a></li>
                     @endadmin
 
                     </ul>
@@ -236,34 +236,34 @@
                         <a href="{{ url('services') }}" class="dropdown-toggle" data-hover="dropdown"
                            data-toggle="dropdown"><i class="fa fa-cogs fa-fw fa-lg fa-nav-icons hidden-md"
                                                      aria-hidden="true"></i> <span
-                                class="hidden-sm">@lang('Services')</span></a>
+                                class="hidden-sm">{{ __('Services') }}</span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="{{ url('services') }}"><i class="fa fa-cogs fa-fw fa-lg" aria-hidden="true"></i> @lang('All Services')</a>
+                            <li><a href="{{ url('services') }}"><i class="fa fa-cogs fa-fw fa-lg" aria-hidden="true"></i> {{ __('All Services') }}</a>
                             </li>
                             <li><a href="{{ route('services.templates.index') }}"><span class="fa-stack" aria-hidden="true" style="font-size: 12px">
                                   <i class="fa fa-square fa-stack-2x"></i>
                                   <i class="fa fa-cogs fa-stack-1x fa-inverse"></i>
-                                </span> @lang('Services Templates')</a>
+                                </span> {{ __('Services Templates') }}</a>
                             </li>
                             @if($service_counts['warning'] || $service_counts['critical'])
                                 <li role="presentation" class="divider"></li>
                                 @if($service_counts['warning'])
                                     <li><a href="{{ url('services/state=warning') }}"><i
                                                 class="fa fa-bell fa-col-warning fa-fw fa-lg"
-                                                aria-hidden="true"></i> @lang('Warning :service_count', ['service_count' => $service_counts['warning']])
+                                                aria-hidden="true"></i> {{ __('Warning :service_count', ['service_count' => $service_counts['warning']]) }}
                                         </a></li>
                                 @endif
                                 @if($service_counts['critical'])
                                     <li><a href="{{ url('services/state=critical') }}"><i
                                                 class="fa fa-bell fa-col-danger fa-fw fa-lg"
-                                                aria-hidden="true"></i> @lang('Critical :service_count', ['service_count' => $service_counts['critical']])
+                                                aria-hidden="true"></i> {{ __('Critical :service_count', ['service_count' => $service_counts['critical']]) }}
                                         </a></li>
                                 @endif
                             @endif
                             @admin
                                 <li role="presentation" class="divider"></li>
                             <li><a href="{{ url('addsrv') }}"><i class="fa fa-plus fa-fw fa-lg"
-                                                                 aria-hidden="true"></i> @lang('Add Service')</a></li>
+                                                                 aria-hidden="true"></i> {{ __('Add Service') }}</a></li>
                             @endadmin
                         </ul>
                     </li>
@@ -272,31 +272,31 @@
                 <li class="dropdown">
                     <a href="{{ url('ports') }}" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i
                             class="fa fa-link fa-fw fa-lg fa-nav-icons hidden-md" aria-hidden="true"></i> <span
-                            class="hidden-sm">@lang('Ports')</span></a>
+                            class="hidden-sm">{{ __('Ports') }}</span></a>
                     <ul class="dropdown-menu">
                         <li><a href="{{ url('ports') }}"><i class="fa fa-link fa-fw fa-lg"
-                                                            aria-hidden="true"></i> @lang('All Ports')</a></li>
+                                                            aria-hidden="true"></i> {{ __('All Ports') }}</a></li>
 
                         @if($port_counts['errored'] > 0)
                             <li><a href="{{ url('ports/errors=1') }}"><i class="fa fa-exclamation-circle fa-fw fa-lg"
-                                                                           aria-hidden="true"></i> @lang('Errored :port_count', ['port_count' => $port_counts['errored']])
+                                                                           aria-hidden="true"></i> {{ __('Errored :port_count', ['port_count' => $port_counts['errored']]) }}
                                 </a></li>
                         @endif
 
                         @if($port_counts['ignored'] > 0)
                             <li><a href="{{ url('ports/ignore=1') }}"><i class="fa fa-question-circle fa-fw fa-lg"
-                                                                           aria-hidden="true"></i> @lang('Ignored :port_count', ['port_count' => $port_counts['ignored']])
+                                                                           aria-hidden="true"></i> {{ __('Ignored :port_count', ['port_count' => $port_counts['ignored']]) }}
                                 </a></li>
                         @endif
 
                         @config('enable_billing')
                         <li><a href="{{ url('bills') }}"><i class="fa fa-money fa-fw fa-lg"
-                                                            aria-hidden="true"></i> @lang('Traffic Bills')</a></li>
+                                                            aria-hidden="true"></i> {{ __('Traffic Bills') }}</a></li>
                         @endconfig
 
                         @if($port_counts['pseudowire'] > 0)
                             <li><a href="{{ url('pseudowires') }}"><i class="fa fa-arrows-alt fa-fw fa-lg"
-                                                                      aria-hidden="true"></i> @lang('Pseudowires')</a>
+                                                                      aria-hidden="true"></i> {{ __('Pseudowires') }}</a>
                             </li>
                         @endif
 
@@ -305,32 +305,32 @@
                                 <li role="presentation" class="divider"></li>
                                 @config('int_customers')
                                 <li><a href="{{ url('customers') }}"><i class="fa fa-users fa-fw fa-lg"
-                                                                        aria-hidden="true"></i> @lang('Customers')</a>
+                                                                        aria-hidden="true"></i> {{ __('Customers') }}</a>
                                 </li>
                                 @endconfig
                                 @config('int_l2tp')
                                 <li><a href="{{ url('iftype/type=l2tp') }}"><i class="fa fa-link fa-fw fa-lg"
-                                                                               aria-hidden="true"></i> @lang('L2TP')</a>
+                                                                               aria-hidden="true"></i> {{ __('L2TP') }}</a>
                                 </li>
                                 @endconfig
                                 @config('int_transit')
                                 <li><a href="{{ url('iftype/type=transit') }}"><i class="fa fa-truck fa-fw fa-lg"
-                                                                                  aria-hidden="true"></i> @lang('Transit')
+                                                                                  aria-hidden="true"></i> {{ __('Transit') }}
                                     </a></li>
                                 @endconfig
                                 @config('int_peering')
                                 <li><a href="{{ url('iftype/type=peering') }}"><i class="fa fa-handshake-o fa-fw fa-lg"
-                                                                                  aria-hidden="true"></i> @lang('Peering')
+                                                                                  aria-hidden="true"></i> {{ __('Peering') }}
                                     </a></li>
                                 @endconfig
                                 @if(\LibreNMS\Config::get('int_peering') && \LibreNMS\Config::get('int_transit'))
                                     <li><a href="{{ url('iftype/type=peering,transit') }}"><i
                                                 class="fa fa-rocket fa-fw fa-lg"
-                                                aria-hidden="true"></i> @lang('Peering + Transit')</a></li>
+                                                aria-hidden="true"></i> {{ __('Peering + Transit') }}</a></li>
                                 @endif
                                 @config('int_core')
                                 <li><a href="{{ url('iftype/type=core') }}"><i class="fa fa-code-fork fa-fw fa-lg"
-                                                                               aria-hidden="true"></i> @lang('Core')</a>
+                                                                               aria-hidden="true"></i> {{ __('Core') }}</a>
                                 </li>
                                 @endconfig
                                 @foreach($custom_port_descr as $custom_descr)
@@ -340,28 +340,28 @@
 
                             <li role="presentation" class="divider"></li>
                             <li><a href="{{ url('port-groups') }}"><i class="fa fa-th fa-fw fa-lg"
-                                                                      aria-hidden="true"></i> @lang('Manage Groups')
+                                                                      aria-hidden="true"></i> {{ __('Manage Groups') }}
                             </a></li>
 
                             <li role="presentation" class="divider"></li>
                             @if($port_counts['alerted'])
                                 <li><a href="{{ url('ports/alerted=1') }}"><i
                                             class="fa fa-exclamation-circle fa-fw fa-lg"
-                                            aria-hidden="true"></i> @lang('Alerts :port_count', ['port_count' => $port_counts['alerted']])
+                                            aria-hidden="true"></i> {{ __('Alerts :port_count', ['port_count' => $port_counts['alerted']]) }}
                                     </a></li>
                             @endif
 
                             <li><a href="{{ url('ports/state=down') }}"><i class="fa fa-arrow-circle-down fa-fw fa-lg"
-                                                                           aria-hidden="true"></i> @lang('Down :port_count', ['port_count' => $port_counts['down']])
+                                                                           aria-hidden="true"></i> {{ __('Down :port_count', ['port_count' => $port_counts['down']]) }}
                                 </a></li>
                             <li><a href="{{ url('ports/state=admindown') }}"><i
                                         class="fa fa-arrow-circle-o-down fa-fw fa-lg"
-                                        aria-hidden="true"></i> @lang('Disabled :port_count', ['port_count' => $port_counts['shutdown']])
+                                        aria-hidden="true"></i> {{ __('Disabled :port_count', ['port_count' => $port_counts['shutdown']]) }}
                                 </a></li>
 
                             @if($port_counts['deleted'])
                                 <li><a href="{{ url('ports/deleted=1') }}"><i class="fa fa-minus-circle fa-fw fa-lg"
-                                                                                aria-hidden="true"></i> @lang('Deleted :port_count', ['port_count' => $port_counts['deleted']])
+                                                                                aria-hidden="true"></i> {{ __('Deleted :port_count', ['port_count' => $port_counts['deleted']]) }}
                                     </a></li>
                             @endif
                         @endif
@@ -371,16 +371,16 @@
                 <li class="dropdown">
                     <a href="{{ url('health') }}" class="dropdown-toggle" data-hover="dropdown"
                        data-toggle="dropdown"><i class="fa fa-heartbeat fa-fw fa-lg fa-nav-icons hidden-md"
-                                                 aria-hidden="true"></i> <span class="hidden-sm">@lang('Health')</span></a>
+                                                 aria-hidden="true"></i> <span class="hidden-sm">{{ __('Health') }}</span></a>
                     <ul class="dropdown-menu">
                         <li><a href="{{ url('health/metric=mempool') }}"><i class="fa fa-braille fa-fw fa-lg"
-                                                                            aria-hidden="true"></i> @lang('Memory')</a>
+                                                                            aria-hidden="true"></i> {{ __('Memory') }}</a>
                         </li>
                         <li><a href="{{ url('health/metric=processor') }}"><i class="fa fa-microchip fa-fw fa-lg"
-                                                                              aria-hidden="true"></i> @lang('Processor')
+                                                                              aria-hidden="true"></i> {{ __('Processor') }}
                             </a></li>
                         <li><a href="{{ url('health/metric=storage') }}"><i class="fa fa-database fa-fw fa-lg"
-                                                                            aria-hidden="true"></i> @lang('Storage')</a>
+                                                                            aria-hidden="true"></i> {{ __('Storage') }}</a>
                         </li>
 
                         @foreach($sensor_menu as $sensor_menu_group)
@@ -400,7 +400,7 @@
                         <a href="{{ url('wireless') }}" class="dropdown-toggle" data-hover="dropdown"
                            data-toggle="dropdown"><i class="fa fa-wifi fa-fw fa-lg fa-nav-icons hidden-md"
                                                      aria-hidden="true"></i> <span
-                                class="hidden-sm">@lang('wireless.title')</span></a>
+                                class="hidden-sm">{{ __('wireless.title') }}</span></a>
                         <ul class="dropdown-menu">
                         @foreach($wireless_menu as $wireless_menu_entry)
                                 <li><a href="{{ url('wireless/metric=' . $wireless_menu_entry->sensor_class) }}"><i class="fa fa-{{ $wireless_menu_entry->icon() }} fa-fw fa-lg" aria-hidden="true"></i> {{ $wireless_menu_entry->classDescr() }}</a></li>
@@ -414,10 +414,10 @@
                         <a href="{{ url('apps') }}" class="dropdown-toggle" data-hover="dropdown"
                            data-toggle="dropdown"><i class="fa fa-tasks fa-fw fa-lg fa-nav-icons hidden-md"
                                                      aria-hidden="true"></i> <span
-                                class="hidden-sm">@lang('Apps')</span></a>
+                                class="hidden-sm">{{ __('Apps') }}</span></a>
                         <ul class="dropdown-menu">
                             <li><a href="{{ url('apps') }}"><i class="fa fa-object-group fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Overview')</a></li>
+                                                               aria-hidden="true"></i> {{ __('Overview') }}</a></li>
                             @foreach($app_menu as $app_type => $app_instances)
                                 @if($app_instances->filter->app_instance->isNotEmpty())
                                     <li class="dropdown-submenu">
@@ -441,7 +441,7 @@
                         <a href="{{ url('routing') }}" class="dropdown-toggle" data-hover="dropdown"
                            data-toggle="dropdown"><i class="fa fa-random fa-fw fa-lg fa-nav-icons hidden-md"
                                                      aria-hidden="true"></i> <span
-                                class="hidden-sm">@lang('Routing')</span></a>
+                                class="hidden-sm">{{ __('Routing') }}</span></a>
                         <ul class="dropdown-menu">
                         @foreach($routing_menu as $routing_menu_group)
                             @if(!$loop->first)
@@ -456,14 +456,14 @@
                             <li role="presentation" class="divider"></li>
                                 <li><a href="{{ url('routing/protocol=bgp/adminstatus=start/state=down') }}"><i
                                             class="fa fa-exclamation-circle fa-fw fa-lg"
-                                            aria-hidden="true"></i> @lang('Alerted BGP :alert_count', ['alert_count' => $bgp_alerts])
+                                            aria-hidden="true"></i> {{ __('Alerted BGP :alert_count', ['alert_count' => $bgp_alerts]) }}
                                     </a></li>
                         @endif
                         @admin
                             @if($show_peeringdb)
                                 <li role="presentation" class="divider"></li>
                                 <li><a href="{{ url('peering') }}"><i class="fa fa-hand-o-right fa-fw fa-lg"
-                                                                      aria-hidden="true"></i> @lang('PeeringDB')</a>
+                                                                      aria-hidden="true"></i> {{ __('PeeringDB') }}</a>
                                 </li>
                             @endif
                         @endadmin
@@ -474,26 +474,26 @@
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i
                             class="fa fa-exclamation-circle fa-col-{{ $alert_menu_class }} fa-fw fa-lg fa-nav-icons hidden-md"
-                            aria-hidden="true"></i> <span class="hidden-sm">@lang('Alerts')</span></a>
+                            aria-hidden="true"></i> <span class="hidden-sm">{{ __('Alerts') }}</span></a>
                     <ul class="dropdown-menu">
                         <li><a href="{{ url('alerts') }}"><i class="fa fa-bell fa-fw fa-lg"
-                                                             aria-hidden="true"></i> @lang('Notifications')</a></li>
+                                                             aria-hidden="true"></i> {{ __('Notifications') }}</a></li>
                         <li><a href="{{ url('alert-log') }}"><i class="fa fa-file-text fa-fw fa-lg"
-                                                                aria-hidden="true"></i> @lang('Alert History')</a></li>
+                                                                aria-hidden="true"></i> {{ __('Alert History') }}</a></li>
                         <li><a href="{{ url('alert-stats') }}"><i class="fa fa-bar-chart fa-fw fa-lg"
-                                                                  aria-hidden="true"></i> @lang('Statistics')</a></li>
+                                                                  aria-hidden="true"></i> {{ __('Statistics') }}</a></li>
                         @admin
                         <li role="presentation" class="divider"></li>
                         <li><a href="{{ url('alert-rules') }}"><i class="fa fa-list fa-fw fa-lg"
-                                                                  aria-hidden="true"></i> @lang('Alert Rules')</a></li>
+                                                                  aria-hidden="true"></i> {{ __('Alert Rules') }}</a></li>
                         <li><a href="{{ url('alert-schedule') }}"><i class="fa fa-calendar fa-fw fa-lg"
-                                                                     aria-hidden="true"></i> @lang('Scheduled Maintenance')
+                                                                     aria-hidden="true"></i> {{ __('Scheduled Maintenance') }}
                             </a></li>
                         <li><a href="{{ url('templates') }}"><i class="fa fa-file fa-fw fa-lg"
-                                                                aria-hidden="true"></i> @lang('Alert Templates')</a>
+                                                                aria-hidden="true"></i> {{ __('Alert Templates') }}</a>
                         </li>
                         <li><a href="{{ url('alert-transports') }}"><i class="fa fa-bus fa-fw fa-lg"
-                                                                       aria-hidden="true"></i> @lang('Alert Transports')
+                                                                       aria-hidden="true"></i> {{ __('Alert Transports') }}
                             </a></li>
                         @endadmin
                     </ul>
@@ -506,7 +506,7 @@
                 @csrf
                 <div class="form-group">
                     <input class="form-control typeahead" type="search" id="gsearch" name="gsearch"
-                           placeholder="@lang('Global Search')" autocomplete="off">
+                           placeholder="{{ __('Global Search') }}" autocomplete="off">
                 </div>
             </form>
             <ul class="nav navbar-nav navbar-right">
@@ -515,18 +515,18 @@
                         <i class="fa fa-user fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i>
                         <span class="badge badge-navbar-user count-notif {{ $notification_count ? 'badge-danger' : 'badge-default' }}">{{ $notification_count ?: '' }}</span>
                         <span class="hidden-sm"><small>{{ Auth::user()->username }}</small></span>
-                        <span class="visible-xs-inline-block">@lang('User')</span>
+                        <span class="visible-xs-inline-block">{{ __('User') }}</span>
                     </a>
                     <ul class="dropdown-menu">
                         <li><a href="{{ url('preferences') }}"><i class="fa fa-cog fa-fw fa-lg"
-                                                                  aria-hidden="true"></i> @lang('My Settings')</a></li>
+                                                                  aria-hidden="true"></i> {{ __('My Settings') }}</a></li>
                         <li><a href="{{ url('notifications') }}"><span
-                                    class="badge count-notif">{{ $notification_count }}</span> @lang('Notifications')
+                                    class="badge count-notif">{{ $notification_count }}</span> {{ __('Notifications') }}
                             </a></li>
                         <li role="presentation" class="divider"></li>
                         <li>
                             <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
-                                <i class="fa fa-sign-out fa-fw fa-lg" aria-hidden="true"></i> @lang('Logout')
+                                <i class="fa fa-sign-out fa-fw fa-lg" aria-hidden="true"></i> {{ __('Logout') }}
                             </a>
 
                             <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@@ -538,43 +538,43 @@
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"
                        style="margin-left:5px"><i class="fa fa-cog fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i>
-                        <span class="visible-xs-inline-block">@lang('settings.title')</span></a>
+                        <span class="visible-xs-inline-block">{{ __('settings.title') }}</span></a>
                     <ul class="dropdown-menu">
                         @admin
                         <li><a href="{{ url('settings') }}"><i class="fa fa-cogs fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Global Settings')</a></li>
+                                                               aria-hidden="true"></i> {{ __('Global Settings') }}</a></li>
                         <li><a href="{{ url('validate') }}"><i class="fa fa-check-circle fa-fw fa-lg"
-                                                               aria-hidden="true"></i> @lang('Validate Config')</a></li>
+                                                               aria-hidden="true"></i> {{ __('Validate Config') }}</a></li>
                         <li role="presentation" class="divider"></li>
                         <li><a href="{{ route('users.index') }}"><i class="fa fa-user-circle-o fa-fw fa-lg"
-                                                                    aria-hidden="true"></i> @lang('Manage Users')</a>
+                                                                    aria-hidden="true"></i> {{ __('Manage Users') }}</a>
                         </li>
                         <li><a href="{{ url('authlog') }}"><i class="fa fa-shield fa-fw fa-lg"
-                                                              aria-hidden="true"></i> @lang('Auth History')</a></li>
+                                                              aria-hidden="true"></i> {{ __('Auth History') }}</a></li>
                         <li role="presentation" class="divider"></li>
                         <li class="dropdown-submenu">
-                            <a href="{{ route('poller.index') }}"><i class="fa fa-th-large fa-fw fa-lg" aria-hidden="true"></i> @lang('Poller')</a>
+                            <a href="{{ route('poller.index') }}"><i class="fa fa-th-large fa-fw fa-lg" aria-hidden="true"></i> {{ __('Poller') }}</a>
                             <ul class="dropdown-menu">
-                                <li><a href="{{ route('poller.index') }}"><i class="fa fa-th-large fa-fw fa-lg" aria-hidden="true"></i> @lang('Poller')</a></li>
+                                <li><a href="{{ route('poller.index') }}"><i class="fa fa-th-large fa-fw fa-lg" aria-hidden="true"></i> {{ __('Poller') }}</a></li>
                                 @config('distributed_poller')
-                                <li><a href="{{ route('poller.groups') }}"><i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> @lang('Groups')</a></li>
+                                <li><a href="{{ route('poller.groups') }}"><i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> {{ __('Groups') }}</a></li>
                                 @endconfig
                                 @if($poller_clusters)
-                                <li><a href="{{ route('poller.settings') }}"><i class="fa fa-gears fa-fw fa-lg" aria-hidden="true"></i> @lang('Settings')</a></li>
+                                <li><a href="{{ route('poller.settings') }}"><i class="fa fa-gears fa-fw fa-lg" aria-hidden="true"></i> {{ __('Settings') }}</a></li>
                                 @endif
-                                <li><a href="{{ route('poller.performance') }}"><i class="fa fa-line-chart fa-fw fa-lg" aria-hidden="true"></i> @lang('Performance')</a></li>
-                                <li><a href="{{ route('poller.log') }}"><i class="fa fa-file-text fa-fw fa-lg" aria-hidden="true"></i> @lang('Log')</a></li>
+                                <li><a href="{{ route('poller.performance') }}"><i class="fa fa-line-chart fa-fw fa-lg" aria-hidden="true"></i> {{ __('Performance') }}</a></li>
+                                <li><a href="{{ route('poller.log') }}"><i class="fa fa-file-text fa-fw fa-lg" aria-hidden="true"></i> {{ __('Log') }}</a></li>
                             </ul>
                         </li>
                         <li role="presentation" class="divider"></li>
                         <li class="dropdown-submenu">
-                            <a href="#"><i class="fa fa-code fa-fw fa-lg" aria-hidden="true"></i> @lang('API')</a>
+                            <a href="#"><i class="fa fa-code fa-fw fa-lg" aria-hidden="true"></i> {{ __('API') }}</a>
                             <ul class="dropdown-menu">
                                 <li><a href="{{ url('api-access') }}"><i class="fa fa-cog fa-fw fa-lg"
-                                                                         aria-hidden="true"></i> @lang('API Settings')
+                                                                         aria-hidden="true"></i> {{ __('API Settings') }}
                                     </a></li>
                                 <li><a href="https://docs.librenms.org/API/" target="_blank" rel="noopener"><i
-                                            class="fa fa-book fa-fw fa-lg" aria-hidden="true"></i> @lang('API Docs')</a>
+                                            class="fa fa-book fa-fw fa-lg" aria-hidden="true"></i> {{ __('API Docs') }}</a>
                                 </li>
                             </ul>
                         </li>
@@ -590,7 +590,7 @@
                         <li role="presentation" class="divider"></li>
                         @endif
                         <li><a href="{{ url('about') }}"><i class="fa fa-info-circle fa-fw fa-lg"
-                                                            aria-hidden="true"></i> @lang('About :project_name', ['project_name' => \LibreNMS\Config::get('project_name')])
+                                                            aria-hidden="true"></i> {{ __('About :project_name', ['project_name' => \LibreNMS\Config::get('project_name')]) }}
                             </a></li>
                     </ul>
                 </li>
@@ -737,7 +737,7 @@
             },
             success: function () {
                 hideDashboardEditor = hideDashboardEditor ? 0 : 1;
-                $('#toggle-dashboard-editor-text').text(hideDashboardEditor ? '@lang('Show Dashboard Editor')' : '@lang('Hide Dashboard Editor')')
+                $('#toggle-dashboard-editor-text').text(hideDashboardEditor ? '{{ __('Show Dashboard Editor') }}' : '{{ __('Hide Dashboard Editor') }}')
 
                 // disable and hide editing
                 if (typeof gridster !== 'undefined') {
diff --git a/resources/views/locations.blade.php b/resources/views/locations.blade.php
index 1fa2d4807a..60418bc38e 100644
--- a/resources/views/locations.blade.php
+++ b/resources/views/locations.blade.php
@@ -21,14 +21,14 @@
             <table id="locations" class="table table-hover table-condensed table-striped">
                 <thead>
                 <tr>
-                    <th data-column-id="location" data-formatter="location" data-order="asc">@lang('Location')</th>
-                    <th data-column-id="coordinates" data-formatter="coordinates" data-sortable="false">@lang('Coordinates')</th>
-                    <th data-column-id="devices" data-formatter="primaryLabel">@lang('Devices')</th>
-                    <th data-column-id="network" data-formatter="defaultLabel">@lang('Network')</th>
-                    <th data-column-id="servers" data-formatter="defaultLabel">@lang('Servers')</th>
-                    <th data-column-id="firewalls" data-formatter="defaultLabel">@lang('Firewalls')</th>
-                    <th data-column-id="down" data-formatter="down">@lang('Down')</th>
-                    <th data-column-id="actions" data-formatter="actions" data-sortable="false">@lang('Actions')</th>
+                    <th data-column-id="location" data-formatter="location" data-order="asc">{{ __('Location') }}</th>
+                    <th data-column-id="coordinates" data-formatter="coordinates" data-sortable="false">{{ __('Coordinates') }}</th>
+                    <th data-column-id="devices" data-formatter="primaryLabel">{{ __('Devices') }}</th>
+                    <th data-column-id="network" data-formatter="defaultLabel">{{ __('Network') }}</th>
+                    <th data-column-id="servers" data-formatter="defaultLabel">{{ __('Servers') }}</th>
+                    <th data-column-id="firewalls" data-formatter="defaultLabel">{{ __('Firewalls') }}</th>
+                    <th data-column-id="down" data-formatter="down">{{ __('Down') }}</th>
+                    <th data-column-id="actions" data-formatter="actions" data-sortable="false">{{ __('Actions') }}</th>
                 </tr>
                 </thead>
             </table>
@@ -48,8 +48,8 @@
 
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">@lang('Cancel')</button>
-                    <button type="button" class="btn btn-primary" id="save-location">@lang('Save changes')</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{{ __('Cancel') }}</button>
+                    <button type="button" class="btn btn-primary" id="save-location">{{ __('Save changes') }}</button>
                 </div>
             </div>
         </div>
@@ -94,7 +94,7 @@
                         if (row.lat && row.lng) {
                             text = row.lat + ', ' + row.lng;
                         } else {
-                            text = '@lang('N/A')';
+                            text = '{{ __('N/A') }}';
                         }
                         return '<div class="coordinates-field" onclick="edit_coordinates(this);" data-id="' + row.id +
                             '"><span class="coordinates-text">' + text + '</span> <i class="fa fa-pencil"></i></div>';
@@ -115,21 +115,21 @@
                     "actions": function (column, row) {
                         var buttons = '<div style="white-space:nowrap"><button type="button" class="btn btn-xs btn-primary" onclick="toggle_location_graphs(' + row.id + ', this)"';
                         if (row.devices < 1) {
-                            buttons += ' disabled title="@lang('Location must have devices to show graphs')"';
+                            buttons += ' disabled title="{{ __('Location must have devices to show graphs') }}"';
                         }
-                        buttons += '><i class="fa fa-area-chart" aria-hidden="true"></i><span class="hidden-sm"> @lang('Traffic')</span></button>';
+                        buttons += '><i class="fa fa-area-chart" aria-hidden="true"></i><span class="hidden-sm"> {{ __('Traffic') }}</span></button>';
 
                         @admin
                         buttons += ' <button type="button" class="btn btn-xs btn-default" data-id="' + row.id +
                             '" data-location="' + row.location + '" data-lat="' + row.lat + '" data-lng="' + row.lng +
                             '" onclick="$(\'#edit-location\').modal(\'show\', this)"><i class="fa fa-pencil" aria-hidden="true"></i>' +
-                            '<span class="hidden-sm"> @lang('Edit')</span></button>';
+                            '<span class="hidden-sm"> {{ __('Edit') }}</span></button>';
 
                         buttons += ' <button type="button" class="btn btn-xs btn-danger" onclick="delete_location(' + row.id + ')"';
                         if (row.devices > 0) {
-                            buttons += ' disabled title="@lang('Cannot delete locations used by devices')"';
+                            buttons += ' disabled title="{{ __('Cannot delete locations used by devices') }}"';
                         }
-                        buttons += '><i class="fa fa-trash" aria-hidden="true"></i><span class="hidden-sm">  @lang('Delete')</span></button>';
+                        buttons += '><i class="fa fa-trash" aria-hidden="true"></i><span class="hidden-sm">  {{ __('Delete') }}</span></button>';
                         @endadmin
 
                         buttons += '</div>';
@@ -224,13 +224,13 @@
                 url: "ajax/location/" + locationId
             }).done(function () {
                 locations_grid.bootgrid('reload');
-                toastr.success('@lang('Location deleted')');
+                toastr.success("{{ __('Location deleted') }}");
             }).fail(function (e) {
                 var data = e.responseJSON;
                 if (data && data.hasOwnProperty('id')) {
                     toastr.error(data.id.join(' '));
                 } else {
-                    toastr.error('@lang('Failed to delete location'): ' + e.statusText)
+                    toastr.error("{{ __('Failed to delete location') }}: " + e.statusText)
                 }
             });
         }
diff --git a/resources/views/map/device-dependency.blade.php b/resources/views/map/device-dependency.blade.php
index 1c8cb5bba6..09b6bff193 100644
--- a/resources/views/map/device-dependency.blade.php
+++ b/resources/views/map/device-dependency.blade.php
@@ -8,10 +8,10 @@
 &nbsp;<big><b>{{ $group_name }}</b></big>
 <div class="pull-right">
 <input type="checkbox" class="custom-control-input" id="showparentdevicepath" onChange="highlightNode()" @if($showparentdevicepath) checked @endif>
-<label class="custom-control-label" for="showparentdevicepath">@lang('Highlight Dependencies to Root Device')</label>
+<label class="custom-control-label" for="showparentdevicepath">{{ __('Highlight Dependencies to Root Device') }}</label>
 <select name="highlight_node" id="highlight_node" class="input-sm" onChange="highlightNode()";>
 <option value="0">None</option>
-<option value="{{ $isolated_device_id }}">@lang('Isolated Devices')</option>
+<option value="{{ $isolated_device_id }}">{{ __('Isolated Devices') }}</option>
 @foreach($device_list as $device)
 <option value="{{ $device['id'] }}">{{ $device['label'] }}</option>
 @endforeach
@@ -19,7 +19,7 @@
 </div>
 <div id="visualization"></div>
 @else
-<div class="alert alert-success" role="alert">@lang('No devices found')</div>
+<div class="alert alert-success" role="alert">{{ __('No devices found') }}</div>
 @endif
 
 @endsection
diff --git a/resources/views/overview/simple.blade.php b/resources/views/overview/simple.blade.php
index 09f796d2b4..7f5b69051c 100644
--- a/resources/views/overview/simple.blade.php
+++ b/resources/views/overview/simple.blade.php
@@ -20,7 +20,7 @@
         <div class="front-box device-down">
             {!! \LibreNMS\Util\Url::deviceLink($device, $device->shortDisplayName()) !!}
             <br />
-            <span class=list-device-down>@lang('Device Down')</span>
+            <span class=list-device-down>{{ __('Device Down') }}</span>
             <br />
             <span class=body-date-1>{{ \LibreNMS\Util\StringHelpers::shortenText($device->location, 20) }}</span>
         </div>
@@ -30,7 +30,7 @@
         <div class="front-box alert alert-danger">
             {!! \LibreNMS\Util\Url::deviceLink($port->device, $port->device->shortDisplayName()) !!}
             <br />
-            <span class="interface-updown">@lang('Port Down')</span>
+            <span class="interface-updown">{{ __('Port Down') }}</span>
             <br />
             {!! \LibreNMS\Util\Url::PortLink($port) !!}
             @if($port->ifAlias)
@@ -43,7 +43,7 @@
     @foreach ($services_down as $service)
         <div class="front-box service-down">
             {!! \LibreNMS\Util\Url::deviceLink($service->device, $service->device->shortDisplayName()) !!}
-            <span class=service-down>@lang('Service Down')</span>
+            <span class=service-down>{{ __('Service Down') }}</span>
             {{ $service->service_type }}
         </div>
     @endforeach
@@ -51,7 +51,7 @@
     @foreach ($bgp_down as $bgp)
         <div class="front-box bgp-down">
             {!! \LibreNMS\Util\Url::deviceLink($bgp->device, $bgp->device->shortDisplayName()) !!}
-            <span class="bgp-down">@lang('BGP Down')</span>
+            <span class="bgp-down">{{ __('BGP Down') }}</span>
             <span class="{{ (strstr($bgp->bgpPeerIdentifier, ':') ? 'front-page-bgp-small' : 'front-page-bgp-normal') }}">
                 {{ $bgp->bgpPeerIdentifier }}
             </span>
@@ -63,7 +63,7 @@
     @foreach ($devices_uptime as $device)
         <div class="front-box device-rebooted">
             {!! \LibreNMS\Util\Url::deviceLink($device, $device->shortDisplayName()) !!}
-            <span class="device-rebooted">@lang('Device Rebooted')</span>
+            <span class="device-rebooted">{{ __('Device Rebooted') }}</span>
             <br />
             <span class="body-date-1">{{ $device->formatDownUptime(true) }}</span>
         </div>
diff --git a/resources/views/plugins/admin.blade.php b/resources/views/plugins/admin.blade.php
index 2e64052ae1..4784c02e2f 100644
--- a/resources/views/plugins/admin.blade.php
+++ b/resources/views/plugins/admin.blade.php
@@ -6,7 +6,7 @@
     <div class="container">
         <div class="panel panel-default panel-condensed col-md-6 col-md-offset-3 col-xs-12 col-sm-8 col-sm-offset-2" style="padding: 0">
             <div class="panel-heading">
-                <strong>@lang('plugins.admin_title')</strong>
+                <strong>{{ __('plugins.admin_title') }}</strong>
             </div>
 
             <table class="table table-condensed">
@@ -22,15 +22,15 @@
                                 @csrf
                                 @if($plugin->plugin_active)
                                     <input type="hidden" name="plugin_active" value="0">
-                                    <button type="submit" class="btn btn-sm btn-danger" style="min-width: 66px">@lang('Disable')</button>
+                                    <button type="submit" class="btn btn-sm btn-danger" style="min-width: 66px">{{ __('Disable') }}</button>
                                 @else
                                     <input type="hidden" name="plugin_active" value="1">
-                                    <button type="submit" class="btn btn-sm btn-success" style="min-width: 66px">@lang('Enable')</button>
+                                    <button type="submit" class="btn btn-sm btn-success" style="min-width: 66px">{{ __('Enable') }}</button>
                                 @endif
                                 @if($plugin->version == 1)
-                                    <a href="{{ route('plugin.legacy', $plugin->plugin_name) }}" class="btn btn-sm btn-primary" style="min-width: 72px">@lang('Page')</a>
+                                    <a href="{{ route('plugin.legacy', $plugin->plugin_name) }}" class="btn btn-sm btn-primary" style="min-width: 72px">{{ __('Page') }}</a>
                                 @else
-                                    <a href="{{ route('plugin.settings', $plugin->plugin_name) }}" class="btn btn-sm btn-primary" style="min-width: 72px">@lang('Settings')</a>
+                                    <a href="{{ route('plugin.settings', $plugin->plugin_name) }}" class="btn btn-sm btn-primary" style="min-width: 72px">{{ __('Settings') }}</a>
                                 @endif
                             </form>
                         </td>
diff --git a/resources/views/plugins/missing.blade.php b/resources/views/plugins/missing.blade.php
index f697e19604..5a6aa79ae9 100644
--- a/resources/views/plugins/missing.blade.php
+++ b/resources/views/plugins/missing.blade.php
@@ -1 +1 @@
-<h2>@lang('plugins.errors.view_missing')</h2>
+<h2>{{ __('plugins.errors.view_missing') }}</h2>
diff --git a/resources/views/poller/groups.blade.php b/resources/views/poller/groups.blade.php
index 489e86e964..0d8a1aebc2 100644
--- a/resources/views/poller/groups.blade.php
+++ b/resources/views/poller/groups.blade.php
@@ -6,20 +6,20 @@
 
 @parent
 
-<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#poller-groups">@lang('Create new poller group')</button>
+<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#poller-groups">{{ __('Create new poller group') }}</button>
 <br /><br />
 <div class="table-responsive">
     <table class="table table-striped table-bordered table-hover table-condensed">
         <tr>
-            <th>@lang('ID')</th>
-            <th>@lang('Group Name')</th>
-            <th>@lang('Devices')</th>
-            <th>@lang('Description')</th>
-            <th>@lang('Action')</th>
+            <th>{{ __('ID') }}</th>
+            <th>{{ __('Group Name') }}</th>
+            <th>{{ __('Devices') }}</th>
+            <th>{{ __('Description') }}</th>
+            <th>{{ __('Action') }}</th>
         </tr>
         <tr id="0">
             <td>0</td>
-            <td>General @if($default_group_id == 0) (@lang('default')) @endif</td>
+            <td>General @if($default_group_id == 0) ({{ __('default') }}) @endif</td>
             <td><a href="{{ url('devices/poller_group=0') }}">{{ $ungrouped_count }}</a></td>
             <td></td>
             <td>
@@ -27,12 +27,12 @@
         @foreach ($poller_groups as $group)
         <tr id="{{ $group->id }}">
             <td>{{ $group->id }}</td>
-            <td>{{ $group->group_name }}@if($group->id == $default_group_id) (@lang('default')) @endif</td>
+            <td>{{ $group->group_name }}@if($group->id == $default_group_id) ({{ __('default') }}) @endif</td>
             <td><a href="{{ url('devices/poller_group=' . $group->id) }}">{{ $group->devices_count }}</a></td>
             <td>{{ $group->descr }}</td>
             <td>
-                <button type="button" class="btn btn-success btn-xs" data-group_id="{{ $group->id }}" data-toggle="modal" data-target="#poller-groups">@lang('Edit')</button>
-                <button type="button" class="btn btn-danger btn-xs" data-group_id="{{ $group->id }}" data-toggle="modal" data-target="#confirm-delete">@lang('Delete')</button>
+                <button type="button" class="btn btn-success btn-xs" data-group_id="{{ $group->id }}" data-toggle="modal" data-target="#poller-groups">{{ __('Edit') }}</button>
+                <button type="button" class="btn btn-danger btn-xs" data-group_id="{{ $group->id }}" data-toggle="modal" data-target="#confirm-delete">{{ __('Delete') }}</button>
             </td>
         @endforeach
         </tr>
@@ -45,16 +45,16 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h5 class="modal-title" id="Delete">@lang('Confirm Delete')</h5>
+                <h5 class="modal-title" id="Delete">{{ __('Confirm Delete') }}</h5>
             </div>
             <div class="modal-body">
-                <p>@lang('If you would like to remove the Poller Group then please click Delete.')</p>
+                <p>{{ __('If you would like to remove the Poller Group then please click Delete.') }}</p>
             </div>
             <div class="modal-footer">
                 <form role="form" class="remove_group_form">
                     @csrf
-                    <button type="button" class="btn btn-default" data-dismiss="modal">@lang('Cancel')</button>
-                    <button type="submit" class="btn btn-danger danger" id="group-removal" data-target="group-removal">@lang('Delete')</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{{ __('Cancel') }}</button>
+                    <button type="submit" class="btn btn-danger danger" id="group-removal" data-target="group-removal">{{ __('Delete') }}</button>
                     <input type="hidden" name="group_id" id="group_id" value="">
                     <input type="hidden" name="type" id="type" value="poller-group-remove">
                     <input type="hidden" name="confirm" id="confirm" value="yes">
@@ -68,7 +68,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="Create">@lang('Poller Groups')</h4>
+                <h4 class="modal-title" id="Create">{{ __('Poller Groups') }}</h4>
             </div>
             <div class="modal-body">
                 <form method="post" role="form" id="poller_groups" class="form-horizontal poller-groups-form">
@@ -82,20 +82,20 @@
                 <div class="row">
                     <div class="col-md-12">
                         <div class="form-group">
-                            <label for="group_name" class="col-sm-3 control-label">@lang('Group Name'):</label>
+                            <label for="group_name" class="col-sm-3 control-label">{{ __('Group Name') }}:</label>
                             <div class="col-sm-9">
                                 <input type="input" class="form-control" id="group_name" name="group_name" placeholder="Group Name">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="descr" class="col-sm-3 control-label">@lang('Description'):</label>
+                            <label for="descr" class="col-sm-3 control-label">{{ __('Description') }}:</label>
                             <div class="col-sm-9">
                                 <input type="input" class="form-control" id="descr" name="descr" placeholder="Description">
                             </div>
                         </div>
                         <div class="form-group">
                              <div class="col-sm-offset-3 col-sm-9">
-                                 <button type="submit" class="btn btn-primary btn-sm" id="create-group" name="create-group">@lang('Add Poller Group')</button>
+                                 <button type="submit" class="btn btn-primary btn-sm" id="create-group" name="create-group">{{ __('Add Poller Group') }}</button>
                              </div>
                         </div>
                     </div>
@@ -123,12 +123,12 @@ $('#group-removal').on("click", function(e) {
         type: 'DELETE',
         url: "ajax/pollergroup/" + groupId,
         success: function(msg) {
-            toastr.success('@lang('Poller Group deleted')');
+            toastr.success('{{ __('Poller Group deleted') }}');
             $("#confirm-delete").modal('hide');
             location.reload(1);
         },
         error: function(e) {
-            toastr.error('@lang('Failed to delete Poller Group'): ' + e.statusText)
+            toastr.error('{{ __('Failed to delete Poller Group') }}: ' + e.statusText)
             $("#confirm-delete").modal('hide');
         }
     });
diff --git a/resources/views/poller/index.blade.php b/resources/views/poller/index.blade.php
index 816f64d3ab..3aeb4f205f 100644
--- a/resources/views/poller/index.blade.php
+++ b/resources/views/poller/index.blade.php
@@ -6,21 +6,21 @@
     <div class="col-md-12">
       <ul class="nav nav-tabs">
         <li role="presentation" @if( $current_tab == 'poller' ) class="active" @endif>
-          <a href="{{ route('poller.index') }}"><i class="fa fa-th-large fa-lg icon-theme" aria-hidden="true"></i> @lang('Poller')</a>
+          <a href="{{ route('poller.index') }}"><i class="fa fa-th-large fa-lg icon-theme" aria-hidden="true"></i> {{ __('Poller') }}</a>
         </li>
         <li role="presentation" @if( $current_tab == 'groups' ) class="active" @endif>
-          <a href="{{ route('poller.groups') }}"><i class="fa fa-th fa-lg icon-theme" aria-hidden="true"></i> @lang('Groups')</a>
+          <a href="{{ route('poller.groups') }}"><i class="fa fa-th fa-lg icon-theme" aria-hidden="true"></i> {{ __('Groups') }}</a>
         </li>
           @if(\App\Models\PollerCluster::exists())
             <li role="presentation" @if( $current_tab == 'settings' ) class="active" @endif>
-              <a href="{{ route('poller.settings') }}"><i class="fa fa-gears fa-lg icon-theme" aria-hidden="true"></i> @lang('Settings')</a>
+              <a href="{{ route('poller.settings') }}"><i class="fa fa-gears fa-lg icon-theme" aria-hidden="true"></i> {{ __('Settings') }}</a>
             </li>
           @endif
         <li role="presentation" @if( $current_tab == 'performance' ) class="active" @endif>
-          <a href="{{ route('poller.performance') }}"><i class="fa fa-line-chart fa-lg icon-theme" aria-hidden="true"></i> @lang('Performance')</a>
+          <a href="{{ route('poller.performance') }}"><i class="fa fa-line-chart fa-lg icon-theme" aria-hidden="true"></i> {{ __('Performance') }}</a>
         </li>
         <li role="presentation" @if( $current_tab == 'log' ) class="active" @endif>
-          <a href="{{ route('poller.log') }}"><i class="fa fa-file-text fa-lg icon-theme" aria-hidden="true"></i> @lang('Log')</a>
+          <a href="{{ route('poller.log') }}"><i class="fa fa-file-text fa-lg icon-theme" aria-hidden="true"></i> {{ __('Log') }}</a>
         </li>
       </ul>
       <br />
diff --git a/resources/views/poller/log.blade.php b/resources/views/poller/log.blade.php
index d3e0f3a8ad..5ff33a8698 100644
--- a/resources/views/poller/log.blade.php
+++ b/resources/views/poller/log.blade.php
@@ -9,11 +9,11 @@
 <table id="poll-log" class="table table-condensed table-hover table-striped">
     <thead>
     <tr>
-        <th data-column-id="hostname">@lang('Hostname')</th>
-        <th data-column-id="last_polled">@lang('Last Polled')</th>
-        <th data-column-id="poller_group">@lang('Poller Group')</th>
-        <th data-column-id="location">@lang('Location')</th>
-        <th data-column-id="last_polled_timetaken" data-order="desc">@lang('Polling Duration') (@lang('Seconds'))</th>
+        <th data-column-id="hostname">{{ __('Hostname') }}</th>
+        <th data-column-id="last_polled">{{ __('Last Polled') }}</th>
+        <th data-column-id="poller_group">{{ __('Poller Group') }}</th>
+        <th data-column-id="location">{{ __('Location') }}</th>
+        <th data-column-id="last_polled_timetaken" data-order="desc">{{ __('Polling Duration') }} ({{ __('Seconds') }})</th>
     </tr>
     </thead>
 </table>
diff --git a/resources/views/poller/poller.blade.php b/resources/views/poller/poller.blade.php
index dc75a65033..159feca4e1 100644
--- a/resources/views/poller/poller.blade.php
+++ b/resources/views/poller/poller.blade.php
@@ -11,11 +11,11 @@
     <div class="table-responsive">
         <table class="table table-striped table-bordered table-hover table-condensed">
             <tr>
-                <th>@lang('Poller Name')</th>
-                <th>@lang('Devices Polled')</th>
-                <th>@lang('Total Poll Time')</th>
-                <th>@lang('Last Run')</th>
-                <th>@lang('Actions')</th>
+                <th>{{ __('Poller Name') }}</th>
+                <th>{{ __('Devices Polled') }}</th>
+                <th>{{ __('Total Poll Time') }}</th>
+                <th>{{ __('Last Run') }}</th>
+                <th>{{ __('Actions') }}</th>
             </tr>
             @foreach($pollers as $poller)
             <tr class="{{ $poller['row_class'] }}" id="row_{{ $poller['id'] }}">
@@ -23,7 +23,7 @@
                 <td>{{ $poller['devices'] }}</td>
                 <td>{{ $poller['time_taken'] }} Seconds</td>
                 <td>{{ $poller['last_polled'] }}</td>
-                <td>@if( $poller['long_not_polled'] )<button type='button' class='btn btn-danger btn-sm' aria-label=@lang('Delete') data-toggle='modal' data-target='#confirm-delete' data-id='{{ $poller['id'] }}' data-pollertype='delete-poller' name='delete-poller'><i class='fa fa-trash' aria-hidden='true'></i></button>@endif</td>
+                <td>@if( $poller['long_not_polled'] )<button type='button' class='btn btn-danger btn-sm' aria-label={{ __('Delete') }} data-toggle='modal' data-target='#confirm-delete' data-id='{{ $poller['id'] }}' data-pollertype='delete-poller' name='delete-poller'><i class='fa fa-trash' aria-hidden='true'></i></button>@endif</td>
             </tr>
             @endforeach
         </table>
@@ -36,18 +36,18 @@
     <div class="table-responsive">
         <table class="table table-striped table-bordered table-condensed">
             <tr>
-                <th>@lang('Name')</th>
-                <th>@lang('Node ID')</th>
-                <th>@lang('Version')</th>
-                <th>@lang('Groups Served')</th>
-                <th>@lang('Last Checkin')</th>
-                <th>@lang('Cluster Master')</th>
-                <th>@lang('Job')</th>
-                <th>@lang('Workers')</th>
-                <th>@lang('Devices Actioned')<br><small>@lang('Last Interval')</small></th>
-                <th>@lang('Devices Pending')</th>
-                <th>@lang('Worker Seconds')<br><small>@lang('Consumed/Maximum')</small></th>
-                <th>@lang('Actions')</th>
+                <th>{{ __('Name') }}</th>
+                <th>{{ __('Node ID') }}</th>
+                <th>{{ __('Version') }}</th>
+                <th>{{ __('Groups Served') }}</th>
+                <th>{{ __('Last Checkin') }}</th>
+                <th>{{ __('Cluster Master') }}</th>
+                <th>{{ __('Job') }}</th>
+                <th>{{ __('Workers') }}</th>
+                <th>{{ __('Devices Actioned') }}<br><small>{{ __('Last Interval') }}</small></th>
+                <th>{{ __('Devices Pending') }}</th>
+                <th>{{ __('Worker Seconds') }}<br><small>{{ __('Consumed/Maximum') }}</small></th>
+                <th>{{ __('Actions') }}</th>
             </tr>
             @foreach($poller_cluster as $poller)
                 @foreach($poller->stats as $stat)
@@ -58,7 +58,7 @@
                     <td rowspan="{{ $poller->stats->count() }}">{{ $poller->poller_version }}</td>
                     <td rowspan="{{ $poller->stats->count() }}">{{ $poller->poller_groups }}</td>
                     <td rowspan="{{ $poller->stats->count() }}">{{ $poller->last_report }}</td>
-                    <td rowspan="{{ $poller->stats->count() }}">@lang($poller->master ? 'Yes' : 'No')</td>
+                    <td rowspan="{{ $poller->stats->count() }}">{{ __($poller->master ? 'Yes' : 'No') }}</td>
                 @endif
                     <td>{{ $stat->poller_type }}</td>
                     <td>{{ $stat->workers }}</td>
@@ -66,7 +66,7 @@
                     <td>{{ $stat->depth }}</td>
                     <td>{{ $stat->worker_seconds }} / {{ $stat->frequency * $stat->workers }}</td>
                 @if( $loop->first )
-                    <td rowspan="{{ $poller->stats->count() }}">@if($poller->long_not_polled)<button type='button' class='btn btn-danger btn-sm' aria-label=@lang('Delete') data-toggle='modal' data-target='#confirm-delete' data-id='{{ $poller->id }}' data-pollertype='delete-cluster-poller' name='delete-cluster-poller'><i class='fa fa-trash' aria-hidden='true'></i></button>@endif</td>
+                    <td rowspan="{{ $poller->stats->count() }}">@if($poller->long_not_polled)<button type='button' class='btn btn-danger btn-sm' aria-label={{ __('Delete') }} data-toggle='modal' data-target='#confirm-delete' data-id='{{ $poller->id }}' data-pollertype='delete-cluster-poller' name='delete-cluster-poller'><i class='fa fa-trash' aria-hidden='true'></i></button>@endif</td>
                 @endif
                 </tr>
                 @endforeach
@@ -81,22 +81,22 @@
 @endif
 
 @if(auth()->user()->isAdmin())
-<div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="@lang('Delete')" aria-hidden="true">
+<div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="{{ __('Delete') }}" aria-hidden="true">
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h5 class="modal-title" id="Delete">@lang('Confirm Delete')</h5>
+                <h5 class="modal-title" id="Delete">{{ __('Confirm Delete') }}</h5>
             </div>
             <div class="modal-body">
-                <p>@lang('Please confirm that you would like to delete this poller.')</p>
+                <p>{{ __('Please confirm that you would like to delete this poller.') }}</p>
             </div>
             <div class="modal-footer">
                 <form role="form" class="remove_token_form">
                     @csrf
-                    <button type="button" class="btn btn-default" data-dismiss="modal">@lang('Cancel')</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{{ __('Cancel') }}</button>
                     <button type="submit" class="btn btn-danger danger" id="poller-removal"
-                            data-target="poller-removal">@lang('Delete')
+                            data-target="poller-removal">{{ __('Delete') }}
                     </button>
                     <input type="hidden" name="id" id="id" value="">
                     <input type="hidden" name="pollertype" id="pollertype" value="">
@@ -138,7 +138,7 @@
                 $("#confirm-delete").modal('hide');
             },
             error: function () {
-                toastr.error('@lang('An error occurred deleting this poller.')');
+                toastr.error('{{ __('An error occurred deleting this poller.') }}');
                 $("#confirm-delete").modal('hide');
             }
         });
diff --git a/resources/views/port-group/create.blade.php b/resources/views/port-group/create.blade.php
index 36d0703be3..a9bf45bee4 100644
--- a/resources/views/port-group/create.blade.php
+++ b/resources/views/port-group/create.blade.php
@@ -7,16 +7,16 @@
         <div class="row">
             <form action="{{ route('port-groups.store') }}" method="POST" role="form"
                   class="form-horizontal device-group-form col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-sm-12">
-                <legend>@lang('Create Port Group')</legend>
+                <legend>{{ __('Create Port Group') }}</legend>
                 @csrf
 
                 @include('port-group.form')
 
                 <div class="form-group">
                     <div class="col-sm-9 col-sm-offset-3 col-md-10 col-sm-offset-2">
-                        <button type="submit" class="btn btn-primary">@lang('Save')</button>
+                        <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
                         <a type="button" class="btn btn-danger"
-                           href="{{ route('port-groups.index') }}">@lang('Cancel')</a>
+                           href="{{ route('port-groups.index') }}">{{ __('Cancel') }}</a>
                     </div>
                 </div>
             </form>
diff --git a/resources/views/port-group/edit.blade.php b/resources/views/port-group/edit.blade.php
index 048ef3be7e..3689516d68 100644
--- a/resources/views/port-group/edit.blade.php
+++ b/resources/views/port-group/edit.blade.php
@@ -7,7 +7,7 @@
         <div class="row">
             <form action="{{ route('port-groups.update', $port_group->id) }}" method="POST" role="form"
                   class="form-horizontal device-group-form col-md-10 col-md-offset-1 col-sm-12">
-                <legend>@lang('Edit Port Group'): {{ $port_group->name }}</legend>
+                <legend>{{ __('Edit Port Group') }}: {{ $port_group->name }}</legend>
                 {{ method_field('PUT') }}
                 @csrf
 
@@ -15,9 +15,9 @@
 
                 <div class="form-group">
                     <div class="col-sm-9 col-sm-offset-3 col-md-10 col-sm-offset-2">
-                        <button type="submit" class="btn btn-primary">@lang('Save')</button>
+                        <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
                         <a type="button" class="btn btn-danger"
-                           href="{{ route('port-groups.index') }}">@lang('Cancel')</a>
+                           href="{{ route('port-groups.index') }}">{{ __('Cancel') }}</a>
                     </div>
                 </div>
             </form>
diff --git a/resources/views/port-group/form.blade.php b/resources/views/port-group/form.blade.php
index be4ef37afd..d776e675a6 100644
--- a/resources/views/port-group/form.blade.php
+++ b/resources/views/port-group/form.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group @if($errors->has('name')) has-error @endif">
-    <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Name')</label>
+    <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Name') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="name" name="name" value="{{ old('name', $port_group->name) }}">
         <span class="help-block">{{ $errors->first('name') }}</span>
@@ -7,7 +7,7 @@
 </div>
 
 <div class="form-group @if($errors->has('desc')) has-error @endif">
-    <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Description')</label>
+    <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Description') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="desc" name="desc" value="{{ old('desc', $port_group->desc) }}">
         <span class="help-block">{{ $errors->first('desc') }}</span>
diff --git a/resources/views/port-group/index.blade.php b/resources/views/port-group/index.blade.php
index e62c51f093..daeace1110 100644
--- a/resources/views/port-group/index.blade.php
+++ b/resources/views/port-group/index.blade.php
@@ -6,13 +6,13 @@
     <div class="container-fluid">
         <x-panel id="manage-port-groups-panel">
             <x-slot name="title">
-                <i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> @lang('Port Groups')
+                <i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> {{ __('Port Groups') }}
             </x-slot>
 
             <div class="row">
                 <div class="col-md-12">
                     <a type="button" class="btn btn-primary" href="{{ route('port-groups.create') }}">
-                        <i class="fa fa-plus"></i> @lang('New Port Group')
+                        <i class="fa fa-plus"></i> {{ __('New Port Group') }}
                     </a>
                 </div>
             </div>
@@ -20,10 +20,10 @@
                 <table id="manage-port-groups-table" class="table table-condensed table-hover">
                     <thead>
                     <tr>
-                        <th>@lang('Name')</th>
-                        <th>@lang('Description')</th>
-                        <th>@lang('Ports')</th>
-                        <th>@lang('Actions')</th>
+                        <th>{{ __('Name') }}</th>
+                        <th>{{ __('Description') }}</th>
+                        <th>{{ __('Ports') }}</th>
+                        <th>{{ __('Actions') }}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -33,10 +33,10 @@
                             <td>{{ $port_group->desc }}</td>
                             <td>{{ $port_group->ports_count }}</td>
                             <td>
-                                <a type="button" title="@lang('edit Port Group')" class="btn btn-primary btn-sm" aria-label="@lang('Edit')"
+                                <a type="button" title="{{ __('edit Port Group') }}" class="btn btn-primary btn-sm" aria-label="{{ __('Edit') }}"
                                    href="{{ route('port-groups.edit', $port_group->id) }}">
                                     <i class="fa fa-pencil" aria-hidden="true"></i></a>
-                                <button type="button" class="btn btn-danger btn-sm" title="@lang('delete Port Group')" aria-label="@lang('Delete')"
+                                <button type="button" class="btn btn-danger btn-sm" title="{{ __('delete Port Group') }}" aria-label="{{ __('Delete') }}"
                                         onclick="delete_pg(this, '{{ $port_group->name }}', '{{ route('port-groups.destroy', $port_group->id) }}')">
                                     <i
                                         class="fa fa-trash" aria-hidden="true"></i></button>
@@ -55,7 +55,7 @@
         function delete_pg(button, name, url) {
             var index = button.parentNode.parentNode.rowIndex;
 
-            if (confirm('@lang('Are you sure you want to delete ')' + name + '?')) {
+            if (confirm('{{ __('Are you sure you want to delete ') }}' + name + '?')) {
                 $.ajax({
                     url: url,
                     type: 'DELETE',
@@ -64,7 +64,7 @@
                         toastr.success(msg);
                     },
                     error: function () {
-                        toastr.error('@lang('The port group could not be deleted')');
+                        toastr.error('{{ __('The port group could not be deleted') }}');
                     }
                 });
             }
diff --git a/resources/views/service-template/create.blade.php b/resources/views/service-template/create.blade.php
index 54673a1d53..960f5e37f8 100644
--- a/resources/views/service-template/create.blade.php
+++ b/resources/views/service-template/create.blade.php
@@ -7,16 +7,16 @@
         <div class="row">
             <form action="{{ route('services.templates.store') }}" method="POST" role="form"
                   class="form-horizontal service-template-form col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-sm-12">
-                <legend><h2>@lang('Create Service Template')</h2></legend>
+                <legend><h2>{{ __('Create Service Template') }}</h2></legend>
                 <div class='alert alert-info'>Service Template will created for the specified Device Group.</div>
                 @csrf
                 <div class='well well-lg'>
                     @include('service-template.form')
                     <div class="form-group">
                     <hr>
-                        <center><button type="submit" class="btn btn-primary">@lang('Save')</button>
+                        <center><button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
                             <a type="button" class="btn btn-danger"
-                            href="{{ route('services.templates.index') }}">@lang('Cancel')</a>
+                            href="{{ route('services.templates.index') }}">{{ __('Cancel') }}</a>
                         </center>
                     </div>
                 </div>
diff --git a/resources/views/service-template/edit.blade.php b/resources/views/service-template/edit.blade.php
index 0a906ac99e..5d7f25def0 100644
--- a/resources/views/service-template/edit.blade.php
+++ b/resources/views/service-template/edit.blade.php
@@ -7,7 +7,7 @@
         <div class="row">
             <form action="{{ route('services.templates.update', $template->id) }}" method="POST" role="form"
                   class="form-horizontal service-template-form col-md-10 col-md-offset-1 col-sm-12">
-                <legend><h2>@lang('Edit Service Template'): {{ $template->name }}</h2></legend>
+                <legend><h2>{{ __('Edit Service Template') }}: {{ $template->name }}</h2></legend>
                 <div class='alert alert-info'>Service Template will be edited for the specified Device Group.</div>
                 {{ method_field('PUT') }}
                 @csrf
@@ -15,9 +15,9 @@
                     @include('service-template.form')
                     <div class="form-group">
                         <center><div class="col-sm-9 col-sm-offset-3 col-md-10 col-sm-offset-2">
-                            <button type="submit" class="btn btn-primary">@lang('Save')</button>
+                            <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
                             <a type="button" class="btn btn-danger"
-                            href="{{ route('services.templates.index') }}">@lang('Cancel')</a>
+                            href="{{ route('services.templates.index') }}">{{ __('Cancel') }}</a>
                         </div></center>
                     </div>
                 </div>
diff --git a/resources/views/service-template/form.blade.php b/resources/views/service-template/form.blade.php
index 092866bb11..d0bddeb536 100644
--- a/resources/views/service-template/form.blade.php
+++ b/resources/views/service-template/form.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group @if($errors->has('name')) has-error @endif">
-    <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Name')</label>
+    <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Name') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="name" name="name" value="{{ old('name', $template->name) }}">
         <span class="help-block">{{ $errors->first('name') }}</span>
@@ -7,20 +7,20 @@
 </div>
 
 <div class="form-group @if($errors->has('type')) has-error @endif">
-    <label for="type" class="control-label col-sm-3 col-md-2">@lang('Device Type')</label>
+    <label for="type" class="control-label col-sm-3 col-md-2">{{ __('Device Type') }}</label>
     <div class="col-sm-9 col-md-10">
         <select class="form-control" id="type" name="type" onchange="change_st_dtype(this)">
             <option value="static"
-                    @if(old('type', $template->type) == 'static') selected @endif>@lang('Static')</option>
+                    @if(old('type', $template->type) == 'static') selected @endif>{{ __('Static') }}</option>
             <option value="dynamic"
-                    @if(old('type', $template->type) == 'dynamic') selected @endif>@lang('Dynamic')</option>
+                    @if(old('type', $template->type) == 'dynamic') selected @endif>{{ __('Dynamic') }}</option>
         </select>
         <span class="help-block">{{ $errors->first('type') }}</span>
     </div>
 </div>
 
 <div id="dynamic-st-d-form" class="form-group @if($errors->has('rules')) has-error @endif" style="display: none">
-    <label for="rules" class="control-label col-sm-3 col-md-2 text-wrap">@lang('Define Device Rules')</label>
+    <label for="rules" class="control-label col-sm-3 col-md-2 text-wrap">{{ __('Define Device Rules') }}</label>
     <div class="col-sm-9 col-md-10">
         <div id="builder"></div>
         <span class="help-block">{{ $errors->first('rules') }}</span>
@@ -28,7 +28,7 @@
 </div>
 
 <div id="static-st-d-form" class="form-group @if($errors->has('devices')) has-error @endif">
-    <label for="devices" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Select Devices')</label>
+    <label for="devices" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Select Devices') }}</label>
     <div class="col-sm-9 col-md-10">
         <select class="form-control" id="devices" name="devices[]" multiple>
             @foreach($template->devices as $device)
@@ -40,7 +40,7 @@
 </div>
 
 <div id="static-st-dg-form" class="form-group @if($errors->has('groups')) has-error @endif">
-    <label for="groups" class="control-label col-sm-3 col-md-2 text-wrap">@lang('Device Groups')</label>
+    <label for="groups" class="control-label col-sm-3 col-md-2 text-wrap">{{ __('Device Groups') }}</label>
     <div class="col-sm-9 col-md-10">
         <select class="form-control" id="groups" name="groups[]" multiple>
             @foreach($template->groups as $group)
@@ -52,7 +52,7 @@
 </div>
 
 <div class="form-group @if($errors->has('check')) has-error @endif">
-    <label for="check" class="control-label col-sm-3 col-md-2">@lang('Check Type')</label>
+    <label for="check" class="control-label col-sm-3 col-md-2">{{ __('Check Type') }}</label>
     <div class="col-sm-9 col-md-10">
         <select class="form-control" id="check" name="check">
             @foreach($services as $current_service)
@@ -64,7 +64,7 @@
 </div>
 
 <div class="form-group @if($errors->has('desc')) has-error @endif">
-    <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Description')</label>
+    <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Description') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="desc" name="desc" value="{{ old('desc', $template->desc) }}">
         <span class="help-block">{{ $errors->first('desc') }}</span>
@@ -72,7 +72,7 @@
 </div>
 
 <div class="form-group @if($errors->has('ip')) has-error @endif">
-    <label for="ip" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Remote Host')</label>
+    <label for="ip" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Remote Host') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="ip" name="ip" value="{{ old('ip', $template->ip) }}">
         <span class="help-block">{{ $errors->first('ip') }}</span>
@@ -80,7 +80,7 @@
 </div>
 
 <div class="form-group @if($errors->has('param')) has-error @endif">
-    <label for="param" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Parameters')</label>
+    <label for="param" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Parameters') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="text" class="form-control" id="param" name="param" value="{{ old('param', $template->param) }}">
         <span class="help-block">{{ $errors->first('param') }}</span>
@@ -94,7 +94,7 @@
 </div>
 
 <div class="form-group @if($errors->has('ignore')) has-error @endif">
-    <label for="ignore" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Ignore alert tag')</label>
+    <label for="ignore" class="control-label col-sm-3 col-md-2 text-nowrap">{{ __('Ignore alert tag') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="hidden" value="0" name="ignore">
         <input type="checkbox" class="form-control" id="ignore" name="ignore" data-size="small" value="{{ old('ignore', $template->ignore) }}"@if(old('ignore', $template->ignore) == 1) checked @endif>
@@ -103,7 +103,7 @@
 </div>
 
 <div class="form-group @if($errors->has('disabled')) has-error @endif">
-    <label for="disabled" class="control-label col-sm-3 col-md-2 text-wrap">@lang('Disable polling and alerting')</label>
+    <label for="disabled" class="control-label col-sm-3 col-md-2 text-wrap">{{ __('Disable polling and alerting') }}</label>
     <div class="col-sm-9 col-md-10">
         <input type="hidden" value="0" name="disabled">
         <input type="checkbox" class="form-control" id="disabled" name="disabled" data-size="small" value="{{ old('disabled', $template->disabled) }}"@if(old('disabled', $template->disabled) == 1) checked @endif>
diff --git a/resources/views/service-template/index.blade.php b/resources/views/service-template/index.blade.php
index 85be944355..50f11c63dc 100644
--- a/resources/views/service-template/index.blade.php
+++ b/resources/views/service-template/index.blade.php
@@ -9,30 +9,30 @@
                 <span class="fa-stack" aria-hidden="true">
                     <i class="fa fa-square fa-stack-2x"></i>
                     <i class="fa fa-cogs fa-stack-1x fa-inverse"></i>
-                </span> @lang('Services Templates')
+                </span> {{ __('Services Templates') }}
             </x-slot>
             <div class="row" style="padding-bottom: 16px;">
                 <div class="col-md-12">
                     <a type="button" class="btn btn-primary" href="{{ route('services.templates.create') }}">
-                        <i class="fa fa-plus"></i> @lang('New Service Template')
+                        <i class="fa fa-plus"></i> {{ __('New Service Template') }}
                     </a>
-                    <button type="button" title="@lang('Apply Service Templates')" class="btn btn-success" aria-label="@lang('Apply Service Templates')"
+                    <button type="button" title="{{ __('Apply Service Templates') }}" class="btn btn-success" aria-label="{{ __('Apply Service Templates') }}"
                             onclick="applyAll_st(this, '{{ route('services.templates.applyAll') }}')">
                         <i
-                            class="fa fa-refresh" aria-hidden="true"></i> @lang('Apply Service Templates')</button>
+                            class="fa fa-refresh" aria-hidden="true"></i> {{ __('Apply Service Templates') }}</button>
                 </div>
             </div>
             <div class="table-responsive">
                 <table id="manage-services-templates-table" class="table table-condensed table-hover">
                     <thead>
                     <tr>
-                        <th>@lang('Name')</th>
-                        <th>@lang('Description')</th>
-                        <th>@lang('Devices')</th>
-                        <th>@lang('Device Groups')</th>
-                        <th>@lang('Device Type')</th>
-                        <th>@lang('Device Rules')</th>
-                        <th>@lang('Actions')</th>
+                        <th>{{ __('Name') }}</th>
+                        <th>{{ __('Description') }}</th>
+                        <th>{{ __('Devices') }}</th>
+                        <th>{{ __('Device Groups') }}</th>
+                        <th>{{ __('Device Type') }}</th>
+                        <th>{{ __('Device Rules') }}</th>
+                        <th>{{ __('Actions') }}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -49,16 +49,16 @@
                             <td>{{ __(ucfirst($template->type)) }}</td>
                             <td>{{ $template->type == 'dynamic' ? $template->getDeviceParser()->toSql(false) : '' }}</td>
                             <td>
-                                <button type="button" title="@lang('Apply Services for this Service Template')" class="btn btn-success btn-sm" aria-label="@lang('Apply')"
+                                <button type="button" title="{{ __('Apply Services for this Service Template') }}" class="btn btn-success btn-sm" aria-label="{{ __('Apply') }}"
                                     onclick="apply_st(this, '{{ $template->name }}', '{{ $template->id }}', '{{ route('services.templates.apply', $template->id) }}')">
                                     <i class="fa fa-refresh" aria-hidden="true"></i></button>
-                                <button type="button" title="@lang('Remove Services for this Service Template')" class="btn btn-warning btn-sm" aria-label="@lang('Remove')"
+                                <button type="button" title="{{ __('Remove Services for this Service Template') }}" class="btn btn-warning btn-sm" aria-label="{{ __('Remove') }}"
                                     onclick="remove_st(this, '{{ $template->name }}', '{{ $template->id }}', '{{ route('services.templates.remove', $template->id) }}')">
                                     <i class="fa fa-ban" aria-hidden="true"></i></button>
-                                <a type="button" title="@lang('Edit Service Template')" class="btn btn-primary btn-sm" aria-label="@lang('Edit')"
+                                <a type="button" title="{{ __('Edit Service Template') }}" class="btn btn-primary btn-sm" aria-label="{{ __('Edit') }}"
                                     href="{{ route('services.templates.edit', $template->id) }}">
                                     <i class="fa fa-pencil" aria-hidden="true"></i></a>
-                                <button type="button" class="btn btn-danger btn-sm" title="@lang('Delete Service Template')" aria-label="@lang('Delete')"
+                                <button type="button" class="btn btn-danger btn-sm" title="{{ __('Delete Service Template') }}" aria-label="{{ __('Delete') }}"
                                     onclick="delete_st(this, '{{ $template->name }}', '{{ $template->id }}', '{{ route('services.templates.destroy', $template->id) }}')">
                                     <i class="fa fa-trash" aria-hidden="true"></i></button>
                             </td>
@@ -70,20 +70,20 @@
             @foreach($groups as $group)
                 <x-panel id="manage-services-templates-panel-dg">
                     <x-slot name="title">
-                        <i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> @lang($group->name)
+                        <i class="fa fa-th fa-fw fa-lg" aria-hidden="true"></i> {{ __($group->name) }}
                     </x-slot>
                     <div class="table-responsive">
                         <table id="manage-services-templates-table-dg-{{ $group->id }}" class="table table-condensed table-hover">
                             <thead>
                             <tr>
-                                <th>@lang('Name')</th>
-                                <th>@lang('Check Type')</th>
-                                <th>@lang('Parameters')</th>
-                                <th>@lang('Remote Host')</th>
-                                <th>@lang('Description')</th>
-                                <th>@lang('Modified')</th>
-                                <th>@lang('Ignored')</th>
-                                <th>@lang('Disabled')</th>
+                                <th>{{ __('Name') }}</th>
+                                <th>{{ __('Check Type') }}</th>
+                                <th>{{ __('Parameters') }}</th>
+                                <th>{{ __('Remote Host') }}</th>
+                                <th>{{ __('Description') }}</th>
+                                <th>{{ __('Modified') }}</th>
+                                <th>{{ __('Ignored') }}</th>
+                                <th>{{ __('Disabled') }}</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -109,20 +109,20 @@
             @foreach($devices as $device)
                 <x-panel id="manage-services-templates-panel-d">
                     <x-slot name="title">
-                        <i class="fa fa-server fa-fw fa-lg" aria-hidden="true"></i> @lang($device->hostname)
+                        <i class="fa fa-server fa-fw fa-lg" aria-hidden="true"></i> {{ __($device->hostname) }}
                     </x-slot>
                     <div class="table-responsive">
                         <table id="manage-services-templates-table-d-{{ $device->id }}" class="table table-condensed table-hover">
                             <thead>
                             <tr>
-                                <th>@lang('Name')</th>
-                                <th>@lang('Check Type')</th>
-                                <th>@lang('Parameters')</th>
-                                <th>@lang('Remote Host')</th>
-                                <th>@lang('Description')</th>
-                                <th>@lang('Modified')</th>
-                                <th>@lang('Ignored')</th>
-                                <th>@lang('Disabled')</th>
+                                <th>{{ __('Name') }}</th>
+                                <th>{{ __('Check Type') }}</th>
+                                <th>{{ __('Parameters') }}</th>
+                                <th>{{ __('Remote Host') }}</th>
+                                <th>{{ __('Description') }}</th>
+                                <th>{{ __('Modified') }}</th>
+                                <th>{{ __('Ignored') }}</th>
+                                <th>{{ __('Disabled') }}</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -152,7 +152,7 @@
 @section('scripts')
     <script>
         function apply_st(button, name, id, url) {
-            if (confirm('@lang('Are you sure you want to create Services for ')' + name + '?')) {
+            if (confirm('{{ __('Are you sure you want to create Services for ') }}' + name + '?')) {
                 $.ajax({
                     url: url,
                     type: 'POST',
@@ -166,7 +166,7 @@
             }
         }
         function applyAll_st(button, url) {
-            if (confirm('@lang('Are you sure you want to Apply All Service Templates?')')) {
+            if (confirm('{{ __('Are you sure you want to Apply All Service Templates?') }}')) {
                 $.ajax({
                     url: url,
                     type: 'POST',
@@ -180,7 +180,7 @@
             }
         }
         function remove_st(button, name, id, url) {
-            if (confirm('@lang('Are you sure you want to remove all Services created by ')' + name + '?')) {
+            if (confirm('{{ __('Are you sure you want to remove all Services created by ') }}' + name + '?')) {
                 $.ajax({
                     url: url,
                     type: 'POST',
@@ -188,7 +188,7 @@
                         toastr.success(msg);
                     },
                     error: function () {
-                        toastr.error('@lang('No Services for this Service Template were removed')');
+                        toastr.error('{{ __('No Services for this Service Template were removed') }}');
                     }
                 });
             }
@@ -197,7 +197,7 @@
         }
         function delete_st(button, name, id, url) {
             var index = button.parentNode.parentNode.rowIndex;
-            if (confirm('@lang('Are you sure you want to delete AND remove all Services created by ')' + name + '?')) {
+            if (confirm('{{ __('Are you sure you want to delete AND remove all Services created by ') }}' + name + '?')) {
                 $.ajax({
                     url: url,
                     type: 'DELETE',
@@ -206,7 +206,7 @@
                         toastr.success(msg);
                     },
                     error: function () {
-                        toastr.error('@lang('The Service Template could not be deleted')');
+                        toastr.error('{{ __('The Service Template could not be deleted') }}');
                     }
                 });
             }
diff --git a/resources/views/settings/search.blade.php b/resources/views/settings/search.blade.php
index 261ebf3b7a..1aca7a5dc2 100644
--- a/resources/views/settings/search.blade.php
+++ b/resources/views/settings/search.blade.php
@@ -1,6 +1,6 @@
 <form class="form-inline">
     <div class="input-group">
-        <input id="settings-search" type="search" class="form-control" placeholder="@lang('Search Settings')" style="border-radius: 4px">
+        <input id="settings-search" type="search" class="form-control" placeholder="{{ __('Search Settings') }}" style="border-radius: 4px">
     </div>
 </form>
 
diff --git a/resources/views/user/authlog.blade.php b/resources/views/user/authlog.blade.php
index cd4c05c70c..a1ab45e82c 100644
--- a/resources/views/user/authlog.blade.php
+++ b/resources/views/user/authlog.blade.php
@@ -8,17 +8,17 @@
 
 <x-panel id="manage-authlog-panel">
     <x-slot name="title">
-        <i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> @lang('Authlog')
+        <i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> {{ __('Authlog') }}
     </x-slot>
 
     <div class="table-responsive">
         <table id="authlog" class="table table-hover table-condensed table-striped" style="display: none;">
             <thead>
             <tr>
-                <th data-column-id='timestamp'>@lang('Timestamp')</th>
-                <th data-column-id='user'>@lang('User')</th>
-                <th data-column-id='ip'>@lang('IP Address')</th>
-                <th data-column-id='authres'>@lang('Result')</th>
+                <th data-column-id='timestamp'>{{ __('Timestamp') }}</th>
+                <th data-column-id='user'>{{ __('User') }}</th>
+                <th data-column-id='ip'>{{ __('IP Address') }}</th>
+                <th data-column-id='authres'>{{ __('Result') }}</th>
             </tr>
             </thead>
             <tbody id="authlog_rows">
diff --git a/resources/views/user/create.blade.php b/resources/views/user/create.blade.php
index 379c53ab6b..36b96fb74d 100644
--- a/resources/views/user/create.blade.php
+++ b/resources/views/user/create.blade.php
@@ -7,11 +7,11 @@
     <div class="row">
         <form action="{{ route('users.store') }}" method="POST" role="form"
               class="form-horizontal col-md-8 col-md-offset-2">
-            <legend>@lang('Create User')</legend>
+            <legend>{{ __('Create User') }}</legend>
             @csrf
 
             <div class="form-group @if($errors->has('username')) has-error @endif">
-                <label for="realname" class="control-label col-sm-3">@lang('Username')</label>
+                <label for="realname" class="control-label col-sm-3">{{ __('Username') }}</label>
                 <div class="col-sm-9">
                     <input type="text" class="form-control" id="username" name="username"
                            value="{{ old('username', $user->username) }}">
@@ -23,8 +23,8 @@
 
             <div class="form-group">
                 <div class="col-sm-9 col-sm-offset-3">
-                    <button type="submit" class="btn btn-primary">@lang('Save')</button>
-                    <a type="button" class="btn btn-danger" href="{{ route('users.index') }}">@lang('Cancel')</a>
+                    <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
+                    <a type="button" class="btn btn-danger" href="{{ route('users.index') }}">{{ __('Cancel') }}</a>
                 </div>
             </div>
         </form>
diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php
index fe02bfca8a..1062faee35 100644
--- a/resources/views/user/edit.blade.php
+++ b/resources/views/user/edit.blade.php
@@ -7,7 +7,7 @@
     <div class="row">
         <form action="{{ route('users.update', $user->user_id)}}" method="POST" role="form"
               class="form-horizontal col-md-8 col-md-offset-2">
-            <legend>@lang('Edit User'): {{ $user->username }}</legend>
+            <legend>{{ __('Edit User') }}: {{ $user->username }}</legend>
             {{ method_field('PUT') }}
             @csrf
 
@@ -19,23 +19,23 @@
                 @if($twofactor_enabled)
                     @if($twofactor_locked)
                         <div class="form-group" id="twofactor-unlock-form">
-                            <button type="button" id="twofactor-unlock" class="btn btn-default col-sm-4 col-sm-offset-1">@lang('Unlock')</button>
-                            <label for="twofactor-unlock" class="col-sm-7 control-label">@lang('User exceeded failures')</label>
+                            <button type="button" id="twofactor-unlock" class="btn btn-default col-sm-4 col-sm-offset-1">{{ __('Unlock') }}</button>
+                            <label for="twofactor-unlock" class="col-sm-7 control-label">{{ __('User exceeded failures') }}</label>
                         </div>
                     @endif
                     <div class="form-group">
-                        <button type="button" id="twofactor-disable" class="btn btn-danger col-sm-offset-1">@lang('Disable TwoFactor')</button>
+                        <button type="button" id="twofactor-disable" class="btn btn-danger col-sm-offset-1">{{ __('Disable TwoFactor') }}</button>
                     </div>
                 @else
-                    <p>@lang('No TwoFactor key generated for this user, Nothing to do.')</p>
+                    <p>{{ __('No TwoFactor key generated for this user, Nothing to do.') }}</p>
                 @endif
             </x-panel>
             @endconfig
 
             <div class="form-group">
                 <div class="col-sm-9 col-sm-offset-3">
-                    <button type="submit" class="btn btn-primary">@lang('Save')</button>
-                    <a type="button" class="btn btn-danger" href="{{ route('users.index') }}">@lang('Cancel')</a>
+                    <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
+                    <a type="button" class="btn btn-danger" href="{{ route('users.index') }}">{{ __('Cancel') }}</a>
                 </div>
             </div>
         </form>
@@ -55,13 +55,13 @@
                     success: function(data){
                         if (data.status === 'ok') {
                             $('#twofactor-unlock-form').remove();
-                            toastr.success('@lang('Unlocked Two Factor.')');
+                            toastr.success('{{ __('Unlocked Two Factor.') }}');
                         } else {
-                            toastr.error('@lang('Failed to unlock Two Factor')<br />' + data.message);
+                            toastr.error('{{ __('Failed to unlock Two Factor') }}<br />' + data.message);
                         }
                     },
                     error: function(){
-                        toastr.error('@lang('Failed to unlock Two Factor')');
+                        toastr.error('{{ __('Failed to unlock Two Factor') }}');
                     }
                 });
             });
@@ -73,13 +73,13 @@
                     dataType: "json",
                     success: function(data){
                         if (data.status === 'ok') {
-                            toastr.success('@lang('Removed Two Factor.')');
+                            toastr.success('{{ __('Removed Two Factor.') }}');
                         } else {
-                            toastr.error('@lang('Failed to remove Two Factor')<br />' + data.message);
+                            toastr.error('{{ __('Failed to remove Two Factor') }}<br />' + data.message);
                         }
                     },
                     error: function(){
-                        toastr.error('@lang('Failed to remove Two Factor')');
+                        toastr.error('{{ __('Failed to remove Two Factor') }}');
                     }
                 });
             });
diff --git a/resources/views/user/form.blade.php b/resources/views/user/form.blade.php
index 8c42e7b325..725703fc28 100644
--- a/resources/views/user/form.blade.php
+++ b/resources/views/user/form.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has('realname') ? 'has-error' : '' }}">
-    <label for="realname" class="control-label col-sm-3 text-nowrap">@lang('Real Name')</label>
+    <label for="realname" class="control-label col-sm-3 text-nowrap">{{ __('Real Name') }}</label>
     <div class="col-sm-9">
         <input type="text" class="form-control" id="realname" name="realname" value="{{ old('realname', $user->realname) }}">
         <span class="help-block">{{ $errors->first('realname') }}</span>
@@ -8,7 +8,7 @@
 
 @if(\LibreNMS\Config::get('auth_mechanism') == 'mysql')
 <div class="form-group @if($errors->has('enabled')) has-error @endif">
-    <label for="enabled" class="control-label col-sm-3">@lang('Enabled')</label>
+    <label for="enabled" class="control-label col-sm-3">{{ __('Enabled') }}</label>
     <div class="col-sm-9">
         <input type="hidden" value="@if(Auth::id() == $user->user_id) 1 else 0 @endif" name="enabled">
         <input type="checkbox" id="enabled" name="enabled" data-size="small" @if(old('enabled', $user->enabled)) checked @endif @if(Auth::id() == $user->user_id) disabled @endif>
@@ -17,7 +17,7 @@
 @endif
 
 <div class="form-group @if($errors->has('email')) has-error @endif">
-    <label for="email" class="control-label col-sm-3">@lang('Email')</label>
+    <label for="email" class="control-label col-sm-3">{{ __('Email') }}</label>
     <div class="col-sm-9">
         <input type="text" class="form-control" id="email" name="email" value="{{ old('email', $user->email) }}">
         <span class="help-block">{{ $errors->first('email') }}</span>
@@ -25,7 +25,7 @@
 </div>
 
 <div class="form-group @if($errors->has('descr')) has-error @endif">
-    <label for="descr" class="control-label col-sm-3">@lang('Description')</label>
+    <label for="descr" class="control-label col-sm-3">{{ __('Description') }}</label>
     <div class="col-sm-9">
         <input type="text" class="form-control" id="descr" name="descr" value="{{ old('descr', $user->descr) }}">
         <span class="help-block">{{ $errors->first('descr') }}</span>
@@ -34,13 +34,13 @@
 
 @can('admin')
     <div class="form-group @if($errors->has('level')) has-error @endif">
-        <label for="level" class="control-label col-sm-3">@lang('Level')</label>
+        <label for="level" class="control-label col-sm-3">{{ __('Level') }}</label>
         <div class="col-sm-9">
             <select class="form-control" id="level" name="level">
-                <option value="1">@lang('Normal')</option>
-                <option value="5" @if(old('level', $user->level) == 5) selected @endif>@lang('Global Read')</option>
-                <option value="10" @if(old('level', $user->level) == 10) selected @endif>@lang('Admin')</option>
-                @if(old('level', $user->level) == 11)<option value="11" selected>@lang('Demo')</option>@endif
+                <option value="1">{{ __('Normal') }}</option>
+                <option value="5" @if(old('level', $user->level) == 5) selected @endif>{{ __('Global Read') }}</option>
+                <option value="10" @if(old('level', $user->level) == 10) selected @endif>{{ __('Admin') }}</option>
+                @if(old('level', $user->level) == 11)<option value="11" selected>{{ __('Demo') }}</option>@endif
             </select>
             <span class="help-block">{{ $errors->first('level') }}</span>
         </div>
@@ -48,7 +48,7 @@
 @endcan
 
 <div class="form-group @if($errors->has('dashboard')) has-error @endif">
-    <label for="dashboard" class="control-label col-sm-3">@lang('Dashboard')</label>
+    <label for="dashboard" class="control-label col-sm-3">{{ __('Dashboard') }}</label>
     <div class="col-sm-9">
         <select id="dashboard" name="dashboard" class="form-control">
             @foreach($dashboards as $dash)
@@ -61,13 +61,13 @@
 
 @if($user->canSetPassword(auth()->user()))
     <div class="form-group @if($errors->hasAny(['old_password', 'new_password', 'new_password_confirmation'])) has-error @endif">
-        <label for="password" class="control-label col-sm-3">@lang('Password')</label>
+        <label for="password" class="control-label col-sm-3">{{ __('Password') }}</label>
         <div class="col-sm-9">
             @cannot('admin')
-                <input type="password" class="form-control" id="old_password" name="old_password" placeholder="@lang('Current Password')">
+                <input type="password" class="form-control" id="old_password" name="old_password" placeholder="{{ __('Current Password') }}">
             @endcannot
-            <input type="password" autocomplete="off" class="form-control" id="new_password" name="new_password" placeholder="@lang('New Password')">
-            <input type="password" autocomplete="off" class="form-control" id="new_password_confirmation" name="new_password_confirmation" placeholder="@lang('Confirm Password')">
+            <input type="password" autocomplete="off" class="form-control" id="new_password" name="new_password" placeholder="{{ __('New Password') }}">
+            <input type="password" autocomplete="off" class="form-control" id="new_password_confirmation" name="new_password_confirmation" placeholder="{{ __('Confirm Password') }}">
             <span class="help-block">
                 @foreach($errors->get('*password*') as $error)
                     {{ implode(' ', $error) }}
@@ -79,7 +79,7 @@
 
 @if(\LibreNMS\Authentication\LegacyAuth::get()->canUpdatePasswords())
 <div class="form-group @if($errors->has('can_modify_passwd')) has-error @endif">
-    <label for="can_modify_passwd" class="control-label col-sm-3">@lang('Can Modify Password')</label>
+    <label for="can_modify_passwd" class="control-label col-sm-3">{{ __('Can Modify Password') }}</label>
     <div class="col-sm-9">
         <input type="hidden" value="0" name="can_modify_passwd">
         <input type="checkbox" id="can_modify_passwd" name="can_modify_passwd" data-size="small" @if(old('can_modify_passwd', $user->can_modify_passwd)) checked @endif>
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index 693867439b..8247baa267 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -6,27 +6,27 @@
 <div class="container-fluid">
     <x-panel>
         <x-slot name="title">
-            <i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> @lang('Manage Users')
+            <i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> {{ __('Manage Users') }}
         </x-slot>
 
         <div class="table-responsive">
             <table id="users" class="table table-bordered table-condensed" style="display: none;">
                 <thead>
                 <tr>
-                    <th data-column-id="user_id" data-visible="false" data-identifier="true" data-type="numeric">@lang('ID')</th>
-                    <th data-column-id="username">@lang('Username')</th>
-                    <th data-column-id="realname">@lang('Real Name')</th>
-                    <th data-column-id="level" data-formatter="level" data-type="numeric">@lang('Access')</th>
-                    <th data-column-id="auth_type" data-visible="{{ $multiauth ? 'true' : 'false' }}">@lang('auth.title')</th>
-                    <th data-column-id="email">@lang('Email')</th>
+                    <th data-column-id="user_id" data-visible="false" data-identifier="true" data-type="numeric">{{ __('ID') }}</th>
+                    <th data-column-id="username">{{ __('Username') }}</th>
+                    <th data-column-id="realname">{{ __('Real Name') }}</th>
+                    <th data-column-id="level" data-formatter="level" data-type="numeric">{{ __('Access') }}</th>
+                    <th data-column-id="auth_type" data-visible="{{ $multiauth ? 'true' : 'false' }}">{{ __('auth.title') }}</th>
+                    <th data-column-id="email">{{ __('Email') }}</th>
                     @if(\LibreNMS\Authentication\LegacyAuth::getType() == 'mysql')
-                    <th data-column-id="enabled" data-formatter="enabled">@lang('Enabled')</th>
+                    <th data-column-id="enabled" data-formatter="enabled">{{ __('Enabled') }}</th>
                     @endif
                     @config('twofactor')
-                    <th data-column-id="twofactor" data-formatter="twofactor">@lang('2FA')</th>
+                    <th data-column-id="twofactor" data-formatter="twofactor">{{ __('2FA') }}</th>
                     @endconfig
-                    <th data-column-id="descr">@lang('Description')</th>
-                    <th data-column-id="action" data-formatter="actions" data-sortable="false" data-searchable="false">@lang('Actions')</th>
+                    <th data-column-id="descr">{{ __('Description') }}</th>
+                    <th data-column-id="action" data-formatter="actions" data-sortable="false" data-searchable="false">{{ __('Actions') }}</th>
                 </tr>
                 </thead>
                 <tbody id="users_rows">
@@ -78,10 +78,10 @@
                     actions: function (column, row) {
                         var edit_button = '<form action="{{ route('users.edit', ':user_id') }}'.replace(':user_id', row['user_id']) + '" method="GET">' +
                             '@csrf' +
-                            '<button type="submit" title="@lang('Edit')" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></button>' +
+                            '<button type="submit" title="{{ __('Edit') }}" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></button>' +
                             '</form> ';
 
-                        var delete_button = '<button type="button" title="@lang('Delete')" class="btn btn-sm btn-danger" onclick="return delete_user(' + row['user_id'] + ', \'' + row['username'] + '\');">' +
+                        var delete_button = '<button type="button" title="{{ __('Delete') }}" class="btn btn-sm btn-danger" onclick="return delete_user(' + row['user_id'] + ', \'' + row['username'] + '\');">' +
                             '<i class="fa fa-trash"></i></button> ';
 
                         var manage_button = '<form action="{{ url('edituser') }}/" method="GET"';
@@ -91,7 +91,7 @@
                         }
 
                         manage_button += '>@csrf<input type="hidden" name="user_id" value="' + row['user_id'] +
-                            '"><button type="submit" title="@lang('Manage Access')" class="btn btn-sm btn-primary"><i class="fa fa-tasks"></i></button>' +
+                            '"><button type="submit" title="{{ __('Manage Access') }}" class="btn btn-sm btn-primary"><i class="fa fa-tasks"></i></button>' +
                             '</form> ';
 
                         var output = manage_button + edit_button;
@@ -104,20 +104,20 @@
                     level: function (column, row) {
                         var level = row[column.id];
                         if (level == 10) {
-                            return '@lang('Admin')';
+                            return '{{ __('Admin') }}';
                         } else if (level == 5) {
-                            return '@lang('Global Read')';
+                            return '{{ __('Global Read') }}';
                         } else if (level == 11) {
-                            return '@lang('Demo')';
+                            return '{{ __('Demo') }}';
                         }
 
-                        return '@lang('Normal')';
+                        return '{{ __('Normal') }}';
                     }
                 }
             });
 
             @if(\LibreNMS\Config::get('auth_mechanism') == 'mysql')
-                $('.actionBar').append('<div class="pull-left"><a href="{{ route('users.create') }}" type="button" class="btn btn-primary">@lang('Add User')</a></div>');
+                $('.actionBar').append('<div class="pull-left"><a href="{{ route('users.create') }}" type="button" class="btn btn-primary">{{ __('Add User') }}</a></div>');
             @endif
 
             user_grid.css('display', 'table'); // done loading, show
@@ -125,7 +125,7 @@
 
         function delete_user(user_id, username, url)
         {
-            if (confirm('@lang('Are you sure you want to delete ')' + username + '?')) {
+            if (confirm('{{ __('Are you sure you want to delete ') }}' + username + '?')) {
                 $.ajax({
                     url: '{{ route('users.destroy', ':user_id') }}'.replace(':user_id', user_id),
                     type: 'DELETE',
@@ -134,7 +134,7 @@
                         toastr.success(msg);
                     },
                     error: function () {
-                        toastr.error('@lang('The user could not be deleted')');
+                        toastr.error('{{ __('The user could not be deleted') }}');
                     }
                 });
             }
diff --git a/resources/views/user/preferences.blade.php b/resources/views/user/preferences.blade.php
index 3e75620f87..386f7403b5 100644
--- a/resources/views/user/preferences.blade.php
+++ b/resources/views/user/preferences.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 <div class="container">
     <row>
-        <legend>@lang('User Preferences')</legend>
+        <legend>{{ __('User Preferences') }}</legend>
     </row>
 
     @if ($errors->any())
@@ -28,26 +28,26 @@
             <input type="hidden" name="_method" value="PATCH">
             @csrf
             <div class="form-group">
-                <label for="old_password" class="col-sm-4 control-label">@lang('Current Password')</label>
+                <label for="old_password" class="col-sm-4 control-label">{{ __('Current Password') }}</label>
                 <div class="col-sm-4">
                     <input type="password" name="old_password" autocomplete="off" class="form-control input-sm">
                 </div>
             </div>
             <div class="form-group">
-                <label for="new_password" class="col-sm-4 control-label">@lang('New Password')</label>
+                <label for="new_password" class="col-sm-4 control-label">{{ __('New Password') }}</label>
                 <div class="col-sm-4">
                     <input type="password" name="new_password" autocomplete="off" class="form-control input-sm">
                 </div>
             </div>
             <div class="form-group">
-                <label for="new_password_confirmation" class="col-sm-4 control-label">@lang('Verify New Password')</label>
+                <label for="new_password_confirmation" class="col-sm-4 control-label">{{ __('Verify New Password') }}</label>
                 <div class="col-sm-4">
                     <input type="password" name="new_password_confirmation" autocomplete="off" class="form-control input-sm">
                 </div>
             </div>
             <div class="form-group">
                 <div class="col-sm-4 col-sm-offset-3">
-                    <button type="submit" class="btn btn-default">@lang('Change Password')</button>
+                    <button type="submit" class="btn btn-default">{{ __('Change Password') }}</button>
                 </div>
             </div>
         </form>
@@ -58,7 +58,7 @@
         <form class="form-horizontal" role="form">
             @csrf
             <div class="form-group">
-                <label for="dashboard" class="col-sm-4 control-label">@lang('Dashboard')</label>
+                <label for="dashboard" class="col-sm-4 control-label">{{ __('Dashboard') }}</label>
                 <div class="col-sm-4">
                     <select class="form-control ajax-select" name="dashboard" data-pref="dashboard" data-previous="{{ $default_dashboard }}">
                         @foreach($dashboards as $dash)
@@ -68,10 +68,10 @@
                 </div>
             </div>
             <div class="form-group">
-                <label for="site_style" class="col-sm-4 control-label">@lang('CSS Style')</label>
+                <label for="site_style" class="col-sm-4 control-label">{{ __('CSS Style') }}</label>
                 <div class="col-sm-4">
                     <select class="form-control ajax-select" name="site_style" data-pref="site_style" data-previous="{{ $site_style }}">
-                        <option value="default">@lang('Default') ({{ $site_style_default }})</option>
+                        <option value="default">{{ __('Default') }} ({{ $site_style_default }})</option>
                         @foreach($site_styles as $style => $descr)
                             <option value="{{ $style }}" @if($style == $site_style) selected @endif>{{ $descr }}</option>
                         @endforeach
@@ -79,21 +79,21 @@
                 </div>
             </div>
             <div class="form-group">
-                <label for="locale" class="col-sm-4 control-label">@lang('Language')</label>
+                <label for="locale" class="col-sm-4 control-label">{{ __('Language') }}</label>
                 <div class="col-sm-4">
                     <select class="form-control ajax-select" name="locale" data-pref="locale" data-previous="{{ $locale }}">
-                        <option value="default">@lang('Default') ({{ $locale_default }})</option>
+                        <option value="default">{{ __('Default') }} ({{ $locale_default }})</option>
                         @foreach($locales as $lang => $descr)
                             <option value="{{ $lang }}" @if($lang == $locale) selected @endif>{{ $descr }}</option>
                         @endforeach
                     </select>
                 </div>
                 <div class="col-sm-4">
-                    <small>* @lang('Translation not fully supported')</small>
+                    <small>* {{ __('Translation not fully supported') }}</small>
                 </div>
             </div>
             <div class="form-group">
-                <label for="notetodevice" class="col-sm-4 control-label">@lang('Add schedule notes to devices notes')</label>
+                <label for="notetodevice" class="col-sm-4 control-label">{{ __('Add schedule notes to devices notes') }}</label>
                 <div class="col-sm-4">
                     <input id="notetodevice" type="checkbox" name="notetodevice" @if($note_to_device) checked @endif>
                 </div>
@@ -107,48 +107,48 @@
             <div id="twofactorqrcontainer">
                 <div id="twofactorqr"></div>
                 <script>$("#twofactorqr").qrcode({"text": "{{ $twofactor_uri }}"});</script>
-                <button class="btn btn-default" onclick="$('#twofactorkeycontainer').show(); $('#twofactorqrcontainer').hide();">@lang('Manual')</button>
+                <button class="btn btn-default" onclick="$('#twofactorkeycontainer').show(); $('#twofactorqrcontainer').hide();">{{ __('Manual') }}</button>
             </div>
             <div id="twofactorkeycontainer">
                 <form id="twofactorkey" class="form-horizontal" role="form">
                     @csrf
                     <div class="form-group">
-                        <label for="twofactorkey" class="col-sm-4 control-label">@lang('Secret Key')</label>
+                        <label for="twofactorkey" class="col-sm-4 control-label">{{ __('Secret Key') }}</label>
                         <div class="col-sm-4">
                             <input type="text" name="twofactorkey" autocomplete="off" disabled class="form-control input-sm" value="{{ $twofactor['key'] }}" />
                         </div>
                     </div>
                     @if($twofactor['counter'] !== false)
                     <div class="form-group">
-                        <label for="twofactorcounter" class="col-sm-4 control-label">@lang('Counter')</label>
+                        <label for="twofactorcounter" class="col-sm-4 control-label">{{ __('Counter') }}</label>
                         <div class="col-sm-4">
                             <input type="text" name="twofactorcounter" autocomplete="off" disabled class="form-control input-sm" value="{{ $twofactor['counter'] }}" />
                         </div>
                     </div>
                     @endif
                 </form>
-                <button class="btn btn-default" onclick="$('#twofactorkeycontainer').hide(); $('#twofactorqrcontainer').show();">@lang('QR')</button>
+                <button class="btn btn-default" onclick="$('#twofactorkeycontainer').hide(); $('#twofactorqrcontainer').show();">{{ __('QR') }}</button>
             </div>
                 <br/>
                 <form method="post" class="form-horizontal" role="form" action="{{ route('2fa.remove') }}">
                     @csrf
-                    <button class="btn btn-danger" type="submit">@lang('Disable TwoFactor')</button>
+                    <button class="btn btn-danger" type="submit">{{ __('Disable TwoFactor') }}</button>
                 </form>
         @else
             <form method="post" class="form-horizontal" role="form" action="{{ route('2fa.add') }}">
                 @csrf
                 <div class="form-group">
-                    <label for="twofactortype" class="col-sm-4 control-label">@lang('TwoFactor Type')</label>
+                    <label for="twofactortype" class="col-sm-4 control-label">{{ __('TwoFactor Type') }}</label>
                     <div class="col-sm-4">
                         <select name="twofactortype" class="select form-control">
-                            <option value="time">@lang('Time Based (TOTP)')</option>
-                            <option value="counter">@lang('Counter Based (HOTP)')</option>
+                            <option value="time">{{ __('Time Based (TOTP)') }}</option>
+                            <option value="counter">{{ __('Counter Based (HOTP)') }}</option>
                         </select>
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="col-sm-4 col-sm-offset-3">
-                        <button class="btn btn-default" type="submit" id="twofactor-generate">@lang('Generate TwoFactor Secret Key')</button>
+                        <button class="btn btn-default" type="submit" id="twofactor-generate">{{ __('Generate TwoFactor Secret Key') }}</button>
                     </div>
                 </div>
             </form>
@@ -158,14 +158,14 @@
 
     <x-panel title="{{ __('Device Permissions') }}">
         @if(auth()->user()->hasGlobalAdmin())
-            <strong class="blue">@lang('Global Administrative Access')</strong>
+            <strong class="blue">{{ __('Global Administrative Access') }}</strong>
         @elseif(auth()->user()->hasGlobalRead())
-            <strong class="green">@lang('Global Viewing Access')</strong>
+            <strong class="green">{{ __('Global Viewing Access') }}</strong>
         @else
             @forelse($devices as $device)
                 <x-device-link :device="$device" /><br />
             @empty
-                <strong class="red">@lang('No access!')</strong>
+                <strong class="red">{{ __('No access!') }}</strong>
             @endforelse
         @endif
     </x-panel>
diff --git a/resources/views/vminfo.blade.php b/resources/views/vminfo.blade.php
index 51e474535e..77131562d7 100644
--- a/resources/views/vminfo.blade.php
+++ b/resources/views/vminfo.blade.php
@@ -9,12 +9,12 @@
             <tr>
                 <th data-column-id="deviceid" data-visible="false" data-css-class="deviceid">No</th>
                 <th data-column-id="sysname" data-visible="false">Sysname</th>
-                <th data-column-id="vmwVmDisplayName">@lang('Device')</th>
-                <th data-column-id="vmwVmState">@lang('Power Status')</th>
-                <th data-column-id="hostname">@lang('Host')</th>
-                <th data-column-id="vmwVmGuestOS" data-searchable="false">@lang('Operating System')</th>
-                <th data-column-id="vmwVmMemSize" data-searchable="false">@lang('Memory')</th>
-                <th data-column-id="vmwVmCpus" data-searchable="false">@lang('CPU')</th>
+                <th data-column-id="vmwVmDisplayName">{{ __('Device') }}</th>
+                <th data-column-id="vmwVmState">{{ __('Power Status') }}</th>
+                <th data-column-id="hostname">{{ __('Host') }}</th>
+                <th data-column-id="vmwVmGuestOS" data-searchable="false">{{ __('Operating System') }}</th>
+                <th data-column-id="vmwVmMemSize" data-searchable="false">{{ __('Memory') }}</th>
+                <th data-column-id="vmwVmCpus" data-searchable="false">{{ __('CPU') }}</th>
             </tr>
         </thead>
         <tbody>
diff --git a/resources/views/widgets/availability-map.blade.php b/resources/views/widgets/availability-map.blade.php
index 8a4b093622..6ae9fb7cef 100644
--- a/resources/views/widgets/availability-map.blade.php
+++ b/resources/views/widgets/availability-map.blade.php
@@ -1,25 +1,25 @@
 @if($device_totals)
 <div class="widget-availability-host">
-    <span>@lang('Total hosts')</span>
+    <span>{{ __('Total hosts') }}</span>
     @if($show_disabled_and_ignored)
-        <a href="{{ url('devices/disable_notify=1') }}"><span class="label label-default label-font-border label-border">@lang('alert-disabled'): {{ $device_totals['ignored'] }}</span></a>
-        <a href="{{ url('devices/disabled=1') }}"><span class="label blackbg label-font-border label-border">@lang('disabled'): {{ $device_totals['disabled'] }}</span></a>
+        <a href="{{ url('devices/disable_notify=1') }}"><span class="label label-default label-font-border label-border">{{ __('alert-disabled') }}: {{ $device_totals['ignored'] }}</span></a>
+        <a href="{{ url('devices/disabled=1') }}"><span class="label blackbg label-font-border label-border">{{ __('disabled') }}: {{ $device_totals['disabled'] }}</span></a>
     @endif
-    <a href="{{ url('devices/state=up') }}@if($device_group){{ '/group='.$device_group }}@endif"><span class="label label-success label-font-border label-border">@lang('up'): {{ $device_totals['up'] }}</span></a>
-    <span class="label label-warning label-font-border label-border">@lang('warn'): {{ $device_totals['warn'] }}</span>
-    <a href="{{ url('devices/state=down') }}@if($device_group){{ '/group='.$device_group }}@endif"><span class="label label-danger label-font-border label-border">@lang('down'): {{ $device_totals['down'] }}</span></a>
+    <a href="{{ url('devices/state=up') }}@if($device_group){{ '/group='.$device_group }}@endif"><span class="label label-success label-font-border label-border">{{ __('up') }}: {{ $device_totals['up'] }}</span></a>
+    <span class="label label-warning label-font-border label-border">{{ __('warn') }}: {{ $device_totals['warn'] }}</span>
+    <a href="{{ url('devices/state=down') }}@if($device_group){{ '/group='.$device_group }}@endif"><span class="label label-danger label-font-border label-border">{{ __('down') }}: {{ $device_totals['down'] }}</span></a>
     @if($device_totals['maintenance'])
-    <span class="label label-default label-font-border label-border">@lang('maintenance'): {{ $device_totals['maintenance'] }}</span>
+    <span class="label label-default label-font-border label-border">{{ __('maintenance') }}: {{ $device_totals['maintenance'] }}</span>
     @endif
 </div>
 @endif
 
 @if($services_totals)
 <div class="widget-availability-service">
-    <span>@lang('Total services')</span>
-    <span class="label label-success label-font-border label-border">@lang('up'): {{ $services_totals['up'] }}</span>
-    <span class="label label-warning label-font-border label-border">@lang('warn'): {{ $services_totals['warn'] }}</span>
-    <span class="label label-danger label-font-border label-border">@lang('down'): {{ $services_totals['down'] }}</span>
+    <span>{{ __('Total services') }}</span>
+    <span class="label label-success label-font-border label-border">{{ __('up') }}: {{ $services_totals['up'] }}</span>
+    <span class="label label-warning label-font-border label-border">{{ __('warn') }}: {{ $services_totals['warn'] }}</span>
+    <span class="label label-danger label-font-border label-border">{{ __('down') }}: {{ $services_totals['down'] }}</span>
 </div>
 @endif
 
@@ -32,12 +32,12 @@
                 <span class="label {{ $row['labelClass'] }} widget-availability-fixed widget-availability label-font-border"> </span>
             @else
             @if($color_only_select == 2)
-                <span class="label {{ $row['labelClass'] }} widget-availability label-font-border">@lang($row['device']->hostname)</span>
+                <span class="label {{ $row['labelClass'] }} widget-availability label-font-border">{{ __($row['device']->hostname) }}</span>
             @else
             @if($color_only_select == 3)
-                <span class="label {{ $row['labelClass'] }} widget-availability label-font-border">@lang($row['device']->sysName)</span>
+                <span class="label {{ $row['labelClass'] }} widget-availability label-font-border">{{ __($row['device']->sysName) }}</span>
             @else
-                <span class="label {{ $row['labelClass'] }} widget-availability label-font-border">@lang($row['stateName'])</span>
+                <span class="label {{ $row['labelClass'] }} widget-availability label-font-border">{{ __($row['stateName']) }}</span>
             @endif
             @endif
             @endif
diff --git a/resources/views/widgets/device-summary-horiz.blade.php b/resources/views/widgets/device-summary-horiz.blade.php
index d75cf3aa05..cc8c10f30a 100644
--- a/resources/views/widgets/device-summary-horiz.blade.php
+++ b/resources/views/widgets/device-summary-horiz.blade.php
@@ -4,20 +4,20 @@
         <thead>
             <tr>
                 <th>&nbsp;</th>
-                <th><span class="grey">@lang('Total')</span></th>
-                <th><span class="green">@lang('Up')</span></th>
-                <th><span class="red">@lang('Down')</span></th>
-                <th><span class="blue">@lang('Ignore tag')</span></th>
-                <th><span class="grey">@lang('Alert disabled')</span></th>
-                <th><span class="black">@lang('Disabled')</span></th>
+                <th><span class="grey">{{ __('Total') }}</span></th>
+                <th><span class="green">{{ __('Up') }}</span></th>
+                <th><span class="red">{{ __('Down') }}</span></th>
+                <th><span class="blue">{{ __('Ignore tag') }}</span></th>
+                <th><span class="grey">{{ __('Alert disabled') }}</span></th>
+                <th><span class="black">{{ __('Disabled') }}</span></th>
                 @if($summary_errors)
-                    <th class="black">@lang('Errored')</th>
+                    <th class="black">{{ __('Errored') }}</th>
                 @endif
             </tr>
         </thead>
         <tbody>
             <tr>
-                <td><a href="{{ url('devices') }}">@lang('Devices')</a></td>
+                <td><a href="{{ url('devices') }}">{{ __('Devices') }}</a></td>
                 <td><a href="{{ url('devices') }}"><span> {{ $devices['total'] }}</span></a></td>
                 <td><a href="{{ url('devices/state=up/format=list_detail') }}"><span class="green"> {{ $devices['up'] }}</span></a></td>
                 <td><a href="{{ url('devices/state=down/format=list_detail') }}"><span class="red"> {{ $devices['down'] }}</span></a></td>
@@ -29,7 +29,7 @@
                 @endif
             </tr>
             <tr>
-                <td><a href="{{ url('ports') }}">@lang('Ports')</a></td>
+                <td><a href="{{ url('ports') }}">{{ __('Ports') }}</a></td>
                 <td><a href="{{ url('ports') }}"><span>{{ $ports['total'] }}</span></a></td>
                 <td><a href="{{ url('ports/format=list_detail/state=up') }}"><span class="green"> {{ $ports['up'] }}</span></a></td>
                 <td><a href="{{ url('ports/format=list_detail/state=down') }}"><span class="red"> {{ $ports['down'] }}</span></a></td>
@@ -42,7 +42,7 @@
             </tr>
             @if($show_services)
                 <tr>
-                    <td><a href="{{ url('services') }}">@lang('Services')</a></td>
+                    <td><a href="{{ url('services') }}">{{ __('Services') }}</a></td>
                     <td><a href="{{ url('services') }}"><span>{{ $services['total'] }}</span></a></td>
                     <td><a href="{{ url('services/state=ok/view=details') }}"><span class="green">{{ $services['ok'] }}</span></a></td>
                     <td><a href="{{ url('services/state=critical/view=details') }}"><span class="red"> {{ $services['critical'] }}</span></a></td>
diff --git a/resources/views/widgets/device-summary-vert.blade.php b/resources/views/widgets/device-summary-vert.blade.php
index bf79d5ea22..ee39535cc8 100644
--- a/resources/views/widgets/device-summary-vert.blade.php
+++ b/resources/views/widgets/device-summary-vert.blade.php
@@ -3,17 +3,17 @@
         <table class="table table-hover table-condensed table-striped">
             <thead>
             <tr>
-                <th>@lang('Summary')</th>
-                <th><a href="{{ url('devices') }}">@lang('Devices')</a></th>
-                <th><a href="{{ url('ports') }}">@lang('Ports')</a></th>
+                <th>{{ __('Summary') }}</th>
+                <th><a href="{{ url('devices') }}">{{ __('Devices') }}</a></th>
+                <th><a href="{{ url('ports') }}">{{ __('Ports') }}</a></th>
                 @if($show_services)
-                    <th><a href="{{ url('services') }}">@lang('Services')</a></th>
+                    <th><a href="{{ url('services') }}">{{ __('Services') }}</a></th>
                 @endif
             </tr>
             </thead>
             <tbody>
             <tr>
-                <th><span class="green">@lang('Up')</span></th>
+                <th><span class="green">{{ __('Up') }}</span></th>
                 <td><a href="{{ url('devices/format=list_detail/state=up') }}"><span class="green"> {{ $devices['up'] }}</span></a></td>
                 <td><a href="{{ url('ports/format=list_detail/state=up') }}"><span class="green"> {{ $ports['up'] }}</span></a></td>
                 @if($show_services)
@@ -21,7 +21,7 @@
                 @endif
             </tr>
             <tr>
-                <th><span class="red">@lang('Down')</span></th>
+                <th><span class="red">{{ __('Down') }}</span></th>
                 <td><a href="{{ url('devices/format=list_detail/state=down') }}"><span class="red"> {{ $devices['down'] }}</span></a></td>
                 <td><a href="{{ url('ports/format=list_detail/state=down') }}"><span class="red"> {{ $ports['down'] }}</span></a></td>
                 @if($show_services)
@@ -29,7 +29,7 @@
                 @endif
             </tr>
             <tr>
-                <th><span class="blue">@lang('Ignored tag')</span></th>
+                <th><span class="blue">{{ __('Ignored tag') }}</span></th>
                 <td><a href="{{ url('devices/format=list_detail/ignore=1') }}"><span class="blue"> {{ $devices['ignored'] }}</span></a></td>
                 <td><a href="{{ url('ports/format=list_detail/ignore=1') }}"><span class="blue"> {{ $ports['ignored'] }}</span></a></td>
                 @if($show_services)
@@ -37,7 +37,7 @@
                 @endif
             </tr>
             <tr>
-                <th><span class="grey">@lang('Alert disabled')</span></th>
+                <th><span class="grey">{{ __('Alert disabled') }}</span></th>
                 <td><a href="{{ url('devices/format=list_detail/disable_notify=1') }}"><span class="grey"> {{ $devices['disable_notify'] }}</span></a></td>
                 <td><span class="grey"> NA</span></a></td>
                 @if($show_services)
@@ -45,7 +45,7 @@
                 @endif
             </tr>
             <tr>
-                <th><span class="black">@lang('Disabled')/@lang('Shutdown')</span></th>
+                <th><span class="black">{{ __('Disabled') }}/{{ __('Shutdown') }}</span></th>
                 <td><a href="{{ url('devices/format=list_detail/disabled=1') }}"><span class="black"> {{ $devices['disabled'] }}</span></a></td>
                 <td><a href="{{ url('ports/format=list_detail/state=admindown') }}"><span class="black"> {{ $ports['shutdown'] }}</span></a></td>
                 @if($show_services)
@@ -54,7 +54,7 @@
             </tr>
             @if($summary_errors)
             <tr>
-                <th><span class="black">@lang('Errored')</span></th>
+                <th><span class="black">{{ __('Errored') }}</span></th>
                 <td>-</td>
                 <td><a href="{{ url('ports/format=list_detail/errors=1') }}"><span class="black">  {{ $ports['errored'] }}</span></a></td>
                 @if($show_services)
@@ -63,7 +63,7 @@
             </tr>
             @endif
             <tr>
-                <th><span class="grey">@lang('Total')</span></th>
+                <th><span class="grey">{{ __('Total') }}</span></th>
                 <td><a href="{{ url('devices') }}"><span> {{ $devices['total'] }}</span></a></td>
                 <td><a href="{{ url('ports') }}"><span> {{ $ports['total'] }}</span></a></td>
                 @if($show_services)
diff --git a/resources/views/widgets/graylog.blade.php b/resources/views/widgets/graylog.blade.php
index 092bc24bab..e13dcc9c75 100644
--- a/resources/views/widgets/graylog.blade.php
+++ b/resources/views/widgets/graylog.blade.php
@@ -3,11 +3,11 @@
         <thead>
         <tr>
             <th data-column-id="severity" data-sortable="false"></th>
-            <th data-column-id="timestamp" data-formatter="browserTime">@lang('Timestamp')</th>
-            <th data-column-id="level" data-sortable="false">@lang('Level')</th>
-            <th data-column-id="source">@lang('Source')</th>
-            <th data-column-id="message" data-sortable="false">@lang('Message')</th>
-            <th data-column-id="facility" data-sortable="false">@lang('Facility')</th>
+            <th data-column-id="timestamp" data-formatter="browserTime">{{ __('Timestamp') }}</th>
+            <th data-column-id="level" data-sortable="false">{{ __('Level') }}</th>
+            <th data-column-id="source">{{ __('Source') }}</th>
+            <th data-column-id="message" data-sortable="false">{{ __('Message') }}</th>
+            <th data-column-id="facility" data-sortable="false">{{ __('Facility') }}</th>
         </tr>
         </thead>
     </table>
diff --git a/resources/views/widgets/server-stats.blade.php b/resources/views/widgets/server-stats.blade.php
index 369153a803..c60024a174 100644
--- a/resources/views/widgets/server-stats.blade.php
+++ b/resources/views/widgets/server-stats.blade.php
@@ -1,5 +1,5 @@
 <div class="col-sm-{{ $columns }}">
-    <div class="gauge-title">@lang('CPU Usage')</div>
+    <div class="gauge-title">{{ __('CPU Usage') }}</div>
     <div
         id="cpu-{{ $id }}"
         class="gauge-{{ $id }} gauge-container"
@@ -11,7 +11,7 @@
 
 @foreach($mempools as $key => $mem)
     <div class="col-sm-{{ $columns }}">
-        <div class="gauge-title">{{ $mem->mempool_descr}} @lang('Usage')</div>
+        <div class="gauge-title">{{ $mem->mempool_descr}} {{ __('Usage') }}</div>
         <div
             id="mem-{{ $key }}-{{ $id }}"
             class="gauge-{{ $id }} gauge-container"
@@ -24,7 +24,7 @@
 
 @foreach($disks as $key => $disk)
     <div class="col-sm-{{ $columns }}">
-        <div class="gauge-title">{{ $disk->storage_descr}} @lang('Usage')</div>
+        <div class="gauge-title">{{ $disk->storage_descr}} {{ __('Usage') }}</div>
         <div
             id="disk-{{ $key }}-{{ $id }}"
             class="gauge-{{ $id }} gauge-container"
diff --git a/resources/views/widgets/settings/alertlog.blade.php b/resources/views/widgets/settings/alertlog.blade.php
index 923314ca42..06183296f0 100644
--- a/resources/views/widgets/settings/alertlog.blade.php
+++ b/resources/views/widgets/settings/alertlog.blade.php
@@ -2,36 +2,36 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="state-{{ $id }}" class="control-label">@lang('State')</label>
+        <label for="state-{{ $id }}" class="control-label">{{ __('State') }}</label>
         <select class="form-control" name="state" id="state-{{ $id }}">
-            <option value="-1">@lang('not filtered')</option>
-            <option value="0" @if($state === '1') selected @endif>@lang('OK')</option>
-            <option value="1" @if($state === '0') selected @endif>@lang('Alert')</option>
+            <option value="-1">{{ __('not filtered') }}</option>
+            <option value="0" @if($state === '1') selected @endif>{{ __('OK') }}</option>
+            <option value="1" @if($state === '0') selected @endif>{{ __('Alert') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="min_severity-{{ $id }}" class="control-label">@lang('Displayed severity')</label>
+        <label for="min_severity-{{ $id }}" class="control-label">{{ __('Displayed severity') }}</label>
         <select class="form-control" name="min_severity" id="min_severity-{{ $id }}">
-            <option value="">@lang('any severity')</option>
+            <option value="">{{ __('any severity') }}</option>
             @foreach($severities as $name => $val)
                 <option value="{{ $val }}" @if($min_severity == $val) selected @endif>{{ $name }}{{$val > 3 ? '' : ' ' . __('or higher')}}</option>
             @endforeach
         </select>
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation')</label>
+        <label for="hidenavigation-{{ $id }}" class="control-label">{{ __('Hide Navigation') }}</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
     </div>
 @endsection
diff --git a/resources/views/widgets/settings/alertlog_stats.blade.php b/resources/views/widgets/settings/alertlog_stats.blade.php
index 803552cba9..d0598cef6e 100644
--- a/resources/views/widgets/settings/alertlog_stats.blade.php
+++ b/resources/views/widgets/settings/alertlog_stats.blade.php
@@ -2,24 +2,24 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="min_severity-{{ $id }}" class="control-label">@lang('Displayed severity'):</label>
+        <label for="min_severity-{{ $id }}" class="control-label">{{ __('Displayed severity') }}:</label>
         <select class="form-control" name="min_severity" id="min_severity-{{ $id }}">
-            <option value="">@lang('any severity')</option>
+            <option value="">{{ __('any severity') }}</option>
             @foreach($severities as $name => $val)
                 <option value="{{ $val }}" @if($min_severity == $val) selected @endif>{{ $name }}{{$val > 3 ? '' : ' ' . __('or higher')}}</option>
             @endforeach
         </select>
     </div>
     <div class="form-group">
-        <label for="time_interval-{{ $id }}" class="control-label">@lang('Last days')</label>
+        <label for="time_interval-{{ $id }}" class="control-label">{{ __('Last days') }}</label>
         <input class="form-control" name="time_interval" id="time_interval-{{ $id }}" value="{{ $time_interval }}">
     </div>
     <div class="form-group">
-        <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation')</label>
+        <label for="hidenavigation-{{ $id }}" class="control-label">{{ __('Hide Navigation') }}</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
     </div>
 @endsection
diff --git a/resources/views/widgets/settings/alerts.blade.php b/resources/views/widgets/settings/alerts.blade.php
index bc704b1d41..c58ed116ea 100644
--- a/resources/views/widgets/settings/alerts.blade.php
+++ b/resources/views/widgets/settings/alerts.blade.php
@@ -2,77 +2,77 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="acknowledged-{{ $id }}" class="control-label">@lang('Show acknowledged'):</label>
+        <label for="acknowledged-{{ $id }}" class="control-label">{{ __('Show acknowledged') }}:</label>
         <select class="form-control" name="acknowledged" id="acknowledged-{{ $id }}">
-            <option value="">@lang('not filtered')</option>
-            <option value="1" @if($acknowledged === '1') selected @endif>@lang('show only acknowledged')</option>
-            <option value="0" @if($acknowledged === '0') selected @endif>@lang('hide acknowledged')</option>
+            <option value="">{{ __('not filtered') }}</option>
+            <option value="1" @if($acknowledged === '1') selected @endif>{{ __('show only acknowledged') }}</option>
+            <option value="0" @if($acknowledged === '0') selected @endif>{{ __('hide acknowledged') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="fired-{{ $id }}" class="control-label">@lang('Show only fired'):</label>
+        <label for="fired-{{ $id }}" class="control-label">{{ __('Show only fired') }}:</label>
         <select class="form-control" name="fired" id="fired-{{ $id }}">
-            <option value="">@lang('not filtered')</option>
-            <option value="1" @if($fired === '1') selected @endif>@lang('show only fired alerts')</option>
+            <option value="">{{ __('not filtered') }}</option>
+            <option value="1" @if($fired === '1') selected @endif>{{ __('show only fired alerts') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="min_severity-{{ $id }}" class="control-label">@lang('Displayed severity'):</label>
+        <label for="min_severity-{{ $id }}" class="control-label">{{ __('Displayed severity') }}:</label>
         <select class="form-control" name="min_severity" id="min_severity-{{ $id }}">
-            <option value="">@lang('any severity')</option>
+            <option value="">{{ __('any severity') }}</option>
             @foreach($severities as $name => $val)
                 <option value="{{ $val }}" @if($min_severity == $val) selected @endif>{{ $name }}{{$val > 3 ? '' : ' ' . __('or higher')}}</option>
             @endforeach
         </select>
     </div>
     <div class="form-group">
-        <label for="state-{{ $id }}" class="control-label">@lang('State'):</label>
+        <label for="state-{{ $id }}" class="control-label">{{ __('State') }}:</label>
         <select class="form-control" name="state" id="state-{{ $id }}">
-            <option value="">@lang('any state')</option>
+            <option value="">{{ __('any state') }}</option>
             @foreach($states as $name => $val)
                 <option value="{{ $val }}" @if($state === $val) selected @endif>{{ $name }}</option>
             @endforeach
         </select>
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="proc-{{ $id }}" class="control-label">@lang('Show Procedure field'):</label>
+        <label for="proc-{{ $id }}" class="control-label">{{ __('Show Procedure field') }}:</label>
         <select class="form-control" name="proc" id="proc-{{ $id }}">
-            <option value="1" @if($proc == 1) selected @endif>@lang('show')</option>
-            <option value="0" @if($proc == 0) selected @endif>@lang('hide')</option>
+            <option value="1" @if($proc == 1) selected @endif>{{ __('show') }}</option>
+            <option value="0" @if($proc == 0) selected @endif>{{ __('hide') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="location-{{ $id }}" class="control-label">@lang('Show Location field'):</label>
+        <label for="location-{{ $id }}" class="control-label">{{ __('Show Location field') }}:</label>
         <select class="form-control" name="location" id="location-{{ $id }}">
-            <option value="1" @if($location == 1) selected @endif>@lang('show')</option>
-            <option value="0" @if($location == 0) selected @endif>@lang('hide')</option>
+            <option value="1" @if($location == 1) selected @endif>{{ __('show') }}</option>
+            <option value="0" @if($location == 0) selected @endif>{{ __('hide') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="uncollapse_key_count-{{ $id }}" class="control-label">@lang('Automatic uncollapse Alert if length below characters'):</label>
+        <label for="uncollapse_key_count-{{ $id }}" class="control-label">{{ __('Automatic uncollapse Alert if length below characters') }}:</label>
         <input class="form-control" type="uncollapse_key_count" min="1" step="1" name="uncollapse_key_count" id="uncollapse_key_count-{{ $id }}" value="{{ $uncollapse_key_count }}">
     </div>
     <div class="form-group">
-        <label for="sort-{{ $id }}" class="control-label">@lang('Sort alerts by'):</label>
+        <label for="sort-{{ $id }}" class="control-label">{{ __('Sort alerts by') }}:</label>
         <select class="form-control" name="sort" id="sort-{{ $id }}">
-            <option value="" @if($sort == 1) selected @endif>@lang('timestamp, descending')</option>
-            <option value="severity" @if($sort == 0) selected @endif>@lang('severity, descending')</option>
+            <option value="" @if($sort == 1) selected @endif>{{ __('timestamp, descending') }}</option>
+            <option value="severity" @if($sort == 0) selected @endif>{{ __('severity, descending') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation'):</label>
+        <label for="hidenavigation-{{ $id }}" class="control-label">{{ __('Hide Navigation') }}:</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
     </div>
 
diff --git a/resources/views/widgets/settings/availability-map.blade.php b/resources/views/widgets/settings/availability-map.blade.php
index 9500fde4c6..4a76871220 100644
--- a/resources/views/widgets/settings/availability-map.blade.php
+++ b/resources/views/widgets/settings/availability-map.blade.php
@@ -2,63 +2,63 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title for widget')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title for widget') }}" value="{{ $title }}">
     </div>
 
     <div class="form-group">
-        <label for="type-{{ $id }}" class="control-label">@lang('Display type')</label>
+        <label for="type-{{ $id }}" class="control-label">{{ __('Display type') }}</label>
         <select class="form-control" name="type" id="type-{{ $id }}" onchange="toggle_availability_type(this, '{{ $id }}');">
-            <option value="0" @if($type == 0) selected @endif>@lang('boxes')</option>
-            <option value="1" @if($type == 1) selected @endif>@lang('compact')</option>
+            <option value="0" @if($type == 0) selected @endif>{{ __('boxes') }}</option>
+            <option value="1" @if($type == 1) selected @endif>{{ __('compact') }}</option>
         </select>
     </div>
 
     <div class="form-group" id="color_only_select-group-{{ $id }}" style="display: {{ $type == 0 ? 'block' : 'none' }};">
-        <label for="color_only_select-{{ $id }}" class="control-label">@lang('Display Text')</label>
+        <label for="color_only_select-{{ $id }}" class="control-label">{{ __('Display Text') }}</label>
         <select class="form-control" name="color_only_select" id="color_only_select-{{ $id }}">
-            <option value="1" @if($color_only_select == 1) selected @endif>@lang('empty')</option>
-            <option value="2" @if($color_only_select == 2) selected @endunless>@lang('Hostname')</option>
-            <option value="3" @if($color_only_select == 3) selected @endunless>@lang('Sysname')</option>
-            <option value="0" @unless($color_only_select) selected @endunless>@lang('Device Status')</option>
+            <option value="1" @if($color_only_select == 1) selected @endif>{{ __('empty') }}</option>
+            <option value="2" @if($color_only_select == 2) selected @endunless>{{ __('Hostname') }}</option>
+            <option value="3" @if($color_only_select == 3) selected @endunless>{{ __('Sysname') }}</option>
+            <option value="0" @unless($color_only_select) selected @endunless>{{ __('Device Status') }}</option>
         </select>
     </div>
 
     <div class="form-group" id="tile_size-group-{{ $id }}" style="display: {{ $type == 1 ? 'block' : 'none' }};">
-        <label for="tile_size-{{ $id }}" class="control-label">@lang('Tile size')</label>
-        <input type="text" class="form-control" name="tile_size" id="tile_size-{{ $id }}" placeholder="@lang('Tile size')" value="{{ $tile_size }}">
+        <label for="tile_size-{{ $id }}" class="control-label">{{ __('Tile size') }}</label>
+        <input type="text" class="form-control" name="tile_size" id="tile_size-{{ $id }}" placeholder="{{ __('Tile size') }}" value="{{ $tile_size }}">
     </div>
 
     <div class="form-group">
-        <label for="show_disabled_and_ignored-{{ $id }}" class="control-label">@lang('Disabled polling/alerting')</label>
+        <label for="show_disabled_and_ignored-{{ $id }}" class="control-label">{{ __('Disabled polling/alerting') }}</label>
         <select class="form-control" name="show_disabled_and_ignored" id="show_disabled_and_ignored-{{ $id }}">
-            <option value="1" @if($show_disabled_and_ignored) selected @endif>@lang('Show')</option>
-            <option value="0" @unless($show_disabled_and_ignored) selected @endunless>@lang('Hide')</option>
+            <option value="1" @if($show_disabled_and_ignored) selected @endif>{{ __('Show') }}</option>
+            <option value="0" @unless($show_disabled_and_ignored) selected @endunless>{{ __('Hide') }}</option>
         </select>
     </div>
 
     <div class="form-group">
-        <label for="mode_select-{{ $id }}" class="control-label">@lang('Mode select')</label>
+        <label for="mode_select-{{ $id }}" class="control-label">{{ __('Mode select') }}</label>
         <select class="form-control" name="mode_select" id="mode_select-{{ $id }}">
-            <option value="0" @if($mode_select == 0) selected @endif>@lang('only devices')</option>
+            <option value="0" @if($mode_select == 0) selected @endif>{{ __('only devices') }}</option>
             @config('show_services')
-            <option value="1" @if($mode_select == 1) selected @endif>@lang('only services')</option>
-            <option value="2" @if($mode_select == 2) selected @endif>@lang('devices and services')</option>
+            <option value="1" @if($mode_select == 1) selected @endif>{{ __('only services') }}</option>
+            <option value="2" @if($mode_select == 2) selected @endif>{{ __('devices and services') }}</option>
             @endconfig
         </select>
     </div>
 
     <div class="form-group">
-        <label for="order_by-{{ $id }}" class="control-label">@lang('Order By')</label>
+        <label for="order_by-{{ $id }}" class="control-label">{{ __('Order By') }}</label>
         <select class="form-control" name="order_by" id="order_by-{{ $id }}">
-            <option value="hostname" @if($order_by == 'hostname') selected @endif>@lang('Hostname')</option>
-            <option value="status" @if($order_by == 'status') selected @endif>@lang('Status')</option>
+            <option value="hostname" @if($order_by == 'hostname') selected @endif>{{ __('Hostname') }}</option>
+            <option value="status" @if($order_by == 'status') selected @endif>{{ __('Status') }}</option>
         </select>
     </div>
 
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/settings/base.blade.php b/resources/views/widgets/settings/base.blade.php
index ef96054b58..bf7c55ea22 100644
--- a/resources/views/widgets/settings/base.blade.php
+++ b/resources/views/widgets/settings/base.blade.php
@@ -3,11 +3,11 @@
     @yield('form')
 
     <div class="form-group">
-        <label for="refresh-{{ $id }}" class="control-label">@lang('Widget refresh interval (s)')</label>
+        <label for="refresh-{{ $id }}" class="control-label">{{ __('Widget refresh interval (s)') }}</label>
         <input type="number" step="1" min="1" class="form-control" name="refresh" id="refresh-{{ $id }}" value="{{ $refresh }}">
     </div>
     <div style="margin-top: 8px;">
-            <button type="submit" class="btn btn-primary pull-right">@lang('Save')</button>
+            <button type="submit" class="btn btn-primary pull-right">{{ __('Save') }}</button>
     </div>
 </form>
 
diff --git a/resources/views/widgets/settings/component-status.blade.php b/resources/views/widgets/settings/component-status.blade.php
index 4c13d58026..ad7930e76c 100644
--- a/resources/views/widgets/settings/component-status.blade.php
+++ b/resources/views/widgets/settings/component-status.blade.php
@@ -2,8 +2,8 @@
 
 @section('form')
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/settings/device-summary.blade.php b/resources/views/widgets/settings/device-summary.blade.php
index af3cd804b7..fa031464c0 100644
--- a/resources/views/widgets/settings/device-summary.blade.php
+++ b/resources/views/widgets/settings/device-summary.blade.php
@@ -2,18 +2,18 @@
 
 @section('form')
     <div class="form-group">
-        <label for="show_services-{{ $id }}" class="control-label">@lang('Show Services')</label>
+        <label for="show_services-{{ $id }}" class="control-label">{{ __('Show Services') }}</label>
             <select class="form-control" id="show_services-{{ $id }}" name="show_services">
-                <option value="0" @unless($show_services) selected @endunless>@lang('no')</option>
-                <option value="1" @if($show_services) selected @endif>@lang('yes')</option>
+                <option value="0" @unless($show_services) selected @endunless>{{ __('no') }}</option>
+                <option value="1" @if($show_services) selected @endif>{{ __('yes') }}</option>
             </select>
         </div>
     </div>
     <div class="form-group">
-        <label for="summary_errors-{{ $id }}" class="control-label">@lang('Show Port Errors')</label>
+        <label for="summary_errors-{{ $id }}" class="control-label">{{ __('Show Port Errors') }}</label>
         <select class="form-control" id="summary_errors-{{ $id }}" name="summary_errors">
-            <option value="0" @unless($summary_errors) selected @endunless>@lang('no')</option>
-            <option value="1" @if($summary_errors) selected @endif>@lang('yes')</option>
+            <option value="0" @unless($summary_errors) selected @endunless>{{ __('no') }}</option>
+            <option value="1" @if($summary_errors) selected @endif>{{ __('yes') }}</option>
         </select>
     </div>
 @endsection
diff --git a/resources/views/widgets/settings/eventlog.blade.php b/resources/views/widgets/settings/eventlog.blade.php
index ccb6450b33..9e08bbacef 100644
--- a/resources/views/widgets/settings/eventlog.blade.php
+++ b/resources/views/widgets/settings/eventlog.blade.php
@@ -2,35 +2,35 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="device-{{ $id }}" class="control-label">@lang('Device')</label>
-        <select class="form-control" id="device-{{ $id }}" name="device" data-placeholder="@lang('All devices')">
+        <label for="device-{{ $id }}" class="control-label">{{ __('Device') }}</label>
+        <select class="form-control" id="device-{{ $id }}" name="device" data-placeholder="{{ __('All devices') }}">
             @if($device)
                 <option value="{{ $device->device_id }}">{{ $device->displayName() }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="eventtype-{{ $id }}" class="control-label">@lang('Event type')</label>
-        <select class="form-control" id="eventtype-{{ $id }}" name="eventtype" data-placeholder="@lang('All types')" data-tags="true">
+        <label for="eventtype-{{ $id }}" class="control-label">{{ __('Event type') }}</label>
+        <select class="form-control" id="eventtype-{{ $id }}" name="eventtype" data-placeholder="{{ __('All types') }}" data-tags="true">
             @if($eventtype)
                 <option value="{{ $eventtype }}">{{ $eventtype }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation')</label>
+        <label for="hidenavigation-{{ $id }}" class="control-label">{{ __('Hide Navigation') }}</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
     </div>
 @endsection
diff --git a/resources/views/widgets/settings/globe.blade.php b/resources/views/widgets/settings/globe.blade.php
index 1e45cb7b9d..e1d10d0c02 100644
--- a/resources/views/widgets/settings/globe.blade.php
+++ b/resources/views/widgets/settings/globe.blade.php
@@ -2,31 +2,31 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Default Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Default Title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="markers-{{ $id }}" class="control-label">@lang('Markers')</label>
+        <label for="markers-{{ $id }}" class="control-label">{{ __('Markers') }}</label>
         <select class="form-control" id="markers-{{ $id }}" name="markers">
-            <option value="devices" @if($markers == 'devices') selected @endif>@lang('Devices')</option>
-            <option value="ports" @if($markers == 'ports') selected @endif>@lang('Ports')</option>
+            <option value="devices" @if($markers == 'devices') selected @endif>{{ __('Devices') }}</option>
+            <option value="ports" @if($markers == 'ports') selected @endif>{{ __('Ports') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="resolution-{{ $id }}-{{ $id }}" class="control-label">@lang('Resolution')</label>
+        <label for="resolution-{{ $id }}-{{ $id }}" class="control-label">{{ __('Resolution') }}</label>
         <select class="form-control" id="resolution-{{ $id }}" name="resolution">
-            <option value="countries" @if($resolution == 'countries') selected @endif>@lang('Countries')</option>
-            <option value="provinces" @if($resolution == 'provinces') selected @endif>@lang('Provinces')</option>
-            <option value="metros" @if($resolution == 'metros') selected @endif>@lang('Metros')</option>
+            <option value="countries" @if($resolution == 'countries') selected @endif>{{ __('Countries') }}</option>
+            <option value="provinces" @if($resolution == 'provinces') selected @endif>{{ __('Provinces') }}</option>
+            <option value="metros" @if($resolution == 'metros') selected @endif>{{ __('Metros') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="region-{{ $id }}" class="control-label">@lang('Region') <a target="_blank" href="https://developers.google.com/chart/interactive/docs/gallery/geochart#configuration-options">@lang('Help')</a></label>
+        <label for="region-{{ $id }}" class="control-label">{{ __('Region') }} <a target="_blank" href="https://developers.google.com/chart/interactive/docs/gallery/geochart#configuration-options">{{ __('Help') }}</a></label>
         <input type="text" class="form-control" name="region" id="region-{{ $id }}" value="{{ $region }}">
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/settings/graph.blade.php b/resources/views/widgets/settings/graph.blade.php
index 263cd47338..1f929a4f26 100644
--- a/resources/views/widgets/settings/graph.blade.php
+++ b/resources/views/widgets/settings/graph.blade.php
@@ -2,101 +2,101 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Automatic Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Automatic Title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="graph_type-{{ $id }}" class="control-label">@lang('Graph type')</label>
-        <select class="form-control" id="graph_type-{{ $id }}" name="graph_type" required data-placeholder="@lang('Select a graph')" onchange="switch_graph_type{{ $id }}(this.value);">
+        <label for="graph_type-{{ $id }}" class="control-label">{{ __('Graph type') }}</label>
+        <select class="form-control" id="graph_type-{{ $id }}" name="graph_type" required data-placeholder="{{ __('Select a graph') }}" onchange="switch_graph_type{{ $id }}(this.value);">
             @if($graph_type)
                 <option value="{{ $graph_type }}">{{ $graph_text }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="graph_legend-{{ $id }}" class="control-label">@lang('Show legend')</label>
+        <label for="graph_legend-{{ $id }}" class="control-label">{{ __('Show legend') }}</label>
         <select class="form-control" id="graph_legend-{{ $id }}" name="graph_legend">
-            <option value="yes" @if($graph_legend == 'yes') selected @endif>@lang('yes')</option>
-            <option value="no" @if($graph_legend == 'no') selected @endif>@lang('no')</option>
+            <option value="yes" @if($graph_legend == 'yes') selected @endif>{{ __('yes') }}</option>
+            <option value="no" @if($graph_legend == 'no') selected @endif>{{ __('no') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="graph_range-{{ $id }}" class="control-label">@lang('Date range')</label>
+        <label for="graph_range-{{ $id }}" class="control-label">{{ __('Date range') }}</label>
         <select class="form-control" id="graph_range-{{ $id }}" name="graph_range">
-            <option value="onehour" @if($graph_range == 'onehour') selected @endif>@lang('One Hour')</option>
-            <option value="fourhour" @if($graph_range == 'fourhour') selected @endif>@lang('Four Hours')</option>
-            <option value="sixhour" @if($graph_range == 'sixhour') selected @endif>@lang('Six Hours')</option>
-            <option value="twelvehour" @if($graph_range == 'twelvehour') selected @endif>@lang('Twelve Hours')</option>
-            <option value="day" @if($graph_range == 'day') selected @endif>@lang('One Day')</option>
-            <option value="twoday" @if($graph_range == 'twoday') selected @endif>@lang('Two Days')</option>
-            <option value="week" @if($graph_range == 'week') selected @endif>@lang('One Week')</option>
-            <option value="twoweek" @if($graph_range == 'twoweek') selected @endif>@lang('Two Weeks')</option>
-            <option value="month" @if($graph_range == 'month') selected @endif>@lang('One Month')</option>
-            <option value="twomonth" @if($graph_range == 'twomonth') selected @endif>@lang('Two Months')</option>
-            <option value="threemonth" @if($graph_range == 'threemonth') selected @endif>@lang('Three Months')</option>
-            <option value="year" @if($graph_range == 'year') selected @endif>@lang('One Year')</option>
-            <option value="twoyear" @if($graph_range == 'twoyear') selected @endif>@lang('Two Years')</option>
+            <option value="onehour" @if($graph_range == 'onehour') selected @endif>{{ __('One Hour') }}</option>
+            <option value="fourhour" @if($graph_range == 'fourhour') selected @endif>{{ __('Four Hours') }}</option>
+            <option value="sixhour" @if($graph_range == 'sixhour') selected @endif>{{ __('Six Hours') }}</option>
+            <option value="twelvehour" @if($graph_range == 'twelvehour') selected @endif>{{ __('Twelve Hours') }}</option>
+            <option value="day" @if($graph_range == 'day') selected @endif>{{ __('One Day') }}</option>
+            <option value="twoday" @if($graph_range == 'twoday') selected @endif>{{ __('Two Days') }}</option>
+            <option value="week" @if($graph_range == 'week') selected @endif>{{ __('One Week') }}</option>
+            <option value="twoweek" @if($graph_range == 'twoweek') selected @endif>{{ __('Two Weeks') }}</option>
+            <option value="month" @if($graph_range == 'month') selected @endif>{{ __('One Month') }}</option>
+            <option value="twomonth" @if($graph_range == 'twomonth') selected @endif>{{ __('Two Months') }}</option>
+            <option value="threemonth" @if($graph_range == 'threemonth') selected @endif>{{ __('Three Months') }}</option>
+            <option value="year" @if($graph_range == 'year') selected @endif>{{ __('One Year') }}</option>
+            <option value="twoyear" @if($graph_range == 'twoyear') selected @endif>{{ __('Two Years') }}</option>
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_device-{{ $id }}" style="display: none;">
-        <label for="graph_device-{{ $id }}" class="control-label">@lang('Device')</label>
-        <select class="form-control" id="graph_device-{{ $id }}" name="graph_device" data-placeholder="@lang('Select a device')">
+        <label for="graph_device-{{ $id }}" class="control-label">{{ __('Device') }}</label>
+        <select class="form-control" id="graph_device-{{ $id }}" name="graph_device" data-placeholder="{{ __('Select a device') }}">
             @if($graph_device)
                 <option value="{{ $graph_device }}">{{ $device_text }}</option>
             @endif
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_port-{{ $id }}" style="display: none;">
-        <label for="graph_port-{{ $id }}" class="control-label">@lang('Port')</label>
-        <select class="form-control" id="graph_port-{{ $id }}" name="graph_port" data-placeholder="@lang('Select a port')">
+        <label for="graph_port-{{ $id }}" class="control-label">{{ __('Port') }}</label>
+        <select class="form-control" id="graph_port-{{ $id }}" name="graph_port" data-placeholder="{{ __('Select a port') }}">
         @if($graph_port)
             <option value="{{ $graph_port }}">{{ $port_text }}</option>
         @endif
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_application-{{ $id }}" style="display: none;">
-        <label for="graph_application-{{ $id }}" class="control-label">@lang('Application')</label>
-        <select class="form-control" id="graph_application-{{ $id }}" name="graph_application" data-placeholder="@lang('Select an application')">
+        <label for="graph_application-{{ $id }}" class="control-label">{{ __('Application') }}</label>
+        <select class="form-control" id="graph_application-{{ $id }}" name="graph_application" data-placeholder="{{ __('Select an application') }}">
         @if($graph_application)
             <option value="{{ $graph_application }}">{{ $application_text }}</option>
         @endif
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_munin-{{ $id }}" style="display: none;">
-        <label for="graph_munin-{{ $id }}" class="control-label">@lang('Munin plugin')</label>
-        <select class="form-control" id="graph_munin-{{ $id }}" name="graph_munin" data-placeholder="@lang('Select a Munin plugin')">
+        <label for="graph_munin-{{ $id }}" class="control-label">{{ __('Munin plugin') }}</label>
+        <select class="form-control" id="graph_munin-{{ $id }}" name="graph_munin" data-placeholder="{{ __('Select a Munin plugin') }}">
         @if($graph_munin)
             <option value="{{ $graph_munin }}">{{ $munin_text }}</option>
         @endif
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_service-{{ $id }}" style="display: none;">
-        <label for="graph_service-{{ $id }}" class="control-label">@lang('Service')</label>
-        <select class="form-control" id="graph_service-{{ $id }}" name="graph_service" data-placeholder="@lang('Select a service')">
+        <label for="graph_service-{{ $id }}" class="control-label">{{ __('Service') }}</label>
+        <select class="form-control" id="graph_service-{{ $id }}" name="graph_service" data-placeholder="{{ __('Select a service') }}">
         @if($graph_service)
             <option value="{{ $graph_service }}">{{ $service_text }}</option>
         @endif
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_bill-{{ $id }}" style="display: none;">
-        <label for="graph_bill-{{ $id }}" class="control-label">@lang('Bill')</label>
-        <select class="form-control" id="graph_bill-{{ $id }}" name="graph_bill" data-placeholder="@lang('Select a bill')">
+        <label for="graph_bill-{{ $id }}" class="control-label">{{ __('Bill') }}</label>
+        <select class="form-control" id="graph_bill-{{ $id }}" name="graph_bill" data-placeholder="{{ __('Select a bill') }}">
         @if($graph_bill)
             <option value="{{ $graph_bill }}">{{ $bill_text }}</option>
         @endif
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_custom-{{ $id }}" style="display: none;">
-        <label for="graph_custom-{{ $id }}" class="control-label">@lang('Custom Aggregator(s)')</label>
-        <select class="form-control" id="graph_custom-{{ $id }}" name="graph_custom[]" data-tags="true" multiple="multiple" data-placeholder="@lang('Select or add one or more')">
+        <label for="graph_custom-{{ $id }}" class="control-label">{{ __('Custom Aggregator(s)') }}</label>
+        <select class="form-control" id="graph_custom-{{ $id }}" name="graph_custom[]" data-tags="true" multiple="multiple" data-placeholder="{{ __('Select or add one or more') }}">
             @foreach($graph_custom as $custom)
                 <option value="{{ $custom }}" selected>{{ ucwords($custom) }}</option>
             @endforeach
         </select>
     </div>
     <div class="form-group graph_select_extra-{{ $id }}" id="graph_select_ports-{{ $id }}" style="display: none;">
-        <label for="graph_ports-{{ $id }}" class="control-label">@lang('Ports')</label>
-        <select class="form-control" id="graph_ports-{{ $id }}" name="graph_ports[]" multiple="multiple" data-placeholder="@lang('Select one or more')">
+        <label for="graph_ports-{{ $id }}" class="control-label">{{ __('Ports') }}</label>
+        <select class="form-control" id="graph_ports-{{ $id }}" name="graph_ports[]" multiple="multiple" data-placeholder="{{ __('Select one or more') }}">
             @foreach($graph_ports as $port)
                 <option value="{{ $port->port_id }}" selected>{{ $port->device->shortDisplayName() . ' - ' . $port->getShortLabel() }}</option>
             @endforeach
diff --git a/resources/views/widgets/settings/graylog.blade.php b/resources/views/widgets/settings/graylog.blade.php
index d5a3b935c1..20778ba134 100644
--- a/resources/views/widgets/settings/graylog.blade.php
+++ b/resources/views/widgets/settings/graylog.blade.php
@@ -2,13 +2,13 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Default Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Default Title') }}" value="{{ $title }}">
     </div>
 
     <div class="form-group">
-        <label for="stream-{{ $id }}" class="control-label">@lang('Stream')</label>
-        <select class="form-control" id="stream-{{ $id }}" name="stream" data-placeholder="@lang('All Messages')">
+        <label for="stream-{{ $id }}" class="control-label">{{ __('Stream') }}</label>
+        <select class="form-control" id="stream-{{ $id }}" name="stream" data-placeholder="{{ __('All Messages') }}">
             @if($stream)
                 <option value="{{ $stream }}">{{ $stream }}</option>
             @endif
@@ -16,8 +16,8 @@
     </div>
 
     <div class="form-group">
-        <label for="device-{{ $id }}" class="control-label">@lang('Device')</label>
-        <select class="form-control" id="device-{{ $id }}" name="device" data-placeholder="@lang('All Devices')">
+        <label for="device-{{ $id }}" class="control-label">{{ __('Device') }}</label>
+        <select class="form-control" id="device-{{ $id }}" name="device" data-placeholder="{{ __('All Devices') }}">
             @if($device)
                 <option value="{{ $device->device_id }}">{{ $device->displayName() }}</option>
             @endif
@@ -25,46 +25,46 @@
     </div>
 
     <div class="form-group">
-        <label for="limit-{{ $id }}" class="control-label">@lang('Page Size')</label>
-        <input type="number" min="1" class="form-control" name="limit" id="limit-{{ $id }}" placeholder="@lang('Page Size')" value="{{ $limit }}">
+        <label for="limit-{{ $id }}" class="control-label">{{ __('Page Size') }}</label>
+        <input type="number" min="1" class="form-control" name="limit" id="limit-{{ $id }}" placeholder="{{ __('Page Size') }}" value="{{ $limit }}">
     </div>
 
     <div class="form-group">
-        <label for="loglevel-{{ $id }}" class="control-label">@lang('Log Level')</label>
+        <label for="loglevel-{{ $id }}" class="control-label">{{ __('Log Level') }}</label>
         <select name="loglevel" id="loglevel-{{ $id }}" class="form-control">
-            <option value="" disabled @if($loglevel == null) selected @endif>@lang('Minimum log Level')</option>
-            <option value="0" @if($loglevel === 0) selected @endif>(0) @lang('syslog.severity.0')</option>
-            <option value="1" @if($loglevel == 1) selected @endif>(1) @lang('syslog.severity.1')</option>
-            <option value="2" @if($loglevel == 2) selected @endif>(2) @lang('syslog.severity.2')</option>
-            <option value="3" @if($loglevel == 3) selected @endif>(3) @lang('syslog.severity.3')</option>
-            <option value="4" @if($loglevel == 4) selected @endif>(4) @lang('syslog.severity.4')</option>
-            <option value="5" @if($loglevel == 5) selected @endif>(5) @lang('syslog.severity.5')</option>
-            <option value="6" @if($loglevel == 6) selected @endif>(6) @lang('syslog.severity.6')</option>
-            <option value="7" @if($loglevel == 7) selected @endif>(7) @lang('syslog.severity.7')</option>
+            <option value="" disabled @if($loglevel == null) selected @endif>{{ __('Minimum log Level') }}</option>
+            <option value="0" @if($loglevel === 0) selected @endif>(0) {{ __('syslog.severity.0') }}</option>
+            <option value="1" @if($loglevel == 1) selected @endif>(1) {{ __('syslog.severity.1') }}</option>
+            <option value="2" @if($loglevel == 2) selected @endif>(2) {{ __('syslog.severity.2') }}</option>
+            <option value="3" @if($loglevel == 3) selected @endif>(3) {{ __('syslog.severity.3') }}</option>
+            <option value="4" @if($loglevel == 4) selected @endif>(4) {{ __('syslog.severity.4') }}</option>
+            <option value="5" @if($loglevel == 5) selected @endif>(5) {{ __('syslog.severity.5') }}</option>
+            <option value="6" @if($loglevel == 6) selected @endif>(6) {{ __('syslog.severity.6') }}</option>
+            <option value="7" @if($loglevel == 7) selected @endif>(7) {{ __('syslog.severity.7') }}</option>
         </select>
     </div>
 
 
     <div class="form-group">
-        <label for="range-{{ $id }}" class="control-label">@lang('Time Range')</label>
+        <label for="range-{{ $id }}" class="control-label">{{ __('Time Range') }}</label>
         <select name="range" id="range-{{ $id }}" class="form-control">
-            <option value="0" @if($range == 0) selected @endif>@lang('Search all time')</option>
-            <option value="300" @if($range == 300) selected @endif>@lang('Search last 5 minutes')</option>
-            <option value="900" @if($range == 900) selected @endif>@lang('Search last 15 minutes')</option>
-            <option value="1800" @if($range == 1800) selected @endif>@lang('Search last 30 minutes')</option>
-            <option value="3600" @if($range == 3600) selected @endif>@lang('Search last 1 hour')</option>
-            <option value="7200" @if($range == 7200) selected @endif>@lang('Search last 2 hours')</option>
-            <option value="28800" @if($range == 28800) selected @endif>@lang('Search last 8 hours')</option>
-            <option value="86400" @if($range == 86400) selected @endif>@lang('Search last 1 day')</option>
-            <option value="172800" @if($range == 172800) selected @endif>@lang('Search last 2 days')</option>
-            <option value="432000" @if($range == 432000) selected @endif>@lang('Search last 5 days')</option>
-            <option value="604800" @if($range == 604800) selected @endif>@lang('Search last 7 days')</option>
-            <option value="1209600" @if($range == 1209600) selected @endif>@lang('Search last 14 days')</option>
-            <option value="2592000" @if($range == 2592000) selected @endif>@lang('Search last 30 days')</option>
+            <option value="0" @if($range == 0) selected @endif>{{ __('Search all time') }}</option>
+            <option value="300" @if($range == 300) selected @endif>{{ __('Search last 5 minutes') }}</option>
+            <option value="900" @if($range == 900) selected @endif>{{ __('Search last 15 minutes') }}</option>
+            <option value="1800" @if($range == 1800) selected @endif>{{ __('Search last 30 minutes') }}</option>
+            <option value="3600" @if($range == 3600) selected @endif>{{ __('Search last 1 hour') }}</option>
+            <option value="7200" @if($range == 7200) selected @endif>{{ __('Search last 2 hours') }}</option>
+            <option value="28800" @if($range == 28800) selected @endif>{{ __('Search last 8 hours') }}</option>
+            <option value="86400" @if($range == 86400) selected @endif>{{ __('Search last 1 day') }}</option>
+            <option value="172800" @if($range == 172800) selected @endif>{{ __('Search last 2 days') }}</option>
+            <option value="432000" @if($range == 432000) selected @endif>{{ __('Search last 5 days') }}</option>
+            <option value="604800" @if($range == 604800) selected @endif>{{ __('Search last 7 days') }}</option>
+            <option value="1209600" @if($range == 1209600) selected @endif>{{ __('Search last 14 days') }}</option>
+            <option value="2592000" @if($range == 2592000) selected @endif>{{ __('Search last 30 days') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation')</label>
+        <label for="hidenavigation-{{ $id }}" class="control-label">{{ __('Hide Navigation') }}</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
     </div>
 @endsection
diff --git a/resources/views/widgets/settings/image.blade.php b/resources/views/widgets/settings/image.blade.php
index c739ef9c83..172d3aba8b 100644
--- a/resources/views/widgets/settings/image.blade.php
+++ b/resources/views/widgets/settings/image.blade.php
@@ -2,17 +2,17 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Default Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Default Title') }}" value="{{ $title }}">
     </div>
 
     <div class="form-group">
-        <label for="image_url-{{ $id }}" class="control-label">@lang('Image URL')</label>
-        <input type="text" class="form-control" name="image_url" id="image_url-{{ $id }}" placeholder="@lang('Image URL')" value="{{ $image_url }}" required>
+        <label for="image_url-{{ $id }}" class="control-label">{{ __('Image URL') }}</label>
+        <input type="text" class="form-control" name="image_url" id="image_url-{{ $id }}" placeholder="{{ __('Image URL') }}" value="{{ $image_url }}" required>
     </div>
 
     <div class="form-group">
-        <label for="target_url-{{ $id }}" class="control-label">@lang('Target URL')</label>
-        <input type="text" class="form-control" name="target_url" id="target_url-{{ $id }}" placeholder="@lang('Target URL')" value="{{ $target_url }}">
+        <label for="target_url-{{ $id }}" class="control-label">{{ __('Target URL') }}</label>
+        <input type="text" class="form-control" name="target_url" id="target_url-{{ $id }}" placeholder="{{ __('Target URL') }}" value="{{ $target_url }}">
     </div>
 @endsection
diff --git a/resources/views/widgets/settings/notes.blade.php b/resources/views/widgets/settings/notes.blade.php
index 73ed229a55..614407e9bc 100644
--- a/resources/views/widgets/settings/notes.blade.php
+++ b/resources/views/widgets/settings/notes.blade.php
@@ -2,12 +2,12 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Default Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Default Title') }}" value="{{ $title }}">
     </div>
 
     <div class="form-group">
-        <label for="notes-{{ $id }}" class="control-label">@lang('Notes')</label>
+        <label for="notes-{{ $id }}" class="control-label">{{ __('Notes') }}</label>
         <textarea name="notes" id="notes-{{ $id }}" rows="3" class="form-control">{{ $notes }}</textarea>
     </div>
 
diff --git a/resources/views/widgets/settings/server-stats.blade.php b/resources/views/widgets/settings/server-stats.blade.php
index 41f3b04b4a..d31915cd36 100644
--- a/resources/views/widgets/settings/server-stats.blade.php
+++ b/resources/views/widgets/settings/server-stats.blade.php
@@ -2,12 +2,12 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Default Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Default Title') }}" value="{{ $title }}">
     </div>
 
     <div class="form-group">
-        <label for="device-{{ $id }}" class="control-label">@lang('Device')</label>
+        <label for="device-{{ $id }}" class="control-label">{{ __('Device') }}</label>
         <select class="form-control" id="device-{{ $id }}" name="device" required>
             @if($device)
                 <option value="{{ $device->device_id }}">{{ $device->displayName() }}</option>
@@ -16,7 +16,7 @@
     </div>
 
     <div class="form-group">
-        <label for="columnsize-{{ $id }}" class="control-label">@lang('Columns')</label>
+        <label for="columnsize-{{ $id }}" class="control-label">{{ __('Columns') }}</label>
         <select name="columnsize" id="columnsize-{{ $id }}" class="form-control">
             <option value="1" @if($columnsize == 1) selected @endif>1</option>
             <option value="2" @if($columnsize == 2) selected @endif>2</option>
diff --git a/resources/views/widgets/settings/syslog.blade.php b/resources/views/widgets/settings/syslog.blade.php
index 94d3bf1099..3ee4b7f5a6 100644
--- a/resources/views/widgets/settings/syslog.blade.php
+++ b/resources/views/widgets/settings/syslog.blade.php
@@ -2,31 +2,31 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="device-{{ $id }}" class="control-label">@lang('Device')</label>
-        <select class="form-control" id="device-{{ $id }}" name="device" data-placeholder="@lang('All devices')">
+        <label for="device-{{ $id }}" class="control-label">{{ __('Device') }}</label>
+        <select class="form-control" id="device-{{ $id }}" name="device" data-placeholder="{{ __('All devices') }}">
             @if($device)
                 <option value="{{ $device->device_id }}">{{ $device->displayName() }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation')</label>
+        <label for="hidenavigation-{{ $id }}" class="control-label">{{ __('Hide Navigation') }}</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
     </div>
     <div class="form-group">
-        <label for="level-{{ $id }}" class="control-label">@lang('Priority')</label>
+        <label for="level-{{ $id }}" class="control-label">{{ __('Priority') }}</label>
         <select class="form-control" name="level" id="level-{{ $id }}">
             @foreach($priorities as $val => $name)
                 <option value="{{ $val }}" @if($level ? $level == $val : $val == 7) selected @endif>{{ $name }}</option>
diff --git a/resources/views/widgets/settings/top-devices.blade.php b/resources/views/widgets/settings/top-devices.blade.php
index f34ec2b159..5c04c05d3a 100644
--- a/resources/views/widgets/settings/top-devices.blade.php
+++ b/resources/views/widgets/settings/top-devices.blade.php
@@ -2,39 +2,39 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Default Title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Default Title') }}" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="top_query-{{ $id }}" class="control-label">@lang('Top query')</label>
+        <label for="top_query-{{ $id }}" class="control-label">{{ __('Top query') }}</label>
         <select class="form-control" name="top_query" id="top_query-{{ $id }}">
-            <option value="traffic" @if($top_query == 'traffic') selected @endif>@lang('Traffic')</option>
-            <option value="uptime" @if($top_query == 'uptime') selected @endif>@lang('Uptime')</option>
-            <option value="ping" @if($top_query == 'ping') selected @endif>@lang('Response time')</option>
-            <option value="poller" @if($top_query == 'poller') selected @endif>@lang('Poller duration')</option>
-            <option value="cpu" @if($top_query == 'cpu') selected @endif>@lang('Processor load')</option>
-            <option value="ram" @if($top_query == 'ram') selected @endif>@lang('Memory usage')</option>
-            <option value="storage" @if($top_query == 'storage') selected @endif>@lang('Disk usage')</option>
+            <option value="traffic" @if($top_query == 'traffic') selected @endif>{{ __('Traffic') }}</option>
+            <option value="uptime" @if($top_query == 'uptime') selected @endif>{{ __('Uptime') }}</option>
+            <option value="ping" @if($top_query == 'ping') selected @endif>{{ __('Response time') }}</option>
+            <option value="poller" @if($top_query == 'poller') selected @endif>{{ __('Poller duration') }}</option>
+            <option value="cpu" @if($top_query == 'cpu') selected @endif>{{ __('Processor load') }}</option>
+            <option value="ram" @if($top_query == 'ram') selected @endif>{{ __('Memory usage') }}</option>
+            <option value="storage" @if($top_query == 'storage') selected @endif>{{ __('Disk usage') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="sort_order-{{ $id }}" class="control-label">@lang('Sort order')</label>
+        <label for="sort_order-{{ $id }}" class="control-label">{{ __('Sort order') }}</label>
         <select class="form-control" name="sort_order" id="sort_order-{{ $id }}">
-            <option value="asc" @if($sort_order == 'asc') selected @endif>@lang('Ascending')</option>
-            <option value="desc" @if($sort_order == 'desc') selected @endif>@lang('Descending')</option>
+            <option value="asc" @if($sort_order == 'asc') selected @endif>{{ __('Ascending') }}</option>
+            <option value="desc" @if($sort_order == 'desc') selected @endif>{{ __('Descending') }}</option>
         </select>
     </div>
     <div class="form-group">
-        <label for="device_count-{{ $id }}" class="control-label">@lang('Number of Devices')</label>
+        <label for="device_count-{{ $id }}" class="control-label">{{ __('Number of Devices') }}</label>
         <input class="form-control" name="device_count" id="device_count-{{ $id }}" value="{{ $device_count }}">
     </div>
     <div class="form-group">
-        <label for="time_interval-{{ $id }}" class="control-label">@lang('Last Polled (minutes)')</label>
+        <label for="time_interval-{{ $id }}" class="control-label">{{ __('Last Polled (minutes)') }}</label>
         <input class="form-control" name="time_interval" id="time_interval-{{ $id }}" value="{{ $time_interval }}">
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/settings/top-errors.blade.php b/resources/views/widgets/settings/top-errors.blade.php
index a01bf353c3..e4cea49484 100644
--- a/resources/views/widgets/settings/top-errors.blade.php
+++ b/resources/views/widgets/settings/top-errors.blade.php
@@ -2,32 +2,32 @@
 
 @section('form')
     <div class="form-group">
-        <label for="interface_count-{{ $id }}" class="control-label">@lang('Number of interfaces'):</label>
+        <label for="interface_count-{{ $id }}" class="control-label">{{ __('Number of interfaces') }}:</label>
         <input class="form-control" type="number" min="1" step="1" name="interface_count" id="interface_count-{{ $id }}" value="{{ $interface_count }}">
     </div>
     <div class="form-group">
-        <label for="time_interval-{{ $id }}" class="control-label">@lang('Last polled (minutes)'):</label>
+        <label for="time_interval-{{ $id }}" class="control-label">{{ __('Last polled (minutes)') }}:</label>
         <input class="form-control" type="number" min="1" step="1" name="time_interval" id="time_interval-{{ $id }}" value="{{ $time_interval }}">
     </div>
     <div class="form-group">
-        <label for="interface_filter-{{ $id }}" class="control-label">@lang('Interface type'):</label>
-        <select class="form-control" id="interface_filter-{{ $id }}" name="interface_filter"  data-placeholder="@lang('All Ports')">
+        <label for="interface_filter-{{ $id }}" class="control-label">{{ __('Interface type') }}:</label>
+        <select class="form-control" id="interface_filter-{{ $id }}" name="interface_filter"  data-placeholder="{{ __('All Ports') }}">
         @if($interface_filter)
             <option value="{{ $interface_filter }}">{{ $interface_filter }}</option>
         @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="port_group-{{ $id }}" class="control-label">@lang('Port group')</label>
-        <select class="form-control" name="port_group" id="port_group-{{ $id }}" data-placeholder="@lang('All Ports')">
+        <label for="port_group-{{ $id }}" class="control-label">{{ __('Port group') }}</label>
+        <select class="form-control" name="port_group" id="port_group-{{ $id }}" data-placeholder="{{ __('All Ports') }}">
             @if($port_group)
                 <option value="{{ $port_group->id }}" selected>{{ $port_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/settings/top-interfaces.blade.php b/resources/views/widgets/settings/top-interfaces.blade.php
index a01bf353c3..e4cea49484 100644
--- a/resources/views/widgets/settings/top-interfaces.blade.php
+++ b/resources/views/widgets/settings/top-interfaces.blade.php
@@ -2,32 +2,32 @@
 
 @section('form')
     <div class="form-group">
-        <label for="interface_count-{{ $id }}" class="control-label">@lang('Number of interfaces'):</label>
+        <label for="interface_count-{{ $id }}" class="control-label">{{ __('Number of interfaces') }}:</label>
         <input class="form-control" type="number" min="1" step="1" name="interface_count" id="interface_count-{{ $id }}" value="{{ $interface_count }}">
     </div>
     <div class="form-group">
-        <label for="time_interval-{{ $id }}" class="control-label">@lang('Last polled (minutes)'):</label>
+        <label for="time_interval-{{ $id }}" class="control-label">{{ __('Last polled (minutes)') }}:</label>
         <input class="form-control" type="number" min="1" step="1" name="time_interval" id="time_interval-{{ $id }}" value="{{ $time_interval }}">
     </div>
     <div class="form-group">
-        <label for="interface_filter-{{ $id }}" class="control-label">@lang('Interface type'):</label>
-        <select class="form-control" id="interface_filter-{{ $id }}" name="interface_filter"  data-placeholder="@lang('All Ports')">
+        <label for="interface_filter-{{ $id }}" class="control-label">{{ __('Interface type') }}:</label>
+        <select class="form-control" id="interface_filter-{{ $id }}" name="interface_filter"  data-placeholder="{{ __('All Ports') }}">
         @if($interface_filter)
             <option value="{{ $interface_filter }}">{{ $interface_filter }}</option>
         @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
         </select>
     </div>
     <div class="form-group">
-        <label for="port_group-{{ $id }}" class="control-label">@lang('Port group')</label>
-        <select class="form-control" name="port_group" id="port_group-{{ $id }}" data-placeholder="@lang('All Ports')">
+        <label for="port_group-{{ $id }}" class="control-label">{{ __('Port group') }}</label>
+        <select class="form-control" name="port_group" id="port_group-{{ $id }}" data-placeholder="{{ __('All Ports') }}">
             @if($port_group)
                 <option value="{{ $port_group->id }}" selected>{{ $port_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/settings/worldmap.blade.php b/resources/views/widgets/settings/worldmap.blade.php
index 5e63d7e303..90191a1879 100644
--- a/resources/views/widgets/settings/worldmap.blade.php
+++ b/resources/views/widgets/settings/worldmap.blade.php
@@ -2,43 +2,43 @@
 
 @section('form')
     <div class="form-group">
-        <label for="title-{{ $id }}" class="control-label">@lang('Widget title')</label>
-        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
+        <label for="title-{{ $id }}" class="control-label">{{ __('Widget title') }}</label>
+        <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="{{ __('Custom title') }}" value="{{ $title }}">
     </div>
 
     <div class="form-group">
-        <label for="init_lat-{{ $id }}" class="control-label">@lang('Initial Latitude')</label>
-        <input class="form-control" name="init_lat" id="init_lat-{{ $id }}"  type="number" min="-90" max="90" step="any" value="{{ $init_lat }}" placeholder="@lang('ie. 51.4800 for Greenwich')">
+        <label for="init_lat-{{ $id }}" class="control-label">{{ __('Initial Latitude') }}</label>
+        <input class="form-control" name="init_lat" id="init_lat-{{ $id }}"  type="number" min="-90" max="90" step="any" value="{{ $init_lat }}" placeholder="{{ __('ie. 51.4800 for Greenwich') }}">
     </div>
 
     <div class="form-group">
-        <label for="init_lng-{{ $id }}" class="control-label">@lang('Initial Longitude')</label>
-        <input class="form-control" name="init_lng" id="init_lng-{{ $id }}" type="number" min="-180" max="180" step="any" value="{{ $init_lng }}" placeholder="@lang('ie. 0 for Greenwich')">
+        <label for="init_lng-{{ $id }}" class="control-label">{{ __('Initial Longitude') }}</label>
+        <input class="form-control" name="init_lng" id="init_lng-{{ $id }}" type="number" min="-180" max="180" step="any" value="{{ $init_lng }}" placeholder="{{ __('ie. 0 for Greenwich') }}">
 
     </div>
 
     <div class="form-group">
-        <label for="init_zoom-{{ $id }}" class="control-label">@lang('Initial Zoom')</label>
-        <input class="form-control" name="init_zoom" id="init_zoom-{{ $id }}" type="number" min="0" max="18" step="0.1" value="{{ $init_zoom }}" placeholder="@lang('ie. 5.8')">
+        <label for="init_zoom-{{ $id }}" class="control-label">{{ __('Initial Zoom') }}</label>
+        <input class="form-control" name="init_zoom" id="init_zoom-{{ $id }}" type="number" min="0" max="18" step="0.1" value="{{ $init_zoom }}" placeholder="{{ __('ie. 5.8') }}">
     </div>
 
     <div class="form-group">
-        <label for="group_radius-{{ $id }}" class="control-label">@lang('Grouping radius')</label>
-        <input class="form-control" name="group_radius" id="group_radius-{{ $id }}" type="number" value="{{ $group_radius }}" placeholder="@lang('default 80')">
+        <label for="group_radius-{{ $id }}" class="control-label">{{ __('Grouping radius') }}</label>
+        <input class="form-control" name="group_radius" id="group_radius-{{ $id }}" type="number" value="{{ $group_radius }}" placeholder="{{ __('default 80') }}">
     </div>
 
     <div class="form-group">
-        <label for="status-{{ $id }}" class="control-label">@lang('Show devices')</label>
+        <label for="status-{{ $id }}" class="control-label">{{ __('Show devices') }}</label>
         <select class="form-control" name="status" id="status-{{ $id }}">
-            <option value="0,1" @if($status == '0,1') selected @endif>@lang('Up + Down')</option>
-            <option value="1" @if($status == '1') selected @endif>@lang('Up')</option>
-            <option value="0" @if($status == '0') selected @endif>@lang('Down')</option>
+            <option value="0,1" @if($status == '0,1') selected @endif>{{ __('Up + Down') }}</option>
+            <option value="1" @if($status == '1') selected @endif>{{ __('Up') }}</option>
+            <option value="0" @if($status == '0') selected @endif>{{ __('Down') }}</option>
         </select>
     </div>
 
     <div class="form-group">
-        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
-        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+        <label for="device_group-{{ $id }}" class="control-label">{{ __('Device group') }}</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="{{ __('All Devices') }}">
             @if($device_group)
                 <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
             @endif
diff --git a/resources/views/widgets/syslog.blade.php b/resources/views/widgets/syslog.blade.php
index 27f9205890..a511a2dc24 100644
--- a/resources/views/widgets/syslog.blade.php
+++ b/resources/views/widgets/syslog.blade.php
@@ -3,12 +3,12 @@
         <thead>
         <tr>
             <th data-column-id="label"></th>
-            <th data-column-id="timestamp" data-order="desc">@lang('Timestamp')</th>
-            <th data-column-id="level">@lang('Level')</th>
-            <th data-column-id="device_id">@lang('Hostname')</th>
-            <th data-column-id="program">@lang('Program')</th>
-            <th data-column-id="msg">@lang('Message')</th>
-            <th data-column-id="priority">@lang('Priority')</th>
+            <th data-column-id="timestamp" data-order="desc">{{ __('Timestamp') }}</th>
+            <th data-column-id="level">{{ __('Level') }}</th>
+            <th data-column-id="device_id">{{ __('Hostname') }}</th>
+            <th data-column-id="program">{{ __('Program') }}</th>
+            <th data-column-id="msg">{{ __('Message') }}</th>
+            <th data-column-id="priority">{{ __('Priority') }}</th>
         </tr>
         </thead>
     </table>
diff --git a/resources/views/widgets/top-devices.blade.php b/resources/views/widgets/top-devices.blade.php
index c1047dbfe3..37b6073861 100644
--- a/resources/views/widgets/top-devices.blade.php
+++ b/resources/views/widgets/top-devices.blade.php
@@ -21,5 +21,5 @@
     </table>
 </div>
 @else
-    <h4>@lang('No devices found within interval.')</h4>
+    <h4>{{ __('No devices found within interval.') }}</h4>
 @endif
diff --git a/resources/views/widgets/top-errors.blade.php b/resources/views/widgets/top-errors.blade.php
index 19b96e38ff..ce7babd96e 100644
--- a/resources/views/widgets/top-errors.blade.php
+++ b/resources/views/widgets/top-errors.blade.php
@@ -3,9 +3,9 @@
     <table class="table table-hover table-condensed table-striped bootgrid-table">
         <thead>
             <tr>
-                <th class="text-left">@lang('Device')</th>
-                <th class="text-left">@lang('Interface')</th>
-                <th class="text-left">@lang('Error Rate')</th>
+                <th class="text-left">{{ __('Device') }}</th>
+                <th class="text-left">{{ __('Interface') }}</th>
+                <th class="text-left">{{ __('Error Rate') }}</th>
             </tr>
         </thead>
         <tbody>
diff --git a/resources/views/widgets/top-interfaces.blade.php b/resources/views/widgets/top-interfaces.blade.php
index d92352305e..f2fd2524e6 100644
--- a/resources/views/widgets/top-interfaces.blade.php
+++ b/resources/views/widgets/top-interfaces.blade.php
@@ -3,9 +3,9 @@
     <table class="table table-hover table-condensed table-striped bootgrid-table">
         <thead>
             <tr>
-                <th class="text-left">@lang('Device')</th>
-                <th class="text-left">@lang('Interface')</th>
-                <th class="text-left">@lang('Total traffic')</th>
+                <th class="text-left">{{ __('Device') }}</th>
+                <th class="text-left">{{ __('Interface') }}</th>
+                <th class="text-left">{{ __('Total traffic') }}</th>
             </tr>
         </thead>
         <tbody>