diff --git a/admin/extension/report/customer_search.php b/admin/extension/report/customer_search.php
index cd08373..abdbd1b 100644
--- a/admin/extension/report/customer_search.php
+++ b/admin/extension/report/customer_search.php
@@ -6,7 +6,7 @@ $_['heading_title']     = 'Customer Searches Report';
 $_['text_extension']    = 'Extensions';
 $_['text_edit']         = 'Edit Customer Searches Report';
 $_['text_success']      = 'Success: You have modified customer searches report!';
-$_['text_filter']       = 'Filter';
+$_['text_filter']       = 'Suodatin';
 $_['text_guest']        = 'Guest';
 $_['text_customer']     = '<a href="%s">%s</a>';
 
@@ -24,8 +24,8 @@ $_['entry_date_end']    = 'Date End';
 $_['entry_keyword']     = 'Keyword';
 $_['entry_customer']    = 'Customer';
 $_['entry_ip']          = 'IP';
-$_['entry_status']      = 'Status';
-$_['entry_sort_order']  = 'Sort Order';
+$_['entry_status']      = 'Tila';
+$_['entry_sort_order']  = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify customer searches report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify customer searches report!';
diff --git a/admin/extension/report/customer_transaction.php b/admin/extension/report/customer_transaction.php
index b7cab53..af668fd 100644
--- a/admin/extension/report/customer_transaction.php
+++ b/admin/extension/report/customer_transaction.php
@@ -6,7 +6,7 @@ $_['heading_title']         = 'Customer Transaction Report';
 $_['text_extension']        = 'Extensions';
 $_['text_edit']             = 'Edit Customer Transaction Report';
 $_['text_success']          = 'Success: You have modified customer credit report!';
-$_['text_filter']           = 'Filter';
+$_['text_filter']           = 'Suodatin';
 
 // Column
 $_['column_customer']       = 'Customer Name';
@@ -20,8 +20,8 @@ $_['column_action']         = 'Action';
 $_['entry_date_start']      = 'Date Start';
 $_['entry_date_end']        = 'Date End';
 $_['entry_customer']        = 'Customer';
-$_['entry_status']          = 'Status';
-$_['entry_sort_order']      = 'Sort Order';
+$_['entry_status']          = 'Tila';
+$_['entry_sort_order']      = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']      = 'Varoitus: You do not have permission to modify customer credit report!';
\ No newline at end of file
+$_['error_permission']      = 'Varoitus: You do not have permission to modify customer credit report!';
diff --git a/admin/extension/report/marketing.php b/admin/extension/report/marketing.php
index bcc8f6a..d1a6203 100644
--- a/admin/extension/report/marketing.php
+++ b/admin/extension/report/marketing.php
@@ -20,8 +20,8 @@ $_['column_total']     = 'Total';
 $_['entry_date_start'] = 'Date Start';
 $_['entry_date_end']   = 'Date End';
 $_['entry_status']     = 'Order Status';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify marketing report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify marketing report!';
diff --git a/admin/extension/report/product_purchased.php b/admin/extension/report/product_purchased.php
index 89836f9..1350ade 100644
--- a/admin/extension/report/product_purchased.php
+++ b/admin/extension/report/product_purchased.php
@@ -21,8 +21,8 @@ $_['column_total']      = 'Total';
 $_['entry_date_start']  = 'Date Start';
 $_['entry_date_end']    = 'Date End';
 $_['entry_status']      = 'Order Status';
-$_['entry_status']      = 'Status';
-$_['entry_sort_order']  = 'Sort Order';
+$_['entry_status']      = 'Tila';
+$_['entry_sort_order']  = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify products purchased report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify products purchased report!';
diff --git a/admin/extension/report/product_viewed.php b/admin/extension/report/product_viewed.php
index e4e8f41..ae1089b 100644
--- a/admin/extension/report/product_viewed.php
+++ b/admin/extension/report/product_viewed.php
@@ -14,8 +14,8 @@ $_['column_viewed']    = 'Viewed';
 $_['column_percent']   = 'Percent';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify products viewed report!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify products viewed report!';
diff --git a/admin/extension/report/sale_coupon.php b/admin/extension/report/sale_coupon.php
index e3b2987..39f7cc5 100644
--- a/admin/extension/report/sale_coupon.php
+++ b/admin/extension/report/sale_coupon.php
@@ -18,8 +18,8 @@ $_['column_action']    = 'Action';
 // Entry
 $_['entry_date_start'] = 'Date Start';
 $_['entry_date_end']   = 'Date End';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify coupon report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify coupon report!';
diff --git a/admin/extension/report/sale_order.php b/admin/extension/report/sale_order.php
index 0d6cb07..fc323b7 100644
--- a/admin/extension/report/sale_order.php
+++ b/admin/extension/report/sale_order.php
@@ -26,8 +26,8 @@ $_['entry_date_start']  = 'Date Start';
 $_['entry_date_end']    = 'Date End';
 $_['entry_group']       = 'Group By';
 $_['entry_status']      = 'Order Status';
-$_['entry_status']      = 'Status';
-$_['entry_sort_order']  = 'Sort Order';
+$_['entry_status']      = 'Tila';
+$_['entry_sort_order']  = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify sales report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify sales report!';
diff --git a/admin/extension/report/sale_return.php b/admin/extension/report/sale_return.php
index 6e6cf5a..b47a8c3 100644
--- a/admin/extension/report/sale_return.php
+++ b/admin/extension/report/sale_return.php
@@ -23,8 +23,8 @@ $_['entry_date_start']  = 'Date Start';
 $_['entry_date_end']    = 'Date End';
 $_['entry_group']       = 'Group By';
 $_['entry_status']      = 'Return Status';
-$_['entry_status']      = 'Status';
-$_['entry_sort_order']  = 'Sort Order';
+$_['entry_status']      = 'Tila';
+$_['entry_sort_order']  = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify returns report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify returns report!';
diff --git a/admin/extension/report/sale_shipping.php b/admin/extension/report/sale_shipping.php
index ff9be11..f80fba4 100644
--- a/admin/extension/report/sale_shipping.php
+++ b/admin/extension/report/sale_shipping.php
@@ -25,8 +25,8 @@ $_['entry_date_start']  = 'Date Start';
 $_['entry_date_end']    = 'Date End';
 $_['entry_group']       = 'Group By';
 $_['entry_status']      = 'Order Status';
-$_['entry_status']      = 'Status';
-$_['entry_sort_order']  = 'Sort Order';
+$_['entry_status']      = 'Tila';
+$_['entry_sort_order']  = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify shipping report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify shipping report!';
diff --git a/admin/extension/report/sale_tax.php b/admin/extension/report/sale_tax.php
index c9b1641..53e7c9e 100644
--- a/admin/extension/report/sale_tax.php
+++ b/admin/extension/report/sale_tax.php
@@ -25,8 +25,8 @@ $_['entry_date_start']  = 'Date Start';
 $_['entry_date_end']    = 'Date End';
 $_['entry_group']       = 'Group By';
 $_['entry_status']      = 'Order Status';
-$_['entry_status']      = 'Status';
-$_['entry_sort_order']  = 'Sort Order';
+$_['entry_status']      = 'Tila';
+$_['entry_sort_order']  = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission']  = 'Varoitus: You do not have permission to modify tax report!';
\ No newline at end of file
+$_['error_permission']  = 'Varoitus: You do not have permission to modify tax report!';
diff --git a/admin/extension/shipping/auspost.php b/admin/extension/shipping/auspost.php
index d79893d..40fdab9 100644
--- a/admin/extension/shipping/auspost.php
+++ b/admin/extension/shipping/auspost.php
@@ -13,12 +13,12 @@ $_['entry_postcode']     = 'Post Code';
 $_['entry_weight_class'] = 'Weight Class';
 $_['entry_tax_class']    = 'Tax Class';
 $_['entry_geo_zone']     = 'Geo Zone';
-$_['entry_status']       = 'Status';
-$_['entry_sort_order']   = 'Sort Order';
+$_['entry_status']       = 'Tila';
+$_['entry_sort_order']   = 'Lajittelujärjestys';
 
 // Help
 $_['help_weight_class']  = 'Set to kilograms.';
 
 // Error
 $_['error_permission']   = 'Varoitus: You do not have permission to modify Australia Post shipping!';
-$_['error_postcode']     = 'Post Code must be 4 digits!';
\ No newline at end of file
+$_['error_postcode']     = 'Post Code must be 4 digits!';
diff --git a/admin/extension/shipping/ec_ship.php b/admin/extension/shipping/ec_ship.php
index 1772668..97a7ec6 100644
--- a/admin/extension/shipping/ec_ship.php
+++ b/admin/extension/shipping/ec_ship.php
@@ -28,8 +28,8 @@ $_['entry_service']                            = 'Services';
 $_['entry_weight_class']                       = 'Weight Class';
 $_['entry_tax_class']                          = 'Tax Class';
 $_['entry_geo_zone']                           = 'Geo Zone';
-$_['entry_status']                             = 'Status';
-$_['entry_sort_order']                         = 'Sort Order';
+$_['entry_status']                             = 'Tila';
+$_['entry_sort_order']                         = 'Lajittelujärjestys';
 
 // Help
 $_['help_api_key']                             = 'Enter the API key assigned to you by EC-SHIP.';
diff --git a/admin/extension/shipping/fedex.php b/admin/extension/shipping/fedex.php
index 7de83d1..eadccf7 100644
--- a/admin/extension/shipping/fedex.php
+++ b/admin/extension/shipping/fedex.php
@@ -44,7 +44,7 @@ $_['text_account_rate']                        = 'Account Rate';
 
 // Entry
 $_['entry_key']                                = 'Key';
-$_['entry_password']                           = 'Password';
+$_['entry_password']                           = 'Salasana';
 $_['entry_account']                            = 'Account Number';
 $_['entry_meter']                              = 'Meter Number';
 $_['entry_postcode']                           = 'Post Code';
@@ -63,8 +63,8 @@ $_['entry_display_weight']                     = 'Display Delivery Weight';
 $_['entry_weight_class']                       = 'Weight Class';
 $_['entry_tax_class']                          = 'Tax Class';
 $_['entry_geo_zone']                           = 'Geo Zone';
-$_['entry_status']                             = 'Status';
-$_['entry_sort_order']                         = 'Sort Order';
+$_['entry_status']                             = 'Tila';
+$_['entry_sort_order']                         = 'Lajittelujärjestys';
 
 // Help
 $_['help_length_class']                        = 'Set to inches or centimeters.';
@@ -79,4 +79,4 @@ $_['error_password']                           = 'Password required!';
 $_['error_account']                            = 'Account required!';
 $_['error_meter']                              = 'Meter required!';
 $_['error_postcode']                           = 'Post Code required!';
-$_['error_dimension']                          = 'Width &amp; Height required!';
\ No newline at end of file
+$_['error_dimension']                          = 'Width &amp; Height required!';
diff --git a/admin/extension/shipping/flat.php b/admin/extension/shipping/flat.php
index 54b7726..487b542 100644
--- a/admin/extension/shipping/flat.php
+++ b/admin/extension/shipping/flat.php
@@ -11,8 +11,8 @@ $_['text_edit']        = 'Edit Flat Rate Shipping';
 $_['entry_cost']       = 'Cost';
 $_['entry_tax_class']  = 'Tax Class';
 $_['entry_geo_zone']   = 'Geo Zone';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify flat rate shipping!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify flat rate shipping!';
