Index: includes/form.inc ========================================================= --- includes/form.inc (revision 1.517) +++ includes/form.inc Fri Dec 31 12:36:19 CET 2010 @@ -4165,7 +4165,7 @@ // Tweak init_message to avoid the bottom of the page flickering down after // init phase. - $batch_set['init_message'] .= '
 '; + $batch_set['init_message'] .= '
 '; // The non-concurrent workflow of batch execution allows us to save // numberOfItems() queries by handling our own counter. Index: modules/field/modules/list/list.module ========================================================= --- modules/field/modules/list/list.module (revision 1.39) +++ modules/field/modules/list/list.module Fri Dec 31 13:16:57 CET 2010 @@ -79,13 +79,13 @@ $description = '

' . t('The possible values this field can contain. Enter one value per line, in the format key|label.'); if ($field['type'] == 'list_integer' || $field['type'] == 'list_float') { - $description .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); - $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); + $description .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); + $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); + $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); } else { - $description .= '
' . t('The key is the stored value. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single string, it will be used as key and label.'); + $description .= '
' . t('The key is the stored value. The label will be used in displayed values and edit forms.'); + $description .= '
' . t('The label is optional: if a line contains a single string, it will be used as key and label.'); } $description .= '

'; $form['allowed_values']['#description'] = $description; Index: modules/field/modules/number/number.module ========================================================= --- modules/field/modules/number/number.module (revision 1.46) +++ modules/field/modules/number/number.module Fri Dec 31 12:28:55 CET 2010 @@ -217,7 +217,7 @@ $settings = $display['settings']; $options = array( - '' => t(''), + '' => '<' . t('none') . '>', '.' => t('Decimal point'), ',' => t('Comma'), ' ' => t('Space'), Index: modules/field_ui/field_ui.admin.inc ========================================================= --- modules/field_ui/field_ui.admin.inc (revision 1.88) +++ modules/field_ui/field_ui.admin.inc Fri Dec 31 12:34:12 CET 2010 @@ -883,7 +883,7 @@ $field_label_options = array( 'above' => t('Above'), 'inline' => t('Inline'), - 'hidden' => t(''), + 'hidden' => '<' . t('Hidden') . '>', ); $extra_visibility_options = array( 'visible' => t('Visible'), @@ -939,7 +939,7 @@ ); $formatter_options = field_ui_formatter_options($field['type']); - $formatter_options['hidden'] = t(''); + $formatter_options['hidden'] = '<' . t('Hidden') . '>'; $table[$name]['format'] = array( 'type' => array( '#type' => 'select', @@ -1847,7 +1847,7 @@ // Build the configurable field values. $description = t('Maximum number of values users can enter for this field.'); if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) { - $description .= '
' . t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like."); + $description .= '
' . t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like."); } $form['field']['cardinality'] = array( '#type' => 'select', Index: modules/filter/tests/filter.url-input.txt ========================================================= --- modules/filter/tests/filter.url-input.txt (revision 1.1) +++ modules/filter/tests/filter.url-input.txt Fri Dec 31 12:39:32 CET 2010 @@ -13,7 +13,7 @@ What about tags that don't exist like x say www.test.com? And what about tag beginning www.test.com with p? -Test <br/>: This is just a www.test.com. paragraph with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph *
with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph person@test.com with some http://www.test.com urls *img* thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. +Test <br/>: This is just a www.test.com. paragraph with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph *
with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph person@test.com with some http://www.test.com urls *img* thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in.
This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. Index: modules/filter/tests/filter.url-output.txt ========================================================= --- modules/filter/tests/filter.url-output.txt (revision 1.1) +++ modules/filter/tests/filter.url-output.txt Fri Dec 31 12:41:28 CET 2010 @@ -13,7 +13,7 @@ What about tags that don't exist like x say www.test.com? And what about tag beginning www.test.com with p? -Test <br/>: This is just a www.test.com. paragraph with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph *
with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph person@test.com with some http://www.test.com urls *img* thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. +Test <br/>: This is just a www.test.com. paragraph with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph *
with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph person@test.com with some http://www.test.com urls *img* thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in.
This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. Index: modules/image/image.module ========================================================= --- modules/image/image.module (revision 1.54) +++ modules/image/image.module Fri Dec 31 12:30:37 CET 2010 @@ -628,7 +628,7 @@ $styles = image_styles(); $options = array(); if ($include_empty && !empty($styles)) { - $options[''] = t(''); + $options[''] = '<' . t('none') . '>'; } $options = array_merge($options, drupal_map_assoc(array_keys($styles))); if (empty($options)) { Index: modules/simpletest/tests/batch_test.callbacks.inc ========================================================= --- modules/simpletest/tests/batch_test.callbacks.inc (revision 1.2) +++ modules/simpletest/tests/batch_test.callbacks.inc Fri Dec 31 12:38:54 CET 2010 @@ -93,7 +93,7 @@ if (!$success) { // A fatal error occurred during the processing. $error_operation = reset($operations); - $messages[] = t('An error occurred while processing @op with arguments:
@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE))); + $messages[] = t('An error occurred while processing @op with arguments:
@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE))); } drupal_set_message(implode('
', $messages)); Index: modules/simpletest/tests/batch_test.module ========================================================= --- modules/simpletest/tests/batch_test.module (revision 1.3) +++ modules/simpletest/tests/batch_test.module Fri Dec 31 13:23:38 CET 2010 @@ -138,7 +138,7 @@ } $form['step_display'] = array( - '#markup' => 'step ' . $form_state['storage']['step'] . '
', + '#markup' => 'step ' . $form_state['storage']['step'] . '
', ); $form['submit'] = array( '#type' => 'submit', Index: modules/simpletest/tests/form.test ========================================================= --- modules/simpletest/tests/form.test (revision 1.79) +++ modules/simpletest/tests/form.test Fri Dec 31 13:23:59 CET 2010 @@ -1257,7 +1257,7 @@ '%values' => print_r($values, TRUE), '%errors' => $valid_form ? t('None') : implode(' ', $errors), ); - $this->assertTrue($valid_input == $valid_form, t('Input values: %values
Validation handler errors: %errors', $args)); + $this->assertTrue($valid_input == $valid_form, t('Input values: %values
Validation handler errors: %errors', $args)); // We check submitted values only if we have a valid input. if ($valid_input) { Index: modules/update/update.manager.inc ========================================================= --- modules/update/update.manager.inc (revision 1.30) +++ modules/update/update.manager.inc Fri Dec 31 12:32:48 CET 2010 @@ -459,7 +459,7 @@ $form['help_text'] = array( '#prefix' => '

', - '#markup' => t('To install a new module or theme, either enter the URL of an archive file you wish to install, or upload the archive file that you have downloaded. You can find modules and themes at http://drupal.org.
The following archive extensions are supported: %extensions.', array('@module_url' => 'http://drupal.org/project/modules', '@theme_url' => 'http://drupal.org/project/themes', '@drupal_org_url' => 'http://drupal.org', '%extensions' => archiver_get_extensions())), + '#markup' => t('To install a new module or theme, either enter the URL of an archive file you wish to install, or upload the archive file that you have downloaded. You can find modules and themes at http://drupal.org.
The following archive extensions are supported: %extensions.', array('@module_url' => 'http://drupal.org/project/modules', '@theme_url' => 'http://drupal.org/project/themes', '@drupal_org_url' => 'http://drupal.org', '%extensions' => archiver_get_extensions())), '#suffix' => '

', );