=== modified file 'payment/uc_2checkout/uc_2checkout.module'
--- payment/uc_2checkout/uc_2checkout.module	2009-05-14 21:04:36 +0000
+++ payment/uc_2checkout/uc_2checkout.module	2009-07-21 15:23:48 +0000
@@ -32,6 +32,15 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_2checkout_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_2checkout_method_title';
+  $conf['i18n_variables'][] = 'uc_2checkout_checkout_button';
+}
+
+/**
  * Make sure anyone can complete their 2Checkout orders.
  */
 function uc_2checkout_completion_access() {

=== modified file 'payment/uc_credit/uc_credit.module'
--- payment/uc_credit/uc_credit.module	2009-07-12 01:04:23 +0000
+++ payment/uc_credit/uc_credit.module	2009-07-21 15:23:48 +0000
@@ -81,6 +81,15 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_credit_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_credit_fail_message';
+  $conf['i18n_variables'][] = 'uc_credit_policy';
+}
+
+/**
  * Implementation of hook_form_alter().
  */
 function uc_credit_form_alter(&$form, &$form_state, $form_id) {

=== modified file 'payment/uc_google_checkout/uc_google_checkout.module'
--- payment/uc_google_checkout/uc_google_checkout.module	2009-07-13 15:03:39 +0000
+++ payment/uc_google_checkout/uc_google_checkout.module	2009-07-21 15:23:48 +0000
@@ -98,6 +98,9 @@
     unset($_SESSION['cart_order'], $_SESSION['do_complete'], $_SESSION['new_user'], $users[$user->uid]);
     variable_set('uc_google_checkout_order_users', $users);
   }
+
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_google_checkout_order_cancel_reason';
 }
 
 function uc_google_checkout_theme() {

=== modified file 'payment/uc_payment/uc_payment.module'
--- payment/uc_payment/uc_payment.module	2009-04-18 01:18:43 +0000
+++ payment/uc_payment/uc_payment.module	2009-07-21 15:23:48 +0000
@@ -206,6 +206,14 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_payment_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_default_payment_msg';
+}
+
+/**
  * Implementation of hook_form_alter().
  */
 function uc_payment_form_alter(&$form, &$form_state, $form_id) {

=== modified file 'payment/uc_payment_pack/uc_payment_pack.module'
--- payment/uc_payment_pack/uc_payment_pack.module	2009-07-10 17:28:52 +0000
+++ payment/uc_payment_pack/uc_payment_pack.module	2009-07-21 15:23:48 +0000
@@ -35,6 +35,15 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_payment_pack_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_cod_policy';
+  $conf['i18n_variables'][] = 'uc_check_policy';
+}
+
+/**
  * Implementation of hook_payment_method().
  */
 function uc_payment_pack_payment_method() {

=== modified file 'payment/uc_paypal/uc_paypal.module'
--- payment/uc_paypal/uc_paypal.module	2009-07-03 19:35:36 +0000
+++ payment/uc_paypal/uc_paypal.module	2009-07-21 15:23:48 +0000
@@ -89,6 +89,14 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_paypal_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_paypal_wps_checkout_button';
+}
+
+/**
  * Implementation of hook_form_alter().
  * Notice how we alter the checkout review form to post the order to PayPal.
  */

