Alphabetized language files, more for #151, refactoring language stri…

…ng hierarchy.
snipe · Jun 9, 2014 · cd0f42c · cd0f42c
1 parent 2fe66c1
commit cd0f42c
Show file tree

Hide file tree

Showing 29 changed files with 199 additions and 169 deletions.
diff --git a/app/lang/en/admin/categories/general.php b/app/lang/en/admin/categories/general.php
@@ -1,11 +1,11 @@
 <?php
 
 return array(
-	'update_category'  					=> 'Update Category',
-	'create_category'  					=> 'Create Category',
-	'asset_categories' 					=> 'Asset Categories',
 	'about_asset_categories' 			=> 'About Asset Categories',
-	'category_name'  					=> 'Category Name',
 	'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
+	'asset_categories' 					=> 'Asset Categories',
+	'category_name'  					=> 'Category Name',
+	'create'  							=> 'Create Category',
+	'update'  							=> 'Update Category',
 
 );
diff --git a/app/lang/en/admin/categories/table.php b/app/lang/en/admin/categories/table.php
@@ -3,7 +3,7 @@
 return array(
 
 	'id'      => 'ID',
-	'title'      => 'Asset Category Name',
 	'parent'   => 'Parent',
+	'title'      => 'Asset Category Name',
 
 );
diff --git a/app/lang/en/admin/depreciations/general.php b/app/lang/en/admin/depreciations/general.php
@@ -1,12 +1,12 @@
 <?php
 
 return array(
-	'update_depreciation'  					=> 'Update Depreciation',
+	'about_asset_depreciations'  			=> 'About Asset Depreciations',
+	'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+	'asset_depreciations'  					=> 'Asset Depreciations',
 	'create_depreciation'  					=> 'Create Depreciation',
 	'depreciation_name'  					=> 'Depreciation Name',
 	'number_of_months'  					=> 'Number of Months',
-	'asset_depreciations'  					=> 'Asset Depreciations',
-	'about_asset_depreciations'  			=> 'About Asset Depreciations',
-	'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+	'update_depreciation'  					=> 'Update Depreciation',
 
 );
diff --git a/app/lang/en/admin/depreciations/table.php b/app/lang/en/admin/depreciations/table.php
@@ -3,8 +3,8 @@
 return array(
 
 	'id'      => 'ID',
-	'title'      => 'Name ',
 	'months'   => 'Months',
 	'term'   => 'Term',
+	'title'      => 'Name ',
 
 );
diff --git a/app/lang/en/admin/groups/table.php b/app/lang/en/admin/groups/table.php
@@ -5,6 +5,5 @@
 	'id'         => 'Id',
 	'name'       => 'Name',
 	'users'      => '# of Users',
-	'created_at' => 'Created at',
 
 );
diff --git a/app/lang/en/admin/hardware/general.php b/app/lang/en/admin/hardware/general.php
@@ -1,11 +1,11 @@
 <?php
 
 return array(
+	'asset'  					=> 'Asset',
 	'checkin'  					=> 'Checkin Asset',
 	'checkout'  				=> 'Checkout Asset to User',
 	'clone'  					=> 'Clone Asset',
-	'view'  					=> 'View Asset',
 	'edit'  					=> 'Edit Asset',
-	'asset'  					=> 'Asset',
 	'pending'  					=> 'Pending Asset',
+	'view'  					=> 'View Asset',
 );
diff --git a/app/lang/en/admin/hardware/table.php b/app/lang/en/admin/hardware/table.php
@@ -2,19 +2,19 @@
 
 return array(
 
-	'id'      		=> 'ID',
-	'title'      	=> 'Asset ',
 	'asset_tag'   	=> 'Asset Tag',
-	'serial'   		=> 'Serial',
-	'purchase_date'	=> 'Purchased',
-	'purchase_cost'	=> 'Cost',
 	'book_value'  	=> 'Value',
-	'status'   		=> 'Status',
-	'checkoutto' 	=> 'Checked Out',
 	'change' 		=> 'In/Out',
-	'location' 		=> 'Location',
-	'eol' 			=> 'EOL',
+	'checkoutto' 	=> 'Checked Out',
 	'diff' 			=> 'Diff',
 	'dl_csv' 		=> 'Download CSV',
+	'eol' 			=> 'EOL',
+	'id'      		=> 'ID',
+	'location' 		=> 'Location',
+	'purchase_cost'	=> 'Cost',
+	'purchase_date'	=> 'Purchased',
+	'serial'   		=> 'Serial',
+	'status'   		=> 'Status',
+	'title'      	=> 'Asset ',
 
 );
