diff --git a/includes/locale.inc b/includes/locale.inc
index 578b1b3..bafed42 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -560,8 +560,8 @@ function _locale_import_po($file, $langcode, $mode, $group = NULL) {
drupal_set_message(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => $additions, '%update' => $updates, '%delete' => $deletes)));
watchdog('locale', 'Imported %file into %locale: %number new strings added, %update updated and %delete removed.', array('%file' => $file->filename, '%locale' => $langcode, '%number' => $additions, '%update' => $updates, '%delete' => $deletes));
if ($skips) {
- $skip_message = format_plural($skips, 'One translation string was skipped because it contains disallowed HTML.', '@count translation strings were skipped because they contain disallowed HTML.');
- drupal_set_message($skip_message);
+ $skip_message = format_plural($skips, 'One translation string was skipped because it contains disallowed or malformed HTML. See the log for details on the skipped string.', '@count translation strings were skipped because they contain disallowed or malformed HTML. See the log for details on the skipped strings.');
+ drupal_set_message($skip_message, 'error');
watchdog('locale', '@count disallowed HTML string(s) in %file', array('@count' => $skips, '%file' => $file->uri), WATCHDOG_WARNING);
}
return TRUE;
@@ -990,6 +990,7 @@ function _locale_import_one_string_db(&$report, $langcode, $context, $source, $t
// Text groups other than default still can contain HTML tags
// (i.e. translatable blocks).
if ($textgroup == "default" && !locale_string_is_safe($translation)) {
+ watchdog('locale', 'String "%string" was not imported due to potentially dangerous or malformed HTML in the string', array('%string' => $translation), WATCHDOG_ERROR);
$report['skips']++;
$lid = 0;
}
diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index fe1221c..a2da77a 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -216,7 +216,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
$settings = $display['settings'];
$options = array(
- '' => t(''),
+ '' => t('(none)'),
'.' => t('Decimal point'),
',' => t('Comma'),
' ' => t('Space'),
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 96beb13..1fdd26d 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -882,7 +882,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
$field_label_options = array(
'above' => t('Above'),
'inline' => t('Inline'),
- 'hidden' => t(''),
+ 'hidden' => t('Hidden'),
);
$extra_visibility_options = array(
'visible' => t('Visible'),
@@ -938,7 +938,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
);
$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',
diff --git a/modules/image/image.module b/modules/image/image.module
index d2d081c..6d6c47a 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -626,7 +626,7 @@ function image_style_options($include_empty = TRUE) {
$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)) {