diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 8a9ab7dc9304..d61a695623e2 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -438,7 +438,7 @@ public function postCheckout($assetId)
             $data['log_id'] = $logaction->id;
             $data['eula'] = $asset->getEula();
             $data['first_name'] = $user->first_name;
-            $data['item_name'] = $asset->assetNameForEula();
+            $data['item_name'] = $asset->showAssetName();
             $data['require_acceptance'] = $asset->requireAcceptance();
 
 
diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php
index 603ba291908b..cf481c8f4db1 100755
--- a/app/lang/ar/general.php
+++ b/app/lang/ar/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'العنوان',
     'admin'					=> 'الإدارة',
     'all_assets'			=> 'كل الأصول',
@@ -56,6 +57,7 @@
     'id'  					=> 'الرقم',
     'image_delete'         	=> 'حذف الصورة',
     'image_upload'         	=> 'رفع صورة',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'الإسم الأخير',
     'license'				=> 'الرخص',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'الرخص المتاحة',
     'licenses'				=> 'الرخص',
     'list_all'				=> 'عرض الكل',
+    'loading'				=> 'Loading',
     'location'              => 'الموقع',
     'locations'				=> 'المواقع',
     'logout'				=> 'تسجيل خروج',
diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php
index 3901a6e4601b..e1d89743b04c 100755
--- a/app/lang/cs/general.php
+++ b/app/lang/cs/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresa',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Všechna zařízení',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Smazat obrázek',
     'image_upload'         	=> 'Nahrát obrázek',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Příjmení',
     'license'				=> 'Licence',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'dostupných licencí',
     'licenses'				=> 'Licence',
     'list_all'				=> 'Vypsat vše',
+    'loading'				=> 'Loading',
     'location'              => 'Lokalita',
     'locations'				=> 'Umístění',
     'logout'				=> 'Odhlásit',
diff --git a/app/lang/da/general.php b/app/lang/da/general.php
index 2b2c7727f1d8..f13df234a963 100755
--- a/app/lang/da/general.php
+++ b/app/lang/da/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Tilbehør',
     'accessory'				=> 'Tilbehør',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Addresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Alle aktiver',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slet billede',
     'image_upload'         	=> 'Upload billede',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Efternavn',
     'license'				=> 'Licens',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Tilgængelige licenser',
     'licenses'				=> 'Licenser',
     'list_all'				=> 'Vis alle',
+    'loading'				=> 'Loading',
     'location'              => 'Lokation',
     'locations'				=> 'Lokationer',
     'logout'				=> 'Log ud',
diff --git a/app/lang/de/general.php b/app/lang/de/general.php
index 7e8c7d94b393..52aa883f06c0 100755
--- a/app/lang/de/general.php
+++ b/app/lang/de/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Zubehör',
     'accessory'				=> 'Zubehör',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Supplier Address',
     'admin'					=> 'Administrator',
     'all_assets'			=> 'Alle Assets',
@@ -56,6 +57,7 @@
     'id'  					=> 'Id',
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
+    'item'  				=> 'Item',
     'last'					=> 'Letztes',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
+    'loading'				=> 'Loading',
     'location'              => 'Standort',
     'locations'				=> 'Standorte',
     'logout'				=> 'Abmelden',
diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php
index 81bdd3a9463b..4f8efeab45db 100755
--- a/app/lang/en-GB/general.php
+++ b/app/lang/en-GB/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index 91bc4adb4445..18c306569bb4 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -57,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php
index 53bb034d6860..7b4cbb3365b6 100755
--- a/app/lang/es-ES/general.php
+++ b/app/lang/es-ES/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accesorios',
     'accessory'				=> 'Accesorio',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Dirección',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Todos los Equipos',
@@ -56,6 +57,7 @@
     'id'  					=> 'Id',
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
+    'item'  				=> 'Item',
     'last'					=> 'Último',
     'last_name'				=> 'Apellidos',
     'license'				=> 'Licencia',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licencias libres',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Listar Todo',
+    'loading'				=> 'Loading',
     'location'              => 'Localización',
     'locations'				=> 'Localizaciones',
     'logout'				=> 'Desconexión',
diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php
index 4dd4e6a352b6..1c441179b7bd 100755
--- a/app/lang/fi/general.php
+++ b/app/lang/fi/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Osoite',
     'admin'					=> 'Ylläpitäjä',
     'all_assets'			=> 'Kaikki Laitteet',
@@ -56,6 +57,7 @@
     'id'  					=> 'Tunnus',
     'image_delete'         	=> 'Poista Kuva',
     'image_upload'         	=> 'Lähetä Kuva',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Sukunimi',
     'license'				=> 'Lisenssi',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Vapaana olevat lisenssit',
     'licenses'				=> 'Lisenssit',
     'list_all'				=> 'Listaa Kaikki',