diff --git a/app/lang/en/admin/licenses/form.php b/app/lang/en/admin/licenses/form.php
@@ -2,23 +2,22 @@
 
 return array(
 
-	'create'	=> 'Create License',
-	'update'	=> 'Update License',
-	'name'		=> 'Software Name',
-	'serial'	=> 'Serial',
-	'to_name'	=> 'Licensed to Name',
-	'to_email'	=> 'Licensed to Email',
-	'seats'		=> 'Seats',
-	'order'		=> 'Order No.',
-	'date'		=> 'Purchase Date',
-	'cost'		=> 'Purchase Cost',
-	'depreciation'	=> 'Depreciation',
-	'no_depreciation'	=> 'Do Not Depreciate',
-	'notes'		=> 'Notes',
-	'checkin'	=> 'Checkin',
-	'checkin'	=> 'Checkin',
-	'date'				=> 'Purchase Date',
+	'checkin'			=> 'Checkin',
+	'checkin'			=> 'Checkin',
+	'cost'				=> 'Purchase Cost',
 	'cost'				=> 'Purchase Cost',
+	'create'			=> 'Create License',
+	'date'				=> 'Purchase Date',
+	'date'				=> 'Purchase Date',
+	'depreciation'		=> 'Depreciation',
+	'name'				=> 'Software Name',
+	'no_depreciation'	=> 'Do Not Depreciate',
+	'notes'				=> 'Notes',
+	'order'				=> 'Order No.',
+	'seats'				=> 'Seats',
+	'serial'			=> 'Serial',
+	'to_email'			=> 'Licensed to Email',
+	'to_name'			=> 'Licensed to Name',
+	'update'			=> 'Update License',
 
-)
-;
+);
diff --git a/app/lang/en/admin/licenses/general.php b/app/lang/en/admin/licenses/general.php
@@ -1,17 +1,18 @@
 <?php
 
 return array(
+
 	'checkin'  					=> 'Checkin License Seat',
+	'checkout_history'  		=> 'Checkout History',
 	'checkout'  				=> 'Checkout License Seat to User',
-	'view'  					=> 'View License',
 	'edit'  					=> 'Edit License',
-	'software_licenses'  		=> 'Software Licenses',
-	'license_seats'  			=> 'License Seats',
-	'in_out'  					=> 'In/Out',
 	'history_for'  				=> 'History for ',
+	'in_out'  					=> 'In/Out',
+	'info'  					=> 'License Info',
+	'license_seats'  			=> 'License Seats',
 	'seat'  					=> 'Seat',
 	'seats'  					=> 'Seats',
+	'software_licenses'  		=> 'Software Licenses',
 	'user'  					=> 'User',
-	'checkout_history'  		=> 'Checkout History',
-	'info'  					=> 'License Info',
+	'view'  					=> 'View License',
 );
diff --git a/app/lang/en/admin/licenses/table.php b/app/lang/en/admin/licenses/table.php
@@ -2,15 +2,15 @@
 
 return array(
 
-	'id'      => 'ID',
-	'seats'   => 'Seats',
-	'title'      => 'License',
-	'purchased'   => 'Purchased',
-	'serial'   => 'Serial',
-	'assigned_to'   => 'Assigned To',
-	'license_name'   => 'Licensed To',
-	'license_email'   => 'License Email',
-	'purchase_date'   => 'Purchase Date',
-	'checkout'   => 'In/Out',
+	'assigned_to'   	=> 'Assigned To',
+	'checkout'   		=> 'In/Out',
+	'id'      			=> 'ID',
+	'license_email'   	=> 'License Email',
+	'license_name'   	=> 'Licensed To',
+	'purchase_date'   	=> 'Purchase Date',
+	'purchased'   		=> 'Purchased',
+	'seats'   			=> 'Seats',
+	'serial'   			=> 'Serial',
+	'title'      		=> 'License',
 
 );
