diff --git a/src/classes/XLite/Controller/Admin/AddonsListInstalled.php b/src/classes/XLite/Controller/Admin/AddonsListInstalled.php
index 6d4a40af45..14358c9dd3 100644
--- a/src/classes/XLite/Controller/Admin/AddonsListInstalled.php
+++ b/src/classes/XLite/Controller/Admin/AddonsListInstalled.php
@@ -44,7 +44,7 @@ class AddonsListInstalled extends \XLite\Controller\Admin\Base\AddonsList
      */
     public function getTitle()
     {
-        return 'Manage add-ons';
+        return static::t('Manage add-ons');
     }
 
     /**
@@ -56,7 +56,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Manage add-ons';
+        return static::t('Manage add-ons');
     }
 
     // {{{ Short-name methods
diff --git a/src/classes/XLite/Controller/Admin/AddonsListMarketplace.php b/src/classes/XLite/Controller/Admin/AddonsListMarketplace.php
index 4df6b678c2..f138cb00f0 100644
--- a/src/classes/XLite/Controller/Admin/AddonsListMarketplace.php
+++ b/src/classes/XLite/Controller/Admin/AddonsListMarketplace.php
@@ -49,7 +49,7 @@ class AddonsListMarketplace extends \XLite\Controller\Admin\Base\AddonsList
      */
     public function getTitle()
     {
-        return self::MARKETPLACE_TITLE;
+        return static::t(self::MARKETPLACE_TITLE);
     }
 
     /**
@@ -61,6 +61,6 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return self::MARKETPLACE_TITLE;
+        return static::t(self::MARKETPLACE_TITLE);
     }
 }
diff --git a/src/classes/XLite/Controller/Admin/AddressBook.php b/src/classes/XLite/Controller/Admin/AddressBook.php
index 8ee07ab2dd..d12bb72941 100644
--- a/src/classes/XLite/Controller/Admin/AddressBook.php
+++ b/src/classes/XLite/Controller/Admin/AddressBook.php
@@ -54,7 +54,7 @@ class AddressBook extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return \XLite\Core\Request::getInstance()->widget ? 'Address details' : 'Edit profile';
+        return \XLite\Core\Request::getInstance()->widget ? static::t('Address details') : static::t('Edit profile');
     }
 
     /**
@@ -180,7 +180,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Search profiles', $this->buildURL('profile_list'));
+        $this->addLocationNode(static::t('Search profiles'), $this->buildURL('profile_list'));
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/Base/BackupRestore.php b/src/classes/XLite/Controller/Admin/Base/BackupRestore.php
index 8eda34086d..0337243167 100644
--- a/src/classes/XLite/Controller/Admin/Base/BackupRestore.php
+++ b/src/classes/XLite/Controller/Admin/Base/BackupRestore.php
@@ -54,7 +54,7 @@ abstract class BackupRestore extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Backup/Restore';
+        return static::t('Backup/Restore');
     }
 
     /**
@@ -136,6 +136,6 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Backup/Restore', $this->buildURL('db_backup'));
+        $this->addLocationNode(static::t('Backup/Restore'), $this->buildURL('db_backup'));
     }
 }
diff --git a/src/classes/XLite/Controller/Admin/BrowseServer.php b/src/classes/XLite/Controller/Admin/BrowseServer.php
index 2f774d5637..e4318a881d 100644
--- a/src/classes/XLite/Controller/Admin/BrowseServer.php
+++ b/src/classes/XLite/Controller/Admin/BrowseServer.php
@@ -44,6 +44,6 @@ class BrowseServer extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Browse server';
+        return static::t('Browse server');
     }
 }
diff --git a/src/classes/XLite/Controller/Admin/Categories.php b/src/classes/XLite/Controller/Admin/Categories.php
index 49bdb8a867..fbb0e1c4c0 100644
--- a/src/classes/XLite/Controller/Admin/Categories.php
+++ b/src/classes/XLite/Controller/Admin/Categories.php
@@ -46,7 +46,7 @@ public function getTitle()
     {
         return ($this->getCategory() && $this->getRootCategoryId() !== $this->getCategory()->getCategoryId())
             ? $this->getCategory()->getName()
-            : 'Manage categories';
+            : static::t('Manage categories');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/Category.php b/src/classes/XLite/Controller/Admin/Category.php
index 546dcf15b6..37c5b6c076 100644
--- a/src/classes/XLite/Controller/Admin/Category.php
+++ b/src/classes/XLite/Controller/Admin/Category.php
@@ -55,7 +55,7 @@ class Category extends \XLite\Controller\Admin\Base\Catalog
     public function getPages()
     {
         return array(
-            'category_modify' => ($this->getCategory()->getCategoryId()) ? 'Modify category' : 'Add new category'
+            'category_modify' => ($this->getCategory()->getCategoryId()) ? static::t('Modify category') : static::t('Add new category')
         );
     }
 
diff --git a/src/classes/XLite/Controller/Admin/Countries.php b/src/classes/XLite/Controller/Admin/Countries.php
index 064df9a374..729962e7f9 100644
--- a/src/classes/XLite/Controller/Admin/Countries.php
+++ b/src/classes/XLite/Controller/Admin/Countries.php
@@ -44,7 +44,7 @@ class Countries extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Countries';
+        return static::t('Countries');
     }
 
     /**
@@ -70,7 +70,7 @@ public function getCountries()
      */
     protected function getLocation()
     {
-        return 'Countries';
+        return static::t('Countries');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/DbBackup.php b/src/classes/XLite/Controller/Admin/DbBackup.php
index fc04d8a48f..30bb6d5825 100644
--- a/src/classes/XLite/Controller/Admin/DbBackup.php
+++ b/src/classes/XLite/Controller/Admin/DbBackup.php
@@ -102,7 +102,7 @@ protected function getPageReturnURL()
         $url = array();
 
         if ('backup' == \XLite\Core\Request::getInstance()->action) {
-            $url[] = '<a href="admin.php?target=db_backup">Return to admin interface.</a>';
+            $url[] = '<a href="admin.php?target=db_backup">'.static::t('Return to admin interface.').'</a>';
 
         } else {
             $url = parent::getPageReturnURL();
diff --git a/src/classes/XLite/Controller/Admin/DbRestore.php b/src/classes/XLite/Controller/Admin/DbRestore.php
index fef83e0c50..30722e10ba 100644
--- a/src/classes/XLite/Controller/Admin/DbRestore.php
+++ b/src/classes/XLite/Controller/Admin/DbRestore.php
@@ -162,7 +162,7 @@ protected function getPageReturnURL()
 
             case 'restore_from_uploaded_file':
             case 'restore_from_local_file':
-                $url[] = '<a href="admin.php?target=db_restore">Return to admin interface.</a>';
+                $url[] = '<a href="admin.php?target=db_restore">'.static::t('Return to admin interface.').'</a>';
                 break;
 
             default:
diff --git a/src/classes/XLite/Controller/Admin/ImportExport.php b/src/classes/XLite/Controller/Admin/ImportExport.php
index 4698f80fd7..6663754c03 100644
--- a/src/classes/XLite/Controller/Admin/ImportExport.php
+++ b/src/classes/XLite/Controller/Admin/ImportExport.php
@@ -102,8 +102,8 @@ class ImportExport extends \XLite\Controller\Admin\AAdmin
     public function getPages()
     {
         return array(
-            'import' => 'Import',
-            'export' => 'Export',
+            'import' => static::t('Import'),
+            'export' => static::t('Export'),
         );
     }
 
@@ -150,7 +150,7 @@ public function getPage()
      */
     public function getTitle()
     {
-        return 'Import / Export';
+        return static::t('Import / Export');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/Languages.php b/src/classes/XLite/Controller/Admin/Languages.php
index b67494cd12..3b454db846 100644
--- a/src/classes/XLite/Controller/Admin/Languages.php
+++ b/src/classes/XLite/Controller/Admin/Languages.php
@@ -55,7 +55,7 @@ class Languages extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Language labels';
+        return static::t('Language labels');
     }
 
     /**
@@ -94,7 +94,7 @@ public function getReturnURL()
      */
     protected function getLocation()
     {
-        return 'Language labels';
+        return static::t('Language labels');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/ModuleKey.php b/src/classes/XLite/Controller/Admin/ModuleKey.php
index 350fb6e4d7..cd0093926b 100644
--- a/src/classes/XLite/Controller/Admin/ModuleKey.php
+++ b/src/classes/XLite/Controller/Admin/ModuleKey.php
@@ -46,7 +46,7 @@ class ModuleKey extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Enter license key';
+        return static::t('Enter license key');
     }
 
     // }}}
diff --git a/src/classes/XLite/Controller/Admin/Order.php b/src/classes/XLite/Controller/Admin/Order.php
index 9f5ae47f90..6ccbdcd7c3 100644
--- a/src/classes/XLite/Controller/Admin/Order.php
+++ b/src/classes/XLite/Controller/Admin/Order.php
@@ -67,7 +67,7 @@ public function checkAccess()
      */
     protected function getLocation()
     {
-        return 'Order #' . \XLite\Core\Request::getInstance()->order_id;
+        return static::t('Order #') . \XLite\Core\Request::getInstance()->order_id;
     }
 
     /**
@@ -81,7 +81,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Search orders', $this->buildURL('order_list'));
+        $this->addLocationNode(static::t('Search orders'), $this->buildURL('order_list'));
     }
 
     /**
@@ -147,7 +147,7 @@ protected function getViewerTemplate()
     public function getPages()
     {
         return array(
-            'default' => 'General info',
+            'default' => static::t('General info'),
         );
     }
 
diff --git a/src/classes/XLite/Controller/Admin/OrderList.php b/src/classes/XLite/Controller/Admin/OrderList.php
index 19bafbb24b..cb2f5c7f30 100644
--- a/src/classes/XLite/Controller/Admin/OrderList.php
+++ b/src/classes/XLite/Controller/Admin/OrderList.php
@@ -44,7 +44,7 @@ class OrderList extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Search orders';
+        return static::t('Search orders');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/OrdersStats.php b/src/classes/XLite/Controller/Admin/OrdersStats.php
index 302a26aaf2..6ff780ed34 100644
--- a/src/classes/XLite/Controller/Admin/OrdersStats.php
+++ b/src/classes/XLite/Controller/Admin/OrdersStats.php
@@ -68,12 +68,12 @@ public function getPageTemplate()
     public function getRowTitles()
     {
         return array(
-            self::P_PROCESSED  => 'Processed/Completed',
-            self::P_QUEUED     => 'Queued',
-            self::P_FAILED     => 'Failed/Declined',
-            self::P_INCOMPLETE => 'Not finished',
-            self::P_TOTAL      => 'Total',
-            self::P_PAID       => 'Paid',
+            self::P_PROCESSED  => static::t('Processed/Completed'),
+            self::P_QUEUED     => static::t('Queued'),
+            self::P_FAILED     => static::t('Failed/Declined'),
+            self::P_INCOMPLETE => static::t('Not finished'),
+            self::P_TOTAL      => static::t('Total'),
+            self::P_PAID       => static::t('Paid'),
         );
     }
 
diff --git a/src/classes/XLite/Controller/Admin/Product.php b/src/classes/XLite/Controller/Admin/Product.php
index a3a2b8de53..112924b67f 100644
--- a/src/classes/XLite/Controller/Admin/Product.php
+++ b/src/classes/XLite/Controller/Admin/Product.php
@@ -55,13 +55,13 @@ class Product extends \XLite\Controller\Admin\AAdmin
     public function getPages()
     {
         $pages = array(
-            'info'  => 'Product info',
+            'info'  => static::t('Product info'),
         );
 
         if (!$this->isNew()) {
             $pages += array(
-                'images'    => 'Product images',
-                'inventory' => 'Inventory tracking',
+                'images'    => static::t('Product images'),
+                'inventory' => static::t('Inventory tracking'),
             );
         }
 
@@ -207,7 +207,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Search products', $this->buildURL('product_list'));
+        $this->addLocationNode(static::t('Search products'), $this->buildURL('product_list'));
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/ProductList.php b/src/classes/XLite/Controller/Admin/ProductList.php
index be365b31ae..9e32e1c71e 100644
--- a/src/classes/XLite/Controller/Admin/ProductList.php
+++ b/src/classes/XLite/Controller/Admin/ProductList.php
@@ -68,7 +68,7 @@ public function getCondition($paramName)
      */
     public function getTitle()
     {
-        return 'Search products';
+        return static::t('Search products');
     }
 
 
@@ -81,7 +81,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Search product';
+        return static::t('Search product');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/Profile.php b/src/classes/XLite/Controller/Admin/Profile.php
index 15ddd3ab07..db98693484 100644
--- a/src/classes/XLite/Controller/Admin/Profile.php
+++ b/src/classes/XLite/Controller/Admin/Profile.php
@@ -56,7 +56,7 @@ public static function getRegisterMode()
      */
     public function getTitle()
     {
-        return 'Edit profile';
+        return static::t('Edit profile');
     }
 
 
@@ -133,7 +133,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Users', $this->buildURL('profile_list'));
+        $this->addLocationNode(static::t('Users'), $this->buildURL('profile_list'));
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/ProfileList.php b/src/classes/XLite/Controller/Admin/ProfileList.php
index 8b07191a7b..f95793afc0 100644
--- a/src/classes/XLite/Controller/Admin/ProfileList.php
+++ b/src/classes/XLite/Controller/Admin/ProfileList.php
@@ -44,7 +44,7 @@ class ProfileList extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Search users';
+        return static::t('Search users');
     }
 
     /**
@@ -56,7 +56,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Users';
+        return static::t('Users');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/SelectFile.php b/src/classes/XLite/Controller/Admin/SelectFile.php
index 6b6b99a52f..a59b1d464d 100644
--- a/src/classes/XLite/Controller/Admin/SelectFile.php
+++ b/src/classes/XLite/Controller/Admin/SelectFile.php
@@ -44,7 +44,7 @@ class SelectFile extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Upload file';
+        return static::t('Upload file');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/Settings.php b/src/classes/XLite/Controller/Admin/Settings.php
index 11b92694e8..ed583a26d6 100644
--- a/src/classes/XLite/Controller/Admin/Settings.php
+++ b/src/classes/XLite/Controller/Admin/Settings.php
@@ -75,7 +75,7 @@ class Settings extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'General settings';
+        return static::t('General settings');
     }
 
     /**
@@ -88,12 +88,12 @@ public function getTitle()
     public function getPages()
     {
         return array(
-            'General'     => 'General',
-            'Company'     => 'Company',
-            'Email'       => 'Email',
-            'Security'    => 'Security',
-            'Environment' => 'Environment',
-            'Performance' => 'Performance',
+            'General'     => static::t('General'),
+            'Company'     => static::t('Company'),
+            'Email'       => static::t('Email'),
+            'Security'    => static::t('Security'),
+            'Environment' => static::t('Environment'),
+            'Performance' => static::t('Performance'),
         );
     }
 
@@ -139,7 +139,7 @@ public function getOptions()
      */
     protected function getLocation()
     {
-        return 'General settings';
+        return static::t('General settings');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/ShippingMethods.php b/src/classes/XLite/Controller/Admin/ShippingMethods.php
index 446585a556..ccc002a4fa 100644
--- a/src/classes/XLite/Controller/Admin/ShippingMethods.php
+++ b/src/classes/XLite/Controller/Admin/ShippingMethods.php
@@ -44,7 +44,7 @@ class ShippingMethods extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Shipping methods';
+        return static::t('Shipping methods');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/ShippingRates.php b/src/classes/XLite/Controller/Admin/ShippingRates.php
index 27e234a208..39f2c7aee2 100644
--- a/src/classes/XLite/Controller/Admin/ShippingRates.php
+++ b/src/classes/XLite/Controller/Admin/ShippingRates.php
@@ -170,7 +170,7 @@ protected function doActionChange()
      */
     protected function getLocation()
     {
-        return 'Shipping rates';
+        return static::t('Shipping rates');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/ShippingSettings.php b/src/classes/XLite/Controller/Admin/ShippingSettings.php
index c9213d56e6..137cac3f1f 100644
--- a/src/classes/XLite/Controller/Admin/ShippingSettings.php
+++ b/src/classes/XLite/Controller/Admin/ShippingSettings.php
@@ -57,7 +57,7 @@ public function getOptions()
      */
     public function getTitle()
     {
-        return 'Shipping';
+        return static::t('Shipping');
     }
 
     /**
@@ -136,6 +136,6 @@ protected function getLocation()
      */
     protected function getOptionsCategory()
     {
-        return static::t('Shipping');
+        return 'Shipping';
     }
 }
diff --git a/src/classes/XLite/Controller/Admin/ShippingZones.php b/src/classes/XLite/Controller/Admin/ShippingZones.php
index e9bac75230..7a33796fa7 100644
--- a/src/classes/XLite/Controller/Admin/ShippingZones.php
+++ b/src/classes/XLite/Controller/Admin/ShippingZones.php
@@ -44,7 +44,7 @@ class ShippingZones extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Shipping zones';
+        return static::t('Shipping zones');
     }
     /**
      * Add elements into the specified zone
@@ -88,7 +88,7 @@ public function addElements($zone, $data)
      */
     protected function getLocation()
     {
-        return 'Shipping zones';
+        return static::t('Shipping zones');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/States.php b/src/classes/XLite/Controller/Admin/States.php
index 30fabbd95d..7df65b416f 100644
--- a/src/classes/XLite/Controller/Admin/States.php
+++ b/src/classes/XLite/Controller/Admin/States.php
@@ -44,7 +44,7 @@ class States extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'States';
+        return static::t('States');
     }
 
     /**
@@ -95,7 +95,7 @@ public function getStates()
      */
     protected function getLocation()
     {
-        return 'States';
+        return static::t('States');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Admin/Stats.php b/src/classes/XLite/Controller/Admin/Stats.php
index cdec45d9fb..5d0d494b56 100644
--- a/src/classes/XLite/Controller/Admin/Stats.php
+++ b/src/classes/XLite/Controller/Admin/Stats.php
@@ -93,11 +93,11 @@ public function getStats()
     public function getColumnTitles()
     {
         return array(
-            self::P_TODAY => 'Today',
-            self::P_WEEK  => 'This week',
-            self::P_MONTH => 'This month',
-            self::P_YEAR  => 'This year',
-            self::P_ALL   => 'All time',
+            self::P_TODAY => static::t('Today'),
+            self::P_WEEK  => static::t('This week'),
+            self::P_MONTH => static::t('This month'),
+            self::P_YEAR  => static::t('This year'),
+            self::P_ALL   => static::t('All time'),
         );
     }
 
diff --git a/src/classes/XLite/Controller/Admin/Taxes.php b/src/classes/XLite/Controller/Admin/Taxes.php
index 9e105b081f..4f5845daee 100644
--- a/src/classes/XLite/Controller/Admin/Taxes.php
+++ b/src/classes/XLite/Controller/Admin/Taxes.php
@@ -77,7 +77,7 @@ public function getPageTemplates()
      */
     public function getTitle()
     {
-        return 'Taxes';
+        return static::t('Taxes');
     }
 
     /**
@@ -89,7 +89,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Taxes';
+        return static::t('Taxes');
     }
 
     // {{{ Widget-specific getters
diff --git a/src/classes/XLite/Controller/Admin/TopSellers.php b/src/classes/XLite/Controller/Admin/TopSellers.php
index f80d8212c6..50274a5b03 100644
--- a/src/classes/XLite/Controller/Admin/TopSellers.php
+++ b/src/classes/XLite/Controller/Admin/TopSellers.php
@@ -102,7 +102,7 @@ public function getStats()
      */
     protected function getLocation()
     {
-        return 'Top sellers';
+        return static::t('Top sellers');
     }
 
     /**
@@ -116,7 +116,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Statistics', $this->buildURL('orders_stats'));
+        $this->addLocationNode(static::t('Statistics'), $this->buildURL('orders_stats'));
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/Checkout.php b/src/classes/XLite/Controller/Customer/Checkout.php
index 30dd53502e..58068dd3b6 100644
--- a/src/classes/XLite/Controller/Customer/Checkout.php
+++ b/src/classes/XLite/Controller/Customer/Checkout.php
@@ -81,7 +81,7 @@ public function handleRequest()
      */
     public function getTitle()
     {
-        return 'Checkout';
+        return static::t('Checkout');
     }
 
     /**
@@ -544,7 +544,7 @@ protected function isPaymentNeeded()
      */
     protected function getLocation()
     {
-        return 'Checkout';
+        return static::t('Checkout');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/CheckoutSuccess.php b/src/classes/XLite/Controller/Customer/CheckoutSuccess.php
index 1aec6982e0..7bdd498e9f 100644
--- a/src/classes/XLite/Controller/Customer/CheckoutSuccess.php
+++ b/src/classes/XLite/Controller/Customer/CheckoutSuccess.php
@@ -63,7 +63,7 @@ class CheckoutSuccess extends \XLite\Controller\Customer\ACustomer
      */
     public function getTitle()
     {
-        return 'Thank you for your order';
+        return static::t('Thank you for your order');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/Login.php b/src/classes/XLite/Controller/Customer/Login.php
index 5d1ec6b1f4..dd46cb5716 100644
--- a/src/classes/XLite/Controller/Customer/Login.php
+++ b/src/classes/XLite/Controller/Customer/Login.php
@@ -124,7 +124,7 @@ public function getShopURL($url = '', $secure = false)
      */
     protected function getLocation()
     {
-        return 'Authentication';
+        return static::t('Authentication');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/Profile.php b/src/classes/XLite/Controller/Customer/Profile.php
index a1c04c6bc3..c503b821f6 100644
--- a/src/classes/XLite/Controller/Customer/Profile.php
+++ b/src/classes/XLite/Controller/Customer/Profile.php
@@ -106,7 +106,7 @@ public function isRegisterMode()
      */
     protected function getLocation()
     {
-        return 'Account details';
+        return static::t('Account details');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/RecoverPassword.php b/src/classes/XLite/Controller/Customer/RecoverPassword.php
index d7393d3d99..570cdeb773 100644
--- a/src/classes/XLite/Controller/Customer/RecoverPassword.php
+++ b/src/classes/XLite/Controller/Customer/RecoverPassword.php
@@ -57,7 +57,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Help zone');
+        $this->addLocationNode(static::t('Help zone'));
     }
 
     /**
@@ -69,7 +69,7 @@ protected function addBaseLocation()
      */
     protected function getLocation()
     {
-        return 'Recover password';
+        return static::t('Recover password');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/Search.php b/src/classes/XLite/Controller/Customer/Search.php
index 9af4abf75b..ab0167a893 100644
--- a/src/classes/XLite/Controller/Customer/Search.php
+++ b/src/classes/XLite/Controller/Customer/Search.php
@@ -82,7 +82,7 @@ public function getChecked($paramName, $value = 'Y')
      */
     protected function getLocation()
     {
-        return 'Search results';
+        return static::t('Search results');
     }
 
     /**
diff --git a/src/classes/XLite/Controller/Customer/SelectAddress.php b/src/classes/XLite/Controller/Customer/SelectAddress.php
index a8b7c18c88..9b1e5e242d 100644
--- a/src/classes/XLite/Controller/Customer/SelectAddress.php
+++ b/src/classes/XLite/Controller/Customer/SelectAddress.php
@@ -54,7 +54,7 @@ class SelectAddress extends \XLite\Controller\Customer\Cart
      */
     public function getTitle()
     {
-        return 'Pick address from address book';
+        return static::t('Pick address from address book');
     }
 
     /**
@@ -87,7 +87,7 @@ public function getCurrentAddressId()
      */
     protected function getLocation()
     {
-        return 'Pick address from address book';
+        return static::t('Pick address from address book');
     }
 
     /**
diff --git a/src/classes/XLite/Model/Shipping/Processor/Offline.php b/src/classes/XLite/Model/Shipping/Processor/Offline.php
index 9582a33dc4..f5edbe7145 100644
--- a/src/classes/XLite/Model/Shipping/Processor/Offline.php
+++ b/src/classes/XLite/Model/Shipping/Processor/Offline.php
@@ -58,7 +58,7 @@ class Offline extends \XLite\Model\Shipping\Processor\AProcessor
      */
     public function getProcessorName()
     {
-        return 'Manually defined shipping methods';
+        return static::t('Manually defined shipping methods');
     }
 
     /**
diff --git a/src/classes/XLite/Model/State.php b/src/classes/XLite/Model/State.php
index 4101c82906..dbf368636c 100644
--- a/src/classes/XLite/Model/State.php
+++ b/src/classes/XLite/Model/State.php
@@ -65,7 +65,7 @@ class State extends \XLite\Model\AEntity
      * @see   ____var_see____
      * @since 1.0.0
      *
-     * @Column (type="string", length="32")
+     * @Column (type="string", length="48")
      */
     protected $state;
 
diff --git a/src/classes/XLite/Module/CDev/AustraliaPost/Controller/Admin/Aupost.php b/src/classes/XLite/Module/CDev/AustraliaPost/Controller/Admin/Aupost.php
index a990266ad7..72066b1091 100644
--- a/src/classes/XLite/Module/CDev/AustraliaPost/Controller/Admin/Aupost.php
+++ b/src/classes/XLite/Module/CDev/AustraliaPost/Controller/Admin/Aupost.php
@@ -44,7 +44,7 @@ class Aupost extends \XLite\Controller\Admin\ShippingSettings
      */
     public function getTitle()
     {
-        return 'AustraliaPost settings';
+        return static::t('AustraliaPost settings');
     }
 
 
@@ -57,7 +57,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'AustraliaPost settings';
+        return static::t('AustraliaPost settings');
     }
 
     /**
diff --git a/src/classes/XLite/Module/CDev/AustraliaPost/View/Tabs/ShippingSettings.php b/src/classes/XLite/Module/CDev/AustraliaPost/View/Tabs/ShippingSettings.php
index 1a41371509..e857c02a05 100644
--- a/src/classes/XLite/Module/CDev/AustraliaPost/View/Tabs/ShippingSettings.php
+++ b/src/classes/XLite/Module/CDev/AustraliaPost/View/Tabs/ShippingSettings.php
@@ -47,7 +47,7 @@ public function init()
         parent::init();
 
         $this->tabs['aupost'] = array(
-            'title'    => 'Australia Post settings',
+            'title'    => static::t('Australia Post settings'),
             'template' => 'modules/CDev/AustraliaPost/main.tpl'
         );
     }
diff --git a/src/classes/XLite/Module/CDev/Bestsellers/View/Bestsellers.php b/src/classes/XLite/Module/CDev/Bestsellers/View/Bestsellers.php
index 4078d0e6ec..59ddae1cef 100644
--- a/src/classes/XLite/Module/CDev/Bestsellers/View/Bestsellers.php
+++ b/src/classes/XLite/Module/CDev/Bestsellers/View/Bestsellers.php
@@ -126,7 +126,7 @@ public function setWidgetParams(array $params)
      */
     protected function getHead()
     {
-        return 'Bestsellers';
+        return static::t('Bestsellers');
     }
 
     /**
diff --git a/src/classes/XLite/Module/CDev/FeaturedProducts/View/Admin/FeaturedProducts.php b/src/classes/XLite/Module/CDev/FeaturedProducts/View/Admin/FeaturedProducts.php
index 4a09f3bb8e..1ae3dd99d6 100644
--- a/src/classes/XLite/Module/CDev/FeaturedProducts/View/Admin/FeaturedProducts.php
+++ b/src/classes/XLite/Module/CDev/FeaturedProducts/View/Admin/FeaturedProducts.php
@@ -72,7 +72,7 @@ static public function getSearchParams()
      */
     protected function getHead()
     {
-        return 'Search result';
+        return static::t('Search results');
     }
 
     /**
@@ -101,7 +101,7 @@ protected function defineViewList($list)
         $result = parent::defineViewList($list);
 
         if ($this->getListName() . '.footer' === $list) {
-            $result[] = $this->getWidget(array('label' => 'Add featured products'), '\XLite\View\Button\Submit');
+            $result[] = $this->getWidget(array('label' => static::t('Add featured products')), '\XLite\View\Button\Submit');
         }
 
         return $result;
diff --git a/src/classes/XLite/Module/CDev/FeaturedProducts/View/Customer/FeaturedProducts.php b/src/classes/XLite/Module/CDev/FeaturedProducts/View/Customer/FeaturedProducts.php
index deb5559618..56631bb745 100644
--- a/src/classes/XLite/Module/CDev/FeaturedProducts/View/Customer/FeaturedProducts.php
+++ b/src/classes/XLite/Module/CDev/FeaturedProducts/View/Customer/FeaturedProducts.php
@@ -73,7 +73,7 @@ public function setWidgetParams(array $params)
      */
     protected function getHead()
     {
-        return 'Featured products';
+        return static::t('Featured products');
     }
 
     /**
diff --git a/src/classes/XLite/Module/CDev/FileAttachments/Controller/Admin/Product.php b/src/classes/XLite/Module/CDev/FileAttachments/Controller/Admin/Product.php
index 12c9c7b846..7d22c455a8 100644
--- a/src/classes/XLite/Module/CDev/FileAttachments/Controller/Admin/Product.php
+++ b/src/classes/XLite/Module/CDev/FileAttachments/Controller/Admin/Product.php
@@ -47,7 +47,7 @@ public function getPages()
         $list = parent::getPages();
 
         if (!$this->isNew()) {
-            $list['attachments'] = 'Attachments';
+            $list['attachments'] = static::t('Attachments');
         }
 
         return $list;
diff --git a/src/classes/XLite/Module/CDev/ProductOptions/Controller/Admin/Product.php b/src/classes/XLite/Module/CDev/ProductOptions/Controller/Admin/Product.php
index f53ec8ee50..a958d41e8e 100644
--- a/src/classes/XLite/Module/CDev/ProductOptions/Controller/Admin/Product.php
+++ b/src/classes/XLite/Module/CDev/ProductOptions/Controller/Admin/Product.php
@@ -67,7 +67,7 @@ public function getPages()
 
         if (!$this->isNew()) {
             $pages += array(
-                'product_options' => 'Product options',
+                'product_options' => static::t('Product options'),
             );
         }
 
diff --git a/src/classes/XLite/Module/CDev/ProductOptions/View/Button/AddGroup.php b/src/classes/XLite/Module/CDev/ProductOptions/View/Button/AddGroup.php
index ff175bbf59..7d66e3cd37 100644
--- a/src/classes/XLite/Module/CDev/ProductOptions/View/Button/AddGroup.php
+++ b/src/classes/XLite/Module/CDev/ProductOptions/View/Button/AddGroup.php
@@ -68,6 +68,6 @@ protected function defineWidgetParams()
      */
     protected function getDefaultLabel()
     {
-        return 'Add new option group';
+        return static::t('Add new option group');
     }
 }
diff --git a/src/classes/XLite/Module/CDev/ProductOptions/View/ModifyOptionGroup.php b/src/classes/XLite/Module/CDev/ProductOptions/View/ModifyOptionGroup.php
index 8d8aead962..fa020ac607 100644
--- a/src/classes/XLite/Module/CDev/ProductOptions/View/ModifyOptionGroup.php
+++ b/src/classes/XLite/Module/CDev/ProductOptions/View/ModifyOptionGroup.php
@@ -160,8 +160,8 @@ public function getOptionTranslation(\XLite\Module\CDev\ProductOptions\Model\Opt
     public function getModifiersNames()
     {
         return array(
-            'price'  => 'Price modifier',
-            'weight' => 'Weight modifier',
+            'price'  => static::t('Price modifier'),
+            'weight' => static::t('Weight modifier'),
         );
     }
 
@@ -236,8 +236,8 @@ public function getOptionGroupViewTypes()
     public function getOptionSurchargeModifierTypes()
     {
         return array(
-            \XLite\Module\CDev\ProductOptions\Model\OptionSurcharge::PERCENT_MODIFIER  => 'Percent',
-            \XLite\Module\CDev\ProductOptions\Model\OptionSurcharge::ABSOLUTE_MODIFIER => 'Absolute',
+            \XLite\Module\CDev\ProductOptions\Model\OptionSurcharge::PERCENT_MODIFIER  => static::t('Percent'),
+            \XLite\Module\CDev\ProductOptions\Model\OptionSurcharge::ABSOLUTE_MODIFIER => static::t('Absolute'),
         );
     }
 
diff --git a/src/classes/XLite/Module/CDev/SalesTax/Controller/Admin/Taxes.php b/src/classes/XLite/Module/CDev/SalesTax/Controller/Admin/Taxes.php
index 11cf9c3b92..6bc50f7a2d 100644
--- a/src/classes/XLite/Module/CDev/SalesTax/Controller/Admin/Taxes.php
+++ b/src/classes/XLite/Module/CDev/SalesTax/Controller/Admin/Taxes.php
@@ -52,7 +52,7 @@ public function getPages()
     {
         $list = parent::getPages();
 
-        $list[self::PAGE_SALES_TAX] = 'Sales tax';
+        $list[self::PAGE_SALES_TAX] = static::t('Sales tax');
 
         return $list;
     }
diff --git a/src/classes/XLite/Module/CDev/USPS/Controller/Admin/Usps.php b/src/classes/XLite/Module/CDev/USPS/Controller/Admin/Usps.php
index a7d0c3adaa..bc96eaa237 100644
--- a/src/classes/XLite/Module/CDev/USPS/Controller/Admin/Usps.php
+++ b/src/classes/XLite/Module/CDev/USPS/Controller/Admin/Usps.php
@@ -44,7 +44,7 @@ class Usps extends \XLite\Controller\Admin\ShippingSettings
      */
     public function getTitle()
     {
-        return 'U.S.P.S. settings';
+        return static::t('U.S.P.S. settings');
     }
 
     /**
@@ -148,7 +148,7 @@ public function getContainerIntlOptions()
      */
     protected function getLocation()
     {
-        return 'U.S.P.S. settings';
+        return static::t('U.S.P.S. settings');
     }
 
     /**
diff --git a/src/classes/XLite/Module/CDev/USPS/View/Tabs/ShippingSettings.php b/src/classes/XLite/Module/CDev/USPS/View/Tabs/ShippingSettings.php
index 912c4a5b3d..044f3135a5 100644
--- a/src/classes/XLite/Module/CDev/USPS/View/Tabs/ShippingSettings.php
+++ b/src/classes/XLite/Module/CDev/USPS/View/Tabs/ShippingSettings.php
@@ -47,7 +47,7 @@ public function init()
         parent::init();
 
         $this->tabs['usps'] = array(
-            'title'    => 'U.S.P.S. settings',
+            'title'    => static::t('U.S.P.S. settings'),
             'template' => 'modules/CDev/USPS/main.tpl'
         );
     }
diff --git a/src/classes/XLite/Module/CDev/VAT/Controller/Admin/Taxes.php b/src/classes/XLite/Module/CDev/VAT/Controller/Admin/Taxes.php
index 8d2e3946b2..7358a9ed9f 100644
--- a/src/classes/XLite/Module/CDev/VAT/Controller/Admin/Taxes.php
+++ b/src/classes/XLite/Module/CDev/VAT/Controller/Admin/Taxes.php
@@ -52,7 +52,7 @@ public function getPages()
     {
         $list = parent::getPages();
 
-        $list[self::PAGE_VAT_TAX] = 'VAT';
+        $list[self::PAGE_VAT_TAX] = static::t('VAT');
 
         return $list;
     }
diff --git a/src/classes/XLite/View/Authorization.php b/src/classes/XLite/View/Authorization.php
index 607a7be08b..7f5dc5f3f6 100644
--- a/src/classes/XLite/View/Authorization.php
+++ b/src/classes/XLite/View/Authorization.php
@@ -46,7 +46,7 @@ class Authorization extends \XLite\View\SimpleDialog
      */
     protected function getHead()
     {
-        return 'Authentication';
+        return static::t('Authentication');
     }
 
     /**
diff --git a/src/classes/XLite/View/BrowseServer.php b/src/classes/XLite/View/BrowseServer.php
index 41fbb371aa..570668171f 100644
--- a/src/classes/XLite/View/BrowseServer.php
+++ b/src/classes/XLite/View/BrowseServer.php
@@ -105,7 +105,7 @@ public static function getNormalizedPath($path)
      */
     protected function getHead()
     {
-        return 'Browse server';
+        return static::t('Browse server');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/Addon/EnterLicenseKey.php b/src/classes/XLite/View/Button/Addon/EnterLicenseKey.php
index 1feb1e7334..dd4a33962c 100644
--- a/src/classes/XLite/View/Button/Addon/EnterLicenseKey.php
+++ b/src/classes/XLite/View/Button/Addon/EnterLicenseKey.php
@@ -44,7 +44,7 @@ class EnterLicenseKey extends \XLite\View\Button\PopupButton
      */
     protected function getDefaultLabel()
     {
-        return 'Enter license key';
+        return static::t('Enter license key');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/Addon/Upload.php b/src/classes/XLite/View/Button/Addon/Upload.php
index 9a7e51ca70..bf2eba84e4 100644
--- a/src/classes/XLite/View/Button/Addon/Upload.php
+++ b/src/classes/XLite/View/Button/Addon/Upload.php
@@ -59,7 +59,7 @@ public function getJSFiles()
      */
     protected function getDefaultLabel()
     {
-        return 'Upload add-on';
+        return static::t('Upload add-on');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/BrowseServer.php b/src/classes/XLite/View/Button/BrowseServer.php
index d1d8f318aa..f06dde05e0 100644
--- a/src/classes/XLite/View/Button/BrowseServer.php
+++ b/src/classes/XLite/View/Button/BrowseServer.php
@@ -74,7 +74,7 @@ protected function prepareURLParams()
      */
     protected function getDefaultLabel()
     {
-        return 'Browse server';
+        return static::t('Browse server');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/DeleteCategory.php b/src/classes/XLite/View/Button/DeleteCategory.php
index dac67c7fe2..154791383c 100644
--- a/src/classes/XLite/View/Button/DeleteCategory.php
+++ b/src/classes/XLite/View/Button/DeleteCategory.php
@@ -83,7 +83,7 @@ protected function prepareURLParams()
      */
     protected function getDefaultLabel()
     {
-        return 'Delete';
+        return static::t('Delete');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/DeleteSelected.php b/src/classes/XLite/View/Button/DeleteSelected.php
index fc0179b166..5faf4d8534 100644
--- a/src/classes/XLite/View/Button/DeleteSelected.php
+++ b/src/classes/XLite/View/Button/DeleteSelected.php
@@ -51,7 +51,7 @@ class DeleteSelected extends \XLite\View\Button\Regular
      */
     protected function getDefaultLabel()
     {
-        return 'Delete selected';
+        return static::t('Delete selected');
     }
 
     /**
@@ -75,7 +75,7 @@ protected function getDefaultAction()
      */
     protected function getDefaultConfirmationText()
     {
-        return 'Do you really want to delete selected items?';
+        return static::t('Do you really want to delete selected items?');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/DeleteUser.php b/src/classes/XLite/View/Button/DeleteUser.php
index 1687f3052b..adc74f3c33 100644
--- a/src/classes/XLite/View/Button/DeleteUser.php
+++ b/src/classes/XLite/View/Button/DeleteUser.php
@@ -76,7 +76,7 @@ protected function prepareURLParams()
      */
     protected function getDefaultLabel()
     {
-        return 'Delete profile';
+        return static::t('Delete profile');
     }
 
     /**
diff --git a/src/classes/XLite/View/Button/Submit.php b/src/classes/XLite/View/Button/Submit.php
index 4c2b91826b..be1906da67 100644
--- a/src/classes/XLite/View/Button/Submit.php
+++ b/src/classes/XLite/View/Button/Submit.php
@@ -56,6 +56,6 @@ protected function getDefaultTemplate()
      */
     protected function getDefaultLabel()
     {
-        return 'Submit';
+        return static::t('Submit');
     }
 }
diff --git a/src/classes/XLite/View/ItemsList/Order/Admin/Search.php b/src/classes/XLite/View/ItemsList/Order/Admin/Search.php
index b02496c754..9cfb4386b3 100644
--- a/src/classes/XLite/View/ItemsList/Order/Admin/Search.php
+++ b/src/classes/XLite/View/ItemsList/Order/Admin/Search.php
@@ -99,7 +99,7 @@ protected function defineViewList($list)
         $result = parent::defineViewList($list);
 
         if ($this->getListName() . '.footer' === $list) {
-            $result[] = $this->getWidget(array('label' => 'Update'), '\XLite\View\Button\Submit');
+            $result[] = $this->getWidget(array('label' => static::t('Update')), '\XLite\View\Button\Submit');
             $result[] = $this->getWidget(array(), '\XLite\View\Button\DeleteSelected');
         }
 
diff --git a/src/classes/XLite/View/ItemsList/Product/Admin/LowInventory.php b/src/classes/XLite/View/ItemsList/Product/Admin/LowInventory.php
index 5b7dc3b92e..9cae972c7a 100644
--- a/src/classes/XLite/View/ItemsList/Product/Admin/LowInventory.php
+++ b/src/classes/XLite/View/ItemsList/Product/Admin/LowInventory.php
@@ -126,7 +126,7 @@ protected function defineViewList($list)
 
         if ($this->getListName() . '.footer' === $list) {
 
-            $result[] = $this->getWidget(array('label' => 'Update'), '\XLite\View\Button\Submit');
+            $result[] = $this->getWidget(array('label' => static::t('Update')), '\XLite\View\Button\Submit');
         }
 
         return $result;
diff --git a/src/classes/XLite/View/ItemsList/Product/Admin/Search.php b/src/classes/XLite/View/ItemsList/Product/Admin/Search.php
index 8eed82a27a..c14bdc455b 100644
--- a/src/classes/XLite/View/ItemsList/Product/Admin/Search.php
+++ b/src/classes/XLite/View/ItemsList/Product/Admin/Search.php
@@ -75,7 +75,7 @@ static public function getSearchParams()
      */
     protected function getHead()
     {
-        return 'Search result';
+        return static::t('Search result');
     }
 
     /**
@@ -92,7 +92,7 @@ protected function defineViewList($list)
         $result = parent::defineViewList($list);
 
         if ($this->getListName() . '.footer' === $list) {
-            $result[] = $this->getWidget(array('label' => 'Update'), '\XLite\View\Button\Submit');
+            $result[] = $this->getWidget(array('label' => static::t('Update')), '\XLite\View\Button\Submit');
             $result[] = $this->getWidget(array(), '\XLite\View\Button\DeleteSelected');
         }
 
diff --git a/src/classes/XLite/View/ItemsList/Product/Customer/ACustomer.php b/src/classes/XLite/View/ItemsList/Product/Customer/ACustomer.php
index 73452fc28b..004ede4145 100644
--- a/src/classes/XLite/View/ItemsList/Product/Customer/ACustomer.php
+++ b/src/classes/XLite/View/ItemsList/Product/Customer/ACustomer.php
@@ -152,9 +152,9 @@ public static function getSidebarDisplayModes()
     public static function getCenterDisplayModes()
     {
         return array(
-                self::DISPLAY_MODE_GRID  => 'Grid',
-                self::DISPLAY_MODE_LIST  => 'List',
-                self::DISPLAY_MODE_TABLE => 'Table',
+                self::DISPLAY_MODE_GRID  => static::t('Grid'),
+                self::DISPLAY_MODE_LIST  => static::t('List'),
+                self::DISPLAY_MODE_TABLE => static::t('Table'),
             );
     }
 
diff --git a/src/classes/XLite/View/LanguagesModify/Button/AddNewLabel.php b/src/classes/XLite/View/LanguagesModify/Button/AddNewLabel.php
index ab6a9e1674..259f30fcbd 100644
--- a/src/classes/XLite/View/LanguagesModify/Button/AddNewLabel.php
+++ b/src/classes/XLite/View/LanguagesModify/Button/AddNewLabel.php
@@ -58,7 +58,7 @@ protected function defineWidgetParams()
             self::PARAM_PAGE     => new \XLite\Model\WidgetParam\Int('Page index', 1),
         );
 
-        $this->widgetParams[self::PARAM_LABEL]->setValue('Add new label');
+        $this->widgetParams[self::PARAM_LABEL]->setValue(static::t('Add new label'));
         $this->widgetParams[self::PARAM_STYLE]->setValue('add-new-label');
     }
 
diff --git a/src/classes/XLite/View/LanguagesModify/Button/AddNewLanguage.php b/src/classes/XLite/View/LanguagesModify/Button/AddNewLanguage.php
index 6805318ccd..12f13a3079 100644
--- a/src/classes/XLite/View/LanguagesModify/Button/AddNewLanguage.php
+++ b/src/classes/XLite/View/LanguagesModify/Button/AddNewLanguage.php
@@ -56,7 +56,7 @@ protected function defineWidgetParams()
             self::PARAM_PAGE => new \XLite\Model\WidgetParam\Int('Page index', 1),
         );
 
-        $this->widgetParams[self::PARAM_LABEL]->setValue('Add new language');
+        $this->widgetParams[self::PARAM_LABEL]->setValue(static::t('Add new language'));
         $this->widgetParams[self::PARAM_STYLE]->setValue('add-new-language');
     }
 
diff --git a/src/classes/XLite/View/Location/Node/Home.php b/src/classes/XLite/View/Location/Node/Home.php
index 1c4b186608..3820c88376 100644
--- a/src/classes/XLite/View/Location/Node/Home.php
+++ b/src/classes/XLite/View/Location/Node/Home.php
@@ -58,7 +58,7 @@ protected function defineWidgetParams()
     {
         parent::defineWidgetParams();
 
-        $this->widgetParams[self::PARAM_NAME]->setValue('Home');
+        $this->widgetParams[self::PARAM_NAME]->setValue(static::t('Home'));
         $this->widgetParams[self::PARAM_LINK]->setValue($this->buildURL());
     }
 }
diff --git a/src/classes/XLite/View/Model/Address/Address.php b/src/classes/XLite/View/Model/Address/Address.php
index 28bc888bdb..686a8875fd 100644
--- a/src/classes/XLite/View/Model/Address/Address.php
+++ b/src/classes/XLite/View/Model/Address/Address.php
@@ -135,6 +135,9 @@ public function getAddressSchema()
         $addressId = $this->getAddressId();
 
         foreach ($this->addressSchema as $key => $data) {
+            if (isset($data[self::SCHEMA_LABEL])) {
+                $data[self::SCHEMA_LABEL] = static::t($data[self::SCHEMA_LABEL]);
+            }
             $result[$addressId . '_' . $key] = $data;
         }
 
diff --git a/src/classes/XLite/View/Model/Profile/AProfile.php b/src/classes/XLite/View/Model/Profile/AProfile.php
index f48ba62ccd..32f309fa71 100644
--- a/src/classes/XLite/View/Model/Profile/AProfile.php
+++ b/src/classes/XLite/View/Model/Profile/AProfile.php
@@ -118,7 +118,7 @@ protected function getFormClass()
      */
     protected function getSubmitButtonLabel()
     {
-        return \XLite\Core\Auth::getInstance()->isLogged() ? 'Update profile' : 'Create new account';
+        return \XLite\Core\Auth::getInstance()->isLogged() ? static::t('Update profile') : static::t('Create new account');
     }
 
     /**
diff --git a/src/classes/XLite/View/Model/Profile/AdminMain.php b/src/classes/XLite/View/Model/Profile/AdminMain.php
index a219bab6d2..c8c03b226e 100644
--- a/src/classes/XLite/View/Model/Profile/AdminMain.php
+++ b/src/classes/XLite/View/Model/Profile/AdminMain.php
@@ -316,7 +316,7 @@ protected function getFormClass()
      */
     protected function getHead()
     {
-        return 'Profile details';
+        return static::t('Profile details');
     }
 
     /**
@@ -484,9 +484,9 @@ protected function checkProfileData()
     protected function getProfileMainSections()
     {
         return array(
-            self::SECTION_SUMMARY => 'Account summary',
-            self::SECTION_MAIN    => 'Email &amp; password',
-            self::SECTION_ACCESS  => 'Access information',
+            self::SECTION_SUMMARY => static::t('Account summary'),
+            self::SECTION_MAIN    => static::t('Email &amp; password'),
+            self::SECTION_ACCESS  => static::t('Access information'),
         );
     }
 
@@ -626,7 +626,7 @@ protected function performActionValidateInput()
      */
     protected function getSubmitButtonLabel()
     {
-        return $this->isRegisterMode() ? 'Create account' : 'Update';
+        return $this->isRegisterMode() ? static::t('Create account') : static::t('Update');
     }
 
     /**
diff --git a/src/classes/XLite/View/Model/Profile/Main.php b/src/classes/XLite/View/Model/Profile/Main.php
index 5de206c06b..ded8642b8b 100644
--- a/src/classes/XLite/View/Model/Profile/Main.php
+++ b/src/classes/XLite/View/Model/Profile/Main.php
@@ -200,7 +200,7 @@ protected function getFormClass()
      */
     protected function getHead()
     {
-        return 'Profile details';
+        return static::t('Profile details');
     }
 
     /**
@@ -294,8 +294,8 @@ protected function checkPassword()
     protected function getProfileMainSections()
     {
         return array(
-            self::SECTION_MAIN   => 'Personal info',
-            self::SECTION_ACCESS => 'Access information',
+            self::SECTION_MAIN   => static::t('Personal info'),
+            self::SECTION_ACCESS => static::t('Access information'),
         );
     }
 
diff --git a/src/classes/XLite/View/Model/Settings.php b/src/classes/XLite/View/Model/Settings.php
index 7131d4d037..c02475bbb7 100644
--- a/src/classes/XLite/View/Model/Settings.php
+++ b/src/classes/XLite/View/Model/Settings.php
@@ -182,7 +182,7 @@ protected function getFormButtons()
         $result = parent::getFormButtons();
         $result['submit'] = new \XLite\View\Button\Submit(
             array(
-                \XLite\View\Button\AButton::PARAM_LABEL => 'Submit',
+                \XLite\View\Button\AButton::PARAM_LABEL => static::t('Submit'),
                 \XLite\View\Button\AButton::PARAM_STYLE => 'action',
             )
         );
diff --git a/src/classes/XLite/View/ModulesManager/AddonKey.php b/src/classes/XLite/View/ModulesManager/AddonKey.php
index 08e18fea10..17fd1f06c1 100644
--- a/src/classes/XLite/View/ModulesManager/AddonKey.php
+++ b/src/classes/XLite/View/ModulesManager/AddonKey.php
@@ -76,7 +76,7 @@ public function getCSSFiles()
      */
     protected function getHead()
     {
-        return 'Enter license key';
+        return static::t('Enter license key');
     }
 
     /**
diff --git a/src/classes/XLite/View/ProductClass/AProductClass.php b/src/classes/XLite/View/ProductClass/AProductClass.php
index af4120e7e3..b81481128a 100644
--- a/src/classes/XLite/View/ProductClass/AProductClass.php
+++ b/src/classes/XLite/View/ProductClass/AProductClass.php
@@ -44,7 +44,7 @@ abstract class AProductClass extends \XLite\View\Dialog
      */
     protected function getHead()
     {
-        return 'Product classes';
+        return static::t('Product classes');
     }
 
     /**
diff --git a/src/classes/XLite/View/RecoverPassword.php b/src/classes/XLite/View/RecoverPassword.php
index 35ba9da5c2..e8f7587f28 100644
--- a/src/classes/XLite/View/RecoverPassword.php
+++ b/src/classes/XLite/View/RecoverPassword.php
@@ -65,11 +65,11 @@ protected function defineSections()
     {
         return array(
             '' => array(
-                'head' => 'Forgot password?',
+                'head' => static::t('Forgot password?'),
                 'body' => 'recover_password.tpl',
             ),
             'recoverMessage' => array(
-                'head' => 'Recover password',
+                'head' => static::t('Recover password'),
                 'body' => 'recover_message.tpl',
             ),
         );
diff --git a/src/classes/XLite/View/States.php b/src/classes/XLite/View/States.php
index 9c8af80efe..e92312288c 100644
--- a/src/classes/XLite/View/States.php
+++ b/src/classes/XLite/View/States.php
@@ -91,7 +91,7 @@ public function getJSFiles()
      */
     protected function getHead()
     {
-        return 'States';
+        return static::t('States');
     }
 
     /**
diff --git a/src/classes/XLite/View/Tabs/ATabs.php b/src/classes/XLite/View/Tabs/ATabs.php
index 54b36bc197..6562eeeb04 100644
--- a/src/classes/XLite/View/Tabs/ATabs.php
+++ b/src/classes/XLite/View/Tabs/ATabs.php
@@ -303,6 +303,10 @@ protected function getTabs()
                 $tab['selected'] = $this->isSelectedTab($target, $tab);
                 $tab['url'] = $this->buildTabURL($target, $tab);
 
+                if (isset($tab['title'])) {
+                    $tab['title'] = static::t($tab['title']);
+                }
+
                 // Set default values for missing tab parameters
                 $tab += $defaultValues;
 
diff --git a/src/classes/XLite/View/Tabs/Account.php b/src/classes/XLite/View/Tabs/Account.php
index 49abdd071b..1f95344be7 100644
--- a/src/classes/XLite/View/Tabs/Account.php
+++ b/src/classes/XLite/View/Tabs/Account.php
@@ -161,6 +161,6 @@ protected function buildTabURL($target)
      */
     protected function getTitle()
     {
-        return 'My account';
+        return static::t('My account');
     }
 }
diff --git a/src/classes/XLite/View/TopCategories.php b/src/classes/XLite/View/TopCategories.php
index 66e5a1ccbb..a3bf10e7ef 100644
--- a/src/classes/XLite/View/TopCategories.php
+++ b/src/classes/XLite/View/TopCategories.php
@@ -138,7 +138,7 @@ public function displayListItemClass($i, $count, \XLite\View\AView $widget)
      */
     protected function getHead()
     {
-        return 'Categories';
+        return static::t('Categories');
     }
 
     /**
diff --git a/src/skins/admin/en/categories/add_modify_body.tpl b/src/skins/admin/en/categories/add_modify_body.tpl
index 5bc0728441..cb80ea8c6a 100644
--- a/src/skins/admin/en/categories/add_modify_body.tpl
+++ b/src/skins/admin/en/categories/add_modify_body.tpl
@@ -136,8 +136,8 @@
 
     <tr>
       <td colspan="3">
-        <widget IF="category.getCategoryId()" class="\XLite\View\Button\Submit" label="Update" />
-        <widget IF="!category.getCategoryId()" class="\XLite\View\Button\Submit" label="Create category" />
+        <widget IF="category.getCategoryId()" class="\XLite\View\Button\Submit" label="{t(#Update#)}" />
+        <widget IF="!category.getCategoryId()" class="\XLite\View\Button\Submit" label="{t(#Create category#)}" />
       </td>
     </tr>
 
diff --git a/src/skins/admin/en/center.tpl b/src/skins/admin/en/center.tpl
index b77999c792..a35ad0a7c1 100644
--- a/src/skins/admin/en/center.tpl
+++ b/src/skins/admin/en/center.tpl
@@ -24,7 +24,7 @@
 <widget target="main" template="common/dialog.tpl" body="menu.tpl" />
 
 <widget name="categoriesWidget" target="categories" template="common/dialog.tpl" body="categories/body.tpl" IF="!mode=#delete#" />
-<widget module="CDev\FeaturedProducts" template="common/dialog.tpl" head="Featured products" body="modules/CDev/FeaturedProducts/featured_products.tpl" IF="{namedWidgets.categoriesWidget.visible}" />
+<widget module="CDev\FeaturedProducts" template="common/dialog.tpl" head="{t(#Featured products#)}" body="modules/CDev/FeaturedProducts/featured_products.tpl" IF="{namedWidgets.categoriesWidget.visible}" />
 
 {* Some bug in Flexy *}
 <widget target="category" class="\XLite\View\Tabber" body="{getPageTemplate()}" switch="page" IF="getCategory()" />
@@ -41,7 +41,7 @@
 
 <widget target="order" class="\XLite\View\Tabber" body="{pageTemplate}" switch="page" />
 
-<widget target="countries" template="common/dialog.tpl" body="countries.tpl" head="Countries">
+<widget target="countries" template="common/dialog.tpl" body="countries.tpl" head="{t(#Countries#)}">
 
 <widget target="update_inventory" class="\XLite\View\Tabber" body="{pageTemplate}" switch="page">
 
diff --git a/src/skins/admin/en/import_export/import.tpl b/src/skins/admin/en/import_export/import.tpl
index 2a7ccc6d2f..861e88be3f 100644
--- a/src/skins/admin/en/import_export/import.tpl
+++ b/src/skins/admin/en/import_export/import.tpl
@@ -20,7 +20,7 @@
     <widget
       class="\XLite\View\Button\FileSelector"
       style="action"
-      label="Import from file"
+      label="{t(#Import from file#)}"
       object="import_export"
       objectId=""
       fileObject="" />
diff --git a/src/skins/admin/en/login/body.tpl b/src/skins/admin/en/login/body.tpl
index 94f6c0060c..ce59bf2e47 100644
--- a/src/skins/admin/en/login/body.tpl
+++ b/src/skins/admin/en/login/body.tpl
@@ -34,7 +34,7 @@
       <tr>
         <td>&nbsp;</td>
         <td>
-          <widget class="\XLite\View\Button\Submit" label="Log in" style="main-button" />
+          <widget class="\XLite\View\Button\Submit" label="{t(#Log in#)}" style="main-button" />
           <div class="forgot-password">
             <a href="cart.php?target=recover_password">{t(#Forgot password?#)}</a>
           </div>
diff --git a/src/skins/admin/en/modules/CDev/AustraliaPost/config.tpl b/src/skins/admin/en/modules/CDev/AustraliaPost/config.tpl
index 92426cebfe..0ae87aad97 100644
--- a/src/skins/admin/en/modules/CDev/AustraliaPost/config.tpl
+++ b/src/skins/admin/en/modules/CDev/AustraliaPost/config.tpl
@@ -47,7 +47,7 @@
     </tr>
 
     <tr>
-      <td colspan="2"><br /><widget class="\XLite\View\Button\Submit" label="Save" /></TD>
+      <td colspan="2"><br /><widget class="\XLite\View\Button\Submit" label="{t(#Save#)}" /></TD>
     </tr>
 
   </table>
diff --git a/src/skins/admin/en/modules/CDev/AustraliaPost/test.tpl b/src/skins/admin/en/modules/CDev/AustraliaPost/test.tpl
index b7acfdaf39..82edc52339 100644
--- a/src/skins/admin/en/modules/CDev/AustraliaPost/test.tpl
+++ b/src/skins/admin/en/modules/CDev/AustraliaPost/test.tpl
@@ -67,7 +67,7 @@
 
   <br /><br />
 
-  <widget class="\XLite\View\Button\Submit" label="Calculate rates" />
+  <widget class="\XLite\View\Button\Submit" label="{t(#Calculate rates#)}" />
 
   <div>Note: a new window will open</div>
 
diff --git a/src/skins/admin/en/modules/CDev/FeaturedProducts/featured_products.tpl b/src/skins/admin/en/modules/CDev/FeaturedProducts/featured_products.tpl
index e6cdb0a5f1..ea2884b012 100644
--- a/src/skins/admin/en/modules/CDev/FeaturedProducts/featured_products.tpl
+++ b/src/skins/admin/en/modules/CDev/FeaturedProducts/featured_products.tpl
@@ -46,7 +46,7 @@
 
 <br /><br />
 
-<widget template="common/dialog.tpl" head="Add featured products" body="modules/CDev/FeaturedProducts/product/search.tpl" />
+<widget template="common/dialog.tpl" head="{t(#Add featured products#)}" body="modules/CDev/FeaturedProducts/product/search.tpl" />
 
 {* Open <form ...> tag *}
 <widget class="\XLite\Module\CDev\FeaturedProducts\View\Form\Add" name="products_form" />
diff --git a/src/skins/admin/en/modules/CDev/FileAttachments/product.tpl b/src/skins/admin/en/modules/CDev/FileAttachments/product.tpl
index 67b953b7ce..80d8bb2dce 100644
--- a/src/skins/admin/en/modules/CDev/FileAttachments/product.tpl
+++ b/src/skins/admin/en/modules/CDev/FileAttachments/product.tpl
@@ -14,7 +14,7 @@
   <div class="add-file">
     <widget
       class="XLite\View\Button\FileSelector"
-      label="Add file"
+      label="{t(#Add file#)}"
       object="product"
       objectId="{product.getProductId()}"
       fileObject="attachments" />
diff --git a/src/skins/admin/en/modules/CDev/ProductOptions/option_group.tpl b/src/skins/admin/en/modules/CDev/ProductOptions/option_group.tpl
index d820ef636e..fb67a10d19 100644
--- a/src/skins/admin/en/modules/CDev/ProductOptions/option_group.tpl
+++ b/src/skins/admin/en/modules/CDev/ProductOptions/option_group.tpl
@@ -9,8 +9,8 @@
  * @link      http://www.litecommerce.com/
  * @since     1.0.0
  *}
-<h2 IF="isNew()">Add new option group</h2>
-<h2 IF="!isNew()">Modify '{group.getName()}' option group</h2>
+<h2 IF="isNew()">{t(#Add new option group#)}</h2>
+<h2 IF="!isNew()">{t(#Modify#)} '{group.getName()}' {t(#option group#)}</h2>
 
 <form action="admin.php" method="post" name="update_option_group_form" class="options-group-modify">
   <input type="hidden" name="target" value="product" />
@@ -23,52 +23,52 @@
   <ul class="form">
 
     <li class="required">
-      <label for="data_name">Name</label>
+      <label for="data_name">{t(#Name#)}</label>
       <input type="text" id="data_name" name="data[name]" value="{translation.getName()}" class="field-required" />
     </li>
 
     <li>
-      <label for="data_fullname">Text</label>
+      <label for="data_fullname">{t(#Text#)}</label>
       <input type="text" id="data_fullname" name="data[fullname]" value="{translation.getFullname()}" />
     </li>
 
     <li>
-      <label for="data_type">Type</label>
+      <label for="data_type">{t(#Type#)}</label>
       <select name="data[type]" id="data_type">
         <option FOREACH="getOptionGroupTypes(),type,name" value="{type}" selected="{isSelected(group.getType(),type)}">{name}</option>
       </select>
     </li>
 
     <li>
-      <label for="data_view_type">Display type</label>
+      <label for="data_view_type">{t(#Display type#)}</label>
       <select name="data[view_type]" id="data_view_type">
         <option FOREACH="getOptionGroupViewTypes(),type,name" value="{type}" selected="{isSelected(group.getViewType(),type)}">{name}</option>
       </select>
     </li>
 
     <li>
-      <label for="data_orderby">Position</label>
+      <label for="data_orderby">{t(#Position#)}</label>
       <input type="text" id="data_orderby" name="data[orderby]" value="{group.getOrderby()}" class="orderby field-integer" />
     </li>
 
     <li>
-      <label for="data_enabled">Enabled</label>
+      <label for="data_enabled">{t(#Enabled#)}</label>
       <input type="checkbox" id="data_enabled" name="data[enabled]" value="1" checked="{group.getEnabled()}" />
     </li>
 
   </ul>
 
   <div id="options_list">
-    <h3>Group options</h3>
+    <h3>{t(#Group options#)}</h3>
 
     <table cellspacing="1" class="data-table">
 
       <tr>
         <th><input type="checkbox" class="column-selector" /></th>
-        <th class="extender">Name</th>
+        <th class="extender">{t(#Name#)}</th>
         <th FOREACH="getModifiersNames(),m" colspan="2">{m}</th>
-        <th>Pos.</th>
-        <th>Enabled</th>
+        <th>{t(#Pos.#)}</th>
+        <th>{t(#Enabled#)}</th>
       </tr>
 
       <tr FOREACH="getOptions(),i,option" class="{getRowClass(i,#highlight#)}">
@@ -113,8 +113,8 @@
   </div>
 
   <div class="buttons">
-    <widget IF="!hasOptions()" class="\XLite\View\Button\Submit" label="Add new option" />
-    <widget IF="hasOptions()" class="\XLite\View\Button\Submit" label="Add/update options" />
+    <widget IF="!hasOptions()" class="\XLite\View\Button\Submit" label="{t(#Add new option#)}" />
+    <widget IF="hasOptions()" class="\XLite\View\Button\Submit" label="{t(#Add/update options#)}" />
     <widget module="CDev\ProductOptions" IF="hasOptions()" class="\XLite\Module\CDev\ProductOptions\View\Button\DeleteSelectedOptions" />
   </div>
 
diff --git a/src/skins/admin/en/modules/CDev/ProductOptions/product_options.tpl b/src/skins/admin/en/modules/CDev/ProductOptions/product_options.tpl
index e350c21bd7..7f9b0851c4 100644
--- a/src/skins/admin/en/modules/CDev/ProductOptions/product_options.tpl
+++ b/src/skins/admin/en/modules/CDev/ProductOptions/product_options.tpl
@@ -24,9 +24,9 @@
 
     <tr>
       <th><input type="checkbox" class="column-selector" /></th>
-      <th class="extender">Option group</th>
-      <th>Pos.</th>
-      <th>Enabled</th>
+      <th class="extender">{t(#Option group#)}</th>
+      <th>{t(#Pos.#)}</th>
+      <th>{t(#Enabled#)}</th>
     </tr>
 
     <tr FOREACH="getOptions(),i,group" class="{getRowClass(i,#highlight#)}">
@@ -39,7 +39,7 @@
   </table>
 
   <div class="buttons">
-    <widget class="\XLite\View\Button\Submit" label="Update" />
+    <widget class="\XLite\View\Button\Submit" label="{t(#Update#)}" />
     <widget class="\XLite\Module\CDev\ProductOptions\View\Button\DeleteSelectedGroups" />
     <widget class="\XLite\Module\CDev\ProductOptions\View\Button\AddGroup" />
   </div>
diff --git a/src/skins/admin/en/modules/CDev/USPS/config.tpl b/src/skins/admin/en/modules/CDev/USPS/config.tpl
index 0d120b77c3..600aad74d2 100644
--- a/src/skins/admin/en/modules/CDev/USPS/config.tpl
+++ b/src/skins/admin/en/modules/CDev/USPS/config.tpl
@@ -175,7 +175,7 @@
     </tr>
 
     <tr>
-      <td colspan="2"><br /><widget class="\XLite\View\Button\Submit" label="Save" /></TD>
+      <td colspan="2"><br /><widget class="\XLite\View\Button\Submit" label="{t(#Save#)}" /></TD>
     </tr>
 
   </table>
diff --git a/src/skins/admin/en/modules/CDev/USPS/test.tpl b/src/skins/admin/en/modules/CDev/USPS/test.tpl
index 7aea3d83f0..ab351ee594 100644
--- a/src/skins/admin/en/modules/CDev/USPS/test.tpl
+++ b/src/skins/admin/en/modules/CDev/USPS/test.tpl
@@ -77,7 +77,7 @@
 
   <br /><br />
 
-  <widget class="\XLite\View\Button\Submit" label="Calculate rates" />
+  <widget class="\XLite\View\Button\Submit" label="{t(#Calculate rates#)}" />
 
   <div>Note: a new window will open</div>
 
diff --git a/src/skins/admin/en/product/product_images.tpl b/src/skins/admin/en/product/product_images.tpl
index 8f53ee6998..bb0aee97cd 100644
--- a/src/skins/admin/en/product/product_images.tpl
+++ b/src/skins/admin/en/product/product_images.tpl
@@ -62,7 +62,7 @@
 <widget
   class="\XLite\View\Button\FileSelector"
   style="main-button"
-  label="Add image"
+  label="{t(#Add image#)}"
   object="product"
   objectId="{product.getProductId()}"
   fileObject="images" />
diff --git a/src/skins/admin/en/settings/security.tpl b/src/skins/admin/en/settings/security.tpl
index 65ff4e5770..a7b6fd7378 100644
--- a/src/skins/admin/en/settings/security.tpl
+++ b/src/skins/admin/en/settings/security.tpl
@@ -30,7 +30,7 @@
     </tr>
   </table>
 
-  <widget class="\XLite\View\Button\Regular" label="Re-generate access key" jsCode="self.location='{buildURL(#settings#,#safe_mode_key_regen#)}'" />
+  <widget class="\XLite\View\Button\Regular" label="{t(#Re-generate access key#)}" jsCode="self.location='{buildURL(#settings#,#safe_mode_key_regen#)}'" />
 
   <p>{t(#New access key will be also sent to the Site administrator email address#)}</p>
 
@@ -91,7 +91,7 @@ document.options_form.admin_security.onclick = https_checkbox_click;
   {* Check if https is available *}
   {t(#Trying to access the shop at X#,_ARRAY_(#url#^getShopURL(#cart.php#,#1#))):h}
   <span id="httpserror-message" style="visibility:hidden">
-    <p class="error-message"><strong>{t(#Failed#)}</strong> {t(##Secure connection cannot be established.)}</p>
+    <p class="error-message"><strong>{t(#Failed#)}</strong> {t(#Secure connection cannot be established.#)}</p>
     {t(#To fix this problem, do the following: 3 points#):h}
   </span>
 
diff --git a/src/skins/admin/en/shipping/methods.tpl b/src/skins/admin/en/shipping/methods.tpl
index 0b748addd2..726d7440a9 100644
--- a/src/skins/admin/en/shipping/methods.tpl
+++ b/src/skins/admin/en/shipping/methods.tpl
@@ -94,7 +94,7 @@ function onDeleteButton(method_id)
             </td>
 
             <td>
-              <widget IF="processor.isMethodDeleteEnabled()" class="\XLite\View\Button\Regular" name="delete" label="Delete" jsCode="onDeleteButton('{method.getMethodId()}');" />
+              <widget IF="processor.isMethodDeleteEnabled()" class="\XLite\View\Button\Regular" name="delete" label="{t(#Delete#)}" jsCode="onDeleteButton('{method.getMethodId()}');" />
             </td>
           </tr>
 
diff --git a/src/skins/admin/en/shipping/zones/details.tpl b/src/skins/admin/en/shipping/zones/details.tpl
index 99b2c5912d..4c067e92a6 100644
--- a/src/skins/admin/en/shipping/zones/details.tpl
+++ b/src/skins/admin/en/shipping/zones/details.tpl
@@ -13,7 +13,7 @@
 <script type="text/javascript">
 <!--
 
-var msg_err_zone_rename='Zone name cannot be empty, please specify it';
+var msg_err_zone_rename='{t(#Zone name cannot be empty, please specify it#)}';
 
 function onZoneSubmit()
 {
@@ -44,12 +44,12 @@ function ShowNotes()
 -->
 </script>
 
-Use this section to define shipping zones.
+{t(#Use this section to define shipping zones.#)}
 
-<span id="notes_url" style="display:"><a href="javascript:ShowNotes();" class="navigation-path" onclick="this.blur()"><b>How to define shipping zones &gt;&gt;&gt;</b></a></span>
+<span id="notes_url" style="display:"><a href="javascript:ShowNotes();" class="navigation-path" onclick="this.blur()"><b>{t(#How to define shipping zones#)} &gt;&gt;&gt;</b></a></span>
 
 <span id="notes_body" style="display: none"><br /><br />
-Select a country or a state from a list, specify the zone where the country or state should be listed and click on the 'Apply' button. To select more than one country/state, hold down the CTRL key while making a selection. A zone can contain either countries or states. You cannot include both states and countries into the same zone.
+{t(#Select a country or a state from a list, specify the zone where the country or state should be listed and click on the 'Apply' button. To select more than one country/state, hold down the CTRL key while making a selection. A zone can contain either countries or states. You cannot include both states and countries into the same zone.#)}
 </span>
 
 <hr />
@@ -67,11 +67,11 @@ Select a country or a state from a list, specify the zone where the country or s
 
     <tr>
       <td colspan="3">
-        Zone name:
+        {t(#Zone name#)}:
         <input type="text" size="50" name="zone_name" value="{zone.getZoneName()}" />
         &nbsp;&nbsp;
-        <widget class="\XLite\View\Button\Regular" IF="!mode=#add#" label="Update" jsCode="onZoneSubmit();" />
-        <widget class="\XLite\View\Button\Regular" IF="mode=#add#" label="Create" jsCode="onZoneSubmit();" />
+        <widget class="\XLite\View\Button\Regular" IF="!mode=#add#" label="{t(#Update#)}" jsCode="onZoneSubmit();" />
+        <widget class="\XLite\View\Button\Regular" IF="mode=#add#" label="{t(#Create#)}" jsCode="onZoneSubmit();" />
         <br /><br />
       </td>
     </tr>
@@ -81,13 +81,13 @@ Select a country or a state from a list, specify the zone where the country or s
     {* Countries *}
 
 	  <tr class="dialog-box">
-	  	<td class="admin-head" colspan="3"><br />Countries<hr /></td>
+	  	<td class="admin-head" colspan="3"><br />{t(#Countries#)}<hr /></td>
 	  </tr>
 
     <tr>
-      <td style="width:45%;" align="center">Set</td>
+      <td style="width:45%;" align="center">{t(#Set#)}</td>
       <td style="width:10%;">&nbsp;</td>
-      <td style="width:45%;" align="center">Unset</td>
+      <td style="width:45%;" align="center">{t(#Unset#)}</td>
     </tr>
 
     <tr>
@@ -120,13 +120,13 @@ Select a country or a state from a list, specify the zone where the country or s
     {* States *}
 
 	  <tr class="dialog-box">
-	  	<td class="admin-head" colspan="3"><br />States<hr /></td>
+	  	<td class="admin-head" colspan="3"><br />{t(#States#)}<hr /></td>
 	  </tr>
 
     <tr>
-      <td style="width:45%;" align="center">Set</td>
+      <td style="width:45%;" align="center">{t(#Set#)}</td>
       <td style="width:10%;">&nbsp;</td>
-      <td style="width:45%;" align="center">Unset</td>
+      <td style="width:45%;" align="center">{t(#Unset#)}</td>
     </tr>
 
     <tr>
@@ -159,13 +159,13 @@ Select a country or a state from a list, specify the zone where the country or s
     {* City masks *}
     {* TODO - disabled until design review 
 	  <tr class="dialog-box">
-	  	<td class="admin-head" colspan="3">City masks<hr /></td>
+	  	<td class="admin-head" colspan="3">{t(#City masks#)}<hr /></td>
 	  </tr>
 
     <tr>
-      <td style="width:45%;" align="center">Set</td>
+      <td style="width:45%;" align="center">{t(#Set#)}</td>
       <td style="width:10%;">&nbsp;</td>
-      <td style="width:45%;">Examples:</td>
+      <td style="width:45%;">{t(#Examples#)}:</td>
     </tr>
 
     <tr>
@@ -178,20 +178,20 @@ Select a country or a state from a list, specify the zone where the country or s
 </textarea>
       </td>
       <td align="center">&nbsp;</td>
-      <td>Examples</td>
+      <td>{t(#Examples#)}</td>
     </tr>
     *}
 
     {* Zip code masks *}
 
 	  <tr class="dialog-box">
-	  	<td class="admin-head" colspan="3">Zip/postal code masks<hr /></td>
+	  	<td class="admin-head" colspan="3">{t(#Zip/postal code masks#)}<hr /></td>
 	  </tr>
 
     <tr>
-      <td style="width:45%;" align="center">Set</td>
+      <td style="width:45%;" align="center">{t(#Set#)}</td>
       <td style="width:10%;">&nbsp;</td>
-      <td style="width:45%;">Examples:</td>
+      <td style="width:45%;">{t(#Examples#)}:</td>
     </tr>
 
     <tr>
@@ -212,13 +212,13 @@ Select a country or a state from a list, specify the zone where the country or s
     {* TODO - disabled until design review
 
 	  <tr class="dialog-box">
-	  	<td class="admin-head" colspan="3">Address masks<hr /></td>
+	  	<td class="admin-head" colspan="3">{t(#Address masks#)}<hr /></td>
 	  </tr>
 
     <tr>
-      <td style="width:45%;" align="center">Set</td>
+      <td style="width:45%;" align="center">{t(#Set#)}</td>
       <td style="width:10%;">&nbsp;</td>
-      <td style="width:45%;">Examples:</td>
+      <td style="width:45%;">{t(#Examples#)}:</td>
     </tr>
 
     <tr>
@@ -231,13 +231,13 @@ Select a country or a state from a list, specify the zone where the country or s
 </textarea>
       </td>
       <td align="center">&nbsp;</td>
-      <td>Examples</td>
+      <td>{t(#Examples#)}</td>
     </tr>
     *}
 
     <tr>
       <td colspan="3"><br /><br /><hr />
-        <widget class="\XLite\View\Button\Regular" jsCode="onZoneSubmit();" label="Save zone details" />
+        <widget class="\XLite\View\Button\Regular" jsCode="onZoneSubmit();" label="{t(#Save zone details#)}" />
       </td>
     </tr>
 
@@ -246,7 +246,7 @@ Select a country or a state from a list, specify the zone where the country or s
     <tbody IF="zone.getIsDefault()=1">
 
       <tr>
-        <td colspan="3"><br />This is a default zone which covers all addresses. It's impossible to edit this zone's countries, states etc</td>
+        <td colspan="3"><br />{t(#This is a default zone which covers all addresses. It's impossible to edit this zone's countries, states etc#)}</td>
       </tr>
 
     </tbody>
diff --git a/src/skins/admin/en/shipping/zones/list.tpl b/src/skins/admin/en/shipping/zones/list.tpl
index 59b390b7bf..8a61177911 100644
--- a/src/skins/admin/en/shipping/zones/list.tpl
+++ b/src/skins/admin/en/shipping/zones/list.tpl
@@ -29,7 +29,7 @@ function ShowNotes()
 //]]>
 </script>
 
-Use this section to define shipping zones.
+{t(#Use this section to define shipping zones.#)}
 
 <hr />
 
@@ -43,8 +43,8 @@ Use this section to define shipping zones.
 checkboxes_form = 'zonesform';
 checkboxes = new Array({foreach:getShippingZones(),k,v}{if:!k=0},{end:}'to_delete[{v.getZoneId()}]'{end:});
 
-lbl_no_items_have_been_selected = 'No items have been selected';
-lbl_delete_confirmation = 'Are you sure you wish to delete the selected zones?';
+lbl_no_items_have_been_selected = '{t(#No items have been selected#)}';
+lbl_delete_confirmation = '{t(#Are you sure you wish to delete the selected zones?#)}';
 
 function deleteZones()
 {
@@ -79,7 +79,7 @@ function deleteZones()
   <tr>
   <td colspan="2">
   <br />
-  <widget class="\XLite\View\Button\Regular" IF="isZonesDefined()" label="Delete selected" jsCode="deleteZones();" />
+  <widget class="\XLite\View\Button\Regular" IF="isZonesDefined()" label="{t(#Delete selected#)}" jsCode="deleteZones();" />
   </td>
 </tr>
 
@@ -92,4 +92,4 @@ function deleteZones()
 <br />
 <br />
 
-<widget class="\XLite\View\Button\Regular" label="Add zone" jsCode="self.location='admin.php?target=shipping_zones&mode=add';" />
+<widget class="\XLite\View\Button\Regular" label="{t(#Add zone#)}" jsCode="self.location='admin.php?target=shipping_zones&mode=add';" />
diff --git a/src/skins/admin/en/summary.tpl b/src/skins/admin/en/summary.tpl
index f7f7e3e7aa..984f996979 100644
--- a/src/skins/admin/en/summary.tpl
+++ b/src/skins/admin/en/summary.tpl
@@ -50,7 +50,7 @@ function setVisible(element_id)
 
 <tr>
   <td class="setting-name">PHP:</td>
-  <td>{phpversion:h}<a href='{getShopURL(#admin.php#)}?target=settings&action=phpinfo' target='blank_' class="navigation-path"> <b>{t(#details#)}</b></a> &gt;&gt;</td>
+  <td><span>{phpversion:h}&nbsp;</span><a href='{getShopURL(#admin.php#)}?target=settings&action=phpinfo' target='blank_' class="navigation-path"> <b>{t(#details#)} &gt;&gt;</b></a></td>
 </tr>
 
 <tr>
diff --git a/src/skins/admin/en/top_menu/menu.css b/src/skins/admin/en/top_menu/menu.css
index 50c1a521f9..353afd642b 100644
--- a/src/skins/admin/en/top_menu/menu.css
+++ b/src/skins/admin/en/top_menu/menu.css
@@ -141,7 +141,7 @@
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
-  width: 170px;
+  width: 275px;
   margin: 0;
 }
 
diff --git a/src/skins/default/en/address/wrapper.tpl b/src/skins/default/en/address/wrapper.tpl
index 5868ce2d51..2ce366fe8b 100644
--- a/src/skins/default/en/address/wrapper.tpl
+++ b/src/skins/default/en/address/wrapper.tpl
@@ -36,7 +36,7 @@
       <td class="address-entry-actions-cell">
 
         <div class="change-action">
-          <widget class="\XLite\View\Button\ModifyAddress" label="Change" addressId="{address.getAddressId()}" />
+          <widget class="\XLite\View\Button\ModifyAddress" label="{t(#Change#)}" addressId="{address.getAddressId()}" />
         </div>
 
         <div class="address-icons">
@@ -53,8 +53,8 @@
   </table>
 
   <div class="address-center-button" IF="{!address.getAddressId()}">
-    <widget class="\XLite\View\Button\AddAddress" style="action" label="Add new address" profileId="{profile_id}" />
+    <widget class="\XLite\View\Button\AddAddress" style="action" label="{t(#Add new address#)}" profileId="{profile_id}" />
   </div>
 
 </div>
-</li>
\ No newline at end of file
+</li>
diff --git a/src/skins/default/en/checkout/profile/anonymous.tpl b/src/skins/default/en/checkout/profile/anonymous.tpl
index f85438bac7..10a232f182 100644
--- a/src/skins/default/en/checkout/profile/anonymous.tpl
+++ b/src/skins/default/en/checkout/profile/anonymous.tpl
@@ -22,7 +22,7 @@
 
   <div class="login">
     <h3>{t(#Already have an account?#)}</h3>
-    <widget class="\XLite\View\Button\Link" label="Login here" location="{getLoginURL()}" />
+    <widget class="\XLite\View\Button\Link" label="{t(#Login here#)}" location="{getLoginURL()}" />
   </div>
 
   <div class="clear"></div>
diff --git a/src/skins/default/en/checkout/steps/payment/parts/selected.address.tpl b/src/skins/default/en/checkout/steps/payment/parts/selected.address.tpl
index 07cdc64bd6..cac0b133f4 100644
--- a/src/skins/default/en/checkout/steps/payment/parts/selected.address.tpl
+++ b/src/skins/default/en/checkout/steps/payment/parts/selected.address.tpl
@@ -12,7 +12,7 @@
  *}
 <div class="secondary">
   <h3>{t(#Billing address#)}</h3>
-  <widget IF="isDisplayAddressButton()" class="\XLite\View\Button\Link" label="Address book" location="{buildURL(#select_address#,##,_ARRAY_(#atype#^#b#))}" style="address-book" />
+  <widget IF="isDisplayAddressButton()" class="\XLite\View\Button\Link" label="{t(#Address book#)}" location="{buildURL(#select_address#,##,_ARRAY_(#atype#^#b#))}" style="address-book" />
 
   <widget class="\XLite\View\Checkout\BillingAddress" />
 </div>
diff --git a/src/skins/default/en/modules/CDev/ProductOptions/change_options.tpl b/src/skins/default/en/modules/CDev/ProductOptions/change_options.tpl
index 3e9157c368..512c52f20c 100644
--- a/src/skins/default/en/modules/CDev/ProductOptions/change_options.tpl
+++ b/src/skins/default/en/modules/CDev/ProductOptions/change_options.tpl
@@ -13,7 +13,7 @@
   <widget class="\XLite\Module\CDev\ProductOptions\View\ProductOptions" product="{getProduct()}" selectedOptions="{getSelectedOptions()}" />
 
   <div class="buttons">
-    <widget class="\XLite\View\Button\Submit" label="Change" style="action" />
+    <widget class="\XLite\View\Button\Submit" label="{t(#Change#)}" style="action" />
   </div>
 
 <widget name="change_options" end />
diff --git a/src/skins/default/en/product/details/parts/common.button-buymore.tpl b/src/skins/default/en/product/details/parts/common.button-buymore.tpl
index 53d9b2b4ad..0fa2d2aace 100644
--- a/src/skins/default/en/product/details/parts/common.button-buymore.tpl
+++ b/src/skins/default/en/product/details/parts/common.button-buymore.tpl
@@ -12,4 +12,4 @@
  * @ListChild (list="product.details.page.info.buttons-added.cart-buttons", weight="30")
  * @ListChild (list="product.details.quicklook.info.buttons-added.cart-buttons", weight="30")
  *}
-<widget class="\XLite\View\Button\Submit" label="Buy more" style="action buy-more" />
+<widget class="\XLite\View\Button\Submit" label="{t(#Buy more#)}" style="action buy-more" />
diff --git a/src/skins/default/en/product/search/body.tpl b/src/skins/default/en/product/search/body.tpl
index eef721775b..495c7e2095 100644
--- a/src/skins/default/en/product/search/body.tpl
+++ b/src/skins/default/en/product/search/body.tpl
@@ -25,7 +25,7 @@
         </td>
 
         <td>
-          <widget class="\XLite\View\Button\Submit" label="Search products" style="search-form-submit" />
+          <widget class="\XLite\View\Button\Submit" label="{t(#Search products#)}" style="search-form-submit" />
         </td>
 
       </tr>
diff --git a/src/skins/default/en/shopping_cart/parts/box.estimator.tpl b/src/skins/default/en/shopping_cart/parts/box.estimator.tpl
index 38d8702265..638eec45e1 100644
--- a/src/skins/default/en/shopping_cart/parts/box.estimator.tpl
+++ b/src/skins/default/en/shopping_cart/parts/box.estimator.tpl
@@ -32,7 +32,7 @@
 
     <widget class="\XLite\View\Form\Cart\ShippingEstimator\Open" name="shippingEstimator" />
       <div class="buttons">
-        <widget class="\XLite\View\Button\Submit" label="Estimate shipping cost" style="action estimate" />
+        <widget class="\XLite\View\Button\Submit" label="{t(#Estimate shipping cost#)}" style="action estimate" />
       </div>
     <widget name="shippingEstimator" end />
 
diff --git a/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.address.tpl b/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.address.tpl
index 070dfed533..489c436c8d 100644
--- a/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.address.tpl
+++ b/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.address.tpl
@@ -17,11 +17,11 @@
   </ul>
 
   <div IF="isEstimate()" class="buttons">
-    <widget class="\XLite\View\Button\Submit" label="Apply destination" />
+    <widget class="\XLite\View\Button\Submit" label="{t(#Apply destination#)}" />
   </div>
 
   <div IF="!isEstimate()" class="buttons main">
-    <widget class="\XLite\View\Button\Submit" label="Apply destination" style="action"/>
+    <widget class="\XLite\View\Button\Submit" label="{t(#Apply destination#)}" style="action"/>
   </div>
 
 <widget name="destination" end />
diff --git a/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.methods.tpl b/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.methods.tpl
index b5a2ad1471..76eb66c646 100644
--- a/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.methods.tpl
+++ b/src/skins/default/en/shopping_cart/shipping_estimator/parts/main.methods.tpl
@@ -19,7 +19,7 @@
       <widget class="\XLite\View\ShippingList" />
 
       <div class="buttons main">
-        <widget class="\XLite\View\Button\Submit" label="Choose method" style="action" />
+        <widget class="\XLite\View\Button\Submit" label="{t(#Choose method#)}" style="action" />
       </div>
     {else:}
       <p class="error">{t(#Shipping methods are not available#)}</p>
diff --git a/src/skins/mail/en/recover_request/subject.tpl b/src/skins/mail/en/recover_request/subject.tpl
index 7cee75e539..24ecc3d07c 100644
--- a/src/skins/mail/en/recover_request/subject.tpl
+++ b/src/skins/mail/en/recover_request/subject.tpl
@@ -9,4 +9,4 @@
  * @link      http://www.litecommerce.com/
  * @since     1.0.0
  *}
-{config.Company.company_name:h}: Confirm password recovery request
+{config.Company.company_name:h}: {t(#Confirm password recovery request#)}