diff --git a/admin/extension/shipping/free.php b/admin/extension/shipping/free.php
index 8dc3037..1f7cf88 100644
--- a/admin/extension/shipping/free.php
+++ b/admin/extension/shipping/free.php
@@ -10,11 +10,11 @@ $_['text_edit']        = 'Edit Free Shipping';
 // Entry
 $_['entry_total']      = 'Total';
 $_['entry_geo_zone']   = 'Geo Zone';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Help
 $_['help_total']       = 'Sub-Total amount needed before the free shipping module becomes available.';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify free shipping!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify free shipping!';
diff --git a/admin/extension/shipping/item.php b/admin/extension/shipping/item.php
index 3d6f46b..2c852c2 100644
--- a/admin/extension/shipping/item.php
+++ b/admin/extension/shipping/item.php
@@ -11,8 +11,8 @@ $_['text_edit']        = 'Edit Per Item Shipping';
 $_['entry_cost']       = 'Cost';
 $_['entry_tax_class']  = 'Tax Class';
 $_['entry_geo_zone']   = 'Geo Zone';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify shipping per item rates!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify shipping per item rates!';
diff --git a/admin/extension/shipping/parcelforce_48.php b/admin/extension/shipping/parcelforce_48.php
index ac6b47c..827360d 100644
--- a/admin/extension/shipping/parcelforce_48.php
+++ b/admin/extension/shipping/parcelforce_48.php
@@ -15,8 +15,8 @@ $_['entry_display_insurance'] = 'Display Insurance';
 $_['entry_display_time']      = 'Display Delivery Time';
 $_['entry_tax_class']         = 'Tax Class';
 $_['entry_geo_zone']          = 'Geo Zone';
-$_['entry_status']            = 'Status';
-$_['entry_sort_order']        = 'Sort Order';
+$_['entry_status']            = 'Tila';
+$_['entry_sort_order']        = 'Lajittelujärjestys';
 
 // Help
 $_['help_rate']               = 'Enter values upto 5,2 decimal places. (12345.67) Example: .1:1,.25:1.27 - Weights less than or equal to 0.1Kg would cost 1.00, Weights less than or equal to 0.25g but more than 0.1Kg will cost 1.27. Do not enter KG or symbols.';
@@ -26,4 +26,4 @@ $_['help_display_insurance']  = 'Do you want to display the shipping insurance?
 $_['help_display_time']       = 'Do you want to display the shipping time? (e.g. Ships within 3 to 5 days)';
 
 // Error
-$_['error_permission']        = 'Varoitus: You do not have permission to modify Parcelforce 48 shipping!';
\ No newline at end of file
+$_['error_permission']        = 'Varoitus: You do not have permission to modify Parcelforce 48 shipping!';
diff --git a/admin/extension/shipping/pickup.php b/admin/extension/shipping/pickup.php
index 464c92b..97c929b 100644
--- a/admin/extension/shipping/pickup.php
+++ b/admin/extension/shipping/pickup.php
@@ -9,8 +9,8 @@ $_['text_edit']        = 'Edit Pickup From Store Shipping';
 
 // Entry
 $_['entry_geo_zone']   = 'Geo Zone';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify pickup from store!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify pickup from store!';
diff --git a/admin/extension/shipping/royal_mail.php b/admin/extension/shipping/royal_mail.php
index 8b09204..7eee51e 100644
--- a/admin/extension/shipping/royal_mail.php
+++ b/admin/extension/shipping/royal_mail.php
@@ -19,8 +19,8 @@ $_['entry_display_insurance']          = 'Display Insurance';
 $_['entry_weight_class']               = 'Weight Class';
 $_['entry_tax_class']                  = 'Tax Class';
 $_['entry_geo_zone']                   = 'Geo Zone';
-$_['entry_status']                     = 'Status';
-$_['entry_sort_order']                 = 'Sort Order';
+$_['entry_status']                     = 'Tila';
+$_['entry_sort_order']                 = 'Lajittelujärjestys';
 
 // Help
 $_['help_rate']                        = 'Example: 5:10.00,7:12.00 Weight:Cost,Weight:Cost, etc..';
@@ -44,4 +44,4 @@ $_['tab_international_signed']         = 'International Signed';
 $_['tab_international_economy']        = 'International Economy';
 
 // Error
-$_['error_permission']                 = 'Varoitus: You do not have permission to modify Royal Mail shipping!';
\ No newline at end of file
+$_['error_permission']                 = 'Varoitus: You do not have permission to modify Royal Mail shipping!';
diff --git a/admin/extension/shipping/ups.php b/admin/extension/shipping/ups.php
index 379f691..d91b499 100644
--- a/admin/extension/shipping/ups.php
+++ b/admin/extension/shipping/ups.php
@@ -78,8 +78,8 @@ $_['entry_height']                 = 'Height';
 $_['entry_width']                  = 'Width';
 $_['entry_tax_class']              = 'Tax Class';
 $_['entry_geo_zone']               = 'Geo Zone';
-$_['entry_status']                 = 'Status';
-$_['entry_sort_order']             = 'Sort Order';
+$_['entry_status']                 = 'Tila';
+$_['entry_sort_order']             = 'Lajittelujärjestys';
 $_['entry_debug']                  = 'Debug Mode';
 
 // Help
@@ -112,4 +112,4 @@ $_['error_password']               = 'Password Required!';
 $_['error_city']                   = 'Origin City!';
 $_['error_state']                  = 'Origin State/Province Required!';
 $_['error_country']                = 'Origin Country Required!';
-$_['error_dimension']              = 'Average Dimensions Required!';
\ No newline at end of file
+$_['error_dimension']              = 'Average Dimensions Required!';
diff --git a/admin/extension/shipping/usps.php b/admin/extension/shipping/usps.php
index fdeff51..0f5409b 100644
--- a/admin/extension/shipping/usps.php
+++ b/admin/extension/shipping/usps.php
@@ -67,8 +67,8 @@ $_['entry_display_weight']  = 'Display Delivery Weight';
 $_['entry_weight_class']    = 'Weight Class';
 $_['entry_tax']             = 'Tax Class';
 $_['entry_geo_zone']        = 'Geo Zone';
-$_['entry_status']          = 'Status';
-$_['entry_sort_order']      = 'Sort Order';
+$_['entry_status']          = 'Tila';
+$_['entry_sort_order']      = 'Lajittelujärjestys';
 $_['entry_debug']           = 'Debug Mode';
 
 // Help
@@ -85,4 +85,4 @@ $_['error_postcode']        = 'Zip Code Required!';
 $_['error_width']           = 'Width Required!';
 $_['error_length']          = 'Length Required!';
 $_['error_height']          = 'Height Required!';
-$_['error_girth']           = 'Girth Required!';
\ No newline at end of file
+$_['error_girth']           = 'Girth Required!';
diff --git a/admin/extension/shipping/weight.php b/admin/extension/shipping/weight.php
index aa5ec78..3667263 100644
--- a/admin/extension/shipping/weight.php
+++ b/admin/extension/shipping/weight.php
@@ -11,11 +11,11 @@ $_['text_edit']        = 'Edit Weight Based Shipping';
 $_['entry_rate']       = 'Rates';
 $_['entry_tax_class']  = 'Tax Class';
 $_['entry_geo_zone']   = 'Geo Zone';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Help
 $_['help_rate']        = 'Example: 5:10.00,7:12.00 Weight:Cost,Weight:Cost, etc..';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify weight based shipping!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify weight based shipping!';
diff --git a/admin/extension/theme/default.php b/admin/extension/theme/default.php
index a1b1af1..be143db 100644
--- a/admin/extension/theme/default.php
+++ b/admin/extension/theme/default.php
@@ -12,7 +12,7 @@ $_['text_image']                       = 'Images';
 
 // Entry
 $_['entry_directory']                  = 'Theme Directory';
-$_['entry_status']                     = 'Status';
+$_['entry_status']                     = 'Tila';
 $_['entry_product_limit']              = 'Default Items Per Page';
 $_['entry_product_description_length'] = 'List Description Limit';
 $_['entry_image_category']             = 'Category Image Size (W x H)';
@@ -45,4 +45,4 @@ $_['error_image_related']              = 'Related Product Image Size dimensions
 $_['error_image_compare']              = 'Compare Image Size dimensions required!';
 $_['error_image_wishlist']             = 'Wish List Image Size dimensions required!';
 $_['error_image_cart']                 = 'Cart Image Size dimensions required!';
-$_['error_image_location']             = 'Store Image Size dimensions required!';
\ No newline at end of file
+$_['error_image_location']             = 'Store Image Size dimensions required!';
diff --git a/admin/extension/total/coupon.php b/admin/extension/total/coupon.php
index dccb860..3bc7a2d 100644
--- a/admin/extension/total/coupon.php
+++ b/admin/extension/total/coupon.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified coupon total!';
 $_['text_edit']        = 'Edit Coupon';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify coupon total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify coupon total!';
diff --git a/admin/extension/total/credit.php b/admin/extension/total/credit.php
index 53b1aa5..d8356be 100644
--- a/admin/extension/total/credit.php
+++ b/admin/extension/total/credit.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified store credit total!';
 $_['text_edit']        = 'Edit Store Credit Total';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify store credit total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify store credit total!';
diff --git a/admin/extension/total/handling.php b/admin/extension/total/handling.php
index c4ca029..7a7ac53 100644
--- a/admin/extension/total/handling.php
+++ b/admin/extension/total/handling.php
@@ -11,11 +11,11 @@ $_['text_edit']        = 'Edit Handling Fee Total';
 $_['entry_total']      = 'Order Total';
 $_['entry_fee']        = 'Fee';
 $_['entry_tax_class']  = 'Tax Class';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Help
 $_['help_total']       = 'The checkout total the order must reach before this order total becomes active.';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify handling fee total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify handling fee total!';
diff --git a/admin/extension/total/klarna_fee.php b/admin/extension/total/klarna_fee.php
index 78eb8a5..02b122c 100644
--- a/admin/extension/total/klarna_fee.php
+++ b/admin/extension/total/klarna_fee.php
@@ -6,19 +6,19 @@ $_['heading_title']    = 'Klarna Fee';
 $_['text_extension']   = 'Extensions';
 $_['text_success']     = 'Success: You have modified Klarna fee total!';
 $_['text_edit']        = 'Edit Klarna Fee Total';
-$_['text_sweden']      = 'Sweden';
-$_['text_norway']      = 'Norway';
-$_['text_finland']     = 'Finland';
-$_['text_denmark']     = 'Denmark';
-$_['text_germany']     = 'Germany';
+$_['text_sweden']      = 'Ruotsi';
+$_['text_norway']      = 'Norja';
+$_['text_finland']     = 'Suomi';
+$_['text_denmark']     = 'Tanska';
+$_['text_germany']     = 'Saksa';
 $_['text_netherlands'] = 'The Netherlands';
 
 // Entry
 $_['entry_total']      = 'Order Total';
 $_['entry_fee']        = 'Invoice Fee';
 $_['entry_tax_class']  = 'Tax Class';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify Klarna fee total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify Klarna fee total!';
diff --git a/admin/extension/total/low_order_fee.php b/admin/extension/total/low_order_fee.php
index b9889fc..4a4f7e1 100644
--- a/admin/extension/total/low_order_fee.php
+++ b/admin/extension/total/low_order_fee.php
@@ -11,8 +11,8 @@ $_['text_edit']        = 'Edit Low Order Fee Total';
 $_['entry_total']      = 'Order Total';
 $_['entry_fee']        = 'Fee';
 $_['entry_tax_class']  = 'Tax Class';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Help
 $_['help_total']       = 'The checkout total the order must reach before this order total is deactivated.';
