Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.500
diff -u -p -r1.500 comment.module
--- modules/comment/comment.module 24 Nov 2006 10:18:23 -0000 1.500
+++ modules/comment/comment.module 24 Nov 2006 11:57:26 -0000
@@ -976,7 +976,7 @@ function comment_confirm_delete($subject
array(),
t('Are you sure you want to delete the comment %title?', array('%title' => $subject)),
'node/'. $nid,
- t('Any replies to this comment will be lost. This action cannot be undone.'),
+ t('Any replies to this comment will be lost. This action cannot be undone.
'),
t('Delete'),
t('Cancel'));
}
@@ -1153,7 +1153,7 @@ function comment_multiple_delete_confirm
else {
return confirm_form($form,
t('Are you sure you want to delete these comments and all their children?'),
- 'admin/content/comment', t('This action cannot be undone.'),
+ 'admin/content/comment', t('This action cannot be undone.
'),
t('Delete comments'), t('Cancel'));
}
}
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.71
diff -u -p -r1.71 contact.module
--- modules/contact/contact.module 21 Nov 2006 20:14:17 -0000 1.71
+++ modules/contact/contact.module 24 Nov 2006 11:57:27 -0000
@@ -256,7 +256,7 @@ function contact_admin_delete($cid = NUL
'#value' => $info->category,
);
- return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $info->category)), 'admin/build/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $info->category)), 'admin/build/contact', t('This action cannot be undone.
'), t('Delete'), t('Cancel'));
}
else {
drupal_set_message(t('Category not found.'), 'error');
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.150
diff -u -p -r1.150 filter.module
--- modules/filter/filter.module 24 Nov 2006 10:18:23 -0000 1.150
+++ modules/filter/filter.module 24 Nov 2006 11:57:29 -0000
@@ -366,7 +366,7 @@ function filter_admin_delete() {
$form['format'] = array('#type' => 'hidden', '#value' => $format->format);
$form['name'] = array('#type' => 'hidden', '#value' => $format->name);
- return confirm_form($form, t('Are you sure you want to delete the input format %format?', array('%format' => $format->name)), 'admin/settings/filters', t('If you have any content left in this input format, it will be switched to the default input format. This action cannot be undone.'), t('Delete'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to delete the input format %format?', array('%format' => $format->name)), 'admin/settings/filters', t('If you have any content left in this input format, it will be switched to the default input format. This action cannot be undone.
'), t('Delete'), t('Cancel'));
}
else {
drupal_set_message(t('The default format cannot be deleted.'));
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.365
diff -u -p -r1.365 forum.module
--- modules/forum/forum.module 21 Nov 2006 20:14:17 -0000 1.365
+++ modules/forum/forum.module 24 Nov 2006 11:57:30 -0000
@@ -565,7 +565,7 @@ function forum_confirm_delete($tid) {
$form['tid'] = array('#type' => 'value', '#value' => $tid);
$form['name'] = array('#type' => 'value', '#value' => $term->name);
- return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/content/forum', t('Deleting a forum or container will delete all sub-forums and associated posts as well. This action cannot be undone.'), t('Delete'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/content/forum', t('Deleting a forum or container will delete all sub-forums and associated posts as well. This action cannot be undone.
'), t('Delete'), t('Cancel'));
}
/**
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.152
diff -u -p -r1.152 locale.module
--- modules/locale/locale.module 24 Nov 2006 10:18:24 -0000 1.152
+++ modules/locale/locale.module 24 Nov 2006 11:57:31 -0000
@@ -327,7 +327,7 @@ function locale_admin_manage_delete_form
}
else {
$form['langcode'] = array('#type' => 'value', '#value' => $langcode);
- return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages['name'][$langcode]))), 'admin/settings/locale/language/overview', t('Deleting a language will remove all data associated with it. This action cannot be undone.'), t('Delete'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages['name'][$langcode]))), 'admin/settings/locale/language/overview', t('Deleting a language will remove all data associated with it. This action cannot be undone.
'), t('Delete'), t('Cancel'));
}
}
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.96
diff -u -p -r1.96 menu.module
--- modules/menu/menu.module 24 Nov 2006 10:18:24 -0000 1.96
+++ modules/menu/menu.module 24 Nov 2006 11:57:33 -0000
@@ -439,7 +439,7 @@ function menu_item_delete_form($mid) {
$message = t('Are you sure you want to delete the custom menu item %item?', array('%item' => $menu->title));
}
- return confirm_form($form, $message, 'admin/build/menu', t('This action cannot be undone.'), t('Delete'));
+ return confirm_form($form, $message, 'admin/build/menu', t('This action cannot be undone.
'), t('Delete'));
}
/**
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.13
diff -u -p -r1.13 content_types.inc
--- modules/node/content_types.inc 24 Nov 2006 09:08:04 -0000 1.13
+++ modules/node/content_types.inc 24 Nov 2006 11:57:33 -0000
@@ -383,7 +383,7 @@ function node_type_delete_confirm($type)
$caption .= ''. t('Warning: there %are currently %num_nodes %type %nodes on your site. %they may not be able to be displayed or edited correctly, once you have removed this content type.', array('%are' => format_plural($num_nodes, 'is', 'are'), '%num_nodes' => $num_nodes, '%type' => $type->name, '%nodes' => format_plural($num_nodes, 'node', 'nodes'), '%they' => format_plural($num_nodes, 'It', 'They'))) .'
';
}
- $caption .= ''. t('This action cannot be undone.') .'
';
+ $caption .= ''. t('
This action cannot be undone.
') .'';
return confirm_form($form, $message, 'admin/content/types', $caption, t('Delete'));
}
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.736
diff -u -p -r1.736 node.module
--- modules/node/node.module 24 Nov 2006 10:18:24 -0000 1.736
+++ modules/node/node.module 24 Nov 2006 11:57:38 -0000
@@ -1568,7 +1568,7 @@ function node_multiple_delete_confirm()
return confirm_form($form,
t('Are you sure you want to delete these items?'),
- 'admin/content/node', t('This action cannot be undone.'),
+ 'admin/content/node', t('This action cannot be undone.
'),
t('Delete all'), t('Cancel'));
}
@@ -2223,7 +2223,7 @@ function node_delete_confirm() {
$form['nid'] = array('#type' => 'value', '#value' => $node->nid);
$output = confirm_form($form,
t('Are you sure you want to delete %title?', array('%title' => $node->title)),
- $_GET['destination'] ? $_GET['destination'] : 'node/'. $node->nid, t('This action cannot be undone.'),
+ $_GET['destination'] ? $_GET['destination'] : 'node/'. $node->nid, t('This action cannot be undone.
'),
t('Delete'), t('Cancel') );
}
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.102
diff -u -p -r1.102 path.module
--- modules/path/path.module 23 Nov 2006 19:46:24 -0000 1.102
+++ modules/path/path.module 24 Nov 2006 11:57:39 -0000
@@ -97,7 +97,7 @@ function path_admin_delete_confirm($pid)
$form['pid'] = array('#type' => 'value', '#value' => $pid);
$output = confirm_form($form,
t('Are you sure you want to delete path alias %title?', array('%title' => $path['dst'])),
- $_GET['destination'] ? $_GET['destination'] : 'admin/build/path', t('This action cannot be undone.'),
+ $_GET['destination'] ? $_GET['destination'] : 'admin/build/path', t('This action cannot be undone.
'),
t('Delete'), t('Cancel') );
}
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.179
diff -u -p -r1.179 profile.module
--- modules/profile/profile.module 21 Nov 2006 20:14:18 -0000 1.179
+++ modules/profile/profile.module 24 Nov 2006 11:57:40 -0000
@@ -364,7 +364,7 @@ function profile_field_delete($fid) {
return confirm_form($form,
t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/user/profile',
- t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to edit this field and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/user/profile/edit/' . $fid))),
+ t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to
edit this field and change it to a hidden profile field so that it may only be accessed by administrators.
This action cannot be undone.
');
drupal_set_title($question);
$form['#attributes'] = array('class' => 'confirmation');
$form['description'] = array('#value' => $description);
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.324
diff -u -p -r1.324 taxonomy.module
--- modules/taxonomy/taxonomy.module 21 Nov 2006 20:14:19 -0000 1.324
+++ modules/taxonomy/taxonomy.module 24 Nov 2006 11:57:44 -0000
@@ -342,7 +342,7 @@ function taxonomy_vocabulary_confirm_del
t('Are you sure you want to delete the vocabulary %title?',
array('%title' => $vocabulary->name)),
'admin/content/taxonomy',
- t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'),
+ t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.
'),
t('Delete'),
t('Cancel'));
}
@@ -532,7 +532,7 @@ function taxonomy_term_confirm_delete($t
t('Are you sure you want to delete the term %title?',
array('%title' => $term->name)),
'admin/content/taxonomy',
- t('Deleting a term will delete all its children if there are any. This action cannot be undone.'),
+ t('Deleting a term will delete all its children if there are any. This action cannot be undone.
'),
t('Delete'),
t('Cancel'));
}
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.719
diff -u -p -r1.719 user.module
--- modules/user/user.module 24 Nov 2006 10:18:24 -0000 1.719
+++ modules/user/user.module 24 Nov 2006 11:57:48 -0000
@@ -1432,7 +1432,7 @@ function user_confirm_delete($name, $uid
return confirm_form(array(),
t('Are you sure you want to delete the account %name?', array('%name' => $name)),
'user/'. $uid,
- t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'),
+ t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.
'),
t('Delete'), t('Cancel'));
}
@@ -1648,7 +1648,7 @@ function user_admin_access_delete_confir
$output = confirm_form($form,
t('Are you sure you want to delete the @type rule for %rule?', array('@type' => $access_types[$edit->type], '%rule' => $edit->mask)),
'admin/user/rules',
- t('This action cannot be undone.'),
+ t('This action cannot be undone.
'),
t('Delete'),
t('Cancel'));
return $output;
@@ -2228,7 +2228,7 @@ function user_multiple_delete_confirm()
return confirm_form($form,
t('Are you sure you want to delete these users?'),
- 'admin/user/user', t('This action cannot be undone.'),
+ 'admin/user/user', t('This action cannot be undone.
'),
t('Delete all'), t('Cancel'));
}