+    'loading'				=> 'Loading',
     'location'              => 'Sijainti',
     'locations'				=> 'Sijainnit',
     'logout'				=> 'Kirjaudu Ulos',
diff --git a/app/lang/fr/admin/accessories/message.php b/app/lang/fr/admin/accessories/message.php
index 62f179c5a1f0..eaa61d5daaae 100755
--- a/app/lang/fr/admin/accessories/message.php
+++ b/app/lang/fr/admin/accessories/message.php
@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'La catégorie n\'éxiste pas.',
     'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'La catégorie n\'a pas été crée, veuillez essayer à nouveau.',
+        'success' => 'Catégorie créée avec succès.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
+        'error'   => 'Catégorie n\'a pas été actualisée, veuillez réessayer',
         'success' => 'Category updated successfully.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this category?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
-        'success' => 'The category was deleted successfully.'
+        'confirm'   => 'Êtes vous sûr de vouloir effacer cette catégorie?',
+        'error'   => 'Problème lors de l\'effacement de cette catégorie. Veuillez réessayer.',
+        'success' => 'Catégorie effacée.'
     ),
     
      'checkout' => array(
diff --git a/app/lang/fr/general.php b/app/lang/fr/general.php
index b06010a52a8a..f838e0d44f92 100755
--- a/app/lang/fr/general.php
+++ b/app/lang/fr/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Tous les actifs',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Supprimer l\'image',
     'image_upload'         	=> 'Charger une image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Nom',
     'license'				=> 'Licence',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Licences disponibles',
     'licenses'				=> 'Licences',
     'list_all'				=> 'Lister tout',
+    'loading'				=> 'Loading',
     'location'              => 'Lieu',
     'locations'				=> 'Lieux',
     'logout'				=> 'Se déconnecter',
diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php
index 2aeabb2cb5f1..886b9bfacf24 100755
--- a/app/lang/hu/general.php
+++ b/app/lang/hu/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Cím',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Vezetéknév',
     'license'				=> 'License',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Kijelentkezés',
diff --git a/app/lang/it/general.php b/app/lang/it/general.php
index 9b1a323c2288..2b2769bc0f5d 100755
--- a/app/lang/it/general.php
+++ b/app/lang/it/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessori',
     'accessory'				=> 'Accessorio',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Indirizzo',
     'admin'					=> 'Amministratore',
     'all_assets'			=> 'Tutti gli Asset',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Cancella l\'Immagine',
     'image_upload'         	=> 'Carica immagine',
+    'item'  				=> 'Item',
     'last'					=> 'Ultimo',
     'last_name'				=> 'Cognome',
     'license'				=> 'Licenza',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Licenze Disponibili',
     'licenses'				=> 'Licenze',
     'list_all'				=> 'Visualizza Tutti',
+    'loading'				=> 'Loading',
     'location'              => 'Luogo',
     'locations'				=> 'Luoghi',
     'logout'				=> 'logout',
diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php
index 32e483f061d6..18c306569bb4 100755
--- a/app/lang/ja/general.php
+++ b/app/lang/ja/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php
index 9aa9fbe97390..bde9141d874d 100755
--- a/app/lang/ms/general.php
+++ b/app/lang/ms/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Alamat',
     'admin'					=> 'Pentadbir',
     'all_assets'			=> 'Semua Harta',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Hapuskan imej',
     'image_upload'         	=> 'Muat naik imej',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Nama Keluarga',
     'license'				=> 'Lesen',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Lesen Yang Ada',
     'licenses'				=> 'Lesen',
     'list_all'				=> 'Senaraikan Semua',
+    'loading'				=> 'Loading',
     'location'              => 'Lokasi',
     'locations'				=> 'Lokasi',
     'logout'				=> 'Log keluar',
diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php
index 19747671afa7..5c4bdf7193a5 100755
--- a/app/lang/nl/general.php
+++ b/app/lang/nl/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adres',
     'admin'					=> 'Beheerder',
     'all_assets'			=> 'Alle materialen',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Afbeelding verwijderen',
     'image_upload'         	=> 'Afbeelding uploaden',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Achternaam',
     'license'				=> 'Licentie',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'beschikbare licenties',
     'licenses'				=> 'Licenties',
     'list_all'				=> 'Toon Alles',
+    'loading'				=> 'Loading',
     'location'              => 'Locatie',
     'locations'				=> 'Locaties',
     'logout'				=> 'Afmelden',
diff --git a/app/lang/no/general.php b/app/lang/no/general.php
index e932535c26ed..fe50e03281b6 100755
--- a/app/lang/no/general.php
+++ b/app/lang/no/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Tilbehør',
     'accessory'				=> 'Tilbehør',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Alle eiendeler',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slett bilde',
     'image_upload'         	=> 'Last opp bilde',
+    'item'  				=> 'Item',
     'last'					=> 'Siste',
     'last_name'				=> 'Etternavn',
     'license'				=> 'Lisens',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Tilgjengelige lisenser',
     'licenses'				=> 'Lisenser',
     'list_all'				=> 'List alle',
+    'loading'				=> 'Loading',
     'location'              => 'Lokasjon',
     'locations'				=> 'Lokasjoner',
     'logout'				=> 'Logg ut',
diff --git a/app/lang/pl/general.php b/app/lang/pl/general.php
index ce0baa4645ab..a84bfb095d7d 100755
--- a/app/lang/pl/general.php
+++ b/app/lang/pl/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adres',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Wszystkie aktywa',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Usuń zdjęcie',
     'image_upload'         	=> 'Dodaj zdjęcie',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Nazwisko',
     'license'				=> 'Licencja',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Dostępne licencje',
     'licenses'				=> 'Licencje',
     'list_all'				=> 'Pokaż Wszystkie',
+    'loading'				=> 'Loading',
     'location'              => 'Lokalizacja',
     'locations'				=> 'Lokalizacje',
     'logout'				=> 'Wyloguj się',
diff --git a/app/lang/pt-BR/general.php b/app/lang/pt-BR/general.php
index 9414bc15c0fc..39eda234575c 100755
--- a/app/lang/pt-BR/general.php
+++ b/app/lang/pt-BR/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Acessórios',
     'accessory'				=> 'Acessório',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Endereço',
     'admin'					=> 'Administrador',
     'all_assets'			=> 'Todos os Ativos',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Excluir Imagem',
     'image_upload'         	=> 'Carregar Imagem',
+    'item'  				=> 'Item',
     'last'					=> 'Última',
     'last_name'				=> 'Último Nome',
     'license'				=> 'Licença',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licenças disponíveis',
     'licenses'				=> 'Licenças',
     'list_all'				=> 'Listar Todos',
+    'loading'				=> 'Loading',
     'location'              => 'Local',
     'locations'				=> 'Locais',
     'logout'				=> 'Sair',
diff --git a/app/lang/pt-PT/general.php b/app/lang/pt-PT/general.php
index 32e483f061d6..18c306569bb4 100755
--- a/app/lang/pt-PT/general.php
+++ b/app/lang/pt-PT/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
diff --git a/app/lang/ro/general.php b/app/lang/ro/general.php
index 1559a88e9b38..552f1995d07f 100755
--- a/app/lang/ro/general.php
+++ b/app/lang/ro/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresa',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Toate activele',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Sterge poza',
     'image_upload'         	=> 'Incarca poza',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Nume',
     'license'				=> 'Licenta',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Licente disponibile',
     'licenses'				=> 'Licente',
     'list_all'				=> 'Arata tot',
+    'loading'				=> 'Loading',
     'location'              => 'Locatie',
     'locations'				=> 'Locatii',
     'logout'				=> 'Log out',
diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php
index be415d1cda96..2722347cf94c 100755
--- a/app/lang/ru/general.php
+++ b/app/lang/ru/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Аксессуары',
     'accessory'				=> 'Аксессуар',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Адрес',
     'admin'					=> 'Администратор',
     'all_assets'			=> 'Все активы',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Удалить изображение',
     'image_upload'         	=> 'Загрузить изображение',
+    'item'  				=> 'Item',
     'last'					=> 'В конец',
     'last_name'				=> 'Фамилия',
     'license'				=> 'Лицензия',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'Доступные лицензии',
     'licenses'				=> 'Лицензии',
     'list_all'				=> 'Весь список',
+    'loading'				=> 'Loading',
     'location'              => 'Расположение',
     'locations'				=> 'Места',
     'logout'				=> 'Выйти',
diff --git a/app/lang/sv-SE/general.php b/app/lang/sv-SE/general.php
index 841dee8f50f9..b0ed015035b7 100755
--- a/app/lang/sv-SE/general.php
+++ b/app/lang/sv-SE/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adress',
     'admin'					=> 'Administratör',
     'all_assets'			=> 'Alla Tillgångar',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Ta bort Bild',
     'image_upload'         	=> 'Ladda upp Bild',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Efternamn',
     'license'				=> 'Licens',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'tillgängliga licenser',
     'licenses'				=> 'Licenser',
     'list_all'				=> 'Lista Alla',
+    'loading'				=> 'Loading',
     'location'              => 'Plats',
     'locations'				=> 'Platser',
     'logout'				=> 'Logga ut',
diff --git a/app/lang/th/general.php b/app/lang/th/general.php
index c6bec1b02da1..04982ffd87fd 100755
--- a/app/lang/th/general.php
+++ b/app/lang/th/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'อุปกรณ์',
     'accessory'				=> 'อุปกรณ์',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'ที่อยู่',
     'admin'					=> 'ผู้ดูแลระบบ',
     'all_assets'			=> 'ทรัพย์สินทั้งหมด',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'ลบรูปภาพประจำตัว',
     'image_upload'         	=> 'อัพโหลดภาพ',
+    'item'  				=> 'Item',
     'last'					=> 'สุดท้าย',
     'last_name'				=> 'นามสกุล',
     'license'				=> 'ลิขสิทธิ์',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'ลิขสิทธิ์พร้อมใช้',
     'licenses'				=> 'ลิขสิทธิ์',
     'list_all'				=> 'รายการทั้งหมด',
+    'loading'				=> 'Loading',
     'location'              => 'สถานที่',
     'locations'				=> 'สถานที่',
     'logout'				=> 'ออกจากระบบ',
diff --git a/app/lang/vi/general.php b/app/lang/vi/general.php
index 32e483f061d6..18c306569bb4 100755
--- a/app/lang/vi/general.php
+++ b/app/lang/vi/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
@@ -63,6 +65,7 @@
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
diff --git a/app/lang/zh-CN/general.php b/app/lang/zh-CN/general.php
index 5a761b7d7fb2..24d7238a32f1 100755
--- a/app/lang/zh-CN/general.php
+++ b/app/lang/zh-CN/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> '附属品',
     'accessory'				=> '附属品',
+    'activity_report'		=> 'Activity Report',
     'address'				=> '地址',
     'admin'					=> '管理员',
     'all_assets'			=> '所有资产',
@@ -56,6 +57,7 @@
     'id'  					=> '编号',
     'image_delete'         	=> '删除图片',
     'image_upload'         	=> '上传图片',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> '姓氏',
     'license'				=> '授权许可',
@@ -63,6 +65,7 @@
     'licenses_available'	=> '可用许可',
     'licenses'				=> '许可证',
     'list_all'				=> '列出全部',
+    'loading'				=> 'Loading',
     'location'              => '位置',
     'locations'				=> '地理位置',
     'logout'				=> '注销',
diff --git a/app/models/Asset.php b/app/models/Asset.php
index 0ac3d04d29d6..bef1e91c7978 100755
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -123,7 +123,7 @@ public function assetstatus()
 	/** 
 	* Get name for EULA 
 	**/
-	public function assetNameForEula()
+	public function showAssetName()
     {
 	    if ($this->name=='') {
 		    return $this->model->name;
diff --git a/app/views/backend/reports/activity.blade.php b/app/views/backend/reports/activity.blade.php
index bda62f26026d..e9d1a19c9e1f 100644
--- a/app/views/backend/reports/activity.blade.php
+++ b/app/views/backend/reports/activity.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-@lang('general.license_report') ::
+@lang('general.activity_report') ::
 @parent
 @stop
 
@@ -15,18 +15,19 @@
     <h3>@lang('general.activity_report')</h3>
 </div>
 
-<div class="row">
 
+<div class="row">
+	
 <div class="table-responsive">
 <table id="example">
         <thead>
             <tr role="row">
-            <th class="col-sm-1">Admin</th>
-            <th class="col-sm-1">@lang('table.action')</th>
+            <th class="col-sm-1">@lang('general.admin')</th>
+            <th class="col-sm-1">@lang('general.action')</th>
 			<th class="col-sm-1"></th>
-            <th class="col-sm-1">Type</th>
-            <th class="col-sm-1">Item</th>
-            <th class="col-sm-1">Date</th
+            <th class="col-sm-1">@lang('general.type')</th>
+            <th class="col-sm-1">@lang('general.item')</th>
+            <th class="col-sm-1">@lang('general.date')</th
         </tr>
     </thead>
     <tbody>
@@ -41,22 +42,21 @@
 	            @endif
             </td>
             <td>
-	            @if ($log_action->assetlog)
+	            @if ($log_action->asset_type=="hardware")
 	            	Asset
-	            @elseif ($log_action->licenselog)
+	            @elseif ($log_action->asset_type=="software")
 	            	License
-	            @elseif ($log_action->accessorylog) 
+	            @elseif ($log_action->asset_type=="accessory") 
 	            	Accessory
-	            @endif
-	            
+	            @endif	            
             </td>
             <td>
 	            
-	            @if ($log_action->assetlog)
-	            	{{ $log_action->assetlog->name }}
-	            @elseif ($log_action->licenselog)
+	            @if ($log_action->asset_type=="hardware")
+	            	{{ $log_action->assetlog->showAssetName() }}
+	            @elseif ($log_action->asset_type=="software")
 	            	{{ $log_action->licenselog->name }}
-	            @elseif ($log_action->accessorylog) 
+	            @elseif ($log_action->asset_type=="accessory") 
 	            	{{ $log_action->accessorylog->name }}
 	            @endif