diff --git a/app/lang/en/admin/locations/message.php b/app/lang/en/admin/locations/message.php
@@ -17,6 +17,7 @@
 	),
 
 	'delete' => array(
+		'confirm'   	=> 'Are you sure you wish to delete this location?',
 		'error'   => 'There was an issue deleting the location. Please try again.',
 		'success' => 'The location was deleted successfully.'
 	)

diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php
@@ -2,10 +2,14 @@
 
 return array(
 
-	'id'      => 'ID',
-	'name'      => 'Name',
-	'city'   => 'City',
-	'state'   => 'State',
-	'country'   => 'Country',
-
+	'id'      		=> 'ID',
+	'city'   		=> 'City',
+	'state'   		=> 'State',
+	'country'   	=> 'Country',
+	'create'		=> 'Create Location',
+	'update'		=> 'Update Location',
+	'name'			=> 'Location Name',
+	'address'		=> 'Address',
+	'zip'			=> 'Postal Code',
+	'locations'		=> 'Locations',
 );
diff --git a/app/lang/en/admin/manufacturers/message.php b/app/lang/en/admin/manufacturers/message.php
@@ -16,6 +16,7 @@
 	),
 
 	'delete' => array(
+		'confirm'   => 'Are you sure you wish to delete this manufacturer?',
 		'error'   => 'There was an issue deleting the blog post. Please try again.',
 		'success' => 'The Manufacturer was deleted successfully.'
 	)

diff --git a/app/lang/en/admin/manufacturers/table.php b/app/lang/en/admin/manufacturers/table.php
@@ -2,7 +2,10 @@
 
 return array(
 
-	'title'      => 'Manufacturer Name',
-	'id'   => 'ID',
+	'asset_manufacturers'	=> 'Asset Manufacturers',
+	'create'				=> 'Create Manufacturer',
+	'id'   					=> 'ID',
+	'name'      			=> 'Manufacturer Name',
+	'update'				=> 'Update Manufacturer',
 
 );
diff --git a/app/lang/en/admin/models/table.php b/app/lang/en/admin/models/table.php
@@ -2,10 +2,12 @@
 
 return array(
 
-	'title'      => 'Asset Model Name',
-	'modelnumber'   => 'Model No.',
-	'created_at' => 'Created at',
-	'numassets' => 'Assets',
-	'eol' => 'EOL',
-
+	'create'				=> 'Create Asset Model',
+	'created_at' 			=> 'Created at',
+	'eol'	 				=> 'EOL',
+	'modelnumber'   		=> 'Model No.',
+	'name'      			=> 'Asset Model Name',
+	'numassets' 			=> 'Assets',
+	'title'					=> 'Asset Models',
+	'update'				=> 'Update Asset Model',
 );
diff --git a/app/lang/en/admin/statuslabels/table.php b/app/lang/en/admin/statuslabels/table.php
@@ -1,11 +1,5 @@
 <?php
 
 return array(
-
-	'id'      => 'ID',
-	'name'      => 'Name',
-	'city'   => 'City',
-	'state'   => 'State',
-	'country'   => 'Country',
-
+	'name'      => 'Status Name',
 );
diff --git a/app/lang/en/admin/users/table.php b/app/lang/en/admin/users/table.php
@@ -2,15 +2,15 @@
 
 return array(
 
-	'id'         	=> 'Id',
+	'activated'  	=> 'Active',
+	'checkedout'  	=> 'Assets',
+	'created_at' 	=> 'Created',
+	'email'      	=> 'Email',
 	'first_name' 	=> 'First Name',
+	'id'         	=> 'Id',
+	'last_login'  	=> 'Last Login',
 	'last_name'  	=> 'Last Name',
 	'name' 			=> 'Name',
-	'email'      	=> 'Email',
-	'last_login'  	=> 'Last Login',
-	'checkedout'  	=> 'Assets',
-	'activated'  	=> 'Active',
-	'created_at' 	=> 'Created',
-	'noresults' 	=> 'There are no results that match your query.',
+
 
 );