diff --git a/catalog/account/address.php b/catalog/account/address.php
index c174405..5320ce6 100644
--- a/catalog/account/address.php
+++ b/catalog/account/address.php
@@ -33,6 +33,6 @@ $_['error_lastname']     = 'Last Name must be between 1 and 32 characters!';
 $_['error_address_1']    = 'Address must be between 3 and 128 characters!';
 $_['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!';
+$_['error_country']      = 'Valitse maa!';
+$_['error_zone']         = 'Valitse alue/osavaltio!';
+$_['error_custom_field'] = '%s vaaditaan!';
diff --git a/catalog/account/download.php b/catalog/account/download.php
index 1198c22..761ea7a 100644
--- a/catalog/account/download.php
+++ b/catalog/account/download.php
@@ -10,5 +10,5 @@ $_['text_empty']        = 'You have not made any previous downloadable orders!';
 // Column
 $_['column_order_id']   = 'Tilausnumero';
 $_['column_name']       = 'Nimi';
-$_['column_size']       = 'Size';
+$_['column_size']       = 'Tiedostokoko';
 $_['column_date_added'] = 'Lisäyspäivä';
diff --git a/catalog/account/edit.php b/catalog/account/edit.php
index c5bbafa..77def3a 100644
--- a/catalog/account/edit.php
+++ b/catalog/account/edit.php
@@ -4,8 +4,8 @@ $_['heading_title']      = 'My Account Information';
 
 // Text
 $_['text_account']       = 'Tili';
-$_['text_edit']          = 'Edit Information';
-$_['text_your_details']  = 'Your Personal Details';
+$_['text_edit']          = 'Muokkaa tietoja';
+$_['text_your_details']  = 'Henkilötiedot';
 $_['text_success']       = 'Success: Your account has been successfully updated.';
 
 // Entry
diff --git a/catalog/account/login.php b/catalog/account/login.php
index f1d883e..712ca6a 100644
--- a/catalog/account/login.php
+++ b/catalog/account/login.php
@@ -8,7 +8,7 @@ $_['text_login']                   = 'Kirjaudu';
 $_['text_new_customer']            = 'Uusi asiakas';
 $_['text_register']                = 'Register Account';
 $_['text_register_account']        = 'By creating an account you will be able to shop faster, be up to date on an order\'s status, and keep track of the orders you have previously made.';
-$_['text_returning_customer']      = 'Returning Customer';
+$_['text_returning_customer']      = 'Palaava asiakas';
 $_['text_i_am_returning_customer'] = 'I am a returning customer';
 $_['text_forgotten']               = 'Forgotten Password';
 
diff --git a/catalog/account/newsletter.php b/catalog/account/newsletter.php
index a4536b9..d763ba3 100644
--- a/catalog/account/newsletter.php
+++ b/catalog/account/newsletter.php
@@ -8,4 +8,4 @@ $_['text_newsletter']  = 'Uutiskirje';
 $_['text_success']     = 'Success: Your newsletter subscription has been successfully updated!';
 
 // Entry
-$_['entry_newsletter'] = 'Subscribe';
+$_['entry_newsletter'] = 'Tilaa';
diff --git a/catalog/account/recurring.php b/catalog/account/recurring.php
index e425c91..4072acc 100644
--- a/catalog/account/recurring.php
+++ b/catalog/account/recurring.php
@@ -13,10 +13,10 @@ $_['text_payment_method']                  = 'Payment Method:';
 $_['text_order_id']                        = 'Tilausnumero:';
 $_['text_product']                         = 'Tuote:';
 $_['text_quantity']                        = 'Määrä:';
-$_['text_description']                     = 'Description';
+$_['text_description']                     = 'Kuvaus';
 $_['text_reference']                       = 'Reference';
 $_['text_transaction']                     = 'Transactions';
-$_['text_status_1']                        = 'Active';
+$_['text_status_1']                        = 'Aktiivinen';
 $_['text_status_2']                        = 'Inactive';
 $_['text_status_3']                        = 'Cancelled';
 $_['text_status_4']                        = 'Suspended';
diff --git a/catalog/account/register.php b/catalog/account/register.php
index 02b3bcd..fbb51cf 100644
--- a/catalog/account/register.php
+++ b/catalog/account/register.php
@@ -1,12 +1,12 @@
 <?php
 // Heading
-$_['heading_title']        = 'Register Account';
+$_['heading_title']        = 'Rekisteröi tili';
 
 // Text
 $_['text_account']         = 'Tili';
 $_['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_your_details']    = 'Henkilötiedot';
 $_['text_newsletter']      = 'Uutiskirje';
 $_['text_your_password']   = 'Your Password';
 $_['text_agree']           = 'I have read and agree to the <a href="%s" class="agree"><b>%s</b></a>';
@@ -17,7 +17,7 @@ $_['entry_firstname']      = 'Etunimi';
 $_['entry_lastname']       = 'Sukunimi';
 $_['entry_email']          = 'Sähköpostiosoite';
 $_['entry_telephone']      = 'Puhelinnumero';
-$_['entry_newsletter']     = 'Subscribe';
+$_['entry_newsletter']     = 'Tilaa';
 $_['entry_password']       = 'Salasana';
 $_['entry_confirm']        = 'Vahvista salasana';
 
diff --git a/catalog/account/return.php b/catalog/account/return.php
index 3ec65a6..6f630de 100644
--- a/catalog/account/return.php
+++ b/catalog/account/return.php
@@ -1,19 +1,19 @@
 <?php
 // Heading
-$_['heading_title']      = 'Product Returns';
+$_['heading_title']      = 'Palautukset';
 
 // Text
 $_['text_account']       = 'Tili';
 $_['text_return']        = 'Return Information';
 $_['text_return_detail'] = 'Return Details';
 $_['text_description']   = 'Please complete the form below to request an RMA number.';
-$_['text_order']         = 'Order Information';
-$_['text_product']       = 'Product Information';
-$_['text_reason']        = 'Reason for Return';
+$_['text_order']         = 'Tilaustiedot';
+$_['text_product']       = 'Tuotetiedot';
+$_['text_reason']        = 'Palautuksen syy';
 $_['text_message']       = '<p>Thank you for submitting your return request. Your request has been sent to the relevant department for processing.</p><p> You will be notified via e-mail as to the status of your request.</p>';
-$_['text_return_id']     = 'Return ID:';
-$_['text_order_id']      = 'Order ID:';
-$_['text_date_ordered']  = 'Order Date:';
+$_['text_return_id']     = 'Palautuskoodi:';
+$_['text_order_id']      = 'Tilausnumero:';
+$_['text_date_ordered']  = 'Tilauspäivä:';
 $_['text_status']        = 'Tila:';
 $_['text_date_added']    = 'Lisäyspäivä:';
 $_['text_comment']       = 'Return Comments';
@@ -22,32 +22,32 @@ $_['text_empty']         = 'You have not made any previous returns!';
 $_['text_agree']         = 'I have read and agree to the <a href="%s" class="agree"><b>%s</b></a>';
 
 // Column
-$_['column_return_id']   = 'Return ID';
-$_['column_order_id']    = 'Order ID';
+$_['column_return_id']   = 'Palautuskoodi';
+$_['column_order_id']    = 'Tilausnumero';
 $_['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';
-$_['column_opened']      = 'Opened';
-$_['column_comment']     = 'Comment';
-$_['column_reason']      = 'Reason';
+$_['column_quantity']    = 'Määrä';
+$_['column_price']       = 'Hinta';
+$_['column_opened']      = 'Avattu';
+$_['column_comment']     = 'Kommentti';
+$_['column_reason']      = 'Syy';
 $_['column_action']      = 'Toiminto';
 
 // Entry
-$_['entry_order_id']     = 'Order ID';
-$_['entry_date_ordered'] = 'Order Date';
+$_['entry_order_id']     = 'Tilausnumero';
+$_['entry_date_ordered'] = 'Tilauspäivä';
 $_['entry_firstname']    = 'Etunimi';
 $_['entry_lastname']     = 'Sukunimi';
 $_['entry_email']        = 'Sähköpostiosoite';
-$_['entry_telephone']    = 'Telephone';
+$_['entry_telephone']    = 'Puhelinnumero';
 $_['entry_product']      = 'Tuotteen nimi';
-$_['entry_model']        = 'Product Code';
-$_['entry_quantity']     = 'Quantity';
-$_['entry_reason']       = 'Reason for Return';
-$_['entry_opened']       = 'Product is opened';
+$_['entry_model']        = 'Tuotekoodi';
+$_['entry_quantity']     = 'Määrä';
+$_['entry_reason']       = 'Palautuksen syy';
+$_['entry_opened']       = 'Tuote on avattu';
 $_['entry_fault_detail'] = 'Faulty or other details';
 
 // Error
diff --git a/catalog/account/reward.php b/catalog/account/reward.php
index e0ea941..a84884e 100644
--- a/catalog/account/reward.php
+++ b/catalog/account/reward.php
@@ -4,7 +4,7 @@ $_['heading_title']      = 'Palkintopisteesi';
 
 // Column
 $_['column_date_added']  = 'Lisäyspäivä';
-$_['column_description'] = 'Description';
+$_['column_description'] = 'Kuvaus';
 $_['column_points']      = 'Pisteet';
 
 // Text
diff --git a/catalog/account/transaction.php b/catalog/account/transaction.php
index 03c2cf9..09d33ba 100644
--- a/catalog/account/transaction.php
+++ b/catalog/account/transaction.php
@@ -4,7 +4,7 @@ $_['heading_title']      = 'Your Transactions';
 
 // Column
 $_['column_date_added']  = 'Lisäyspäivä';
-$_['column_description'] = 'Description';
+$_['column_description'] = 'Kuvaus';
 $_['column_amount']      = 'Amount (%s)';
 
 // Text
diff --git a/catalog/checkout/cart.php b/catalog/checkout/cart.php
index 5b8a5c6..34447f0 100644
--- a/catalog/checkout/cart.php
+++ b/catalog/checkout/cart.php
@@ -6,7 +6,7 @@ $_['heading_title']            = 'Ostoskori';
 $_['text_success']             = 'Success: You have added <a href="%s">%s</a> to your <a href="%s">shopping cart</a>!';
 $_['text_remove']              = 'Success: You have modified your shopping cart!';
 $_['text_login']               = 'Attention: You must <a href="%s">login</a> or <a href="%s">create an account</a> to view prices!';
-$_['text_items']               = '%s item(s) - %s';
+$_['text_items']               = '%s tuote(tta) - %s';
 $_['text_points']              = 'Palkintopisteet: %s';
 $_['text_next']                = 'What would you like to do next?';
 $_['text_next_choice']         = 'Choose if you have a discount code or reward points you want to use or would like to estimate your delivery cost.';
@@ -19,7 +19,7 @@ $_['text_year']                = 'vuosi';
 $_['text_trial']               = '%s every %s %s for %s payments then ';
 $_['text_recurring']           = '%s every %s %s';
 $_['text_recurring_item']      = 'Recurring Item';
-$_['text_payment_recurring']   = 'Payment Profile';
+$_['text_payment_recurring']   = 'Maksuprofiili';
 $_['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';
diff --git a/catalog/checkout/checkout.php b/catalog/checkout/checkout.php
index f8d926f..11ddf3c 100644
--- a/catalog/checkout/checkout.php
+++ b/catalog/checkout/checkout.php
@@ -5,12 +5,12 @@ $_['heading_title']                  = 'Checkout';
 // Text
 $_['text_cart']                      = 'Ostoskori';
 $_['text_checkout_option']           = 'Step %s: Checkout Options';
-$_['text_checkout_account']          = 'Step %s: Account &amp; Billing Details';
-$_['text_checkout_payment_address']  = 'Step %s: Billing Details';
-$_['text_checkout_shipping_address'] = 'Step %s: Delivery Details';
-$_['text_checkout_shipping_method']  = 'Step %s: Delivery Method';
-$_['text_checkout_payment_method']   = 'Step %s: Payment Method';
-$_['text_checkout_confirm']          = 'Step %s: Confirm Order';
+$_['text_checkout_account']          = 'Step %s: Tili- ja laskutustiedot';
+$_['text_checkout_payment_address']  = 'Step %s: Laskutustiedot';
+$_['text_checkout_shipping_address'] = 'Step %s: Toimitustiedot';
+$_['text_checkout_shipping_method']  = 'Step %s: Toimitustapa';
+$_['text_checkout_payment_method']   = 'Step %s: Laskutustapa';
+$_['text_checkout_confirm']          = 'Step %s: Vahvista tilaus';
 $_['text_modify']                    = 'Modify &raquo;';
 $_['text_new_customer']              = 'Uusi asiakas';
 $_['text_returning_customer']        = 'Palaava asiakas';
@@ -55,11 +55,11 @@ $_['entry_confirm']                  = 'Vahvista salasana';
 $_['entry_firstname']                = 'Etunimi';
 $_['entry_lastname']                 = 'Sukunimi';
 $_['entry_telephone']                = 'Puhelinnumero';
-$_['entry_address']                  = 'Choose Address';
+$_['entry_address']                  = 'Valitse osoite';
 $_['entry_company']                  = 'Yritys';
 $_['entry_customer_group']           = 'Asiakasryhmä';
-$_['entry_address_1']                = 'Address 1';
-$_['entry_address_2']                = 'Address 2';
+$_['entry_address_1']                = 'Osoite (rivi 1)';
+$_['entry_address_2']                = 'Osoite (rivi 2)';
 $_['entry_postcode']                 = 'Postinumero';
 $_['entry_city']                     = 'Postitoimipaikka';
 $_['entry_country']                  = 'Maa';
@@ -82,8 +82,8 @@ $_['error_confirm']                  = 'Password confirmation does not match pas
 $_['error_address_1']                = 'Address 1 must be between 3 and 128 characters!';
 $_['error_city']                     = 'City must be between 2 and 128 characters!';
 $_['error_postcode']                 = 'Postcode must be between 2 and 10 characters!';
-$_['error_country']                  = 'Please select a country!';
-$_['error_zone']                     = 'Please select a region / state!';
+$_['error_country']                  = 'Valitse maa!';
+$_['error_zone']                     = 'Valitse alue/osavaltio!';
 $_['error_agree']                    = 'Varoitus: You must agree to the %s!';
 $_['error_address']                  = 'Varoitus: You must select address!';
 $_['error_shipping']                 = 'Varoitus: Shipping method required!';
diff --git a/catalog/common/cart.php b/catalog/common/cart.php
index 5a16718..69b1e24 100644
--- a/catalog/common/cart.php
+++ b/catalog/common/cart.php
@@ -1,7 +1,7 @@
 <?php
 // Text
-$_['text_items']     = '%s item(s) - %s';
+$_['text_items']     = '%s tuote(tta) - %s';
 $_['text_empty']     = 'Ostoskorisi on tyhjä!';
 $_['text_cart']      = 'Kurkkaa ostoskoriin';
 $_['text_checkout']  = 'Kassa';
-$_['text_recurring'] = 'Payment Profile';
+$_['text_recurring'] = 'Maksuprofiili';
diff --git a/catalog/common/footer.php b/catalog/common/footer.php
index 6334478..7e8705c 100644
--- a/catalog/common/footer.php
+++ b/catalog/common/footer.php
@@ -1,15 +1,15 @@
 <?php
 // Text
-$_['text_information']  = 'Information';
+$_['text_information']  = 'Tietoa';
 $_['text_service']      = 'Asiakaspalvelu';
-$_['text_extra']        = 'Extras';
+$_['text_extra']        = 'Extrat';
 $_['text_contact']      = 'Ota yhteyttä';
 $_['text_return']       = 'Palautukset';
 $_['text_sitemap']      = 'Sivustokartta';
 $_['text_manufacturer'] = 'Brands';
 $_['text_voucher']      = 'Lahjakortit';
 $_['text_affiliate']    = 'Kumppanuus';
-$_['text_special']      = 'Specials';
+$_['text_special']      = 'Erikoistarjoukset';
 $_['text_account']      = 'Oma tili';
 $_['text_order']        = 'Tilaushistoria';
 $_['text_wishlist']     = 'Toivelista';
diff --git a/catalog/information/contact.php b/catalog/information/contact.php
index cd51240..ece53b1 100644
--- a/catalog/information/contact.php
+++ b/catalog/information/contact.php
@@ -9,12 +9,12 @@ $_['text_contact']   = 'Yhteydenottolomake';
 $_['text_address']   = 'Osoite';
 $_['text_telephone'] = 'Puhelinnumero';
 $_['text_fax']       = 'Fax';
-$_['text_open']      = 'Opening Times';
-$_['text_comment']   = 'Comments';
+$_['text_open']      = 'Aukioloajat';
+$_['text_comment']   = 'Kommentit';
 $_['text_message']   = '<p>Your enquiry has been successfully sent to the store owner!</p>'; 
 
 // Entry
-$_['entry_name']     = 'Your Name';
+$_['entry_name']     = 'Nimi';
 $_['entry_email']    = 'Sähköpostiosoite';
 $_['entry_enquiry']  = 'Enquiry';
 
diff --git a/catalog/product/product.php b/catalog/product/product.php
index e75f604..0efbc71 100644
--- a/catalog/product/product.php
+++ b/catalog/product/product.php
@@ -10,18 +10,18 @@ $_['text_stock']               = 'Saatavuus:';
 $_['text_instock']             = 'Varastossa';
 $_['text_tax']                 = 'Ex Tax:';
 $_['text_discount']            = ' or more ';
-$_['text_option']              = 'Available Options';
+$_['text_option']              = 'Vaihtoehdot';
 $_['text_minimum']             = 'This product has a minimum quantity of %s';
-$_['text_reviews']             = '%s reviews';
-$_['text_write']               = 'Write a review';
+$_['text_reviews']             = '%s arvostelua';
+$_['text_write']               = 'Kirjoita arvostelu';
 $_['text_login']               = 'Please <a href="%s">login</a> or <a href="%s">register</a> to review';
 $_['text_no_reviews']          = 'There are no reviews for this product.';
 $_['text_note']                = '<span class="text-danger">Note:</span> HTML is not translated!';
 $_['text_success']             = 'Thank you for your review. It has been submitted to the webmaster for approval.';
 $_['text_related']             = 'Related Products';
 $_['text_tags']                = 'Tagit:';
-$_['text_error']               = 'Product not found!';
-$_['text_payment_recurring']   = 'Payment Profile';
+$_['text_error']               = 'Tuote ei löytynyt!';
+$_['text_payment_recurring']   = 'Maksuprofiili';
 $_['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';
@@ -33,16 +33,16 @@ $_['text_year']                = 'vuosi';
 
 // Entry
 $_['entry_qty']                = 'Määrä';
-$_['entry_name']               = 'Your Name';
+$_['entry_name']               = 'Nimi';
 $_['entry_review']             = 'Your Review';
 $_['entry_rating']             = 'Rating';
 $_['entry_good']               = 'Good';
 $_['entry_bad']                = 'Bad';
 
 // Tabs
-$_['tab_description']          = 'Description';
+$_['tab_description']          = 'Kuvaus';
 $_['tab_attribute']            = 'Specification';
-$_['tab_review']               = 'Reviews (%s)';
+$_['tab_review']               = 'Arvostelut (%s)';
 
 // Error
 $_['error_name']               = 'Varoitus: Review Name must be between 3 and 25 characters!';