Fixed location string

snipe · May 4, 2015 · 2f52369 · 2f52369
1 parent aab52d0
commit 2f52369
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.7-9',
-  'hash_version' => 'v1.2.7-9-g68d8b10',
+  'app_version' => 'v1.2.7-10',
+  'hash_version' => 'v1.2.7-10-g71febc1',
 );
diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php
@@ -9,7 +9,7 @@
     'id'      		=> 'ID',
     'locations'		=> 'Locations',
     'name'			=> 'Location Name',
-    'parent'		=> 'Parent Location',
+    'parent'		=> 'Parent',
     'state'   		=> 'State',
     'update'		=> 'Update Location',
     'zip'			=> 'Postal Code',

diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
@@ -23,7 +23,7 @@
         <tr role="row">
             <th class="col-md-2">@lang('admin/locations/table.name')</th>
             <th class="col-md-2">@lang('admin/locations/table.parent')</th>
-            <th class="col-md-3">@lang('admin/locations/table.assets')</th>
+            <th class="col-md-3">@lang('general.assets')</th>
             <th class="col-md-3">@lang('admin/locations/table.address')</th>
             <th class="col-md-2">@lang('admin/locations/table.city'),
              @lang('admin/locations/table.state')