diff --git a/admin/extension/total/reward.php b/admin/extension/total/reward.php
index 277e297..3bba215 100644
--- a/admin/extension/total/reward.php
+++ b/admin/extension/total/reward.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified reward points total!';
 $_['text_edit']        = 'Edit Reward Points Total';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify reward points total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify reward points total!';
diff --git a/admin/extension/total/shipping.php b/admin/extension/total/shipping.php
index 09d3945..12714b0 100644
--- a/admin/extension/total/shipping.php
+++ b/admin/extension/total/shipping.php
@@ -9,8 +9,8 @@ $_['text_edit']        = 'Edit Shipping Total';
 
 // Entry
 $_['entry_estimator']  = 'Shipping Estimator';
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify shipping total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify shipping total!';
diff --git a/admin/extension/total/sub_total.php b/admin/extension/total/sub_total.php
index 704825c..103b2a3 100644
--- a/admin/extension/total/sub_total.php
+++ b/admin/extension/total/sub_total.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified sub-total total!';
 $_['text_edit']        = 'Edit Sub-Total Total';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify sub-total total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify sub-total total!';
diff --git a/admin/extension/total/tax.php b/admin/extension/total/tax.php
index fba2e81..409e8b5 100644
--- a/admin/extension/total/tax.php
+++ b/admin/extension/total/tax.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified taxes total!';
 $_['text_edit']        = 'Edit Tax Total';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify taxes total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify taxes total!';
diff --git a/admin/extension/total/total.php b/admin/extension/total/total.php
index 13c1019..83186f3 100644
--- a/admin/extension/total/total.php
+++ b/admin/extension/total/total.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified total totals!';
 $_['text_edit']        = 'Edit Total Total';
 
 // Entry
-$_['entry_status']     = 'Status';
-$_['entry_sort_order'] = 'Sort Order';
+$_['entry_status']     = 'Tila';
+$_['entry_sort_order'] = 'Lajittelujärjestys';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify total totals!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify total totals!';
diff --git a/admin/extension/total/voucher.php b/admin/extension/total/voucher.php
index c4026e2..16212ce 100644
--- a/admin/extension/total/voucher.php
+++ b/admin/extension/total/voucher.php
@@ -8,8 +8,8 @@ $_['text_success']     = 'Success: You have modified gift voucher total!';
 $_['text_edit']        = 'Edit Gift Voucher Total';
 
 // Entry
-$_['entry_status']     = 'Status';
+$_['entry_status']     = 'Tila';
 $_['entry_sort_order'] = 'Sort Order';
 
 // Error
-$_['error_permission'] = 'Varoitus: You do not have permission to modify gift voucher total!';
\ No newline at end of file
+$_['error_permission'] = 'Varoitus: You do not have permission to modify gift voucher total!';
diff --git a/admin/localisation/country.php b/admin/localisation/country.php
index f25296c..dd19f68 100644
--- a/admin/localisation/country.php
+++ b/admin/localisation/country.php
@@ -20,7 +20,7 @@ $_['entry_iso_code_2']        = 'ISO Code (2)';
 $_['entry_iso_code_3']        = 'ISO Code (3)';
 $_['entry_address_format']    = 'Address Format';
 $_['entry_postcode_required'] = 'Postcode Required';
-$_['entry_status']            = 'Status';
+$_['entry_status']            = 'Tila';
 
 // Help
 $_['help_address_format']     = 'First Name = {firstname}<br />Last Name = {lastname}<br />Company = {company}<br />Address 1 = {address_1}<br />Address 2 = {address_2}<br />City = {city}<br />Postcode = {postcode}<br />Zone = {zone}<br />Zone Code = {zone_code}<br />Country = {country}';
diff --git a/admin/localisation/currency.php b/admin/localisation/currency.php
index 9478573..0c653b9 100644
--- a/admin/localisation/currency.php
+++ b/admin/localisation/currency.php
@@ -23,7 +23,7 @@ $_['entry_value']          = 'Value';
 $_['entry_symbol_left']    = 'Symbol Left';
 $_['entry_symbol_right']   = 'Symbol Right';
 $_['entry_decimal_place']  = 'Decimal Places';
-$_['entry_status']         = 'Status';
+$_['entry_status']         = 'Tila';
 
 // Help
 $_['help_code']            = 'Do not change if this is your default currency.';
diff --git a/admin/localisation/location.php b/admin/localisation/location.php
index 78635d6..62e4632 100644
--- a/admin/localisation/location.php
+++ b/admin/localisation/location.php
@@ -12,8 +12,8 @@ $_['text_time']        = 'Opening Times';
 $_['text_geocode']     = 'Geocode was not successful for the following reason:';
 
 // Column
-$_['column_name']      = 'Store Name';
-$_['column_address']   = 'Address';
+$_['column_name']      = 'Kaupan nimi';
+$_['column_address']   = 'Osoite';
 $_['column_action']    = 'Toiminto';
 
 // Entry
diff --git a/admin/localisation/tax_rate.php b/admin/localisation/tax_rate.php
index 54f25b6..ec547fa 100644
--- a/admin/localisation/tax_rate.php
+++ b/admin/localisation/tax_rate.php
@@ -15,8 +15,8 @@ $_['column_name']          = 'Tax Name';
 $_['column_rate']          = 'Tax Rate';
 $_['column_type']          = 'Type';
 $_['column_geo_zone']      = 'Geo Zone';
-$_['column_date_added']    = 'Date Added';
-$_['column_date_modified'] = 'Date Modified';
+$_['column_date_added']    = 'Lisäyspäivä';
+$_['column_date_modified'] = 'Muokkauspäivä';
 $_['column_action']        = 'Toiminto';
 
 // Entry
diff --git a/admin/mail/voucher.php b/admin/mail/voucher.php
index bc49ab6..726a91a 100644
--- a/admin/mail/voucher.php
+++ b/admin/mail/voucher.php
@@ -6,4 +6,4 @@ $_['text_greeting'] = 'Congratulations, You have received a Gift Certificate wor
 $_['text_from']     = 'This Gift Certificate has been sent to you by %s';
 $_['text_message']  = 'With a message saying';
 $_['text_redeem']   = 'To redeem this Gift Certificate, write down the redemption code which is <b>%s</b> then click on the the link below and purchase the product you wish to use this gift certificate on. You can enter the gift certificate code on the shopping cart page before you click checkout.';
-$_['text_footer']   = 'Please reply to this email if you have any questions.';
\ No newline at end of file
+$_['text_footer']   = 'Please reply to this email if you have any questions.';
diff --git a/admin/marketing/coupon.php b/admin/marketing/coupon.php
index 6499df2..b05e24c 100644
--- a/admin/marketing/coupon.php
+++ b/admin/marketing/coupon.php
@@ -17,17 +17,17 @@ $_['column_code']         = 'Code';
 $_['column_discount']     = 'Discount';
 $_['column_date_start']   = 'Date Start';
 $_['column_date_end']     = 'Date End';
-$_['column_status']       = 'Status';
+$_['column_status']       = 'Tila';
 $_['column_order_id']     = 'Order ID';
-$_['column_customer']     = 'Customer';
+$_['column_customer']     = 'Asiakas';
 $_['column_amount']       = 'Amount';
-$_['column_date_added']   = 'Date Added';
+$_['column_date_added']   = 'Lisäyspäivä';
 $_['column_action']       = 'Toiminto';
 
 // Entry
 $_['entry_name']          = 'Coupon Name';
 $_['entry_code']          = 'Code';
-$_['entry_type']          = 'Type';
+$_['entry_type']          = 'Tyyppi';
 $_['entry_discount']      = 'Discount';
 $_['entry_logged']        = 'Customer Login';
 $_['entry_shipping']      = 'Free Shipping';
@@ -38,7 +38,7 @@ $_['entry_date_start']    = 'Date Start';
 $_['entry_date_end']      = 'Date End';
 $_['entry_uses_total']    = 'Uses Per Coupon';
 $_['entry_uses_customer'] = 'Uses Per Customer';
-$_['entry_status']        = 'Status';
+$_['entry_status']        = 'Tila';
 
 // Help
 $_['help_code']           = 'The code the customer enters to get the discount.';
diff --git a/admin/marketing/marketing.php b/admin/marketing/marketing.php
index 685c7af..9de05a1 100644
--- a/admin/marketing/marketing.php
+++ b/admin/marketing/marketing.php
@@ -7,14 +7,14 @@ $_['text_success']      = 'Success: You have modified marketing tracking!';
 $_['text_list']         = 'Marketing Tracking List';
 $_['text_add']          = 'Add Marketing Tracking';
 $_['text_edit']         = 'Edit Marketing Tracking';
-$_['text_filter']       = 'Filter';
+$_['text_filter']       = 'Suodatin';
 		
 // Column
 $_['column_name']       = 'Campaign Name';
 $_['column_code']       = 'Code';
 $_['column_clicks']     = 'Clicks';
 $_['column_orders']     = 'Orders';
-$_['column_date_added'] = 'Date Added';
+$_['column_date_added'] = 'Lisäyspäivä';
 $_['column_action']     = 'Toiminto';
 
 // Entry
@@ -22,7 +22,7 @@ $_['entry_name']        = 'Campaign Name';
 $_['entry_description'] = 'Campaign Description';
 $_['entry_code']        = 'Tracking Code';
 $_['entry_example']     = 'Examples';
-$_['entry_date_added']  = 'Date Added';
+$_['entry_date_added']  = 'Lisäyspäivä';
 
 // Help
 $_['help_code']         = 'The tracking code that will be used to track marketing campaigns.';
diff --git a/admin/marketplace/api.php b/admin/marketplace/api.php
index bb036fa..1c386af 100644
--- a/admin/marketplace/api.php
+++ b/admin/marketplace/api.php
@@ -8,7 +8,7 @@ $_['text_signup']      = 'Please enter your OpenCart API information which you c
 
 // Entry
 $_['entry_username']   = 'Username';
-$_['entry_secret']     = 'Secret';
+$_['entry_secret']     = 'Salaisuus';
 
 // Error
 $_['error_permission'] = 'Varoitus: You do not have permission to modify marketplace API!';
diff --git a/admin/marketplace/extension.php b/admin/marketplace/extension.php
index aa1b953..40e610c 100644
--- a/admin/marketplace/extension.php
+++ b/admin/marketplace/extension.php
@@ -1,6 +1,6 @@
 <?php
 // Heading
-$_['heading_title'] = 'Extensions';
+$_['heading_title'] = 'Laajennukset';
 
 // Text
 $_['text_success']  = 'Success: You have modified extensions!';
diff --git a/admin/marketplace/marketplace.php b/admin/marketplace/marketplace.php
index 1eebc48..132aa62 100644
--- a/admin/marketplace/marketplace.php
+++ b/admin/marketplace/marketplace.php
@@ -5,7 +5,7 @@ $_['heading_title']      = 'Extension Marketplace';
 // Text
 $_['text_success']       = 'Success: You have modified extensions!';
 $_['text_list']          = 'Extension List';
-$_['text_filter']        = 'Filter';
+$_['text_filter']        = 'Suodatin';
 $_['text_search']        = 'Search for extensions and themes';
 $_['text_category']      = 'Categories';
 $_['text_all']           = 'All';