=== modified file 'shipping/uc_quote/uc_quote.module'
--- shipping/uc_quote/uc_quote.module	2009-07-21 14:29:21 +0000
+++ shipping/uc_quote/uc_quote.module	2009-07-21 15:23:48 +0000
@@ -80,6 +80,10 @@
  */
 function uc_quote_init() {
   drupal_add_css(drupal_get_path('module', 'uc_quote') .'/uc_quote.css', 'module');
+
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_quote_err_msg';
+  $conf['i18n_variables'][] = 'uc_quote_pane_description';
 }
 
 /**

=== modified file 'uc_cart/uc_cart.module'
--- uc_cart/uc_cart.module	2009-07-21 14:29:21 +0000
+++ uc_cart/uc_cart.module	2009-07-21 15:23:48 +0000
@@ -258,6 +258,25 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_cart_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_cart_breadcrumb_text';
+  $conf['i18n_variables'][] = 'uc_cart_help_text';
+  $conf['i18n_variables'][] = 'uc_cart_new_account_details';
+  $conf['i18n_variables'][] = 'uc_checkout_instructions';
+  $conf['i18n_variables'][] = 'uc_checkout_review_instructions';
+  $conf['i18n_variables'][] = 'uc_continue_shopping_text';
+  $conf['i18n_variables'][] = 'uc_minimum_subtotal_text';
+  $conf['i18n_variables'][] = 'uc_msg_continue_shopping';
+  $conf['i18n_variables'][] = 'uc_msg_order_existing_user';
+  $conf['i18n_variables'][] = 'uc_msg_order_logged_in';
+  $conf['i18n_variables'][] = 'uc_msg_order_new_user';
+  $conf['i18n_variables'][] = 'uc_msg_order_submit';
+}
+
+/**
  * Implementation of hook_cron().
  */
 function uc_cart_cron() {

=== modified file 'uc_catalog/uc_catalog.module'
--- uc_catalog/uc_catalog.module	2009-07-21 14:29:21 +0000
+++ uc_catalog/uc_catalog.module	2009-07-21 15:23:48 +0000
@@ -131,6 +131,15 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_catalog_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_catalog_description';
+  $conf['i18n_variables'][] = 'uc_catalog_name';
+}
+
+/**
  * Implementation of hook_enable().
  *
  * Add imagecache preset "uc_category".

=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-07-21 14:29:21 +0000
+++ uc_product/uc_product.module	2009-07-21 15:23:48 +0000
@@ -236,6 +236,10 @@
  */
 function uc_product_init() {
   drupal_add_css(drupal_get_path('module', 'uc_product') .'/uc_product.css');
+
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_product_add_to_cart_text';
+  $conf['i18n_variables'][] = 'uc_teaser_add_to_cart_text';
 }
 
 /**

=== modified file 'uc_roles/uc_roles.module'
--- uc_roles/uc_roles.module	2009-07-01 15:58:50 +0000
+++ uc_roles/uc_roles.module	2009-07-21 15:23:48 +0000
@@ -110,6 +110,19 @@
 function uc_roles_init() {
   drupal_add_js(drupal_get_path('module', 'uc_roles') .'/uc_roles.js');
   drupal_add_css(drupal_get_path('module', 'uc_roles') .'/uc_roles.css');
+
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_roles_default_expiration_header';
+  $conf['i18n_variables'][] = 'uc_roles_default_expiration_message';
+  $conf['i18n_variables'][] = 'uc_roles_default_expiration_title';
+  $conf['i18n_variables'][] = 'uc_roles_grant_notification_message';
+  $conf['i18n_variables'][] = 'uc_roles_grant_notification_subject';
+  $conf['i18n_variables'][] = 'uc_roles_reminder_message';
+  $conf['i18n_variables'][] = 'uc_roles_reminder_subject';
+  $conf['i18n_variables'][] = 'uc_roles_renewal_notification_message';
+  $conf['i18n_variables'][] = 'uc_roles_renewal_notification_subject';
+  $conf['i18n_variables'][] = 'uc_roles_revocation_notification_message';
+  $conf['i18n_variables'][] = 'uc_roles_revocation_notification_subject';
 }
 
 /**

=== modified file 'uc_stock/uc_stock.module'
--- uc_stock/uc_stock.module	2009-05-14 21:04:36 +0000
+++ uc_stock/uc_stock.module	2009-07-21 15:23:48 +0000
@@ -100,6 +100,15 @@
 }
 
 /**
+ * Implementation of hook_init().
+ */
+function uc_stock_init() {
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_stock_threshold_notification_message';
+  $conf['i18n_variables'][] = 'uc_stock_threshold_notification_subject';
+}
+
+/**
  * Implementation of hook_mail().
  */
 function uc_stock_mail($key, &$message, $params) {

=== modified file 'uc_store/uc_store.module'
--- uc_store/uc_store.module	2009-07-21 14:29:21 +0000
+++ uc_store/uc_store.module	2009-07-21 15:23:48 +0000
@@ -332,6 +332,22 @@
   require_once($dir .'/includes/uc_price.inc');
 
   drupal_add_css($dir .'/uc_store.css');
+
+  global $conf;
+  $conf['i18n_variables'][] = 'uc_store_name';
+  $conf['i18n_variables'][] = 'uc_field_first_name';
+  $conf['i18n_variables'][] = 'uc_field_last_name';
+  $conf['i18n_variables'][] = 'uc_field_email';
+  $conf['i18n_variables'][] = 'uc_field_phone';
+  $conf['i18n_variables'][] = 'uc_field_company';
+  $conf['i18n_variables'][] = 'uc_field_address';
+  $conf['i18n_variables'][] = 'uc_field_street';
+  $conf['i18n_variables'][] = 'uc_field_street1';
+  $conf['i18n_variables'][] = 'uc_field_street2';
+  $conf['i18n_variables'][] = 'uc_field_city';
+  $conf['i18n_variables'][] = 'uc_field_zone';
+  $conf['i18n_variables'][] = 'uc_field_postal_code';
+  $conf['i18n_variables'][] = 'uc_field_country';
 }
 
 /**