=== modified file 'payment/uc_authorizenet/uc_authorizenet.module' --- payment/uc_authorizenet/uc_authorizenet.module 2009-02-13 20:06:02 +0000 +++ payment/uc_authorizenet/uc_authorizenet.module 2009-04-06 10:47:42 +0000 @@ -116,7 +116,7 @@ function uc_authorizenet_settings_form() $form['aim_settings']['uc_authnet_aim_txn_mode'] = array( '#type' => 'radios', '#title' => t('Transaction mode'), - '#description' => t('Only specify a developer test account if you login to your account through https://test.authorize.net.
Adjust to live transactions when you are ready to start processing real payments.'), + '#description' => t('Only specify a developer test account if you login to your account through https://test.authorize.net.
Adjust to live transactions when you are ready to start processing real payments.'), '#options' => array( 'live' => t('Live transactions in a live account'), 'live_test' => t('Test transactions in a live account'), @@ -174,7 +174,7 @@ function uc_authorizenet_settings_form() $form['cim_settings']['uc_authnet_cim_mode'] = array( '#type' => 'radios', '#title' => t('Transaction mode'), - '#description' => t('Only specify a developer test account if you login to your account through https://test.authorize.net.
Adjust to live transactions when you are ready to start processing real payments.'), + '#description' => t('Only specify a developer test account if you login to your account through https://test.authorize.net.
Adjust to live transactions when you are ready to start processing real payments.'), '#options' => array( 'production' => t('Production'), 'developer' => t('Developer test'), === modified file 'payment/uc_payment/translations/uc_payment.pot' --- payment/uc_payment/translations/uc_payment.pot 2008-01-04 21:21:40 +0000 +++ payment/uc_payment/translations/uc_payment.pot 2009-04-06 10:47:42 +0000 @@ -434,7 +434,7 @@ msgid "not tracked" msgstr "" #: uc_payment.module:378 -msgid "Default payment details message:
%message" +msgid "Default payment details message:
%message" msgstr "" #: uc_payment.module:384 === modified file 'payment/uc_recurring/uc_recurring.module' --- payment/uc_recurring/uc_recurring.module 2009-03-20 07:18:57 +0000 +++ payment/uc_recurring/uc_recurring.module 2009-04-06 10:47:42 +0000 @@ -612,7 +612,7 @@ function uc_recurring_settings_form() { $form['uc_recurring_payment_methods'] = array( '#type' => 'checkboxes', '#title' => t('Valid payment methods for orders with recurring fees'), - '#description' => t('Only selected payment methods will be available for customers purchasing products with recurring fees.
It is up to you to make sure your chosen handler is compatible with the payment methods you select.
For example, the uc_recurring handler is only compatible with the Credit Card payment method.'), + '#description' => t('Only selected payment methods will be available for customers purchasing products with recurring fees.
It is up to you to make sure your chosen handler is compatible with the payment methods you select.
For example, the uc_recurring handler is only compatible with the Credit Card payment method.'), '#options' => $options, '#default_value' => variable_get('uc_recurring_payment_methods', array()), ); @@ -631,7 +631,7 @@ function uc_recurring_settings_form() { $form['uc_recurring_checkout_fail'] = array( '#type' => 'radios', '#title' => t('Action to take if a recurring fee fails to process during checkout'), - '#description' => t('Regardless of your selection, an admin comment will report the failure.
Note: Even if you select the first option, checkout will complete if another payment has already been captured.'), + '#description' => t('Regardless of your selection, an admin comment will report the failure.
Note: Even if you select the first option, checkout will complete if another payment has already been captured.'), '#options' => array( 'fail' => t('Return a failed message and do not complete checkout.'), 'proceed' => t('Return a failed message but complete checkout.'), === modified file 'uc_attribute/translations/uc_attribute.pot' --- uc_attribute/translations/uc_attribute.pot 2008-01-04 21:21:40 +0000 +++ uc_attribute/translations/uc_attribute.pot 2009-04-06 10:47:42 +0000 @@ -22,7 +22,7 @@ msgid "Select attributes to add to this msgstr "" #: uc_attribute.module:29 -msgid "If a specific combination of attributes causes a change in a product's SKU,\n put the new SKU in the appropriate field. Hover over a row to get a reminder of the \n meaning of an attribute combination.
\n Warning: If any attributes are added to or removed from this product, all work on this page will be lost!" +msgid "If a specific combination of attributes causes a change in a product's SKU,\n put the new SKU in the appropriate field. Hover over a row to get a reminder of the \n meaning of an attribute combination.
\n Warning: If any attributes are added to or removed from this product, all work on this page will be lost!" msgstr "" #: uc_attribute.module:42 === modified file 'uc_catalog/uc_catalog.pages.inc' --- uc_catalog/uc_catalog.pages.inc 2009-03-25 18:29:36 +0000 +++ uc_catalog/uc_catalog.pages.inc 2009-04-06 10:47:42 +0000 @@ -71,7 +71,7 @@ function theme_uc_catalog_browse($tid = if ($child->nodes) { $cell_link = $image .''. l($child->name, uc_catalog_path($child)) .''; if (variable_get('uc_catalog_show_subcategories', TRUE)) { - $cell_link .= "
". implode(', ', $grandchildren) ."\n"; + $cell_link .= "
". implode(', ', $grandchildren) ."\n"; } $child_list[] = $cell_link; } === modified file 'uc_file/translations/uc_file.pot' --- uc_file/translations/uc_file.pot 2008-01-04 21:21:40 +0000 +++ uc_file/translations/uc_file.pot 2009-04-06 10:47:42 +0000 @@ -122,19 +122,19 @@ msgid "%file is not a valid file or dire msgstr "" #: uc_file.module:366 -msgid "SKU: Any
" +msgid "SKU: Any
" msgstr "" #: uc_file.module:366 -msgid "SKU: !sku
" +msgid "SKU: !sku
" msgstr "" #: uc_file.module:368 -msgid "Directory: !dir
" +msgid "Directory: !dir
" msgstr "" #: uc_file.module:371 -msgid "File: !file
" +msgid "File: !file
" msgstr "" #: uc_file.module:374 === modified file 'uc_file/uc_file.module' --- uc_file/uc_file.module 2009-04-01 15:17:04 +0000 +++ uc_file/uc_file.module 2009-04-06 10:47:42 +0000 @@ -907,10 +907,10 @@ function uc_file_feature_form_submit($fo // Build product feature descriptions. $description = t('SKU: !sku
', array('!sku' => empty($file_product['model']) ? 'Any' : $file_product['model'])); if (is_dir(variable_get('uc_file_base_dir', NULL) ."/". $file_product['filename'])) { - $description .= t('Directory: !dir
', array('!dir' => $file_product['filename'])); + $description .= t('Directory: !dir
', array('!dir' => $file_product['filename'])); } else { - $description .= t('File: !file
', array('!file' => basename($file_product['filename'])));; + $description .= t('File: !file
', array('!file' => basename($file_product['filename'])));; } $description .= $file_product['shippable'] ? t('Shippable: Yes') : t('Shippable: No'); === modified file 'uc_order/translations/uc_order.pot' --- uc_order/translations/uc_order.pot 2008-01-04 21:21:40 +0000 +++ uc_order/translations/uc_order.pot 2009-04-06 10:47:42 +0000 @@ -986,7 +986,7 @@ msgid "Search options" msgstr "" #: uc_order.module:1357 -msgid "Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)" +msgid "Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)" msgstr "" #: uc_order.module:1364 === modified file 'uc_order/uc_order.admin.inc' --- uc_order/uc_order.admin.inc 2009-04-01 17:14:08 +0000 +++ uc_order/uc_order.admin.inc 2009-04-06 10:47:42 +0000 @@ -717,7 +717,7 @@ function uc_order_address_book_form($for $select = uc_select_address($uid, $type, $func); if ($uid == 0) { - $form['desc'] = array('#value' => '
'. t('You must select a customer before address
information is available.
') .'
'); + $form['desc'] = array('#value' => '
'. t('You must select a customer before address
information is available.
') .'
'); } elseif (is_null($select)) { $form['desc'] = array('#value' => '
'. t('No addresses found for customer.') .'
'); @@ -796,7 +796,7 @@ function uc_order_select_customer($email $output .= ''. t('Use this account now?') .'
' . t('User !uid - !mail', array('!uid' => $user->uid, '!mail' => $user->mail)) .'


'; + . $user->mail .'\');" value="'. t('Apply') .'" />


'; } else { $name = uc_store_email_to_username($email); @@ -823,7 +823,7 @@ function uc_order_select_customer($email $output .= ''. t('Use this account now?') .'
' . t('User @uid - @mail', array('@uid' => $account->uid, '@mail' => $account->mail)) .'


'; + . $account->mail .'\');" value="'. t('Apply') .'" />


'; } } @@ -837,7 +837,7 @@ function uc_order_select_customer_form($ if (is_null(arg(4))) { $form['desc'] = array( '#value' => '
'. t('Search for a customer based on these fields.') - .'
'. t('Use * as a wildcard to match any character.') .'
' + .'
'. t('Use * as a wildcard to match any character.') .'
' .'('. t('Leave a field empty to ignore it in the search.') .')
', ); === modified file 'uc_order/uc_order.module' --- uc_order/uc_order.module 2009-04-06 18:31:41 +0000 +++ uc_order/uc_order.module 2009-04-06 10:47:42 +0000 @@ -764,7 +764,7 @@ function uc_order_search_form() { $form['search']['table1'] = array('#value' => '
'); $form['search']['desc'] = array( - '#value' => '
'. t("Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)") .'
', + '#value' => '
'. t("Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)") .'
', ); $form['search']['table2'] = array('#value' => '
'); === modified file 'uc_reports/uc_reports.admin.inc' --- uc_reports/uc_reports.admin.inc 2009-03-16 13:41:39 +0000 +++ uc_reports/uc_reports.admin.inc 2009-04-06 10:47:42 +0000 @@ -704,7 +704,7 @@ function uc_reports_sales_custom() { // Grab the detailed product breakdown if selected. $result = db_query("SELECT SUM(op.qty) as count, n.title, n.nid FROM {uc_order_products} as op LEFT JOIN {uc_orders} as o ON o.order_id = op.order_id LEFT JOIN {node} as n ON n.nid = op.nid WHERE %d <= o.created AND o.created <= %d AND o.order_status IN $order_statuses GROUP BY n.nid ORDER BY count DESC, n.title ASC", $subreport['start'], $subreport['end']); while ($product_breakdown = db_fetch_object($result)) { - $product_data .= $product_breakdown->count .' x '. l($product_breakdown->title, 'node/'. $product_breakdown->nid) ."
\n"; + $product_data .= $product_breakdown->count .' x '. l($product_breakdown->title, 'node/'. $product_breakdown->nid) ."
\n"; $product_csv .= $product_breakdown->count .' x '. $product_breakdown->title ."\n"; } } === modified file 'uc_roles/translations/uc_roles.pot' --- uc_roles/translations/uc_roles.pot 2008-01-04 21:21:40 +0000 +++ uc_roles/translations/uc_roles.pot 2009-04-06 10:47:42 +0000 @@ -282,35 +282,35 @@ msgid " " msgstr "" #: uc_roles.module:594 -msgid "SKU: Any
" +msgid "SKU: Any
" msgstr "" #: uc_roles.module:594 -msgid "SKU: !sku
" +msgid "SKU: !sku
" msgstr "" #: uc_roles.module:595 -msgid "Role: !role_name
" +msgid "Role: !role_name
" msgstr "" #: uc_roles.module:598 -msgid "Expiration: never
" +msgid "Expiration: never
" msgstr "" #: uc_roles.module:601 -msgid "Expiration: !qty day(s)
" +msgid "Expiration: !qty day(s)
" msgstr "" #: uc_roles.module:604 -msgid "Expiration: !qty week(s)
" +msgid "Expiration: !qty week(s)
" msgstr "" #: uc_roles.module:607 -msgid "Expiration: !qty month(s)
" +msgid "Expiration: !qty month(s)
" msgstr "" #: uc_roles.module:610 -msgid "Expiration: !qty year(s)
" +msgid "Expiration: !qty year(s)
" msgstr "" #: uc_roles.module:615 === modified file 'uc_roles/uc_roles.module' --- uc_roles/uc_roles.module 2009-04-01 15:17:04 +0000 +++ uc_roles/uc_roles.module 2009-04-06 10:47:42 +0000 @@ -833,8 +833,8 @@ function uc_roles_feature_form_submit($f 'end_time' => $form_state['values']['expiration' ] === 'abs' ? $form_state['values']['uc_roles_expire_absolute'] : NULL, ); - $description = empty($product_role['model']) ? t('SKU: Any
') : t('SKU: !sku
', array('!sku' => $product_role['model'])); - $description .= t('Role: !role_name
', array('!role_name' => _uc_roles_get_name($product_role['rid']))); + $description = empty($product_role['model']) ? t('SKU: Any
') : t('SKU: !sku
', array('!sku' => $product_role['model'])); + $description .= t('Role: !role_name
', array('!role_name' => _uc_roles_get_name($product_role['rid']))); if ($product_role['end_override']) { if ($product_role['end_time']) { @@ -843,19 +843,19 @@ function uc_roles_feature_form_submit($f else { switch ($product_role['granularity']) { case 'never': - $description .= t('Expiration: never
'); + $description .= t('Expiration: never
'); break; case 'day': - $description .= t('Expiration: !qty day(s)
', array('!qty' => $product_role['duration'])); + $description .= t('Expiration: !qty day(s)
', array('!qty' => $product_role['duration'])); break; case 'week': - $description .= t('Expiration: !qty week(s)
', array('!qty' => $product_role['duration'])); + $description .= t('Expiration: !qty week(s)
', array('!qty' => $product_role['duration'])); break; case 'month': - $description .= t('Expiration: !qty month(s)
', array('!qty' => $product_role['duration'])); + $description .= t('Expiration: !qty month(s)
', array('!qty' => $product_role['duration'])); break; case 'year': - $description .= t('Expiration: !qty year(s)
', array('!qty' => $product_role['duration'])); + $description .= t('Expiration: !qty year(s)
', array('!qty' => $product_role['duration'])); break; default: break; @@ -863,9 +863,9 @@ function uc_roles_feature_form_submit($f } } else { - $description .= t('Expiration: !link (not overridden)
', array('!link' => l(t('Global expiration'), 'admin/store/settings/products/edit/features'))); + $description .= t('Expiration: !link (not overridden)
', array('!link' => l(t('Global expiration'), 'admin/store/settings/products/edit/features'))); } - $description .= $product_role['shippable'] ? t('Shippable: Yes
') : t('Shippable: No
'); + $description .= $product_role['shippable'] ? t('Shippable: Yes
') : t('Shippable: No
'); $description .= $product_role['by_quantity'] ? t('Multiply by quantity: Yes') : t('Multiply by quantity: No'); $data = array( === modified file 'uc_store/translations/es.po' --- uc_store/translations/es.po 2007-10-15 14:09:33 +0000 +++ uc_store/translations/es.po 2009-04-06 10:47:42 +0000 @@ -387,8 +387,8 @@ msgid "Search options" msgstr "Opciones de búsqueda" #: uc_store.module:843 -msgid "Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)" -msgstr "Buscar clientes basados en alguno de los siguientes campos. Use * como comodín para coincidir cualquier carácter.
Por ejemplo, buscando por los últimos apellidos con 's*' devolverá todos los clientes cuyo apellido comience con una s.
(Déjelo en blanco para ignorarlo en la búsqueda." +msgid "Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)" +msgstr "Buscar clientes basados en alguno de los siguientes campos. Use * como comodín para coincidir cualquier carácter.
Por ejemplo, buscando por los últimos apellidos con 's*' devolverá todos los clientes cuyo apellido comience con una s.
(Déjelo en blanco para ignorarlo en la búsqueda." #: uc_store.module:850 msgid "First name" === modified file 'uc_store/translations/uc_store.pot' --- uc_store/translations/uc_store.pot 2008-01-04 21:21:40 +0000 +++ uc_store/translations/uc_store.pot 2009-04-06 10:47:42 +0000 @@ -402,7 +402,7 @@ msgid "Search options" msgstr "" #: uc_store.module:861 -msgid "Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)" +msgid "Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)" msgstr "" #: uc_store.module:868;1572;2135 === modified file 'uc_store/uc_store.admin.inc' --- uc_store/uc_store.admin.inc 2009-03-11 04:33:33 +0000 +++ uc_store/uc_store.admin.inc 2009-04-06 10:47:42 +0000 @@ -223,7 +223,7 @@ function uc_store_customer_search_form() $form['search']['table1'] = array('#value' => '
'); $form['search']['desc'] = array( - '#value' => '
'. t("Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)") .'
', + '#value' => '
'. t("Search for customers based on any of the following fields. Use * as a wildcard to match any character.
For example, searching by last name for 's*' will return all customers whose last name starts with an s.
(Leave a field empty to ignore it in the search.)") .'
', ); $form['search']['table2'] = array('#value' => '
'); === modified file 'uc_taxes/uc_taxes.admin.inc' --- uc_taxes/uc_taxes.admin.inc 2009-03-07 20:02:36 +0000 +++ uc_taxes/uc_taxes.admin.inc 2009-04-06 10:47:42 +0000 @@ -73,7 +73,7 @@ function uc_taxes_form($form_state, $rat $form['name'] = array( '#type' => 'textfield', '#title' => t('Name'), - '#description' => t('This name will appear to the customer when this tax is applied to an order.
It will also be used to name the corresponding predicate for this rate.'), + '#description' => t('This name will appear to the customer when this tax is applied to an order.
It will also be used to name the corresponding predicate for this rate.'), '#default_value' => $rate_id ? $rate->name : '', '#required' => TRUE, );