@@ -54,14 +54,14 @@ $_['entry_pin']          = 'PIN';
 $_['tab_description']    = 'Description';
 $_['tab_documentation']  = 'Documentation';
 $_['tab_download']       = 'Download';
-$_['tab_comment']        = 'Comment';
+$_['tab_comment']        = 'Kommentti';
 
 // Button
 $_['button_opencart']    = 'Marketplace API';
 $_['button_purchase']    = 'Purchase';
 $_['button_view_all']    = 'View all extensions';
 $_['button_get_support'] = 'Get Support';
-$_['button_comment']     = 'Comment';
+$_['button_comment']     = 'Kommentti';
 $_['button_reply']       = 'Reply';
 
 // Error
diff --git a/admin/marketplace/modification.php b/admin/marketplace/modification.php
index fc2d5cf..48a57d0 100644
--- a/admin/marketplace/modification.php
+++ b/admin/marketplace/modification.php
@@ -10,9 +10,9 @@ $_['text_list']         = 'Modification List';
 // Column
 $_['column_name']       = 'Modification Name';
 $_['column_author']     = 'Author';
-$_['column_version']    = 'Version';
-$_['column_status']     = 'Status';
-$_['column_date_added'] = 'Date Added';
+$_['column_version']    = 'Versio';
+$_['column_status']     = 'Tila';
+$_['column_date_added'] = 'Lisäyspäivä';
 $_['column_action']     = 'Toiminto';
 
 // Error
diff --git a/admin/marketplace/openbay.php b/admin/marketplace/openbay.php
index 7c7e3e0..1946f22 100644
--- a/admin/marketplace/openbay.php
+++ b/admin/marketplace/openbay.php
@@ -56,7 +56,7 @@ $_['text_patch_option']				    = 'Manual patching';
 
 // Column
 $_['column_name']          				= 'Plugin name';
-$_['column_status']        				= 'Status';
+$_['column_status']        				= 'Tila';
 $_['column_action']        				= 'Toiminto';
 
 // Entry
diff --git a/admin/report/online.php b/admin/report/online.php
index 031a5d9..22966c1 100644
--- a/admin/report/online.php
+++ b/admin/report/online.php
@@ -7,7 +7,7 @@ $_['text_extension']    = 'Extensions';
 $_['text_success']      = 'Success: You have modified customers online report!';
 $_['text_list']         = 'Online List';
 $_['text_filter']       = 'Suodatin';
-$_['text_guest']        = 'Guest';
+$_['text_guest']        = 'Vieras';
 
 // Column
 $_['column_ip']         = 'IP';
diff --git a/admin/sale/order.php b/admin/sale/order.php
index 518e017..98ef29d 100644
--- a/admin/sale/order.php
+++ b/admin/sale/order.php
@@ -7,7 +7,7 @@ $_['text_success']               = 'Success: You have modified orders!';
 $_['text_list']                  = 'Order List';
 $_['text_add']                   = 'Add Order';
 $_['text_edit']                  = 'Edit Order';
-$_['text_filter']                = 'Filter';
+$_['text_filter']                = 'Suodatin';
 $_['text_order_detail']          = 'Order Details';
 $_['text_customer_detail']       = 'Customer Details';
 $_['text_option']                = 'Options';
@@ -15,9 +15,9 @@ $_['text_store']                 = 'Store';
 $_['text_date_added']            = 'Date Added';
 $_['text_payment_method']        = 'Payment Method';
 $_['text_shipping_method']       = 'Shipping Method';
-$_['text_customer']              = 'Customer';
-$_['text_customer_group']        = 'Customer Group';
-$_['text_email']                 = 'E-Mail';
+$_['text_customer']              = 'Asiakas';
+$_['text_customer_group']        = 'Asiakasryhmä';
+$_['text_email']                 = 'Sähköpostiosoite';
 $_['text_telephone']             = 'Telephone';
 $_['text_fax']                   = 'Fax';
 $_['text_invoice']               = 'Invoice';
@@ -63,36 +63,36 @@ $_['text_picklist']              = 'Dispatch Note';
 
 // Column
 $_['column_order_id']            = 'Order ID';
-$_['column_customer']            = 'Customer';
-$_['column_status']              = 'Status';
-$_['column_date_added']          = 'Date Added';
-$_['column_date_modified']       = 'Date Modified';
+$_['column_customer']            = 'Asiakas';
+$_['column_status']              = 'Tila';
+$_['column_date_added']          = 'Lisäyspäivä';
+$_['column_date_modified']       = 'Muokkauspäivä';
 $_['column_total']               = 'Total';
-$_['column_product']             = 'Product';
+$_['column_product']             = 'Tuote';
 $_['column_model']               = 'Model';
 $_['column_quantity']            = 'Quantity';
 $_['column_price']               = 'Unit Price';
-$_['column_comment']             = 'Comment';
+$_['column_comment']             = 'Kommentti';
 $_['column_notify']              = 'Customer Notified';
-$_['column_location']            = 'Location';
+$_['column_location']            = 'Sijainti';
 $_['column_reference']           = 'Reference';
 $_['column_action']              = 'Toiminto';
 $_['column_weight']              = 'Product Weight';
 
 // Entry
 $_['entry_store']                = 'Store';
-$_['entry_customer']             = 'Customer';
-$_['entry_customer_group']       = 'Customer Group';
-$_['entry_firstname']            = 'First Name';
-$_['entry_lastname']             = 'Last Name';
-$_['entry_email']                = 'E-Mail';
+$_['entry_customer']             = 'Asiakas';
+$_['entry_customer_group']       = 'Asiakasryhmä';
+$_['entry_firstname']            = 'Etunimi';
+$_['entry_lastname']             = 'Sukunimi';
+$_['entry_email']                = 'Sähköpostiosoite';
 $_['entry_telephone']            = 'Telephone';
 $_['entry_address']              = 'Choose Address';
-$_['entry_company']              = 'Company';
+$_['entry_company']              = 'Yritys';
 $_['entry_address_1']            = 'Address 1';
 $_['entry_address_2']            = 'Address 2';
 $_['entry_city']                 = 'City';
-$_['entry_postcode']             = 'Postcode';
+$_['entry_postcode']             = 'Postinumero';
 $_['entry_country']              = 'Country';
 $_['entry_zone']                 = 'Region / State';
 $_['entry_zone_code']            = 'Region / State Code';
@@ -104,13 +104,13 @@ $_['entry_to_email']             = 'Recipient\'s E-mail';
 $_['entry_from_name']            = 'Sender\'s Name';
 $_['entry_from_email']           = 'Sender\'s E-mail';
 $_['entry_theme']                = 'Gift Certificate Theme';
-$_['entry_message']              = 'Message';
+$_['entry_message']              = 'Viesti';
 $_['entry_amount']               = 'Amount';
 $_['entry_affiliate']            = 'Affiliate';
 $_['entry_order_status']         = 'Order Status';
 $_['entry_notify']               = 'Notify Customer';
 $_['entry_override']             = 'Override';
-$_['entry_comment']              = 'Comment';
+$_['entry_comment']              = 'Kommentti';
 $_['entry_currency']             = 'Currency';
 $_['entry_shipping_method']      = 'Shipping Method';
 $_['entry_payment_method']       = 'Payment Method';
@@ -119,8 +119,8 @@ $_['entry_voucher']              = 'Voucher';
 $_['entry_reward']               = 'Reward';
 $_['entry_order_id']             = 'Order ID';
 $_['entry_total']                = 'Total';
-$_['entry_date_added']           = 'Date Added';
-$_['entry_date_modified']        = 'Date Modified';
+$_['entry_date_added']           = 'Lisäyspäivä';
+$_['entry_date_modified']        = 'Muokkauspäivä';
 
 // Help
 $_['help_override']              = 'If the customers order is being blocked from changing the order status due to an anti-fraud extension enable override.';
diff --git a/admin/sale/recurring.php b/admin/sale/recurring.php
index 98e4c09..c6ae98f 100644
--- a/admin/sale/recurring.php
+++ b/admin/sale/recurring.php
@@ -5,7 +5,7 @@ $_['heading_title']                        = 'Recurring Orders';
 // Text
 $_['text_success']                         = 'Success: You have modified recurring profiles!';
 $_['text_list']                            = 'Recurring Order List';
-$_['text_filter']                          = 'Filter';
+$_['text_filter']                          = 'Suodatin';
 $_['text_recurring_detail']                = 'Recurring Details';
 $_['text_order_detail']                    = 'Order Details';
 $_['text_product_detail']                  = 'Product Details';
@@ -17,8 +17,8 @@ $_['text_recurring_description']           = 'Description';
 $_['text_recurring_status']                = 'Recurring Status';
 $_['text_payment_method']                  = 'Payment Method';
 $_['text_order_id']                        = 'Order ID';
-$_['text_customer']                        = 'Customer';
-$_['text_email']                           = 'Email';
+$_['text_customer']                        = 'Asiakas';
+$_['text_email']                           = 'Sähköpostiosoite';
 $_['text_date_added']                      = 'Date Added';
 $_['text_order_status']                    = 'Order Status';
 $_['text_type']                            = 'Type';
@@ -36,7 +36,7 @@ $_['text_status_6']                        = 'Pending';
 
 $_['text_transactions']                    = 'Transactions';
 $_['text_cancel_confirm']                  = 'Profile\'s cancellation cannot be undone! Are you sure want to do this?';
-$_['text_transaction_date_added']          = 'Date added';
+$_['text_transaction_date_added']          = 'Lisäyspäivä';
 $_['text_transaction_payment']             = 'Payment';
 $_['text_transaction_outstanding_payment'] = 'Outstanding payment';
 $_['text_transaction_skipped']             = 'Payment skipped';
@@ -52,11 +52,11 @@ $_['text_cancelled']                       = 'Recurring payment has been cancell
 $_['column_order_recurring_id']             = 'Recurring ID';
 $_['column_order_id']                       = 'Order ID';
 $_['column_reference']                      = 'Payment Reference';
-$_['column_customer']                       = 'Customer';
-$_['column_date_added']                     = 'Date Added';
-$_['column_status']                         = 'Status';
+$_['column_customer']                       = 'Asiakas';
+$_['column_date_added']                     = 'Lisäyspäivä';
+$_['column_status']                         = 'Tila';
 $_['column_amount']                         = 'Amount';
-$_['column_type']                           = 'Type';
+$_['column_type']                           = 'Tyyppi';
 $_['column_action']                         = 'Toiminto';
 
 // Entry
@@ -66,11 +66,11 @@ $_['entry_reference']                      = 'Payment Reference';
 $_['entry_customer']                       = 'Customer';
 $_['entry_date_added']                     = 'Date Added';
 $_['entry_status']                         = 'Status';
-$_['entry_type']                           = 'Type';
+$_['entry_type']                           = 'Tyyppi';
 $_['entry_action']                         = 'Toiminto';
-$_['entry_email']                          = 'Email';
+$_['entry_email']                          = 'Sähköpostiosoite';
 $_['entry_description']                    = 'Recurring Profile\'s description';
-$_['entry_product']                        = 'Product';
+$_['entry_product']                        = 'Tuote';
 $_['entry_quantity']                       = 'Quantity';
 $_['entry_amount']                         = 'Amount';
 $_['entry_recurring']                      = 'Recurring Profile';
