Merge branch 'develop'

# Conflicts:
#	config/version.php

app/Http/Controllers/AssetModelsController.php

@@ -40,6 +40,7 @@ class AssetModelsController extends Controller
     */
     public function index()
     {
+        $this->authorize('index', AssetModel::class);
         return view('models/index');
     }
 
@@ -52,6 +53,7 @@ class AssetModelsController extends Controller
     */
     public function create()
     {
+        $this->authorize('create', AssetModel::class);
         $category_type = 'asset';
         return view('models/edit')->with('category_type',$category_type)
         ->with('depreciation_list', Helper::depreciationList())
@@ -69,6 +71,7 @@ class AssetModelsController extends Controller
     public function store(ImageUploadRequest $request)
     {
 
+        $this->authorize('create', AssetModel::class);
         // Create a new asset model
         $model = new AssetModel;
 
@@ -124,7 +127,8 @@ class AssetModelsController extends Controller
      */
     public function apiStore(Request $request)
     {
-      //COPYPASTA!!!! FIXME
+        //COPYPASTA!!!! FIXME
+        $this->authorize('create', AssetModel::class);
         $model = new AssetModel;
 
         $settings=Input::all();
@@ -162,6 +166,7 @@ class AssetModelsController extends Controller
     */
     public function edit($modelId = null)
     {
+        $this->authorize('edit', AssetModel::class);
         if ($item = AssetModel::find($modelId)) {
             $category_type = 'asset';
             $view = View::make('models/edit', compact('item','category_type'));
@@ -185,6 +190,7 @@ class AssetModelsController extends Controller
     */
     public function update(ImageUploadRequest $request, $modelId = null)
     {
+        $this->authorize('edit', AssetModel::class);
         // Check if the model exists
         if (is_null($model = AssetModel::find($modelId))) {
             // Redirect to the models management page
@@ -255,6 +261,7 @@ class AssetModelsController extends Controller
     */
     public function destroy($modelId)
     {
+        $this->authorize('delete', AssetModel::class);
         // Check if the model exists
         if (is_null($model = AssetModel::find($modelId))) {
             return redirect()->route('models.index')->with('error', trans('admin/models/message.not_found'));
@@ -291,7 +298,7 @@ class AssetModelsController extends Controller
     */
     public function getRestore($modelId = null)
     {
-
+        $this->authorize('create', AssetModel::class);
         // Get user information
         $model = AssetModel::withTrashed()->find($modelId);
 
@@ -322,6 +329,7 @@ class AssetModelsController extends Controller
     */
     public function show($modelId = null)
     {
+        $this->authorize('view', AssetModel::class);
         $model = AssetModel::withTrashed()->find($modelId);
 
         if (isset($model->id)) {

app/Http/Controllers/CategoriesController.php

@@ -40,6 +40,7 @@ class CategoriesController extends Controller
     public function index()
     {
         // Show the page
+        $this->authorize('view', Category::class);
         return view('categories/index');
     }
 
@@ -55,6 +56,7 @@ class CategoriesController extends Controller
     public function create()
     {
         // Show the page
+        $this->authorize('create', Category::class);
          $category_types= Helper::categoryTypeList();
         return view('categories/edit')->with('item', new Category)
             ->with('category_types', $category_types);
@@ -71,6 +73,7 @@ class CategoriesController extends Controller
      */
     public function store(ImageUploadRequest $request)
     {
+        $this->authorize('create', Category::class);
         $category = new Category();
         $category->name                 = $request->input('name');
         $category->category_type        = $request->input('category_type');
@@ -110,6 +113,7 @@ class CategoriesController extends Controller
      */
     public function edit($categoryId = null)
     {
+        $this->authorize('edit', Category::class);
         if (is_null($item = Category::find($categoryId))) {
             return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
         }
@@ -132,7 +136,7 @@ class CategoriesController extends Controller
      */
     public function update(ImageUploadRequest $request, $categoryId = null)
     {
-        // Check if the blog post exists
+        $this->authorize('edit', Category::class);
         if (is_null($category = Category::find($categoryId))) {
             // Redirect to the categories management page
             return redirect()->to('admin/categories')->with('error', trans('admin/categories/message.does_not_exist'));
@@ -198,6 +202,7 @@ class CategoriesController extends Controller
      */
     public function destroy($categoryId)
     {
+        $this->authorize('delete', Category::class);
         // Check if the category exists
         if (is_null($category = Category::find($categoryId))) {
             return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
@@ -231,6 +236,7 @@ class CategoriesController extends Controller
      */
     public function show($id)
     {
+        $this->authorize('view', Category::class);
         if ($category = Category::find($id)) {
 
             if ($category->category_type=='asset') {

app/Http/Controllers/LocationsController.php

@@ -40,6 +40,7 @@ class LocationsController extends Controller
     public function index()
     {
         // Grab all the locations
+        $this->authorize('view', Location::class);
         $locations = Location::orderBy('created_at', 'DESC')->with('parent', 'assets', 'assignedassets')->get();
 
         // Show the page
@@ -57,6 +58,7 @@ class LocationsController extends Controller
      */
     public function create()
     {
+        $this->authorize('create', Location::class);
         $locations = Location::orderBy('name', 'ASC')->get();
 
         $location_options_array = Location::getLocationHierarchy($locations);
@@ -80,6 +82,7 @@ class LocationsController extends Controller
      */
     public function store(ImageUploadRequest $request)
     {
+        $this->authorize('create', Location::class);
         $location = new Location();
         $location->name             = $request->input('name');
         $location->parent_id        = $request->input('parent_id', null);
@@ -122,6 +125,7 @@ class LocationsController extends Controller
     */
     public function apiStore(Request $request)
     {
+        $this->authorize('create', Location::class);
         $new['currency']=Setting::first()->default_currency;
 
         // create a new location instance
@@ -158,6 +162,7 @@ class LocationsController extends Controller
      */
     public function edit($locationId = null)
     {
+        $this->authorize('edit', Location::class);
         // Check if the location exists
         if (is_null($item = Location::find($locationId))) {
             return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
@@ -186,6 +191,7 @@ class LocationsController extends Controller
      */
     public function update(ImageUploadRequest $request, $locationId = null)
     {
+        $this->authorize('edit', Location::class);
         // Check if the location exists
         if (is_null($location = Location::find($locationId))) {
             return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
@@ -252,6 +258,7 @@ class LocationsController extends Controller
      */
     public function destroy($locationId)
     {
+        $this->authorize('delete', Location::class);
         if (is_null($location = Location::find($locationId))) {
             return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
         }

app/Http/Controllers/StatuslabelsController.php

@@ -32,12 +32,13 @@ class StatuslabelsController extends Controller
 
     public function index()
     {
+        $this->authorize('view', Statuslabel::class);
         return view('statuslabels.index', compact('statuslabels'));
     }
 
     public function show($id)
     {
-
+        $this->authorize('view', Statuslabel::class);
         if ($statuslabel = Statuslabel::find($id)) {
             return view('statuslabels.view')->with('statuslabel', $statuslabel);
         }
@@ -55,6 +56,7 @@ class StatuslabelsController extends Controller
     public function create()
     {
         // Show the page
+        $this->authorize('create', Statuslabel::class);
         $item = new Statuslabel;
         $use_statuslabel_type = $item->getStatuslabelType();
         $statuslabel_types = Helper::statusTypeList();
@@ -72,6 +74,7 @@ class StatuslabelsController extends Controller
     public function store(Request $request)
     {
 
+        $this->authorize('create', Statuslabel::class);
         // create a new model instance
         $statusLabel = new Statuslabel();
 
@@ -106,6 +109,7 @@ class StatuslabelsController extends Controller
      */
     public function apiStore(Request $request)
     {
+        $this->authorize('create', Statuslabel::class);
         $statuslabel = new Statuslabel();
         if (!$request->has('statuslabel_types')) {
             return JsonResponse::create(["error" => trans('validation.statuslabel_type')], 500);
@@ -137,6 +141,7 @@ class StatuslabelsController extends Controller
      */
     public function edit($statuslabelId = null)
     {
+        $this->authorize('update', Statuslabel::class);
         // Check if the Statuslabel exists
         if (is_null($item = Statuslabel::find($statuslabelId))) {
             // Redirect to the blogs management page
@@ -159,6 +164,7 @@ class StatuslabelsController extends Controller
      */
     public function update(Request $request, $statuslabelId = null)
     {
+        $this->authorize('update', Statuslabel::class);
         // Check if the Statuslabel exists
         if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
             // Redirect to the blogs management page
@@ -197,6 +203,7 @@ class StatuslabelsController extends Controller
      */
     public function destroy($statuslabelId)
     {
+        $this->authorize('delete', Statuslabel::class);
         // Check if the Statuslabel exists
         if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
             return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.not_found'));

app/Http/Controllers/SuppliersController.php

@@ -33,6 +33,7 @@ class SuppliersController extends Controller
     public function index()
     {
         // Grab all the suppliers
+        $this->authorize('view', Supplier::class);
         $suppliers = Supplier::orderBy('created_at', 'DESC')->get();
 
         // Show the page
@@ -47,6 +48,7 @@ class SuppliersController extends Controller
      */
     public function create()
     {
+        $this->authorize('create', Supplier::class);
         return view('suppliers/edit')->with('item', new Supplier);
     }
 
@@ -59,6 +61,7 @@ class SuppliersController extends Controller
      */
     public function store(ImageUploadRequest $request)
     {
+        $this->authorize('create', Supplier::class);
         // Create a new supplier
         $supplier = new Supplier;
         // Save the location data
@@ -100,6 +103,7 @@ class SuppliersController extends Controller
      */
     public function apiStore(Request $request)
     {
+        $this->authorize('create', Supplier::class);
         $supplier = new Supplier;
         $supplier->name =  $request->input('name');
         $supplier->user_id              = Auth::id();
@@ -118,6 +122,7 @@ class SuppliersController extends Controller
      */
     public function edit($supplierId = null)
     {
+        $this->authorize('edit', Supplier::class);
         // Check if the supplier exists
         if (is_null($item = Supplier::find($supplierId))) {
             // Redirect to the supplier  page
@@ -137,6 +142,7 @@ class SuppliersController extends Controller
      */
     public function update($supplierId = null, ImageUploadRequest $request)
     {
+        $this->authorize('edit', Supplier::class);
         // Check if the supplier exists
         if (is_null($supplier = Supplier::find($supplierId))) {
             // Redirect to the supplier  page
@@ -207,6 +213,7 @@ class SuppliersController extends Controller
      */
     public function destroy($supplierId)
     {
+        $this->authorize('delete', Supplier::class);
         if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances','assets','licenses')->find($supplierId))) {
             return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
         }

app/Http/Transformers/LocationsTransformer.php

@@ -57,7 +57,7 @@ class LocationsTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Location::class) ? true : false,
-                'delete' => (Gate::allows('delete', Department::class) && ($location->assigned_assets_count==0) && ($location->assets_count==0) && ($location->users_count==0) && ($location->deleted_at=='')) ? true : false,
+                'delete' => (Gate::allows('delete', Location::class) && ($location->assigned_assets_count==0) && ($location->assets_count==0) && ($location->users_count==0) && ($location->deleted_at=='')) ? true : false,
             ];
 
             $array += $permissions_array;

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v4.1.10-pre',
-  'full_app_version' => 'v4.1.10-pre - build 3238-g4ca8272',
+  'full_app_version' => 'v4.1.10-pre - build 3244-g798ea75',
-  'build_version' => '3238',
+  'build_version' => '3244',
   'prerelease_version' => '',
-  'hash_version' => 'g4ca8272',
+  'hash_version' => 'g798ea75',
-  'full_hash' => 'v4.1.10-pre-108-g4ca8272',
+  'full_hash' => 'v4.1.10-pre-114-g798ea75',
   'branch' => 'master',
 );

resources/lang/af/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Voer enige aangepaste CSS-oortredings in wat u graag wil gebruik. Moenie die <style></style>-etikette insluit nie.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Verstek Geld',
 	'default_eula_text'			=> 'Standaard EULA',
-  'default_language'					=> 'Verstek taal',
+  'default_language'			=> 'Verstek taal',
 	'default_eula_help_text'	=> 'U kan ook aangepaste EULA\'s aan spesifieke batekategorieë assosieer.',
     'display_asset_name'        => 'Wys bate naam',
     'display_checkout_date'     => 'Vertoon Checkout Date',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Kode Teks',
     'setting'                   => 'omgewing',
     'settings'                  => 'instellings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Site Naam',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/af/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'lêer',
     'file_uploads'			=> 'Lêeroplaaie',
     'generate'				=> 'genereer',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'groepe',
     'gravatar_email'        => 'Gravatar e-pos adres',
     'history'  			    => 'Geskiedenis',

resources/lang/ar/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'أدخل أي تخصيصات CSS ترغب في استخدامها. لا تقم باضافة <style></style>.',
     'custom_forgot_pass_url'	=> 'رابط مخصص لاعادة تعيين كلمة المرور',
     'custom_forgot_pass_url_help'	=> 'يحل هذا محل الرابط الخاص باعادة تعيين كلمة المرور على شاشة تسجيل الدخول، وهو مفيد لتوجيه الأشخاص إلى وظيفة إعادة تعيين كلمة مرور من خلال LDAP الداخلي أو المستضاف. وهذا سوف يعطل وظيفة إعادة تعيين كلمة مرور المحلية.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'العملة الافتراضية',
 	'default_eula_text'			=> 'اتفاقية ترخيص المستخدم النهائي الافتراضية',
-  'default_language'					=> 'اللغة الافتراضية',
+  'default_language'			=> 'اللغة الافتراضية',
 	'default_eula_help_text'	=> 'يمكنك أيضا ربط (اتفاقية ترخيص المستخدم) لاصناف محددة من الاصول.',
     'display_asset_name'        => 'عرض اسم مادة العرض',
     'display_checkout_date'     => 'عرض تاريخ الخروج',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'نص رمز الاستجابة السريعة',
     'setting'                   => 'ضبط',
     'settings'                  => 'إعدادات',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'اسم الموقع',
     'slack_botname'             => 'سلاك بوتنام',
     'slack_channel'             => 'قناة سلاك',

resources/lang/ar/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'ملف',
     'file_uploads'			=> 'تحميلات الملفات',
     'generate'				=> 'توفير',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'المجموعات',
     'gravatar_email'        => 'البريد الإلكتروني لخدمة Gravatar',
     'history'  			    => 'الأرشيف',

resources/lang/bg/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Включете вашите CSS правила тук. Не използвайте <style></style> тагове.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Валута по подразбиране',
 	'default_eula_text'			=> 'EULA по подразбиране',
-  'default_language'					=> 'Език по подразбиране',
+  'default_language'			=> 'Език по подразбиране',
 	'default_eula_help_text'	=> 'Можете да асоциирате специфична EULA към всяка избрана категория.',
     'display_asset_name'        => 'Визуализиране на актив',
     'display_checkout_date'     => 'Визуализиране на дата на изписване',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Съдържание на QR код',
     'setting'                   => 'Настройка',
     'settings'                  => 'Настройки',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Име на системата',
     'slack_botname'             => 'Име на Slack bot',
     'slack_channel'             => 'Slack канал',

resources/lang/bg/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Файл',
     'file_uploads'			=> 'Качени файлове',
     'generate'				=> 'Генериране',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Групи',
     'gravatar_email'        => 'Gravatar email адрес',
     'history'  			    => 'История',

resources/lang/cs/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Zadejte libovolné vlastní CSS, které chcete použít. Nezahrnujte <style></style> tagy.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Výchozí měna',
 	'default_eula_text'			=> 'Výchozí EULA',
-  'default_language'					=> 'Výchozí jazyk',
+  'default_language'			=> 'Výchozí jazyk',
 	'default_eula_help_text'	=> 'Můžete také spojit vlastní EULA se specifickými kategoriemi majetku.',
     'display_asset_name'        => 'Zobrazit název majetku',
     'display_checkout_date'     => 'Zobrazit den převzetí',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Text QR kódu',
     'setting'                   => 'Nastavení',
     'settings'                  => 'Nastavení',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Název stránky',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack kanál',

resources/lang/cs/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Soubor',
     'file_uploads'			=> 'Nahrání souboru',
     'generate'				=> 'Vytvořit',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Skupiny',
     'gravatar_email'        => 'Emailová adresa Gravatar',
     'history'  			    => 'Historie',

resources/lang/da/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Indtast eventuelle brugerdefinerede CSS overskridelser, du gerne vil bruge. Indsæt ikke de <style></style> tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Standardvaluta',
 	'default_eula_text'			=> 'Standard EULA',
-  'default_language'					=> 'Standard sprog',
+  'default_language'			=> 'Standard sprog',
 	'default_eula_help_text'	=> 'Du kan også knytte brugerdefinerede EULA til specifikke aktivkategorier.',
     'display_asset_name'        => 'Vis aktivnavn',
     'display_checkout_date'     => 'Vis checkout dato',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Kode Tekst',
     'setting'                   => 'Indstilling',
     'settings'                  => 'Indstillinger',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Side navn',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/da/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filoverførsel',
     'generate'				=> 'Skab',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar email addresse',
     'history'  			    => 'Historik',

resources/lang/de/admin/accessories/general.php

@@ -10,7 +10,7 @@ return array(
     'create'  							=> 'Zubehör anlegen',
     'edit'  							=> 'Zubehör bearbeiten',
     'eula_text'							=> 'Kategorie EULA',
-    'eula_text_help'					=> 'Dieses Feld erlaubt Ihnen, die EULA an Ihren Bedürfnisse je nach Asset-Typ anzupassen. Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb, um die Standard EULA zu verwenden.',
+    'eula_text_help'					=> 'Dieses Feld erlaubt Ihnen, die EULA je nach Asset-Typ an Ihre Bedürfnisse anzupassen. Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb, um die Standard-EULA zu verwenden.',
     'require_acceptance'				=> 'Benutzer müssen die Annahme von Assets in dieser Kategorie bestätigen.',
     'no_default_eula'					=> 'Keine Standard-EULA gefunden. Bitte fügen Sie eine EULA in den Einstellungen hinzu.',
     'total'  							=> 'Gesamt',

resources/lang/de/admin/accessories/message.php

@@ -22,14 +22,14 @@ return array(
     ),
 
      'checkout' => array(
-        'error'   		=> 'Zubehör konnte nicht ausgebucht werden, bitte versuchen Sie es erneut',
+        'error'   		=> 'Zubehör konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
-        'success' 		=> 'Zubehör erfolgreich ausgebucht.',
+        'success' 		=> 'Zubehör erfolgreich herausgegeben.',
         'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Das Zubehör wurde nicht erfolgreich eingebucht, bitte versuchen Sie es erneut',
+        'error'   		=> 'Das Zubehör wurde nicht erfolgreich zurückgenommen. Bitte versuchen Sie es erneut',
-        'success' 		=> 'Zubehör erfolgreich eingebucht.',
+        'success' 		=> 'Zubehör erfolgreich zurückgenommen.',
         'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
     )
 

resources/lang/de/admin/categories/general.php

@@ -5,7 +5,7 @@ return array(
     'about_categories'  				=> 'Kategorien helfen Ihnen beim Organisieren von Assets. Beispielkategorien sind "PCs", "Laptops", "Mobiltelefone", "Tablets" usw., jedoch können Sie Kategorien nutzen, wie Sie es für sinnvoll erachten.',
     'asset_categories' 					=> 'Asset-Kategorien',
     'category_name'  					=> 'Kategoriename',
-    'checkin_email'                     => 'Dem Nutzer beim Einbuchen eine Mail zusenden.',
+    'checkin_email'                     => 'Dem Nutzer beim Zurücknehmen eine Mail zusenden.',
     'clone'                             => 'Kategorie duplizieren',
     'create'  							=> 'Kategorie erstellen',
     'edit'                              => 'Kategorie bearbeiten',

resources/lang/de/admin/hardware/message.php

@@ -67,17 +67,17 @@ return array(
     ),
 
     'checkin' => array(
-        'error'   		=> 'Asset konnte nicht eingebucht werden. Bitte versuchen Sie es erneut',
+        'error'   		=> 'Asset konnte nicht zurückgenommen werden. Bitte versuchen Sie es erneut',
-        'success' 		=> 'Asset wurde erfolgreich eingebucht.',
+        'success' 		=> 'Asset wurde erfolgreich zurückgenommen.',
         'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.',
-        'already_checked_in'  => 'Dieses Asset ist bereits eingebucht.',
+        'already_checked_in'  => 'Dieses Asset ist bereits zurückgenommen.',
 
     ),
 
     'requests' => array(
         'error'   		=> 'Das Asset wurde nicht angefordert, bitte versuchen Sie es erneut',
         'success' 		=> 'Asset erfolgreich angefordert.',
-        'canceled'      => 'Herausgeben erfolgreich abgebrochen'
+        'canceled'      => 'Herausgabe erfolgreich abgebrochen'
     )
 
 );

resources/lang/de/admin/models/general.php

@@ -4,9 +4,9 @@ return array(
     'about_models_title'     => 'Asset-Modelle',
     'about_models_text'           => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.',
     'deleted'  					        => 'Dieses Modell wurde gelöscht.<a href="/hardware/models/:model_id/restore">klicken Sie hier um es Wiederzuherstellen</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => 'Massenlöschen von Asset-Modellen',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_help'               => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle die noch zugewiesene Assets haben können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderem Asset-Modell zugewiesen werden.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Sie sind im Begriff :model_count Asset-Modelle zu löschen.',
     'restore'                   => 'Modell wiederherstellen',
     'requestable'               => 'Benutzer können dieses Modell anfordern',
 	'show_mac_address'			      => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell',

resources/lang/de/admin/models/message.php

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'error'   		    => 'Es wurden keine Modelle ausgewählt. Somit wurde auch nichts gelöscht.',
-        'success' 		    => ':success_count model(s) deleted!',
+        'success' 		    => ':success_count Modell(e) gelöscht!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'success_partial' 	=> ':success_count Modell(e) wurden gelöscht. Jedochen konnten :fail_count nicht gelöscht werden, da ihnen noch Assets zugeordnet sind.'
     ),
 
 );

resources/lang/de/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Füge eigenes CSS hinzu. Benutze keine <style></style> tags.',
     'custom_forgot_pass_url'	=> 'Benutzerdefinierte Passwort Reset URL',
     'custom_forgot_pass_url_help'	=> 'Dadurch wird die integrierte URL für vergessene Passwörter auf dem Anmeldebildschirm ersetzt. Dies ist nützlich, um Benutzer zur internen oder gehosteten Funktion zum Zurücksetzen von LDAP-Passwörtern zu leiten. Es wird effektiv die Funktionalität des lokalen, vergessenen Passworts deaktiviert.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Standardwährung',
 	'default_eula_text'			=> 'Standard EULA',
-  'default_language'					=> 'Standardsprache',
+  'default_language'			=> 'Standardsprache',
 	'default_eula_help_text'	=> 'Sie können ebenfalls eigene EULA\'s mit spezifischen Asset Kategorien verknüpfen.',
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Einstellung',
     'settings'                  => 'Einstellungen',
+    'show_alerts_in_menu'       => 'Warnungen im oberen Menü anzeigen',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Seitenname',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Kanal',

resources/lang/de/general.php

@@ -28,16 +28,16 @@
     'bad_data'      		=> 'Nichts gefunden. Vielleicht defekte Daten?',
     'bulkaudit'             => 'Massenprüfung',
     'bulkaudit_status'      => 'Audit-Status',
-    'bulk_checkout'  		=> 'Massen-Auschecken',
+    'bulk_checkout'  		=> 'Massen-Herausgeben',
     'cancel'  				=> 'Abbrechen',
     'categories'			=> 'Kategorien',
     'category'				=> 'Kategorie',
     'change' 		        => 'Eingang/Ausgang',
     'changeemail'  			=> 'E-Mail Adresse ändern',
     'changepassword'  		=> 'Passwort ändern',
-    'checkin'  				=> 'Einchecken',
+    'checkin'  				=> 'Zurücknehmen',
-    'checkin_from'  		=> 'Einchecken von',
+    'checkin_from'  		=> 'Zurücknehmen von',
-    'checkout'  			=> 'Auschecken',
+    'checkout'  			=> 'Herausgeben',
     'city'  				=> 'Stadt',
 	'click_here'			=> 'Hier klicken',
     'clear_selection'		=> 'Auswahl löschen',
@@ -85,6 +85,7 @@
     'file_name'				=> 'Datei',
     'file_uploads'			=> 'Datei-Uploads',
     'generate'				=> 'Generieren',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Gruppen',
     'gravatar_email'        => 'Gravatar E-Mail Adresse',
     'history'  			    => 'Historie',
@@ -93,7 +94,7 @@
     'image'                 => 'Abbildung',
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg.',
+    'image_filetypes_help'  => 'Zugelassene Dateitypen sind jpg, png, gif und svg.',
     'import'         	    => 'Import',
     'import-history'        => 'Import Verlauf',
     'asset_maintenance'        => 'Asset Wartung',
@@ -151,7 +152,7 @@
     'recent_activity'		=> 'Letzte Aktivität',
     'remove_company'        => 'Firmenzuordnung entfernen',
     'reports'				=> 'Berichte',
-    'restored'				=> 'restored',
+    'restored'				=> 'wiederhergestellt',
     'requested'				=> 'Angefragt',
     'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',

resources/lang/de/mail.php

@@ -14,20 +14,20 @@ return array(
     'assigned_to' => 'Zugewiesen an',
     'best_regards' => 'Grüße,',
     'canceled' => 'Abgebrochen:',
-    'checkin_date' => 'Eingecheckt am:',
+    'checkin_date' => 'Rücknahmedatum:',
-    'checkout_date' => 'Ausgecheckt am:',
+    'checkout_date' => 'Herausgabedatum:',
     'click_to_confirm' => 'Bitte klicken Sie zum Bestätigen Ihres :web Kontos auf den folgenden Link:',
     'click_on_the_link_accessory' => 'Bitte klicken Sie auf den Link weiter unten, um den Erhalt des Zubehörs zu bestätigen.',
     'click_on_the_link_asset' => 'Bitte klicken Sie auf den Link weiter unten, um den Erhalt des Gegenstands zu bestätigen.',
-    'Confirm_Asset_Checkin' => 'Gegenstand Einchecken bestätigen.',
+    'Confirm_Asset_Checkin' => 'Zurücknehmen von Asset bestätigen.',
-    'Confirm_Accessory_Checkin' => 'Zubehör Einchecken bestätigen.',
+    'Confirm_Accessory_Checkin' => 'Zurücknehmen von Zubehör bestätigen.',
     'Confirm_accessory_delivery' => 'Zubehör Zustellung bestätigen.',
     'Confirm_asset_delivery' => 'Gegenstands Lieferung bestätigen.',
     'Confirm_consumable_delivery' => 'Verbrauchsmaterial Lieferung bestätigen.',
     'current_QTY' => 'Aktuelle Menge',
     'Days' => 'Tage',
     'days' => 'Tage',
-    'expecting_checkin_date' => 'Erwartetes Eincheck Datum:',
+    'expecting_checkin_date' => 'Erwartetes Rückgabedatum:',
     'expires' => 'Ablaufdatum',
     'Expiring_Assets_Report' => 'Bericht über Ablaufende Gegenstände.',
     'Expiring_Licenses_Report' => 'Bericht über ablaufende Lizenzen.',

resources/lang/el/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Εισαγάγετε τυχόν προσαρμοσμένες επικαλύψεις CSS που θέλετε να χρησιμοποιήσετε. Μην συμπεριλάβετε τις ετικέτες <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Προεπιλεγμένο νόμισμα',
 	'default_eula_text'			=> 'Προεπιλογή EULA',
-  'default_language'					=> 'Προκαθορισμένη γλώσσα',
+  'default_language'			=> 'Προκαθορισμένη γλώσσα',
 	'default_eula_help_text'	=> 'Μπορείτε επίσης να συσχετίσετε προσαρμοσμένες ΑΔΕΚ με συγκεκριμένες κατηγορίες περιουσιακών στοιχείων.',
     'display_asset_name'        => 'Εμφάνιση ονόματος παγίου',
     'display_checkout_date'     => 'Εμφάνιση ημερομηνίας αποχώρησης',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Code Κείμενο',
     'setting'                   => 'Ρύθμιση',
     'settings'                  => 'Ρυθμίσεις',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Όνομα ιστότοπου',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Χωρίς κανάλι',

resources/lang/el/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Αρχείο',
     'file_uploads'			=> 'Ανέβασμα αρχείου',
     'generate'				=> 'Δημιουργία',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Ομάδες',
     'gravatar_email'        => 'Gravatar Email Διεύθυνση',
     'history'  			    => 'Ιστορία',

resources/lang/en-GB/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
-  'default_language'					=> 'Default Language',
+  'default_language'			=> 'Default Language',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Setting',
     'settings'                  => 'Settings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Site Name',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/en-GB/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Groups',
     'gravatar_email'        => 'Gravatar Email Address',
     'history'  			    => 'History',

resources/lang/en-ID/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
-  'default_language'					=> 'Default Language',
+  'default_language'			=> 'Default Language',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Setting',
     'settings'                  => 'Settings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Site Name',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/en-ID/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'File',
     'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Groups',
     'gravatar_email'        => 'Gravatar Email Address',
     'history'  			    => 'History',

resources/lang/es-CO/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: <style></style&gt.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Moneda Predeterminada',
 	'default_eula_text'			=> 'EULA por defecto',
-  'default_language'					=> 'Idioma predeterminado',
+  'default_language'			=> 'Idioma predeterminado',
 	'default_eula_help_text'	=> 'También puede asociar EULAs personalizadas para categorías especificas de equipos.',
     'display_asset_name'        => 'Mostrar Nombre Equipo',
     'display_checkout_date'     => 'Mostrar Fecha de Salida',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Texto Código QR',
     'setting'                   => 'Parámetro',
     'settings'                  => 'Configuración',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nombre del sitio',
     'slack_botname'             => 'Nombre de bot en Slack',
     'slack_channel'             => 'Canal en Slack',

resources/lang/es-CO/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Archivo',
     'file_uploads'			=> 'Carga de Archivos',
     'generate'				=> 'Generar',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupos',
     'gravatar_email'        => 'Gravatar Email',
     'history'  			    => 'Historial',

resources/lang/es-ES/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: <style></style&gt.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Moneda Predeterminada',
 	'default_eula_text'			=> 'EULA por defecto',
-  'default_language'					=> 'Idioma predeterminado',
+  'default_language'			=> 'Idioma predeterminado',
 	'default_eula_help_text'	=> 'También puede asociar EULAs personalizadas para categorías especificas de equipos.',
     'display_asset_name'        => 'Mostrar Nombre Equipo',
     'display_checkout_date'     => 'Mostrar Fecha de Salida',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Texto Código QR',
     'setting'                   => 'Parámetro',
     'settings'                  => 'Configuración',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nombre del sitio',
     'slack_botname'             => 'Nombre de bot en Slack',
     'slack_channel'             => 'Canal en Slack',

resources/lang/es-ES/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Archivo',
     'file_uploads'			=> 'Carga de Archivos',
     'generate'				=> 'Generar',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupos',
     'gravatar_email'        => 'Gravatar Email',
     'history'  			    => 'Historial',

resources/lang/et/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Sisestage kõik kohandatud CSS-i muudatused, mida soovite kasutada. Ärge lisage silte <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Valuuta vaikimisi',
 	'default_eula_text'			=> 'EULA vaikimisi',
-  'default_language'					=> 'Vaikimisi keel',
+  'default_language'			=> 'Vaikimisi keel',
 	'default_eula_help_text'	=> 'Võite ka kohandatud EULA-sid siduda kindlate varakategooriatega.',
     'display_asset_name'        => 'Kuvatava vara nimi',
     'display_checkout_date'     => 'Display Checkout Kuupäev',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR-koodi tekst',
     'setting'                   => 'Seadistus',
     'settings'                  => 'Seaded',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Saidi nimi',
     'slack_botname'             => 'Vähene botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/et/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fail',
     'file_uploads'			=> 'Faili üleslaadimine',
     'generate'				=> 'Genereeri',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupid',
     'gravatar_email'        => 'Gravatari e-maili aadress',
     'history'  			    => 'Ajalugu',

resources/lang/fa/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'هر ابطال CSS سفارشی می خواهید استفاده کنید را وارد کنید.از  برچسب های <style></style> استفاده نکنید.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'ارز پیش فرض',
 	'default_eula_text'			=> 'EULA پیش فرض',
-  'default_language'					=> 'زبان پیش فرض',
+  'default_language'			=> 'زبان پیش فرض',
 	'default_eula_help_text'	=> 'همچنین می توانید  EULA های سفارشی به دسته های خاص دارایی مرتبط کنید.',
     'display_asset_name'        => 'نمایش نام حساب',
     'display_checkout_date'     => 'نمایش تاریخ پرداخت',
@@ -92,6 +94,9 @@ return array(
     'qr_text'                   => 'متن QR کد',
     'setting'                   => 'تنظیمات',
     'settings'                  => 'تنظيمات',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'نام سایت',
     'slack_botname'             => 'پشت گوش فراخ Botname',
     'slack_channel'             => 'اسلک کانال',

resources/lang/fa/general.php

@@ -87,6 +87,7 @@
     'file_name'				=> 'فایل',
     'file_uploads'			=> 'بارگذاری پرونده',
     'generate'				=> 'تولید',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'گروه ها',
     'gravatar_email'        => 'آدرس آواتار ایمیل ',
     'history'  			    => 'پيشينه',

resources/lang/fi/admin/custom_fields/general.php

@@ -20,7 +20,7 @@ return array(
     'field_element_short'     => 'elementti',
     'field_format'            => 'Muoto',
     'field_custom_format'     => 'Mukautettu muoto',
-    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format_help'     => 'Tämän kentän avulla voit käyttää regex-lauseketta validointiin. Sen pitäisi alkaa "regex:" - esimerkiksi vahvistaaksesi, että mukautetun kentän arvo sisältää voimassa olevan IMEI: n (15 numeerista numeroa), käyttäisit <code>regex: /^[0-9]{15}$/</code>.',
     'required'   		          => 'Edellytetään',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Käytetään mallien mukaan',

resources/lang/fi/admin/hardware/message.php

@@ -63,7 +63,7 @@ return array(
         'success' 		=> 'Laite luovutettu onnistuneesti.',
         'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.',
         'not_available' => 'Tätä omaisuutta ei ole saatavilla kassalle!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Valitse ainakin yksi nimike listasta'
     ),
 
     'checkin' => array(

resources/lang/fi/admin/models/general.php

@@ -4,9 +4,9 @@ return array(
     'about_models_title'     => 'Tietoja varallismalleista',
     'about_models_text'           => 'Asset-mallit ovat tapa ryhmitellä identtiset varat. "MBP 2013", "IPhone 6s" jne.',
     'deleted'  					        => 'Tämä malli on poistettu. <a href="/hardware/models/:model_id/restore">Vaihda tästä palauttaaksesi sen</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => 'Massa Poista Nimike Malleja',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_help'               => 'Vahvista valittujen omaisuusmallien poistaminen alla olevilla valintaruuduilla. Omaisuusmalleja, joilla on niihin liittyviä nimikkeitä, ei voida poistaa, ennen kuin nimikkeet on liittetty toiseen malliin.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Olet poistamassa :model_count nimike malleja.',
     'restore'                   => 'Palauta malli',
     'requestable'               => 'Käyttäjät voivat pyytää tätä mallia',
 	'show_mac_address'			      => 'Näytä MAC-osoitekenttä tämän mallin laitteille',

resources/lang/fi/admin/models/message.php

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'error'   		    => 'Ei malleja valittuna, mitään ei poistettu.',
-        'success' 		    => ':success_count model(s) deleted!',
+        'success' 		    => ': success_count mallit poistettu!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'success_partial' 	=> ': success_count mallit poistettiin, mutta fail_count ei voitu poistaa, koska niillä on vielä niihin liittyviä nimikkeitä.'
     ),
 
 );

resources/lang/fi/admin/settings/general.php

@@ -23,11 +23,13 @@ return array(
     'confirm_purge_help'		=> 'Kirjoita alla olevaan kohtaan "DELETE" teksti tyhjentääksesi poistetut tietueet. Tätä toimintoa ei voi kumota.',
 	'custom_css'				=> 'Oma CSS',
 	'custom_css_help'			=> 'Anna haluamasi mukautetut CSS-ohitukset. Älä lisää <style></style> tunnisteita.',
-    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url'	=> 'Muokattu Salasanan Nollaus URL-osoite',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Oletusvaluutta',
 	'default_eula_text'			=> 'Oletus EULA',
-  'default_language'					=> 'Oletuskieli',
+  'default_language'			=> 'Oletuskieli',
 	'default_eula_help_text'	=> 'Voit myös liittää muokattuja EULA-sopimuksia tiettyihin omaisuusluokkiin.',
     'display_asset_name'        => 'Näytä laitteen nimi listauksessa',
     'display_checkout_date'     => 'Näytä luovutuspäivämäärä listauksessa',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR-koodin Teksti',
     'setting'                   => 'Asetus',
     'settings'                  => 'Asetukset',
+    'show_alerts_in_menu'       => 'Näytä ilmoitukset ylävalikossa',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Sivuston Nimi',
     'slack_botname'             => 'Löysä Botname',
     'slack_channel'             => 'Löytää kanava',

resources/lang/fi/admin/suppliers/message.php

@@ -19,9 +19,9 @@ return array(
         'confirm'   => 'Oletko varma että haluat poistaa tämän toimittajan?',
         'error'   => 'Toimittajan poistossa tapahtui virhe. Yritä uudelleen.',
         'success' => 'Toimittaja poistettiin onnistuneesti.',
-        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_assets'	 => 'Tähän toimittajaan liittyy tällä hetkellä :asset_count nimikkeitä ja sitä ei voi poistaa. Ole hyvä ja päivitä nimikkeet, jotta ne eivät enää viittaa tähän toimittajaan ja yritä uudelleen. ',
-        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'Tähän toimittajaan liittyy tällä hetkellä :licenses_count lisenssiä ja sitä ei voi poistaa. Ole hyvä ja päivitä lisenssit, jotta ne eivät enää viittaa tähän toimittajaan ja yritä uudelleen. ',
-        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'Tähän toimittajaan liittyy tällä hetkellä: asset_maintenances_count omaisuudenhoitoa ja sitä ei voi poistaa. Ole hyvä ja päivitä omaisuudenhoitoasi, jotta se ei enää viitata tähän toimittajaan ja yritä uudelleen. ',
     )
 
 );

resources/lang/fi/general.php

@@ -40,7 +40,7 @@
     'checkout'  			=> 'Luovuta',
     'city'  				=> 'Kaupunki',
 	'click_here'			=> 'Klikkaa tästä',
-    'clear_selection'		=> 'Clear Selection',
+    'clear_selection'		=> 'Tyhjennä Valinta',
     'companies'			    => 'Yritykset',
     'company'				=> 'Yritys',
     'component'			    => 'Komponentti',
@@ -85,15 +85,16 @@
     'file_name'				=> 'Tiedosto',
     'file_uploads'			=> 'Tiedostolataus',
     'generate'				=> 'Luo',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Ryhmät',
     'gravatar_email'        => 'Gravatarin Email-osoite',
     'history'  			    => 'Historia',
     'history_for'  			=> 'Laitehistoria käyttäjälle',
     'id'  					=> 'Tunnus',
-    'image'                 => 'Image',
+    'image'                 => 'Kuva',
     'image_delete'         	=> 'Poista Kuva',
     'image_upload'         	=> 'Lähetä Kuva',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg.',
+    'image_filetypes_help'  => 'Hyväksytyt tiedostotyypit ovat jpg, png, gif ja svg.',
     'import'         	    => 'Tuo tiedot',
     'import-history'        => 'Tuontihistoria',
     'asset_maintenance'        => 'Omaisuuden ylläpito',
@@ -151,7 +152,7 @@
     'recent_activity'		=> 'Viimeisin toiminta',
     'remove_company'        => 'Poista yritysliitto',
     'reports'				=> 'Raportit',
-    'restored'				=> 'restored',
+    'restored'				=> 'palautettu',
     'requested'				=> 'pyydetty',
     'request_canceled'      => 'Pyyntö peruutettu',
     'save'  				=> 'Tallenna',

resources/lang/fi/validation.php

@@ -67,7 +67,7 @@ return array(
     'not_in'               => 'Valittu :attribute on virheellinen.',
     'numeric'              => ':attribute tulee olla numero.',
     'present'              => 'Attribuutti-kentän on oltava läsnä.',
-    'valid_regex'          => 'That is not a valid regex. ',
+    'valid_regex'          => 'Tuo ei ole kelvollinen regex. ',
     'regex'                => ':attribute muotoilu on virheellinen.',
     'required'             => ':attribute on vaadittu.',
     'required_if'          => ':attribute on vaadittu kun :other on :value.',
@@ -88,7 +88,7 @@ return array(
     'unique'               => ':attribute on jo käytössä.',
     'uploaded'             => 'Attribuutti ei onnistunut lataamaan.',
     'url'                  => ':attribute muotoilu on virheellinen.',
-    "unique_undeleted"     => "The :attribute must be unique.",
+    "unique_undeleted"     => ":attribute on oltava ainutlaatuinen.",
 
     /*
     |--------------------------------------------------------------------------

resources/lang/fr/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Entrez les codes CSS personnalisé que vous souhaitez utiliser . Ne pas inclure les balises <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Devise par défaut',
 	'default_eula_text'			=> 'Licence d\'utilisation par défaut',
-  'default_language'					=> 'Langue par défaut',
+  'default_language'			=> 'Langue par défaut',
 	'default_eula_help_text'	=> 'Vous pouvez également associer les licences d\'utilisations personnalisés à des catégories spécifiques d\'actifs .',
     'display_asset_name'        => 'Afficher le nom des actifs',
     'display_checkout_date'     => 'Afficher la date d\'association',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Texte du QR Code',
     'setting'                   => 'Paramètre',
     'settings'                  => 'Paramètres',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nom du site',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/fr/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fichier',
     'file_uploads'			=> 'Uploads de fichiers',
     'generate'				=> 'Générer',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Groupes',
     'gravatar_email'        => 'E-mail adresse Gravatar',
     'history'  			    => 'Historique',

resources/lang/ga-IE/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Cuir isteach aon scriosadh CSS saincheaptha ar mhaith leat a úsáid. Ná cuir na clibeanna <style></style> san áireamh.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Réamhshocrú Airgeadra',
 	'default_eula_text'			=> 'Réamhshocrú EULA',
-  'default_language'					=> 'Teanga Réamhshocraithe',
+  'default_language'			=> 'Teanga Réamhshocraithe',
 	'default_eula_help_text'	=> 'Is féidir leat freisin EULAs saincheaptha a chomhcheangal le catagóirí sonracha sócmhainne.',
     'display_asset_name'        => 'Taispeáin Ainm na Sócmhainne',
     'display_checkout_date'     => 'Taispeáin Dáta Seiceáil',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Cód Téacs',
     'setting'                   => 'Socrú',
     'settings'                  => 'Socruithe',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Ainm an tSuímh',
     'slack_botname'             => 'Botharc Slack',
     'slack_channel'             => 'Slack Channel',

resources/lang/ga-IE/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Comhad',
     'file_uploads'			=> 'Uaslódáil comhad',
     'generate'				=> 'Gin',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grúpaí',
     'gravatar_email'        => 'Seoladh Ríomhphoist Gravatar',
     'history'  			    => 'Stair',

resources/lang/he/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'הזן כל דריסת CSS מותאמת אישית שבה תרצה להשתמש. אל תכלול את התגים <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'מטבע ברירת מחדל',
 	'default_eula_text'			=> 'ברירת מחדל ל- EULA',
-  'default_language'					=> 'שפת ברירת מחדל',
+  'default_language'			=> 'שפת ברירת מחדל',
 	'default_eula_help_text'	=> 'ניתן גם לשייך ערכי רשיון קצה מותאמים אישית לקטגוריות ספציפיות של נכסים.',
     'display_asset_name'        => 'שם נכס לתצוגה',
     'display_checkout_date'     => 'הצג תאריך יציאה',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'טקסט קוד QR',
     'setting'                   => 'הגדרה',
     'settings'                  => 'הגדרות',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'שם אתר',
     'slack_botname'             => 'שם בוטני',
     'slack_channel'             => 'ערוץ רפה',

resources/lang/he/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'קוֹבֶץ',
     'file_uploads'			=> 'העלאות קבצים',
     'generate'				=> 'לִיצוֹר',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'קבוצות',
     'gravatar_email'        => 'כתובת דוא"ל Gravatar',
     'history'  			    => 'הִיסטוֹרִיָה',

resources/lang/hr/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Unesite bilo koji prilagođeni CSS nadjačaj koji biste željeli koristiti. Ne uključujte oznake <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Zadana valuta',
 	'default_eula_text'			=> 'Zadana EULA',
-  'default_language'					=> 'Zadani jezik',
+  'default_language'			=> 'Zadani jezik',
 	'default_eula_help_text'	=> 'Također možete povezati prilagođene EULA-e s određenim kategorijama imovine.',
     'display_asset_name'        => 'Prikaz naziva imovine',
     'display_checkout_date'     => 'Prikaz datuma narudžbe',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR kodni tekst',
     'setting'                   => 'postavljanje',
     'settings'                  => 'postavke',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Ime stranice',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/hr/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Datoteka',
     'file_uploads'			=> 'Prijenos datoteka',
     'generate'				=> 'Generirati',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'grupe',
     'gravatar_email'        => 'Gravatar adresa e-pošte',
     'history'  			    => 'Povijest',

resources/lang/hu/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Adjon meg olyan egyedi CSS felülírást, amelyet használni szeretne. Ne tüntesse fel a <style></style> címkéket.',
     'custom_forgot_pass_url'	=> 'Egyéni jelszó visszaállítási URL',
     'custom_forgot_pass_url_help'	=> 'Ez felváltja a beépített elfelejtett jelszó URL-jét a bejelentkezési képernyőn, amely hasznos lehet arra, hogy az embereket belső vagy hosztolt LDAP jelszó-visszaállítási funkciókra irányítsa. Hatékonyan kikapcsolja a helyi felhasználók elfelejtett jelszavát.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Alapértelmezett pénznem',
 	'default_eula_text'			=> 'Alapértelmezett EULA',
-  'default_language'					=> 'Alapértelmezett nyelv',
+  'default_language'			=> 'Alapértelmezett nyelv',
 	'default_eula_help_text'	=> 'Egyéni EULA-kat is társíthat bizonyos eszközkategóriákhoz.',
     'display_asset_name'        => 'Eszköznév megjelenítése',
     'display_checkout_date'     => 'Megjelenik a Checkout dátum',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR kód szöveg',
     'setting'                   => 'Beállítás',
     'settings'                  => 'Beállítások',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Webhely neve',
     'slack_botname'             => 'Laza botneve',
     'slack_channel'             => 'Laza csatorna',

resources/lang/hu/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fájl',
     'file_uploads'			=> 'Fájlfeltöltések',
     'generate'				=> 'Létrehoz',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Csoportok',
     'gravatar_email'        => 'Gravatar email cím',
     'history'  			    => 'Történelem',

resources/lang/id/admin/models/general.php

@@ -4,8 +4,8 @@ return array(
     'about_models_title'     => 'Tentang Model Aset',
     'about_models_text'           => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.',
     'deleted'  					        => 'Model ini telah dihapus. <a href="/hardware/models/:model_id/restore">Click di sini untuk memulihkan</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => 'Menghapus massal aset model',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_help'               => 'Centang kotak di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
     'restore'                   => 'Mengembalikan Model',
     'requestable'               => 'Pengguna dapat meminta model ini',

resources/lang/id/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Masukan modifikasi CSS yang hendak anda gunakan. Jangan sertakan <style></style> tags.',
     'custom_forgot_pass_url'	=> 'URL Reset Kata Sandi Kustom',
     'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL lupa kata sandi bawaan pada layar login, berguna untuk mengarahkan orang ke fungsi reset kata sandi LDAP internal atau yang dihosting. Ini secara efektif akan menonaktifkan fungsionalitas lupa kata sandi lokal.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Mata uang utama',
 	'default_eula_text'			=> 'EULA utama',
-  'default_language'					=> 'Bahasa utama',
+  'default_language'			=> 'Bahasa utama',
 	'default_eula_help_text'	=> 'Anda juga dapat mengaitkan kustom EULAs untuk kategori aset tertentu.',
     'display_asset_name'        => 'Tampilan Nama Aset',
     'display_checkout_date'     => 'Tampilan Tanggal Keluar',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Teks kode QR',
     'setting'                   => 'Pengaturan',
     'settings'                  => 'Pengaturan',
+    'show_alerts_in_menu'       => 'Tampilkan pemberitahuan di menu atas',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nama Situs',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/id/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Berkas',
     'file_uploads'			=> 'Unggah Berkas',
     'generate'				=> 'Generate',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Kelompok',
     'gravatar_email'        => 'Alamat Gravatar Email',
     'history'  			    => 'Riwayat',
@@ -93,7 +94,7 @@
     'image'                 => 'Gambar',
     'image_delete'         	=> 'Menghapus gambar',
     'image_upload'         	=> 'Unggah gambar',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg.',
+    'image_filetypes_help'  => 'Tipe file yang diterima adalah jpg, png, gif, dan svg.',
     'import'         	    => 'Impor',
     'import-history'        => 'Sejarah Impor',
     'asset_maintenance'        => 'Pemeliharaan Aset',
@@ -151,7 +152,7 @@
     'recent_activity'		=> 'Aktivitas Terakhir',
     'remove_company'        => 'Hapus Asosiasi Perusahaan',
     'reports'				=> 'Laporan',
-    'restored'				=> 'restored',
+    'restored'				=> 'kembalikan',
     'requested'				=> 'Diminta',
     'request_canceled'      => 'Permintaan Dibatalkan',
     'save'  				=> 'Simpan',

resources/lang/it/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Inserisci qualsiasi CSS personalizzato che vuoi utilizzare. Do not include the <style></style> tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Valuta predefinita',
 	'default_eula_text'			=> 'EULA Predefinita',
-  'default_language'					=> 'Lingua predefinita',
+  'default_language'			=> 'Lingua predefinita',
 	'default_eula_help_text'	=> 'È possibile associare EULAs personalizzati a categorie di beni specifici.',
     'display_asset_name'        => 'Mostra Nome Bene',
     'display_checkout_date'     => 'Mostra Data Estrazione',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Impostazioni',
     'settings'                  => 'Impostazioni',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nome sito',
     'slack_botname'             => 'Botname Slack',
     'slack_channel'             => 'Canale Slack',

resources/lang/it/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'File',
     'file_uploads'			=> 'Carica i file',
     'generate'				=> 'Genera',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Gruppi',
     'gravatar_email'        => 'Indirizzo Email Gravatar',
     'history'  			    => 'Storia',

resources/lang/ja/admin/models/general.php

@@ -4,7 +4,7 @@ return array(
     'about_models_title'     => '資産モデルについて',
     'about_models_text'           => '資産モデルは、同一資産をグループ化する方法です。(例:「MBP 2013」、「IPhone 6」など)',
     'deleted'  					        => 'この型番は削除されました。<a href="/hardware/models/:model_id/restore">元に戻すにはココをクリックして下さい。</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => '資産モデルの一括削除',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
     'restore'                   => '型番を復元',

resources/lang/ja/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> '使用したいカスタムCSSを入力してください。<style></style> タグは含めないでください',
     'custom_forgot_pass_url'	=> 'パスワードリセットURLを変更する',
     'custom_forgot_pass_url_help'	=> 'これにより、ログイン画面に表示されるパスワードリセット用のURLが置き換えられ、内部またはホストされているLDAPパスワードのリセット機能にユーザーを誘導するのに役立ちます。ローカルユーザーがパスワードを忘れた場合、その機能は無効になります。',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> '既定の通貨',
 	'default_eula_text'			=> '既定のEULA',
-  'default_language'					=> '既定の言語',
+  'default_language'			=> '既定の言語',
 	'default_eula_help_text'	=> '特殊な資産カテゴリーにカスタムEULAを関連付けられます。',
     'display_asset_name'        => '資産名を表示',
     'display_checkout_date'     => 'チェックアウト日を表示',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QRコードテキスト',
     'setting'                   => '設定',
     'settings'                  => '設定',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'サイト名',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/ja/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'ファイル',
     'file_uploads'			=> 'ファイルアップロード',
     'generate'				=> '作成',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'グループ',
     'gravatar_email'        => 'Gravatar のメールアドレス',
     'history'  			    => '履歴',
@@ -93,7 +94,7 @@
     'image'                 => '画像',
     'image_delete'         	=> '画像を削除',
     'image_upload'         	=> '画像をアップロード',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg.',
+    'image_filetypes_help'  => '受け入れられるファイルタイプはjpg、png、gif、svgです。',
     'import'         	    => 'インポート',
     'import-history'        => 'インポート履歴',
     'asset_maintenance'        => '資産管理',

resources/lang/ko/admin/models/general.php

@@ -4,9 +4,9 @@ return array(
     'about_models_title'     => '자산 모델이란',
     'about_models_text'           => '자산 모델은 동일한 자산들을 그룹화 하는 방법입니다. "MBP 2013", "IPhone 6들", 등등.',
     'deleted'  					        => '이 모델은 삭제되었습니다. <a href="/hardware/models/:model_id/restore">복원 하려면 여기를 클릭하세요</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => '자산 모델 대량 삭제',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_help'               => '선택한 자산 모델의 삭제를 확인하려면 아래 체크박스를 사용하십시오. 자산에 연결된 자산 모델은 자산이 다른 모델과 연결될 때까지 삭제할 수 없습니다.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => '다음을 삭제하려 합니다:model_count asset models.',
     'restore'                   => '모델 복원',
     'requestable'               => '사용자가 이 모델을 요청하실 수 있습니다',
 	'show_mac_address'			      => '이 모델의 자산에서 MAC 어드레스 항목 보기',

resources/lang/ko/admin/models/message.php

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'error'   		    => '선택된 모델이 없기에, 삭제되지 않습니다.',
-        'success' 		    => ':success_count model(s) deleted!',
+        'success' 		    => ': success_count 모델이 삭제되었습니다!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'success_partial' 	=> ': success_count개의 모델이 삭제되었지만, fail_count 개는 관련된 자산이 있기에 삭제할 수 없습니다.'
     ),
 
 );

resources/lang/ko/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> '사용하려는 사용자 CSS를 입력하세요. <style></style> 태그들은 넣지 마세요.',
     'custom_forgot_pass_url'	=> '사용자정의 암호 재설정 URL',
     'custom_forgot_pass_url_help'	=> '이것은 로그인 화면에 내장된 잊어버린 비밀번호 URL을 변경하여, 내부 또는 호스트 LDAP 암호 재설정 기능으로 사람들을 안내할 때 유용합니다. 로컬 사용자가 잊어버린 비밀번호 기능을 효과적으로 비활성화합니다.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> '기본 통화',
 	'default_eula_text'			=> '기본 사용권 계약',
-  'default_language'					=> '기본 언어',
+  'default_language'			=> '기본 언어',
 	'default_eula_help_text'	=> '또한 특정 자산 분류에는 맞춤형 사용권 계약들과 연결을 해야 합니다.',
     'display_asset_name'        => '자산 명 표시',
     'display_checkout_date'     => '반출 일자 표시',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR 코드 문구',
     'setting'                   => '설정',
     'settings'                  => '설정',
+    'show_alerts_in_menu'       => '상단 메뉴에 경고 표시',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => '사이트 명',
     'slack_botname'             => 'Slack Bot 명',
     'slack_channel'             => 'Slack 채널',

resources/lang/ko/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> '파일',
     'file_uploads'			=> '파일 올리기',
     'generate'				=> '생성',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> '그룹',
     'gravatar_email'        => 'Gravatar 메일 주소',
     'history'  			    => '기록',
@@ -93,7 +94,7 @@
     'image'                 => '이미지',
     'image_delete'         	=> '이미지 삭제',
     'image_upload'         	=> '이미지 올리기',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg.',
+    'image_filetypes_help'  => '허용되는 파일 형식은 jpg, png, gif 및 svg입니다.',
     'import'         	    => '불러오기',
     'import-history'        => '가져오기 이력',
     'asset_maintenance'        => '자산 관리',
@@ -151,7 +152,7 @@
     'recent_activity'		=> '최근 활동',
     'remove_company'        => '공급자 연결 제거',
     'reports'				=> '보고서',
-    'restored'				=> 'restored',
+    'restored'				=> '복원됨',
     'requested'				=> '요청됨',
     'request_canceled'      => '요청 취소',
     'save'  				=> '저장',

resources/lang/lt/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Įveskite bet kokį užsakytą CSS peržiūrėjimo norėtumėte naudoti. Neįtraukite <style></Stilius> žymės.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Numatytoji valiuta',
 	'default_eula_text'			=> 'Numatytasis EULA',
-  'default_language'					=> 'Numatyta kalba',
+  'default_language'			=> 'Numatyta kalba',
 	'default_eula_help_text'	=> 'Jūs taip pat galite susieti pritaikytą EULĄ specifinėms įrangos grupėms.',
     'display_asset_name'        => 'Rodyti įrangos pavadinimą',
     'display_checkout_date'     => 'Rodyti išdavimo datą',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR kodo tekstas',
     'setting'                   => 'Nustatymai',
     'settings'                  => 'Nustatymai',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Interneto puslapio pavadinimas',
     'slack_botname'             => 'Slack\'o boto vardas',
     'slack_channel'             => 'Slack\'o kanalas',

resources/lang/lt/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Failas',
     'file_uploads'			=> 'Failo Įkėlimas',
     'generate'				=> 'Sukurti',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupės',
     'gravatar_email'        => 'Gravatar el. paštas',
     'history'  			    => 'Istorija',

resources/lang/lv/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Ievadiet jebkuru pielāgotu CSS ignorēšanu, kuru vēlaties izmantot. Neiekļaujiet <style></style> atzīmes.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Valūta pēc noklusējuma',
 	'default_eula_text'			=> 'Noklusējuma EULA',
-  'default_language'					=> 'Noklusējuma valoda',
+  'default_language'			=> 'Noklusējuma valoda',
 	'default_eula_help_text'	=> 'Varat arī saistīt pielāgotās EULA ar noteiktām aktīvu kategorijām.',
     'display_asset_name'        => 'Displeja aktīvu nosaukums',
     'display_checkout_date'     => 'Displeja norēķinu datums',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR kodu tekstu',
     'setting'                   => 'Iestatījums',
     'settings'                  => 'Iestatījumi',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Vietnes nosaukums',
     'slack_botname'             => 'Vāja Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/lv/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fails',
     'file_uploads'			=> 'Faila augšupielāde',
     'generate'				=> 'Izveidot',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupas',
     'gravatar_email'        => 'Gravatar e-pasta adrese',
     'history'  			    => 'Vēsture',

resources/lang/mi/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Whakauruhia tetahi tahua CSS ritenga e hiahia ana koe ki te whakamahi. Kaua e whakauru i nga tūtohu <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Moni Moni',
 	'default_eula_text'			=> 'EULA Taunoa',
-  'default_language'					=> 'Reo Taunoa',
+  'default_language'			=> 'Reo Taunoa',
 	'default_eula_help_text'	=> 'Ka taea hoki e koe te hono atu i nga Taekerangi ritenga ki nga waahanga tahua.',
     'display_asset_name'        => 'Whakaatuhia te Ingoa Tahua',
     'display_checkout_date'     => 'Whakaatuhia te Whakataunga Rā',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Kuputuhi Raraunga QR',
     'setting'                   => 'Tautuhi',
     'settings'                  => 'Tautuhinga',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Ingoa Pae',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/mi/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Kōnae',
     'file_uploads'			=> 'Ngā Tukunga Kōnae',
     'generate'				=> 'Whakanuia',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Ngā rōpū',
     'gravatar_email'        => 'Gravatar Wāhitau Īmēra',
     'history'  			    => 'Hītori',

resources/lang/mn/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Ямар нэгэн гаалийн CSS дарж өөрчлөхийг хүсч оруулаарай. <style></style> хаягуудыг бүү оруулаарай.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Анхдагч валют',
 	'default_eula_text'			=> 'Үндсэн EULA',
-  'default_language'					=> 'Үндсэн хэл',
+  'default_language'			=> 'Үндсэн хэл',
 	'default_eula_help_text'	=> 'Та мөн EULA-г тусгай активын төрлөөр ангилж болно.',
     'display_asset_name'        => 'Дэлгэцийн нэрийг харуулах',
     'display_checkout_date'     => 'Дэлгэцийн төлбөр хийх хугацаа',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR кодын текст',
     'setting'                   => 'Тохируулах',
     'settings'                  => 'Тохиргоо',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Сайтын нэр',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack суваг',

resources/lang/mn/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Файл',
     'file_uploads'			=> 'Файл оруулах',
     'generate'				=> 'Үүсгэх',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Бүлгүүд',
     'gravatar_email'        => 'Gravatar Email Address',
     'history'  			    => 'Түүх',

resources/lang/ms/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Masukkan mana-mana CSS ubah khas yang anda mahu gunakan. Jangan masukkan tag <style></style>.',
     'custom_forgot_pass_url'	=> 'URL Khas untuk Penetapan Semula Kata Laluan',
     'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL terlupa kata laluan terbina pada skrin log masuk, berguna untuk mengarahkan pengguna ke fungsi semula kata laluan LDAP dalaman atau dihoskan. Ia secara langsung akan melumpuhkan fungsi kata laluan terlupa pengguna tempatan.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Mata Wang Default',
 	'default_eula_text'			=> 'EULA lalai',
-  'default_language'					=> 'Bahasa Lalai',
+  'default_language'			=> 'Bahasa Lalai',
 	'default_eula_help_text'	=> 'Anda juga boleh mengaitkan EULA tersuai untuk kategori aset tertentu.',
     'display_asset_name'        => 'Papar Nama Harta',
     'display_checkout_date'     => 'Papar Tarikh \'Checkout\'',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Teks Kod QR',
     'setting'                   => 'Tetapan',
     'settings'                  => 'Tetapan',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nama Sesawang',
     'slack_botname'             => 'Botak Botak',
     'slack_channel'             => 'Saluran Slack',

resources/lang/ms/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fail',
     'file_uploads'			=> 'Muat Naik Fail',
     'generate'				=> 'Laksanakan',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Kumpulan',
     'gravatar_email'        => 'Alam e-mel gravatar',
     'history'  			    => 'Sejarah',

resources/lang/nl/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Voer een aangepaste CSS overschrijving die je wilt gebruiken in. Gebruik geen <style></style> tags.',
     'custom_forgot_pass_url'	=> 'Aangepaste Paswoord reset URL',
     'custom_forgot_pass_url_help'	=> 'Dit vervangt de ingebouwde "vergeten paswoord URL" op de inlogpagina, handig om gebruikers te verwijzen naar een interne of gehoste LDAP paswoord reset functionaliteit. Deze optie inschakelen zal effectief de functionaliteit "vergeten paswoord" voor een lokale gebruiker uitschakelen.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Standaard valuta',
 	'default_eula_text'			=> 'Standaard gebruikersovereenkomst',
-  'default_language'					=> 'Standaardtaal',
+  'default_language'			=> 'Standaardtaal',
 	'default_eula_help_text'	=> 'Je kan aangepaste gebruikersovereenkomsten koppelen aan specifieke product categorieën.',
     'display_asset_name'        => 'Laat Product naam zien',
     'display_checkout_date'     => 'Laat Checkout datum zien',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'QR Code tekst',
     'setting'                   => 'Instelling',
     'settings'                  => 'Instellingen',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Site naam',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack kanaal',

resources/lang/nl/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Bestand',
     'file_uploads'			=> 'Bestand uploaden',
     'generate'				=> 'Genereer',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Groepen',
     'gravatar_email'        => 'Gravatar E-mailadres',
     'history'  			    => 'Historie',

resources/lang/no/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Legg til egendefinert CSS. Ikke ta med taggene <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Standardvaluta',
 	'default_eula_text'			=> 'Standard EULA',
-  'default_language'					=> 'Standardspråk',
+  'default_language'			=> 'Standardspråk',
 	'default_eula_help_text'	=> 'Du kan også knytte tilpassede EULAer til bestemte eiendelskategorier.',
     'display_asset_name'        => 'Vis eiendelsnavn',
     'display_checkout_date'     => 'Vis utsjekksdato',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Tekst QR-kode',
     'setting'                   => 'Innstilling',
     'settings'                  => 'Innstillinger',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nettstedsnavn',
     'slack_botname'             => 'Slack botnavn',
     'slack_channel'             => 'Slack-kanal',

resources/lang/no/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filopplastinger',
     'generate'				=> 'Generer',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar e-postadresse',
     'history'  			    => 'Historie',

resources/lang/pl/admin/settings/general.php

@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Wprowadź własny kod CSS. Nie używaj tagów <style></style>.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Domyślna Waluta',
 	'default_eula_text'			=> 'Domyślna EULA',
-  'default_language'					=> 'Domyślny język',
+  'default_language'			=> 'Domyślny język',
 	'default_eula_help_text'	=> 'Możesz również sporządzić własną licencje by sprecyzować kategorie aktywa.',
     'display_asset_name'        => 'Wyświetl nazwę aktywa',
     'display_checkout_date'     => 'Wyświetl Datę Przypisania',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Tekst kodu QR',
     'setting'                   => 'Ustawienie',
     'settings'                  => 'Ustawienia',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nazwa Witryny',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Kanał Slack',

resources/lang/pl/general.php

@@ -85,6 +85,7 @@
     'file_name'				=> 'Plik',
     'file_uploads'			=> 'Dodaj plik',
     'generate'				=> 'Generuj',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupy',
     'gravatar_email'        => 'adres Email Gravatara',
     'history'  			    => 'Historia',

resources/lang/pt-BR/admin/asset_maintenances/message.php

@@ -12,8 +12,8 @@
             'success' => 'Manutenção do ativo criada com sucesso.'
         ],
         'edit'                       => [
-            'error'   => 'Manutenção de ativos não foi editada, tente novamente.',
+            'error'   => 'Manutenção de ativos não foi alterada, por favor tente novamente.',
-            'success' => 'Manutenção de ativos editada com sucesso.'
+            'success' => 'Manutenção de ativo alterada com sucesso.'
         ],
         'asset_maintenance_incomplete' => 'Não foi Completada Ainda',
         'warranty'                     => 'Garantia',

resources/lang/pt-BR/admin/custom_fields/general.php

@@ -20,7 +20,7 @@ return array(
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
     'field_custom_format'     => 'Formato personalizado',
-    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format_help'     => 'Este campo permite que você use uma expressão regex para validação. Deve começar com "regex:" - por exemplo, para validar que um valor de campo personalizado contém um IMEI válido (15 dígitos numéricos), você usaria <code>regex: / ^ [0-9]{15} $ / </code>.',
     'required'   		          => 'Requerido',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Usado por modelos',

resources/lang/pt-BR/admin/hardware/general.php

@@ -7,7 +7,7 @@ return array(
     'asset'  					=> 'Ativo',
     'bulk_checkout'             => 'Atribuir ativo a utilizador',
     'checkin'  					=> 'Retornar Ativo',
-    'checkout'  				=> 'Ativo de compras',
+    'checkout'  				=> 'Checkout de Ativo',
     'clone'  					=> 'Clonar Ativo',
     'deployable'  				=> 'Implementável',
     'deleted'  					=> 'Este ativo foi excluído. <a href="/hardware/:asset_id/restore">Clique aqui para restaurá-lo</a>.',

resources/lang/pt-BR/admin/hardware/message.php

@@ -24,8 +24,8 @@ return array(
     ),
 
     'audit' => array(
-        'error'   		=> 'A auditoria de ativos não teve êxito. Por favor, tente novamente.',
+        'error'   		=> 'A auditoria de equipamentos não teve êxito. Por favor, tente novamente.',
-        'success' 		=> 'Auditoria de ativos logada com sucesso.'
+        'success' 		=> 'Auditoria de equipamentos logada com sucesso.'
     ),
 
 
@@ -62,7 +62,7 @@ return array(
         'success' 		=> 'Ativo registrado com sucesso.',
         'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.',
         'not_available' => 'Esse recurso não está disponível para checkout!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Você deve selecionar pelo menos um recurso da lista'
     ),
 
     'checkin' => array(

resources/lang/pt-BR/admin/licenses/message.php

@@ -7,7 +7,7 @@ return array(
     'asset_does_not_exist' 	=> 'O ativo do qual você está tentando associar com esta licença não existe.',
     'owner_doesnt_match_asset' => 'O bem que você está tentando associar a está licença é propriedade de alguma outra pessoa que não está selecionada na lista suspensa.',
     'assoc_users'	 => 'Esta licença é atualmente check-out para um usuário e não pode ser excluído. Por favor, atualize seu bem para que não referencie mais este usuário e, em seguida, tente apagar novamente. ',
-    'select_asset_or_person' => 'Você deve selecionar um recurso ou um usuário, mas não ambos.',
+    'select_asset_or_person' => 'Você deve selecionar um ativo ou um usuário, mas não ambos.',
 
 
     'create' => array(

resources/lang/pt-BR/admin/models/general.php

@@ -4,9 +4,9 @@ return array(
     'about_models_title'     => 'Sobre os Modelos de Ativos',
     'about_models_text'           => 'Os Modelos dos ativos são uma maneira para agrupar ativos idênticos. "MBP 2013", "iPhone 6s", etc.',
     'deleted'  					        => 'Este modelo foi excluído. <a href="/hardware/models/:model_id/restore">Clique aqui para o restaurar</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => 'Bulk deletar modelos de ativos',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_help'               => 'Use a caixa abaixo para confirmar a exlusão dos modelos de ativos selecionados. Modelos de ativos que tem ativos associados a eles não podem ser deletados a não ser que esses ativos sejam associados a um modelo diferente.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Você está prestes a exluir :model_count asset models.',
     'restore'                   => 'Restaurar Modelo',
     'requestable'               => 'Usuários podem solicitar este modelo',
 	'show_mac_address'			      => 'Exibir o campo de endereço MAC nos ativos neste modelo',

resources/lang/pt-BR/admin/models/message.php

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'error'   		    => 'Nenhum modelo foi selecionado, então nada foi deletado.',
-        'success' 		    => ':success_count model(s) deleted!',
+        'success' 		    => '::succes_count model (s) deletados!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'success_partial' 	=> ':success_count model(s) foram deletados,no entando :fail_count não pode ser excluído porque eles ainda possuem ativos associados a eles.'
     ),
 
 );

resources/lang/pt-BR/admin/settings/general.php

@@ -23,11 +23,13 @@ return array(
     'confirm_purge_help'		=> 'Digite o texto "DELETE" na caixa antes de excluir os registros. Este ação não poderá ser deifeita.',
 	'custom_css'				=> 'CSS personalizado',
 	'custom_css_help'			=> 'Digite quaisquer CSS modificada que você gostaria de usar. Mas não inclua as tags <style></style>.',
-    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url'	=> 'URL de redefinição de senha personalizada',
-    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'custom_forgot_pass_url_help'	=> 'Isso substitui o URL de senha esquecida na tela de login, útil para direcionar pessoas para a funcionalidade de redefinição de senha LDAP interna. Eke efetivamente desativará a funcionalidade de senha esquecida do usuário local.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Moeda padrão',
 	'default_eula_text'			=> 'EULA Padrão',
-  'default_language'					=> 'Idioma Padrão',
+  'default_language'			=> 'Idioma Padrão',
 	'default_eula_help_text'	=> 'Você também pode associar EULAs personalizados para categorias específicas de ativos.',
     'display_asset_name'        => 'Exibir Nome do Ativo',
     'display_checkout_date'     => 'Mostrar data de check-out',
@@ -46,8 +48,8 @@ return array(
     'ldap_enabled'              => 'LDAP ativo',
     'ldap_integration'          => 'Integração LDAP',
     'ldap_settings'             => 'Configurações LDAP',
-    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_test_help'      => 'Digite um nome de usuário e senha LDAP válidos a partir do DN base que você especificou acima para testar se seu login LDAP está configurado corretamente. VOCÊ DEVE SALVAR AS CONFIGURAÇÕES LDAP ATUALIZADAS PRIMEIRAMENTE.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'Isso apenas prova que LDAP sincroniza corretamente. Se o autenticador query LDAP não estiver correto, usuários ainda não poderão realizar o login. VOCÊ DEVE PRIMEIRO SALVAR AS NOVAS CONFIGURAÇÕES DO LDAP.',
     'ldap_server'               => 'Servidor LDAP',
     'ldap_server_help'          => 'Deve iniciar com ldap:// (para encriptado ou TLS) ou ldaps:// (para SSL)',
 	'ldap_server_cert'			=> 'Validação certificado SSL LDAP',
@@ -72,7 +74,7 @@ return array(
     'load_remote_text'          => 'Scripts Remotos',
     'load_remote_help_text'		=> 'Esta instalação do Snipe-IT pode carregar qualquer scripts do mundo.',
     'login_note'                => 'Login Note',
-    'login_note_help'           => 'Opcionalmente, inclua algumas frases na tela de login, por exemplo, para ajudar as pessoas que encontraram um dispositivo perdido ou roubado. Este campo aceita <a href="https://help.github.com/articles/github-flavored-markdown/">Gitão com sabor marcado</a>',
+    'login_note_help'           => 'Optionally inclui algumas coisas na sua tela de login, por exemplo para ajudar pessoas que acharam um equipamento perdido ou um equipamento furtado. Este campo aceita <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'logo'                    	=> 'Logo',
     'full_multiple_companies_support_help_text' => 'Restringir utilizadores (incluindo admins) associados a empresas ao ativos da empresa.',
     'full_multiple_companies_support_text' => 'Suporte multi-empresa completo',
@@ -83,7 +85,7 @@ return array(
     'php_gd_warning'            => 'O plugin PHP Image Processing and GD NÃO está instalado.',
     'pwd_secure_complexity'     => 'Complexidade de senha',
     'pwd_secure_complexity_help' => 'Selecione as regras de complexidade de senha que você deseja aplicar.',
-    'pwd_secure_min'            => 'Senha mínima',
+    'pwd_secure_min'            => 'Senha (mín. caracteres)',
     'pwd_secure_min_help'       => 'Valor mínimo permitido é 5',
     'pwd_secure_uncommon'       => 'Prevenir senhas comuns',
     'pwd_secure_uncommon_help'  => 'Isso impedirá os usuários de usar senhas comuns das 10 senhas superiores registradas em brechas.',
@@ -91,6 +93,9 @@ return array(
     'qr_text'                   => 'Texto do Código QR',
     'setting'                   => 'Configuração',
     'settings'                  => 'Configurações',
+    'show_alerts_in_menu'       => 'Mostrar alertas no menu superior',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
     'site_name'                 => 'Nome do Site',
     'slack_botname'             => 'Botname do Stack',
     'slack_channel'             => 'Canal do Stack',
@@ -121,7 +126,7 @@ return array(
     'width_w'        => 'largura',
     'height_h'        => 'altura',
     'show_url_in_emails'                => 'Link para Snipe-IT em E-mails',
-    'show_url_in_emails_help_text'      => 'Desmarque esta caixa se não deseja vincular novamente a sua instalação Snipe-IT em seus rodapés de e-mail. Útil se a maioria de seus usuários nunca logar.',
+    'show_url_in_emails_help_text'      => 'Desmarque esta caixa se não deseja vincular novamente a sua instalação Snipe-IT em seus rodapés de e-mail. Útil se a maioria de seus usuários nunca logar. ',
     'text_pt'        => 'pt',
     'thumbnail_max_h'   => 'Altura máxima da miniatura',
     'thumbnail_max_h_help'   => 'Altura máxima em pixels que as miniaturas podem exibir na visualização de listagem. Min 25, max 500.',

resources/lang/pt-BR/admin/statuslabels/message.php

@@ -24,9 +24,9 @@ return array(
 
     'help' => array(
         'undeployable'   => 'Esses ativos não podem ser atribuídos a ninguém.',
-        'deployable'   => 'Esses ativos podem ser verificados. Uma vez que são atribuídos, eles assumirão um status meta de <i class="fa fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'deployable'   => 'Esses ativos podem ser retirados. Uma vez que são retirados, eles assumirão um status meta de <i class="fa fa-circle text-blue"></i> <strong>Deployed</strong>.',
         'archived'   => 'Esses ativos não podem ser verificados, e só aparecerão na visão arquivada. Isso é útil para manter informações sobre recursos para fins orçamentários / históricos, mas mantendo-os fora da lista de ativos do dia-a-dia.',
-        'pending'   => 'Esses ativos ainda não podem ser atribuídos a qualquer pessoa, muitas vezes usado para itens que estão fora de reparo, mas é esperado que retornem à circulação.',
+        'pending'   => 'Esses ativos ainda não podem ser atribuídos a ninguém, muitas vezes usado para itens que estão fora para reparo, mas é esperado que retornem à circulação.',
     ),
 
 );

resources/lang/pt-BR/admin/suppliers/message.php

@@ -19,9 +19,9 @@ return array(
         'confirm'   => 'Tem certeza de que deseja excluir este fornecedor?',
         'error'   => 'Houve um problema ao excluir o fornecedor. Tente novamente.',
         'success' => 'O fornecedor foi excluído com sucesso.',
-        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_assets'	 => 'Este fornecedor está no momento associado com :asset_count asset(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ',
-        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'Este fornecedor está no momento associado com :asset_count asset(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ',
-        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'Este fornecedor está no momento associado com :asset_maintenances_count asset maintenance(s) e não pode ser excluído. Atualize seus modelos para não referenciarem mais este fornecedor e tente novamente. ',
     )
 
 );

resources/lang/pt-BR/admin/users/message.php

@@ -41,7 +41,7 @@ return array(
         'ldap_could_not_bind' => 'Não foi possível se ligar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP: ',
         'ldap_could_not_search' => 'Não foi possível procurar o servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP:',
         'ldap_could_not_get_entries' => 'Não foi possível obter informações do servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP:',
-        'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha.',
+        'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha. ',
     ),
 
     'deletefile' => array(

resources/lang/pt-BR/admin/users/table.php

@@ -19,7 +19,7 @@ return array(
     'location'  			=> 'Local',
     'lock_passwords'		=> 'Detalhes de login não podem ser alterados nesta instalação.',
     'manager' 				=> 'Gerenciador',
-    'managed_locations'     => 'Locais gerenciados',
+    'managed_locations'     => 'Gerenciar locações',
     'name' 					=> 'Nome',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Senha',

resources/lang/pt-BR/general.php

@@ -40,7 +40,7 @@
     'checkout'  			=> 'Check-out',
     'city'  				=> 'Cidade',
 	'click_here'			=> 'Clique aqui',
-    'clear_selection'		=> 'Clear Selection',
+    'clear_selection'		=> 'Limpar Seleção',
     'companies'			    => 'Empresas',
     'company'				=> 'Empresas',
     'component'			    => 'Componente',
@@ -85,15 +85,16 @@
     'file_name'				=> 'Arquivo',
     'file_uploads'			=> 'Carregamentos de Arquivos',
     'generate'				=> 'Gerar',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupos',
     'gravatar_email'        => 'Endereço de E-mail do Gravatar',
     'history'  			    => 'Histórico',
     'history_for'  			=> 'Histórico de',
     'id'  					=> 'ID',
-    'image'                 => 'Image',
+    'image'                 => 'Imagem',
     'image_delete'         	=> 'Excluir Imagem',
     'image_upload'         	=> 'Carregar Imagem',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg.',
+    'image_filetypes_help'  => 'Tipos de arquivos aceitos: jpg, png, gif e svg.',
     'import'         	    => 'Importar',
     'import-history'        => 'Importar Histórico',
     'asset_maintenance'        => 'Manutenção de Ativo',
@@ -151,7 +152,7 @@
     'recent_activity'		=> 'Atividade Recente',
     'remove_company'        => 'Remover associação de empresa',
     'reports'				=> 'Relatórios',
-    'restored'				=> 'restored',
+    'restored'				=> 'restaurado',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Pedido cancelado',
     'save'  				=> 'Salvar',

resources/lang/pt-BR/validation.php

@@ -16,18 +16,18 @@ return array(
     'accepted'             => 'O :attribute dever ser aceito.',
     'active_url'           => 'O :attribute não é uma URL válida.',
     'after'                => 'O :attribute deve ser uma data após :date.',
-    'after_or_equal'       => 'O atributo: deve ser uma data após ou igual a: data.',
+    'after_or_equal'       => 'O :attribute deve ser uma data depois ou igual a :date.',
     'alpha'                => 'O :attribute pode apenas conter letras.',
     'alpha_dash'           => 'O :attribute pode apenas conter letras, números, e traços.',
     'alpha_num'            => 'O :attribute pode apenas conter letras e números.',
-    'array'                => 'O atributo: deve ser uma matriz.',
+    'array'                => 'O :attribute deve estar em ordem.',
     'before'               => 'O :attribute deve ser uma data antes de :date.',
-    'before_or_equal'      => 'O atributo: deve ser uma data anterior ou igual a: data.',
+    'before_or_equal'      => 'O atributo: deve ser uma data anterior ou igual a: date.',
     'between'              => [
         'numeric' => 'O :attribute deve estar entre :min - :max.',
         'file'    => 'O :attribute deve estar entre :min - :max kilobytes.',
         'string'  => 'O :attribute deve estar entre :min - :max caracteres.',
-        'array'   => 'O atributo deve ter entre: min e: itens máximos.',
+        'array'   => 'O :attribute deve ter entre :min e :max items.',
     ],
     'boolean'              => 'O :atributo têm que ser verdadeiro ou falso.',
     'confirmed'            => 'A confirmação do :attribute não corresponde.',
@@ -36,59 +36,59 @@ return array(
     'different'            => 'O :attribute e :other devem ser diferentes.',
     'digits'               => 'O :attribute deve ter :digits dígitos.',
     'digits_between'       => 'O :attribute deve ter entre :min e :max dígitos.',
-    'dimensions'           => 'O atributo: tem dimensões de imagem inválidas.',
+    'dimensions'           => 'O :attribute tem dimensões de imagem inválidas.',
-    'distinct'             => 'O campo: atributo tem um valor duplicado.',
+    'distinct'             => 'O :attribute tem um valor duplicado.',
     'email'                => 'O formato de :attribute é inválido.',
     'exists'               => 'O :attribute selecionado é inválido.',
-    'file'                 => 'O atributo: deve ser um arquivo.',
+    'file'                 => 'O :attribute deve ser um arquivo.',
-    'filled'               => 'O campo: atributo deve ter um valor.',
+    'filled'               => 'O :attribute deve ter um valor.',
     'image'                => 'O :attribute deve ser uma imagem.',
     'in'                   => 'O :attribute selecionado é inválido.',
-    'in_array'             => 'O campo: atributo não existe em: outro.',
+    'in_array'             => 'O :attribute campo não existe em :other.',
     'integer'              => 'O :attribute deve ser um número inteiro.',
     'ip'                   => 'O :attribute deve ser um endereço de IP válido.',
-    'ipv4'                 => 'O atributo: deve ser um endereço IPv4 válido.',
+    'ipv4'                 => 'O :attribute deve ter um endereço IPv4.',
-    'ipv6'                 => 'O atributo deve ser um endereço IPv6 válido.',
+    'ipv6'                 => 'O :attribute deve ter um IPv6 válido.',
-    'json'                 => 'O atributo: deve ser uma string JSON válida.',
+    'json'                 => 'The :attribute deve ser um JSON válida.',
     'max'                  => [
         'numeric' => 'O :attribute não pode ser maior do que :max.',
         'file'    => 'O :attribute não pode ser maior do que :max kilobytes.',
         'string'  => 'O :attribute não pode ser maior do que :max caracteres.',
-        'array'   => 'O atributo: pode não ter mais do que: itens máximos.',
+        'array'   => 'O :attribute não pode ter mais que :max items.',
     ],
     'mimes'                => 'O :attribute deve ser um arquivo do tipo: :values.',
-    'mimetypes'            => 'O: atributo deve ser um arquivo de tipo:: valores.',
+    'mimetypes'            => 'O :attribute deve ser um arquivo de tipo: :values.',
     'min'                  => [
         'numeric' => 'O :attribute deve ter pelo menos :min.',
         'file'    => 'O :attribute deve ter pelo menos :min kilobytes.',
         'string'  => 'O :attribute deve ter pelo menos :min caracteres.',
-        'array'   => 'O atributo deve ter pelo menos: itens mínimos.',
+        'array'   => 'O :attribute deve ter pelo menos :min items.',
     ],
     'not_in'               => 'O :attribute selecionado é inválido.',
     'numeric'              => 'O :attribute deve ser um número.',
-    'present'              => 'O campo: atributo deve estar presente.',
+    'present'              => 'O campo:attribute deve estar presente.',
-    'valid_regex'          => 'That is not a valid regex. ',
+    'valid_regex'          => 'Isso não é uma regex válida. ',
     'regex'                => 'O formato de :attribute é inválido.',
     'required'             => 'O campo de :attribute é requerido.',
     'required_if'          => 'O campo de :attribute é requerido quando :other é :value.',
-    'required_unless'      => 'O campo: atributo é necessário a menos que: outro esteja em: valores.',
+    'required_unless'      => 'O campo:attribute é obrigatório a não ser que: :other estiver em : :values.',
     'required_with'        => 'O campo de :attribute é requerido quando :values está presente.',
-    'required_with_all'    => 'O campo: atributo é obrigatório quando: os valores estão presentes.',
+    'required_with_all'    => 'O campo :attribute é obrigatorio quando : :values está presente.',
     'required_without'     => 'O campo de :attribute é requerido quando :values não está presente.',
-    'required_without_all' => 'O campo: atributo é obrigatório quando nenhum de: valores estão presentes.',
+    'required_without_all' => 'O campo :attribute é obrigatório nenhum dos :values está presente.',
     'same'                 => 'O :attribute e :other devem corresponderem.',
     'size'                 => [
         'numeric' => 'O :attribute deve ser :size.',
         'file'    => 'O :attribute deve ter :size kilobytes.',
         'string'  => 'O :attribute deve ter :size caracteres.',
-        'array'   => 'O atributo: deve conter: itens de tamanho.',
+        'array'   => 'O :attribute deve conter :size items.',
     ],
-    'string'               => 'O atributo deve ser uma string.',
+    'string'               => 'O :attribute deve ser string.',
-    'timezone'             => 'O atributo: deve ser uma zona válida.',
+    'timezone'             => 'O :attribute deve ser um campo válido.',
     'unique'               => 'O :attribute já foi tomado.',
-    'uploaded'             => 'O atributo: não foi possível carregar.',
+    'uploaded'             => 'O :attribute falhou no upload.',
     'url'                  => 'O formato de :attribute é inválido.',
-    "unique_undeleted"     => "The :attribute must be unique.",
+    "unique_undeleted"     => "O :attribute deve ser único.",
 
     /*
     |--------------------------------------------------------------------------
@@ -114,8 +114,8 @@ return array(
     */
 
     'custom' => [
-        'alpha_space' => "O campo: atributo contém um caractere que não é permitido.",
+        'alpha_space' => "O campo :attribute contém um caractere que não é permitido.",
-        "email_array"      => "Um ou mais endereços de e-mail são inválidos.",
+        "email_array"      => "Um ou mais e-mails sõ invalidos.",
         "hashed_pass"      => "Sua senha atual está incorreta",
         'dumbpwd'          => 'Essa senha é muito comum.',
         "statuslabel_type" => "Você deve selecionar um tipo de etiqueta de status válido",