merge with origin and add localize

app/views/settings/zones/edit.html.erb

@@ -5,7 +5,7 @@
   			<li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
 		  	<li class="breadcrumb-item active">Edit</li>
 		  	<span class="float-right">
-		    	<%= link_to t('.new', :default => t("views.btn.new")), settings_zones_path %>
+		  		<%= link_to t("views.btn.back"), settings_zones_path %> 		    	
 		  	</span>
 		 </ul>
 		</div>

app/views/settings/zones/index.html.erb

@@ -22,7 +22,7 @@
             <th>Name</th>
             <th>Is active</th>
             <th>Created by</th>
-            <th></th>
+            <th>Action</th>
           </tr>
         </thead>
 

app/views/settings/zones/show.html.erb

@@ -4,7 +4,7 @@
   <li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
   <li class="breadcrumb-item active">Details</li>
   <span class="float-right">
-    <%= link_to t('.new', :default => t("views.btn.new")), settings_zones_path %>
+    <%= link_to t("views.btn.back"), settings_zones_path %>
   </span>
 </ul>
 </div>
@@ -22,7 +22,7 @@
               <th>Name</th>
               <th>Is active</th>
               <th>Created by</th>
-              <th></th>
+              <th>Action</th>
             </tr>
           </thead>
 
@@ -60,9 +60,10 @@
               <th>Name</th>
               <th>Type</th>
               <th>Seater</th>
-              <th>Is active</th>
-              <th>Created by</th>
-              <th></th>
+              <th>Is Active</th>
+              <th>Created By</th>
+              <th>Created At</th>
+              <th>Action</th>
             </tr>
           </thead>