diff --git a/admin/sale/return.php b/admin/sale/return.php
index 03d0374..b1a2031 100644
--- a/admin/sale/return.php
+++ b/admin/sale/return.php
@@ -11,19 +11,19 @@ $_['text_opened']          = 'Opened';
 $_['text_unopened']        = 'Unopened';
 $_['text_order']           = 'Order Information';
 $_['text_product']         = 'Product Information &amp; Reason for Return';
-$_['text_history']         = 'History';
+$_['text_history']         = 'Historia';
 $_['text_history_add']     = 'Add History';
 
 // Column
 $_['column_return_id']     = 'Return ID';
 $_['column_order_id']      = 'Order ID';
 $_['column_customer']      = 'Customer';
-$_['column_product']       = 'Product';
+$_['column_product']       = 'Tuote';
 $_['column_model']         = 'Model';
-$_['column_status']        = 'Status';
-$_['column_date_added']    = 'Date Added';
-$_['column_date_modified'] = 'Date Modified';
-$_['column_comment']       = 'Comment';
+$_['column_status']        = 'Tila';
+$_['column_date_added']    = 'Lisäyspäivä';
+$_['column_date_modified'] = 'Muokkauspäivä';
+$_['column_comment']       = 'Kommentti';
 $_['column_notify']        = 'Customer Notified';
 $_['column_action']        = 'Toiminto';
 
@@ -31,22 +31,22 @@ $_['column_action']        = 'Toiminto';
 $_['entry_customer']       = 'Asiakas';
 $_['entry_order_id']       = 'Order ID';
 $_['entry_date_ordered']   = 'Order Date';
-$_['entry_firstname']      = 'First Name';
-$_['entry_lastname']       = 'Last Name';
-$_['entry_email']          = 'E-Mail';
+$_['entry_firstname']      = 'Etunimi';
+$_['entry_lastname']       = 'Sukunimi';
+$_['entry_email']          = 'Sähköpostiosoite';
 $_['entry_telephone']      = 'Telephone';
 $_['entry_product']        = 'Product';
 $_['entry_model']          = 'Model';
 $_['entry_quantity']       = 'Quantity';
 $_['entry_opened']         = 'Opened';
-$_['entry_comment']        = 'Comment';
+$_['entry_comment']        = 'Kommentti';
 $_['entry_return_reason']  = 'Return Reason';
 $_['entry_return_action']  = 'Return Action';
 $_['entry_return_status']  = 'Return Status';
 $_['entry_notify']         = 'Notify Customer';
 $_['entry_return_id']      = 'Return ID';
-$_['entry_date_added']     = 'Date Added';
-$_['entry_date_modified']  = 'Date Modified';
+$_['entry_date_added']     = 'Lisäyspäivä';
+$_['entry_date_modified']  = 'Muokkauspäivä';
 
 // Help
 $_['help_product']         = '(Autocomplete)';
diff --git a/admin/sale/voucher.php b/admin/sale/voucher.php
index e33341d..926c807 100644
--- a/admin/sale/voucher.php
+++ b/admin/sale/voucher.php
@@ -12,14 +12,14 @@ $_['text_sent']         = 'Success: Gift Voucher e-mail has been sent!';
 // Column
 $_['column_name']       = 'Voucher Name';
 $_['column_code']       = 'Code';
-$_['column_from']       = 'From';
-$_['column_to']         = 'To';
-$_['column_theme']      = 'Theme';
+$_['column_from']       = 'Lähettäjä';
+$_['column_to']         = 'Vastaanottaja';
+$_['column_theme']      = 'Teema';
 $_['column_amount']     = 'Amount';
-$_['column_status']     = 'Status';
+$_['column_status']     = 'Tila';
 $_['column_order_id']   = 'Order ID';
-$_['column_customer']   = 'Customer';
-$_['column_date_added'] = 'Date Added';
+$_['column_customer']   = 'Asiakas';
+$_['column_date_added'] = 'Lisäyspäivä';
 $_['column_action']     = 'Toiminto';
 
 // Entry
@@ -28,10 +28,10 @@ $_['entry_from_name']   = 'From Name';
 $_['entry_from_email']  = 'From E-Mail';
 $_['entry_to_name']     = 'To Name';
 $_['entry_to_email']    = 'To E-Mail';
-$_['entry_theme']       = 'Theme';
-$_['entry_message']     = 'Message';
+$_['entry_theme']       = 'Teema';
+$_['entry_message']     = 'Viesti';
 $_['entry_amount']      = 'Amount';
-$_['entry_status']      = 'Status';
+$_['entry_status']      = 'Tila';
 
 // Help
 $_['help_code']         = 'The code the customer enters to activate the voucher.';
diff --git a/admin/sale/voucher_theme.php b/admin/sale/voucher_theme.php
index 390dc38..426dc90 100644
--- a/admin/sale/voucher_theme.php
+++ b/admin/sale/voucher_theme.php
@@ -15,7 +15,7 @@ $_['column_action']     = 'Toiminto';
 // Entry
 $_['entry_name']        = 'Voucher Theme Name';
 $_['entry_description'] = 'Voucher Theme Description';
-$_['entry_image']       = 'Image';
+$_['entry_image']       = 'Kuva';
 
 // Error
 $_['error_permission']  = 'Varoitus: You do not have permission to modify voucher themes!';
diff --git a/admin/setting/setting.php b/admin/setting/setting.php
index 071f7d0..14a2b4f 100644
--- a/admin/setting/setting.php
+++ b/admin/setting/setting.php
@@ -121,7 +121,7 @@ $_['entry_compression']              = 'Output Compression Level';
 $_['entry_error_display']            = 'Display Errors';
 $_['entry_error_log']                = 'Log Errors';
 $_['entry_error_filename']           = 'Error Log Filename';
-$_['entry_status']                   = 'Status';
+$_['entry_status']                   = 'Tila';
 
 // Help
 $_['help_geocode']                   = 'Please enter your store location geocode manually.';
diff --git a/admin/setting/store.php b/admin/setting/store.php
index bbd6bc6..bc4cd31 100644
--- a/admin/setting/store.php
+++ b/admin/setting/store.php
@@ -95,4 +95,4 @@ $_['error_email']                  = 'E-Mail Address does not appear to be valid
 $_['error_telephone']              = 'Telephone must be between 3 and 32 characters!';
 $_['error_customer_group_display'] = 'You must include the default customer group if you are going to use this feature!';
 $_['error_default']                = 'Varoitus: You can not delete your default store!';
-$_['error_store']                  = 'Varoitus: This Store cannot be deleted as it is currently assigned to %s orders!';
\ No newline at end of file
+$_['error_store']                  = 'Varoitus: This Store cannot be deleted as it is currently assigned to %s orders!';
diff --git a/admin/user/user.php b/admin/user/user.php
index 4c20aa0..970089b 100644
--- a/admin/user/user.php
+++ b/admin/user/user.php
@@ -6,7 +6,7 @@ $_['heading_title']         = 'Käyttäjät';
 $_['text_success']          = 'Success: You have modified users!';
 $_['text_list']             = 'Käyttäjälista';
 $_['text_add']              = 'Lisää käyttäjä';
-$_['text_edit']             = 'Edit User';
+$_['text_edit']             = 'Muokkaa käyttäjää';
 
 // Column
 $_['column_username']       = 'Käyttäjätunnus';
diff --git a/admin/user/user_group.php b/admin/user/user_group.php
index 2f86246..9419efb 100644
--- a/admin/user/user_group.php
+++ b/admin/user/user_group.php
@@ -20,4 +20,4 @@ $_['entry_modify']     = 'Modify Permission';
 // Error
 $_['error_permission'] = 'Varoitus: You do not have permission to modify user groups!';
 $_['error_name']       = 'User Group Name must be between 3 and 64 characters!';
-$_['error_user']       = 'Varoitus: This user group cannot be deleted as it is currently assigned to %s users!';
\ No newline at end of file
+$_['error_user']       = 'Varoitus: This user group cannot be deleted as it is currently assigned to %s users!';
diff --git a/catalog/account/account.php b/catalog/account/account.php
index e2220cc..416a819 100644
--- a/catalog/account/account.php
+++ b/catalog/account/account.php
@@ -23,4 +23,4 @@ $_['text_recurring']      = 'Recurring payments';
 $_['text_transactions']   = 'Transactions';
 $_['text_affiliate_add']  = 'Register for an affiliate account';
 $_['text_affiliate_edit'] = 'Edit your affiliate information';
-$_['text_tracking']       = 'Custom Affiliate Tracking Code';
\ No newline at end of file
+$_['text_tracking']       = 'Custom Affiliate Tracking Code';
diff --git a/catalog/account/address.php b/catalog/account/address.php
index 7a5d235..93bcce0 100644
--- a/catalog/account/address.php
+++ b/catalog/account/address.php
@@ -34,4 +34,4 @@ $_['error_postcode']     = 'Postcode must be between 2 and 10 characters!';
 $_['error_city']         = 'City must be between 2 and 128 characters!';
 $_['error_country']      = 'Please select a country!';
 $_['error_zone']         = 'Please select a region / state!';
-$_['error_custom_field'] = '%s required!';
\ No newline at end of file
+$_['error_custom_field'] = '%s required!';
diff --git a/catalog/account/affiliate.php b/catalog/account/affiliate.php
index 6d862b7..20453bc 100644
--- a/catalog/account/affiliate.php
+++ b/catalog/account/affiliate.php
@@ -32,4 +32,4 @@ $_['error_cheque']              = 'Cheque Payee Name required!';
 $_['error_paypal']              = 'PayPal Email Address does not appear to be valid!';
 $_['error_bank_account_name']   = 'Account Name required!';
 $_['error_bank_account_number'] = 'Account Number required!';
-$_['error_custom_field']        = '%s required!';
\ No newline at end of file
+$_['error_custom_field']        = '%s required!';
diff --git a/catalog/account/download.php b/catalog/account/download.php
index 1490bcb..ef6173f 100644
--- a/catalog/account/download.php
+++ b/catalog/account/download.php
@@ -4,11 +4,11 @@ $_['heading_title']     = 'Account Downloads';
 
 // Text
 $_['text_account']      = 'Tili';
-$_['text_downloads']    = 'Downloads';
+$_['text_downloads']    = 'Lataukset';
 $_['text_empty']        = 'You have not made any previous downloadable orders!';
 
 // Column
 $_['column_order_id']   = 'Order ID';
-$_['column_name']       = 'Name';
+$_['column_name']       = 'Nimi';
 $_['column_size']       = 'Size';
-$_['column_date_added'] = 'Date Added';
+$_['column_date_added'] = 'Lisäyspäivä';
diff --git a/catalog/account/edit.php b/catalog/account/edit.php
index 92f42ac..c5bbafa 100644
--- a/catalog/account/edit.php
+++ b/catalog/account/edit.php
@@ -20,4 +20,4 @@ $_['error_firstname']    = 'First Name must be between 1 and 32 characters!';
 $_['error_lastname']     = 'Last Name must be between 1 and 32 characters!';
 $_['error_email']        = 'E-Mail Address does not appear to be valid!';
 $_['error_telephone']    = 'Telephone must be between 3 and 32 characters!';
-$_['error_custom_field'] = '%s required!';
\ No newline at end of file
+$_['error_custom_field'] = '%s required!';
diff --git a/catalog/account/forgotten.php b/catalog/account/forgotten.php
index 6396916..98ad8a9 100644
--- a/catalog/account/forgotten.php
+++ b/catalog/account/forgotten.php
@@ -18,4 +18,4 @@ $_['entry_confirm']   = 'Vahvista';
 $_['error_email']     = 'Varoitus: The E-Mail Address was not found in our records, please try again!';
 $_['error_approved']  = 'Varoitus: Your account requires approval before you can login.';
 $_['error_password']  = 'Password must be between 4 and 20 characters!';
-$_['error_confirm']   = 'Password and password confirmation do not match!';
\ No newline at end of file
+$_['error_confirm']   = 'Password and password confirmation do not match!';
diff --git a/catalog/account/login.php b/catalog/account/login.php
index 73f47c9..86ae162 100644
--- a/catalog/account/login.php
+++ b/catalog/account/login.php
@@ -19,4 +19,4 @@ $_['entry_password']               = 'Salasana';
 // Error
 $_['error_login']                  = 'Varoitus: No match for E-Mail Address and/or Password.';
 $_['error_attempts']               = 'Varoitus: Your account has exceeded allowed number of login attempts. Please try again in 1 hour.';
-$_['error_approved']               = 'Varoitus: Your account requires approval before you can login.';
\ No newline at end of file
+$_['error_approved']               = 'Varoitus: Your account requires approval before you can login.';
diff --git a/catalog/account/logout.php b/catalog/account/logout.php
index fdb5ec1..e33e090 100644
--- a/catalog/account/logout.php
+++ b/catalog/account/logout.php
@@ -5,4 +5,4 @@ $_['heading_title'] = 'Account Logout';
 // Text
 $_['text_message']  = '<p>You have been logged off your account. It is now safe to leave the computer.</p><p>Your shopping cart has been saved, the items inside it will be restored whenever you log back into your account.</p>';
 $_['text_account']  = 'Tili';
-$_['text_logout']   = 'Kirjaudu Ulos';
\ No newline at end of file
+$_['text_logout']   = 'Kirjaudu Ulos';
diff --git a/catalog/account/newsletter.php b/catalog/account/newsletter.php
index bcc2506..a4536b9 100644
--- a/catalog/account/newsletter.php
+++ b/catalog/account/newsletter.php
@@ -4,7 +4,7 @@ $_['heading_title']    = 'Newsletter Subscription';
 
 // Text
 $_['text_account']     = 'Tili';
-$_['text_newsletter']  = 'Newsletter';
+$_['text_newsletter']  = 'Uutiskirje';
 $_['text_success']     = 'Success: Your newsletter subscription has been successfully updated!';
 
 // Entry
diff --git a/catalog/account/order.php b/catalog/account/order.php
index bdd31e3..0888ae6 100644
--- a/catalog/account/order.php
+++ b/catalog/account/order.php
@@ -8,7 +8,7 @@ $_['text_order']            = 'Order Information';
 $_['text_order_detail']     = 'Order Details';
 $_['text_invoice_no']       = 'Invoice No.:';
 $_['text_order_id']         = 'Order ID:';
-$_['text_date_added']       = 'Date Added:';
+$_['text_date_added']       = 'Lisäyspäivä:';
 $_['text_shipping_address'] = 'Shipping Address';
 $_['text_shipping_method']  = 'Shipping Method:';
 $_['text_payment_address']  = 'Payment Address';
@@ -21,7 +21,7 @@ $_['text_error']            = 'The order you requested could not be found!';
 
 // Column
 $_['column_order_id']       = 'Order ID';
-$_['column_customer']       = 'Customer';
+$_['column_customer']       = 'Asiakas';
 $_['column_product']        = 'No. of Products';
 $_['column_name']           = 'Product Name';
 $_['column_model']          = 'Model';
@@ -30,8 +30,8 @@ $_['column_price']          = 'Price';
 $_['column_total']          = 'Total';
 $_['column_action']         = 'Toiminto';
 $_['column_date_added']     = 'Date Added';
-$_['column_status']         = 'Status';
-$_['column_comment']        = 'Comment';
+$_['column_status']         = 'Tila';
+$_['column_comment']        = 'Kommentti';
 
 // Error
 $_['error_reorder']         = '%s is not currently available to be reordered.';
diff --git a/catalog/account/recurring.php b/catalog/account/recurring.php
index e57775b..a13a472 100644
--- a/catalog/account/recurring.php
+++ b/catalog/account/recurring.php
@@ -7,8 +7,8 @@ $_['text_account']                         = 'Tili';
 $_['text_recurring']                       = 'Recurring Payment Information';
 $_['text_recurring_detail']                = 'Recurring Payment Details';
 $_['text_order_recurring_id']              = 'Recurring ID:';
-$_['text_date_added']                      = 'Date Added:';
-$_['text_status']                          = 'Status:';
+$_['text_date_added']                      = 'Lisäyspäivä:';
+$_['text_status']                          = 'Tila:';
 $_['text_payment_method']                  = 'Payment Method:';
 $_['text_order_id']                        = 'Order ID:';
 $_['text_product']                         = 'Product:';
@@ -37,10 +37,10 @@ $_['text_error']                           = 'The recurring order you requested
 $_['text_cancelled']                       = 'Recurring payment has been cancelled';
 
 // Column
-$_['column_date_added']                    = 'Date Added';
-$_['column_type']                          = 'Type';
+$_['column_date_added']                    = 'Lisäyspäivä';
+$_['column_type']                          = 'Tyyppi';
 $_['column_amount']                        = 'Amount';
-$_['column_status']                        = 'Status';
+$_['column_status']                        = 'Tila';
 $_['column_product']                       = 'Product';
 $_['column_order_recurring_id']            = 'Recurring ID';
 
@@ -49,4 +49,4 @@ $_['error_not_cancelled']                  = 'Virhe: %s';
 $_['error_not_found']                      = 'Could not cancel recurring';
 
 // Button
-$_['button_return']                        = 'Return';
\ No newline at end of file
+$_['button_return']                        = 'Return';
diff --git a/catalog/account/register.php b/catalog/account/register.php
index d193f84..02b3bcd 100644
--- a/catalog/account/register.php
+++ b/catalog/account/register.php
@@ -4,7 +4,7 @@ $_['heading_title']        = 'Register Account';
 
 // Text
 $_['text_account']         = 'Tili';
-$_['text_register']        = 'Register';
+$_['text_register']        = 'Rekisteröidy';
 $_['text_account_already'] = 'If you already have an account with us, please login at the <a href="%s">login page</a>.';
 $_['text_your_details']    = 'Your Personal Details';
 $_['text_newsletter']      = 'Uutiskirje';
@@ -30,4 +30,4 @@ $_['error_telephone']      = 'Telephone must be between 3 and 32 characters!';
 $_['error_custom_field']   = '%s required!';
 $_['error_password']       = 'Password must be between 4 and 20 characters!';
 $_['error_confirm']        = 'Password confirmation does not match password!';
-$_['error_agree']          = 'Varoitus: You must agree to the %s!';
\ No newline at end of file
+$_['error_agree']          = 'Varoitus: You must agree to the %s!';
diff --git a/catalog/account/reset.php b/catalog/account/reset.php
index ffe2ec5..676414a 100644
--- a/catalog/account/reset.php
+++ b/catalog/account/reset.php
@@ -14,4 +14,4 @@ $_['entry_confirm']  = 'Vahvista';
 // Error
 $_['error_password'] = 'Password must be between 4 and 20 characters!';
 $_['error_confirm']  = 'Password and password confirmation do not match!';
-$_['error_code']     = 'Password reset code is invalid or was used previously!';
\ No newline at end of file
+$_['error_code']     = 'Password reset code is invalid or was used previously!';
diff --git a/catalog/account/return.php b/catalog/account/return.php
index 29ee002..3ec65a6 100644
--- a/catalog/account/return.php
+++ b/catalog/account/return.php
@@ -14,8 +14,8 @@ $_['text_message']       = '<p>Thank you for submitting your return request. You
 $_['text_return_id']     = 'Return ID:';
 $_['text_order_id']      = 'Order ID:';
 $_['text_date_ordered']  = 'Order Date:';
-$_['text_status']        = 'Status:';
-$_['text_date_added']    = 'Date Added:';
+$_['text_status']        = 'Tila:';
+$_['text_date_added']    = 'Lisäyspäivä:';
 $_['text_comment']       = 'Return Comments';
 $_['text_history']       = 'Return History';
 $_['text_empty']         = 'You have not made any previous returns!';
@@ -24,10 +24,10 @@ $_['text_agree']         = 'I have read and agree to the <a href="%s" class="agr
 // Column
 $_['column_return_id']   = 'Return ID';
 $_['column_order_id']    = 'Order ID';
-$_['column_status']      = 'Status';
-$_['column_date_added']  = 'Date Added';
-$_['column_customer']    = 'Customer';
-$_['column_product']     = 'Product Name';
+$_['column_status']      = 'Tila';
+$_['column_date_added']  = 'Lisäyspäivä';
+$_['column_customer']    = 'Asiakas';
+$_['column_product']     = 'Tuotteen nimi';
 $_['column_model']       = 'Model';
 $_['column_quantity']    = 'Quantity';
 $_['column_price']       = 'Price';
@@ -39,11 +39,11 @@ $_['column_action']      = 'Toiminto';
 // Entry
 $_['entry_order_id']     = 'Order ID';
 $_['entry_date_ordered'] = 'Order Date';
-$_['entry_firstname']    = 'First Name';
-$_['entry_lastname']     = 'Last Name';
-$_['entry_email']        = 'E-Mail';
+$_['entry_firstname']    = 'Etunimi';
+$_['entry_lastname']     = 'Sukunimi';
+$_['entry_email']        = 'Sähköpostiosoite';
 $_['entry_telephone']    = 'Telephone';
-$_['entry_product']      = 'Product Name';
+$_['entry_product']      = 'Tuotteen nimi';
 $_['entry_model']        = 'Product Code';
 $_['entry_quantity']     = 'Quantity';
 $_['entry_reason']       = 'Reason for Return';
diff --git a/catalog/account/voucher.php b/catalog/account/voucher.php
index b9c8d64..204c015 100644
--- a/catalog/account/voucher.php
+++ b/catalog/account/voucher.php
@@ -29,4 +29,4 @@ $_['error_from_name']  = 'Your Name must be between 1 and 64 characters!';
 $_['error_email']      = 'E-Mail Address does not appear to be valid!';
 $_['error_theme']      = 'You must select a theme!';
 $_['error_amount']     = 'Amount must be between %s and %s!';
-$_['error_agree']      = 'Varoitus: You must agree that the gift certificates are non-refundable!';
\ No newline at end of file
+$_['error_agree']      = 'Varoitus: You must agree that the gift certificates are non-refundable!';
diff --git a/catalog/account/wishlist.php b/catalog/account/wishlist.php
index 68a290e..4892902 100644
--- a/catalog/account/wishlist.php
+++ b/catalog/account/wishlist.php
@@ -17,4 +17,4 @@ $_['column_name']   = 'Tuotteen nimi';
 $_['column_model']  = 'Malli';
 $_['column_stock']  = 'Varasto';
 $_['column_price']  = 'Yksikköhinta';
-$_['column_action'] = 'Toiminto';
\ No newline at end of file
+$_['column_action'] = 'Toiminto';
diff --git a/catalog/affiliate/login.php b/catalog/affiliate/login.php
index 905596b..f3322b0 100644
--- a/catalog/affiliate/login.php
+++ b/catalog/affiliate/login.php
@@ -4,7 +4,7 @@ $_['heading_title']                 = 'Affiliate Program';
 
 // Text
 $_['text_account']                  = 'Tili';
-$_['text_login']                    = 'Login';
+$_['text_login']                    = 'Kirjaudu';
 $_['text_description']              = '<p>%s affiliate program is free and enables members to earn revenue by placing a link or links on their web site which advertises %s or specific products on it. Any sales made to customers who have clicked on those links will earn the affiliate commission. The standard commission rate is currently %s.</p><p>For more information, visit our FAQ page or see our Affiliate terms &amp; conditions.</p>';
 $_['text_new_affiliate']            = 'New Affiliate';
 $_['text_register_account']         = '<p>I am not currently an affiliate.</p><p>Click Continue below to create a new affiliate account. Please note that this is not connected in any way to your customer account.</p>';
@@ -14,7 +14,7 @@ $_['text_forgotten']                = 'Forgotten Password';
 
 // Entry
 $_['entry_email']                   = 'Affiliate E-Mail';
-$_['entry_password']                = 'Password';
+$_['entry_password']                = 'Salasana';
 
 // Error
 $_['error_login']                   = 'Varoitus: No match for E-Mail Address and/or Password.';
diff --git a/catalog/affiliate/register.php b/catalog/affiliate/register.php
index f6b86b8..bb2191d 100644
--- a/catalog/affiliate/register.php
+++ b/catalog/affiliate/register.php
@@ -13,14 +13,14 @@ $_['text_your_affiliate']       = 'Your Affiliate Information';
 $_['text_your_password']        = 'Your Password';
 $_['text_cheque']               = 'Cheque';
 $_['text_paypal']               = 'PayPal';
-$_['text_bank']                 = 'Bank Transfer';
+$_['text_bank']                 = 'Tilisiirto';
 $_['text_agree']                = 'I have read and agree to the <a href="%s" class="agree"><b>%s</b></a>';
 
 // Entry
-$_['entry_customer_group']      = 'Customer Group';
-$_['entry_firstname']           = 'First Name';
-$_['entry_lastname']            = 'Last Name';
-$_['entry_email']               = 'E-Mail';
+$_['entry_customer_group']      = 'Asiakasryhmä';
+$_['entry_firstname']           = 'Etunimi';
+$_['entry_lastname']            = 'Sukunimi';
+$_['entry_email']               = 'Sähköpostiosoite';
 $_['entry_telephone']           = 'Telephone';
 $_['entry_company']             = 'Company';
 $_['entry_website']             = 'Web Site';
@@ -33,8 +33,8 @@ $_['entry_bank_branch_number']  = 'ABA/BSB number (Branch Number)';
 $_['entry_bank_swift_code']     = 'SWIFT Code';
 $_['entry_bank_account_name']   = 'Account Name';
 $_['entry_bank_account_number'] = 'Account Number';
-$_['entry_password']            = 'Password';
-$_['entry_confirm']             = 'Password Confirm';
+$_['entry_password']            = 'Salasana';
+$_['entry_confirm']             = 'Vahvista salasana';
 
 // Error
 $_['error_exists']              = 'Varoitus: E-Mail Address is already registered!';
diff --git a/catalog/api/payment.php b/catalog/api/payment.php
index f79e1dc..772fce2 100644
--- a/catalog/api/payment.php
+++ b/catalog/api/payment.php
@@ -15,4 +15,4 @@ $_['error_zone']         = 'Please select a region / state!';
 $_['error_custom_field'] = '%s required!';
 $_['error_address']      = 'Varoitus: Payment address required!';
 $_['error_method']       = 'Varoitus: Payment method required!';
-$_['error_no_payment']   = 'Varoitus: No Payment options are available!';
\ No newline at end of file
+$_['error_no_payment']   = 'Varoitus: No Payment options are available!';
diff --git a/catalog/api/reward.php b/catalog/api/reward.php
index 9b95b85..e288486 100644
--- a/catalog/api/reward.php
+++ b/catalog/api/reward.php
@@ -6,4 +6,4 @@ $_['text_success']     = 'Success: Your reward points discount has been applied!
 $_['error_permission'] = 'Varoitus: You do not have permission to access the API!';
 $_['error_reward']     = 'Varoitus: Please enter the amount of reward points to use!';
 $_['error_points']     = 'Varoitus: You don\'t have %s reward points!';
-$_['error_maximum']    = 'Varoitus: The maximum number of points that can be applied is %s!';
\ No newline at end of file
+$_['error_maximum']    = 'Varoitus: The maximum number of points that can be applied is %s!';
diff --git a/catalog/api/voucher.php b/catalog/api/voucher.php
index 0cd2834..d24005e 100644
--- a/catalog/api/voucher.php
+++ b/catalog/api/voucher.php
@@ -11,4 +11,4 @@ $_['error_to_name']    = 'Recipient\'s Name must be between 1 and 64 characters!
 $_['error_from_name']  = 'Your Name must be between 1 and 64 characters!';
 $_['error_email']      = 'E-Mail Address does not appear to be valid!';
 $_['error_theme']      = 'You must select a theme!';
-$_['error_amount']     = 'Amount must be between %s and %s!';
\ No newline at end of file
+$_['error_amount']     = 'Amount must be between %s and %s!';
diff --git a/catalog/checkout/cart.php b/catalog/checkout/cart.php
index 4d4501f..d6b52e2 100644
--- a/catalog/checkout/cart.php
+++ b/catalog/checkout/cart.php
@@ -38,4 +38,4 @@ $_['error_stock']              = 'Products marked with *** are not available in
 $_['error_minimum']            = 'Minimum order amount for %s is %s!';
 $_['error_required']           = '%s vaaditaan!';
 $_['error_product']            = 'Varoitus: There are no products in your cart!';
-$_['error_recurring_required'] = 'Please select a payment recurring!';
\ No newline at end of file
+$_['error_recurring_required'] = 'Please select a payment recurring!';
diff --git a/catalog/checkout/checkout.php b/catalog/checkout/checkout.php
index 28b7384..84f4a3f 100644
--- a/catalog/checkout/checkout.php
+++ b/catalog/checkout/checkout.php
@@ -52,15 +52,15 @@ $_['entry_email_address']            = 'E-Mail Address';
 $_['entry_email']                    = 'E-Mail';
 $_['entry_password']                 = 'Password';
 $_['entry_confirm']                  = 'Password Confirm';
-$_['entry_firstname']                = 'First Name';
-$_['entry_lastname']                 = 'Last Name';
+$_['entry_firstname']                = 'Etunimi';
+$_['entry_lastname']                 = 'Sukunimi';
 $_['entry_telephone']                = 'Telephone';
 $_['entry_address']                  = 'Choose Address';
-$_['entry_company']                  = 'Company';
-$_['entry_customer_group']           = 'Customer Group';
+$_['entry_company']                  = 'Yritys';
+$_['entry_customer_group']           = 'Asiakasryhmä';
 $_['entry_address_1']                = 'Address 1';
 $_['entry_address_2']                = 'Address 2';
-$_['entry_postcode']                 = 'Post Code';
+$_['entry_postcode']                 = 'Postinumero';
 $_['entry_city']                     = 'City';
 $_['entry_country']                  = 'Country';
 $_['entry_zone']                     = 'Region / State';
@@ -90,4 +90,4 @@ $_['error_shipping']                 = 'Varoitus: Shipping method required!';
 $_['error_no_shipping']              = 'Varoitus: No Shipping options are available. Please <a href="%s">contact us</a> for assistance!';
 $_['error_payment']                  = 'Varoitus: Payment method required!';
 $_['error_no_payment']               = 'Varoitus: No Payment options are available. Please <a href="%s">contact us</a> for assistance!';
-$_['error_custom_field']             = '%s vaaditaan!';
\ No newline at end of file
+$_['error_custom_field']             = '%s vaaditaan!';
diff --git a/catalog/checkout/failure.php b/catalog/checkout/failure.php
index c687521..0b641be 100644
--- a/catalog/checkout/failure.php
+++ b/catalog/checkout/failure.php
@@ -17,4 +17,4 @@ $_['text_message']  = '<p>There was a problem processing your payment and the or
 <p>Please try to order again using a different payment method.</p>
 
 <p>If the problem persists please <a href="%s">contact us</a> with the details of the order you are trying to place.</p>
-';
\ No newline at end of file
+';
diff --git a/catalog/checkout/success.php b/catalog/checkout/success.php
index 9ceee5d..37d795d 100644
--- a/catalog/checkout/success.php
+++ b/catalog/checkout/success.php
@@ -7,4 +7,4 @@ $_['text_basket']          = 'Ostoskori';
 $_['text_checkout']        = 'Checkout';
 $_['text_success']         = 'Success';
 $_['text_customer']        = '<p>Your order has been successfully processed!</p><p>You can view your order history by going to the <a href="%s">my account</a> page and by clicking on <a href="%s">history</a>.</p><p>If your purchase has an associated download, you can go to the account <a href="%s">downloads</a> page to view them.</p><p>Please direct any questions you have to the <a href="%s">store owner</a>.</p><p>Thanks for shopping with us online!</p>';
-$_['text_guest']           = '<p>Your order has been successfully processed!</p><p>Please direct any questions you have to the <a href="%s">store owner</a>.</p><p>Thanks for shopping with us online!</p>';
\ No newline at end of file
+$_['text_guest']           = '<p>Your order has been successfully processed!</p><p>Please direct any questions you have to the <a href="%s">store owner</a>.</p><p>Thanks for shopping with us online!</p>';
diff --git a/catalog/common/cart.php b/catalog/common/cart.php
index d6daa2c..0839e62 100644
--- a/catalog/common/cart.php
+++ b/catalog/common/cart.php
@@ -4,4 +4,4 @@ $_['text_items']     = '%s item(s) - %s';
 $_['text_empty']     = 'Ostoskorisi on tyhjä!';
 $_['text_cart']      = 'View Cart';
 $_['text_checkout']  = 'Checkout';
-$_['text_recurring'] = 'Payment Profile';
\ No newline at end of file
+$_['text_recurring'] = 'Payment Profile';
diff --git a/catalog/common/header.php b/catalog/common/header.php
index 6850564..f237e73 100644
--- a/catalog/common/header.php
+++ b/catalog/common/header.php
@@ -12,5 +12,5 @@ $_['text_transaction']   = 'Transactions';
 $_['text_download']      = 'Lataukset';
 $_['text_logout']        = 'Kirjaudu Ulos';
 $_['text_checkout']      = 'Checkout';
-$_['text_search']        = 'Search';
-$_['text_all']           = 'Show All';
\ No newline at end of file
+$_['text_search']        = 'Haku';
+$_['text_all']           = 'Show All';
diff --git a/catalog/extension/credit_card/sagepay_direct.php b/catalog/extension/credit_card/sagepay_direct.php
index 0788bf5..22dc7c5 100644
--- a/catalog/extension/credit_card/sagepay_direct.php
+++ b/catalog/extension/credit_card/sagepay_direct.php
@@ -4,7 +4,7 @@ $_['heading_title']         = 'Sagepay Direct Cards';
 
 // Text
 $_['text_empty']		    = 'You have no saved cards';
-$_['text_account']          = 'Account';
+$_['text_account']          = 'Tili';
 $_['text_card']			    = 'SagePay Direct Card Management';
 $_['text_fail_card']	    = 'There was an issue removing your SagePay card, Please contact the shop administrator for help.';
 $_['text_success_card']     = 'SagePay card successfully removed';
diff --git a/catalog/extension/credit_card/sagepay_server.php b/catalog/extension/credit_card/sagepay_server.php
index dedc331..46843a8 100644
--- a/catalog/extension/credit_card/sagepay_server.php
+++ b/catalog/extension/credit_card/sagepay_server.php
@@ -4,7 +4,7 @@ $_['heading_title']         = 'Sagepay Server Cards';
 
 // Text
 $_['text_empty']		    = 'You have no saved cards';
-$_['text_account']          = 'Account';
+$_['text_account']          = 'Tili';
 $_['text_card']			    = 'SagePay Server Card Management';
 $_['text_fail_card']	    = 'There was an issue removing your SagePay card, Please contact the shop administrator for help.';
 $_['text_success_card']     = 'SagePay card successfully removed';
diff --git a/catalog/extension/credit_card/squareup.php b/catalog/extension/credit_card/squareup.php
index 85339e5..7a77ce9 100644
--- a/catalog/extension/credit_card/squareup.php
+++ b/catalog/extension/credit_card/squareup.php
@@ -2,10 +2,10 @@
 
 $_['heading_title'] = 'Square Credit Cards';
 
-$_['text_account'] = 'Account';
+$_['text_account'] = 'Tili';
 $_['text_back'] = 'Back';
 $_['text_delete'] = 'Delete';
 $_['text_no_cards'] = 'There are no cards stored on our database.';
 $_['text_card_ends_in'] = '%s card ending in &bull;&bull;&bull;&bull; &bull;&bull;&bull;&bull; &bull;&bull;&bull;&bull; %s';
 $_['text_warning_card'] = 'Do you confirm you want to remove this card? You may add it again later on your next checkout.';
-$_['text_success_card_delete'] = 'Success! This card has been removed.';
\ No newline at end of file
+$_['text_success_card_delete'] = 'Success! This card has been removed.';
diff --git a/catalog/extension/module/account.php b/catalog/extension/module/account.php
index cfe1c80..26e410e 100644
--- a/catalog/extension/module/account.php
+++ b/catalog/extension/module/account.php
@@ -1,21 +1,21 @@
 <?php
 // Heading
-$_['heading_title']    = 'Account';
+$_['heading_title']    = 'Tili';
 
 // Text
-$_['text_register']    = 'Register';
-$_['text_login']       = 'Login';
-$_['text_logout']      = 'Logout';
+$_['text_register']    = 'Registeröidy';
+$_['text_login']       = 'Kirjaudu';
+$_['text_logout']      = 'Kirjaudu Ulos';
 $_['text_forgotten']   = 'Forgotten Password';
 $_['text_account']     = 'My Account';
 $_['text_edit']        = 'Edit Account';
-$_['text_password']    = 'Password';
-$_['text_address']     = 'Address Book';
-$_['text_wishlist']    = 'Wish List';
+$_['text_password']    = 'Salasana';
+$_['text_address']     = 'Osoitekirja';
+$_['text_wishlist']    = 'Toivelista';
 $_['text_order']       = 'Order History';
-$_['text_download']    = 'Downloads';
+$_['text_download']    = 'Lataukset';
 $_['text_reward']      = 'Reward Points';
 $_['text_return']      = 'Returns';
 $_['text_transaction'] = 'Transactions';
-$_['text_newsletter']  = 'Newsletter';
-$_['text_recurring']   = 'Recurring payments';
\ No newline at end of file
+$_['text_newsletter']  = 'Uutiskirje';
+$_['text_recurring']   = 'Recurring payments';
diff --git a/catalog/extension/module/category.php b/catalog/extension/module/category.php
index 0184c92..7a9cafa 100644
--- a/catalog/extension/module/category.php
+++ b/catalog/extension/module/category.php
@@ -1,3 +1,3 @@
 <?php
 // Heading
-$_['heading_title'] = 'Categories';
\ No newline at end of file
+$_['heading_title'] = 'Kategoriat';
diff --git a/catalog/extension/module/information.php b/catalog/extension/module/information.php
index db6cfa2..4ab4aff 100644
--- a/catalog/extension/module/information.php
+++ b/catalog/extension/module/information.php
@@ -4,4 +4,4 @@ $_['heading_title'] = 'Information';
 
 // Text
 $_['text_contact']  = 'Contact Us';
-$_['text_sitemap']  = 'Site Map';
\ No newline at end of file
+$_['text_sitemap']  = 'Site Map';
diff --git a/catalog/extension/total/shipping.php b/catalog/extension/total/shipping.php
index b28b653..4a5e817 100644
--- a/catalog/extension/total/shipping.php
+++ b/catalog/extension/total/shipping.php
@@ -10,11 +10,11 @@ $_['text_shipping_method'] = 'Please select the preferred shipping method to use
 // Entry
 $_['entry_country']        = 'Country';
 $_['entry_zone']           = 'Region / State';
-$_['entry_postcode']       = 'Post Code';
+$_['entry_postcode']       = 'Postinumero';
 
 // Error
 $_['error_postcode']       = 'Postcode must be between 2 and 10 characters!';
 $_['error_country']        = 'Please select a country!';
 $_['error_zone']           = 'Please select a region / state!';
 $_['error_shipping']       = 'Varoitus: Shipping method required!';
-$_['error_no_shipping']    = 'Varoitus: No Shipping options are available. Please <a href="%s">contact us</a> for assistance!';
\ No newline at end of file
+$_['error_no_shipping']    = 'Varoitus: No Shipping options are available. Please <a href="%s">contact us</a> for assistance!';
diff --git a/catalog/information/contact.php b/catalog/information/contact.php
index 64c7f77..ca93e35 100644
--- a/catalog/information/contact.php
+++ b/catalog/information/contact.php
@@ -24,4 +24,4 @@ $_['email_subject']  = 'Enquiry %s';
 // Errors
 $_['error_name']     = 'Name must be between 3 and 32 characters!';
 $_['error_email']    = 'E-Mail Address does not appear to be valid!';
-$_['error_enquiry']  = 'Enquiry must be between 10 and 3000 characters!';
\ No newline at end of file
+$_['error_enquiry']  = 'Enquiry must be between 10 and 3000 characters!';
diff --git a/catalog/product/category.php b/catalog/product/category.php
index 2aecc2e..5cd358c 100644
--- a/catalog/product/category.php
+++ b/catalog/product/category.php
@@ -21,4 +21,4 @@ $_['text_rating_asc']   = 'Rating (Lowest)';
 $_['text_rating_desc']  = 'Rating (Highest)';
 $_['text_model_asc']    = 'Model (A - Z)';
 $_['text_model_desc']   = 'Model (Z - A)';
-$_['text_limit']        = 'Show:';
\ No newline at end of file
+$_['text_limit']        = 'Näytä:';
diff --git a/catalog/product/compare.php b/catalog/product/compare.php
index c7ec0e1..e8050ee 100644
--- a/catalog/product/compare.php
+++ b/catalog/product/compare.php
@@ -19,4 +19,4 @@ $_['text_dimension']    = 'Dimensions (L x W x H)';
 $_['text_compare']      = 'Product Compare (%s)';
 $_['text_success']      = 'Success: You have added <a href="%s">%s</a> to your <a href="%s">product comparison</a>!';
 $_['text_remove']       = 'Success: You have modified your product comparison!';
-$_['text_empty']        = 'You have not chosen any products to compare.';
\ No newline at end of file
+$_['text_empty']        = 'You have not chosen any products to compare.';
diff --git a/catalog/product/manufacturer.php b/catalog/product/manufacturer.php
index 30fc2fb..68920d9 100644
--- a/catalog/product/manufacturer.php
+++ b/catalog/product/manufacturer.php
@@ -24,4 +24,4 @@ $_['text_rating_asc']   = 'Rating (Lowest)';
 $_['text_rating_desc']  = 'Rating (Highest)';
 $_['text_model_asc']    = 'Model (A - Z)';
 $_['text_model_desc']   = 'Model (Z - A)';
-$_['text_limit']        = 'Show:';
\ No newline at end of file
+$_['text_limit']        = 'Show:';
diff --git a/catalog/product/product.php b/catalog/product/product.php
index 55693ba..0d47543 100644
--- a/catalog/product/product.php
+++ b/catalog/product/product.php
@@ -25,11 +25,11 @@ $_['text_payment_recurring']   = 'Payment Profile';
 $_['text_trial_description']   = '%s every %d %s(s) for %d payment(s) then';
 $_['text_payment_description'] = '%s every %d %s(s) for %d payment(s)';
 $_['text_payment_cancel']      = '%s every %d %s(s) until canceled';
-$_['text_day']                 = 'day';
-$_['text_week']                = 'week';
+$_['text_day']                 = 'päivä';
+$_['text_week']                = 'viikko';
 $_['text_semi_month']          = 'half-month';
-$_['text_month']               = 'month';
-$_['text_year']                = 'year';
+$_['text_month']               = 'kuukausi';
+$_['text_year']                = 'vuosi';
 
 // Entry
 $_['entry_qty']                = 'Qty';
@@ -47,4 +47,4 @@ $_['tab_review']               = 'Reviews (%s)';
 // Error
 $_['error_name']               = 'Varoitus: Review Name must be between 3 and 25 characters!';
 $_['error_text']               = 'Varoitus: Review Text must be between 25 and 1000 characters!';
-$_['error_rating']             = 'Varoitus: Please select a review rating!';
\ No newline at end of file
+$_['error_rating']             = 'Varoitus: Please select a review rating!';
diff --git a/catalog/product/search.php b/catalog/product/search.php
index 2c665e7..eed0ff7 100644
--- a/catalog/product/search.php
+++ b/catalog/product/search.php
@@ -5,7 +5,7 @@ $_['heading_tag']       = 'Tag - ';
 
 // Text
 $_['text_search']       = 'Products meeting the search criteria';
-$_['text_keyword']      = 'Keywords';
+$_['text_keyword']      = 'Avainsanat';
 $_['text_category']     = 'All Categories';
 $_['text_sub_category'] = 'Search in subcategories';
 $_['text_empty']        = 'There is no product that matches the search criteria.';
@@ -27,8 +27,8 @@ $_['text_rating_asc']   = 'Rating (Lowest)';
 $_['text_rating_desc']  = 'Rating (Highest)';
 $_['text_model_asc']    = 'Model (A - Z)';
 $_['text_model_desc']   = 'Model (Z - A)';
-$_['text_limit']        = 'Show:';
+$_['text_limit']        = 'Näytä:';
 
 // Entry
 $_['entry_search']      = 'Search Criteria';
-$_['entry_description'] = 'Search in product descriptions';
\ No newline at end of file
+$_['entry_description'] = 'Search in product descriptions';
diff --git a/catalog/product/special.php b/catalog/product/special.php
index 5790502..7fab0f9 100644
--- a/catalog/product/special.php
+++ b/catalog/product/special.php
@@ -1,6 +1,6 @@
 <?php
 // Heading
-$_['heading_title']     = 'Special Offers';
+$_['heading_title']     = 'Erikoistarjoukset';
 
 // Text
 $_['text_empty']        = 'There are no special offer products to list.';
@@ -21,4 +21,4 @@ $_['text_rating_asc']   = 'Rating (Lowest)';
 $_['text_rating_desc']  = 'Rating (Highest)';
 $_['text_model_asc']    = 'Model (A - Z)';
 $_['text_model_desc']   = 'Model (Z - A)';
-$_['text_limit']        = 'Show:';
\ No newline at end of file
+$_['text_limit']        = 'Näytä:';