? block.module_24.patch ? save_save-2.patch ? save_save.patch ? files/.htaccess ? sites/default/settings.php Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.167 diff -u -p -r1.167 locale.inc --- includes/locale.inc 6 Dec 2007 09:58:30 -0000 1.167 +++ includes/locale.inc 13 Dec 2007 23:29:22 -0000 @@ -55,7 +55,7 @@ function locale_languages_overview_form( '#options' => $options, '#default_value' => language_default('language'), ); - $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); $form['#theme'] = 'locale_languages_overview_form'; return $form; @@ -200,7 +200,7 @@ function locale_languages_edit_form(&$fo _locale_languages_common_controls($form, $language); $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save language') + '#value' => t('Save') ); $form['#submit'][] = 'locale_languages_edit_form_submit'; $form['#validate'][] = 'locale_languages_edit_form_validate'; @@ -455,7 +455,7 @@ function locale_languages_configure_form ); $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save settings') + '#value' => t('Save') ); return $form; } @@ -814,7 +814,7 @@ function locale_translate_edit_form(&$fo $form['translations'][$translation->language]['#default_value'] = $translation->translation; } - $form['submit'] = array('#type' => 'submit', '#value' => t('Save translations')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); return $form; } Index: modules/aggregator/aggregator.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v retrieving revision 1.5 diff -u -p -r1.5 aggregator.pages.inc --- modules/aggregator/aggregator.pages.inc 16 Oct 2007 13:48:11 -0000 1.5 +++ modules/aggregator/aggregator.pages.inc 13 Dec 2007 23:29:22 -0000 @@ -130,7 +130,7 @@ function aggregator_categorize_items($it '#multiple' => TRUE ); } - $form['submit'] = array('#type' => 'submit', '#value' => t('Save categories')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); return $form; } Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.12 diff -u -p -r1.12 block.admin.inc --- modules/block/block.admin.inc 26 Nov 2007 16:36:42 -0000 1.12 +++ modules/block/block.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -82,7 +82,7 @@ function block_admin_display_form(&$form $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save blocks'), + '#value' => t('Save'), ); return $form; @@ -252,7 +252,7 @@ function block_admin_configure(&$form_st $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save block'), + '#value' => t('Save'), ); return $form; Index: modules/block/block.js =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.js,v retrieving revision 1.1 diff -u -p -r1.1 block.js --- modules/block/block.js 14 Nov 2007 09:49:30 -0000 1.1 +++ modules/block/block.js 13 Dec 2007 23:29:22 -0000 @@ -17,7 +17,7 @@ Drupal.behaviors.blockDrag = function(co // A custom message for the blocks page specifically. Drupal.theme.tableDragChangedWarning = function () { - return '
' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t("The changes to these blocks will not be saved until the Save blocks button is clicked.") + '
'; + return '
' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t("The changes to these blocks will not be saved until the Save button is clicked.") + '
'; }; // Add a handler so when a row is dropped, update fields dropped into new regions. Index: modules/book/book.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v retrieving revision 1.7 diff -u -p -r1.7 book.admin.inc --- modules/book/book.admin.inc 8 Dec 2007 14:06:20 -0000 1.7 +++ modules/book/book.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -75,7 +75,7 @@ function book_admin_edit($form_state, $n $form['table'] = _book_admin_table($node); $form['save'] = array( '#type' => 'submit', - '#value' => t('Save book pages'), + '#value' => t('Save'), ); return $form; } Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.606 diff -u -p -r1.606 comment.module --- modules/comment/comment.module 13 Dec 2007 09:34:37 -0000 1.606 +++ modules/comment/comment.module 13 Dec 2007 23:29:22 -0000 @@ -1505,7 +1505,7 @@ function comment_controls($mode = COMMEN ); $form['submit'] = array('#type' => 'submit', - '#value' => t('Save settings'), + '#value' => t('Save'), '#weight' => 20, ); @@ -1520,7 +1520,7 @@ function theme_comment_controls($form) { $output = '
'; $output .= drupal_render($form); $output .= '
'; - $output .= '
'. t('Select your preferred way to display the comments and click "Save settings" to activate your changes.') .'
'; + $output .= '
'. t('Select your preferred way to display the comments and click "Save" to activate your changes.') .'
'; return theme('box', t('Comment viewing options'), $output); } Index: modules/filter/filter.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v retrieving revision 1.5 diff -u -p -r1.5 filter.admin.inc --- modules/filter/filter.admin.inc 6 Dec 2007 09:58:31 -0000 1.5 +++ modules/filter/filter.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -155,7 +155,7 @@ function filter_admin_format_form(&$form $group .= $tiplist; $form['tips'] = array('#value' => '

'. t('Formatting guidelines') .'

'. $group); } - $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); return $form; } @@ -343,7 +343,7 @@ function filter_admin_order(&$form_state $form['weights'][$id] = array('#type' => 'weight', '#default_value' => $filter->weight); } $form['format'] = array('#type' => 'hidden', '#value' => $format->format); - $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); return $form; } Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.20 diff -u -p -r1.20 menu.admin.inc --- modules/menu/menu.admin.inc 11 Dec 2007 12:17:58 -0000 1.20 +++ modules/menu/menu.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -47,7 +47,7 @@ function menu_overview_form(&$form_state if (element_children($form)) { $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save configuration'), + '#value' => t('Save'), ); } else { Index: modules/node/content_types.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v retrieving revision 1.47 diff -u -p -r1.47 content_types.inc --- modules/node/content_types.inc 28 Nov 2007 10:29:20 -0000 1.47 +++ modules/node/content_types.inc 13 Dec 2007 23:29:22 -0000 @@ -189,7 +189,7 @@ function node_type_form(&$form_state, $t $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save content type'), + '#value' => t('Save'), '#weight' => 40, ); @@ -197,7 +197,7 @@ function node_type_form(&$form_state, $t if (!empty($type->type)) { $form['delete'] = array( '#type' => 'submit', - '#value' => t('Delete content type'), + '#value' => t('Delete'), '#weight' => 45, ); } @@ -278,7 +278,7 @@ function node_type_form_submit($form, &$ if ($op == t('Reset to defaults')) { node_type_reset($type); } - elseif ($op == t('Delete content type')) { + elseif ($op == t('Delete')) { $form_state['redirect'] = 'admin/content/types/'. str_replace('_', '-', $type->old_type) .'/delete'; return; } Index: modules/profile/profile.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v retrieving revision 1.6 diff -u -p -r1.6 profile.admin.inc --- modules/profile/profile.admin.inc 9 Dec 2007 13:03:01 -0000 1.6 +++ modules/profile/profile.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -41,7 +41,7 @@ function profile_admin_overview() { // Display the submit button only when there's more than one field if (count($form) > 1) { - $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); } else { // Disable combo boxes when there isn't a submit button @@ -279,7 +279,7 @@ Unless you know what you are doing, it i '#default_value' => $edit['register'], ); $form['submit'] = array('#type' => 'submit', - '#value' => t('Save field'), + '#value' => t('Save'), ); return $form; } Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.36 diff -u -p -r1.36 system.admin.inc --- modules/system/system.admin.inc 13 Dec 2007 10:46:43 -0000 1.36 +++ modules/system/system.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -232,7 +232,7 @@ function system_themes_form() { ); $form['buttons']['submit'] = array( '#type' => 'submit', - '#value' => t('Save configuration'), + '#value' => t('Save'), ); $form['buttons']['reset'] = array( '#type' => 'submit', @@ -252,7 +252,7 @@ function system_themes_form_submit($form } db_query("UPDATE {system} SET status = 0 WHERE type = 'theme'"); - if ($form_state['values']['op'] == t('Save configuration')) { + if ($form_state['values']['op'] == t('Save')) { if (is_array($form_state['values']['status'])) { foreach ($form_state['values']['status'] as $key => $choice) { // Always enable the default theme, despite its status checkbox being checked: @@ -719,7 +719,7 @@ function system_modules($form_state = ar $form['buttons']['submit'] = array( '#type' => 'submit', - '#value' => t('Save configuration'), + '#value' => t('Save'), ); $form['#action'] = url('admin/build/modules/list/confirm'); Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.560 diff -u -p -r1.560 system.module --- modules/system/system.module 8 Dec 2007 14:06:22 -0000 1.560 +++ modules/system/system.module 13 Dec 2007 23:29:22 -0000 @@ -45,7 +45,7 @@ function system_help($path, $arg) { case 'admin/build/themes/settings': return '

'. t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') .'

'; case 'admin/build/modules': - $output = '

'. t('Modules are plugins that extend Drupal\'s core functionality. Enable modules by selecting the Enabled checkboxes below and clicking the Save configuration button. Once a module is enabled, new permissions may be available. To reduce server load, modules with their Throttle checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the Throttle checkbox is only available if the Throttle module is enabled.)', array('@permissions' => url('admin/user/permissions'))); + $output = '

'. t('Modules are plugins that extend Drupal\'s core functionality. Enable modules by selecting the Enabled checkboxes below and clicking the Save button. Once a module is enabled, new permissions may be available. To reduce server load, modules with their Throttle checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the Throttle checkbox is only available if the Throttle module is enabled.)', array('@permissions' => url('admin/user/permissions'))); if (module_exists('throttle')) { $output .= ' '. t('The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.', array('@throttle' => url('admin/settings/throttle'))); } @@ -916,7 +916,7 @@ function system_initialize_theme_blocks( * Add default buttons to a form and set its prefix */ function system_settings_form($form) { - $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') ); + $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save') ); $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') ); if (!empty($_POST) && form_get_errors()) { Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.11 diff -u -p -r1.11 user.admin.inc --- modules/user/user.admin.inc 24 Nov 2007 20:13:43 -0000 1.11 +++ modules/user/user.admin.inc 13 Dec 2007 23:29:22 -0000 @@ -546,7 +546,7 @@ function user_admin_perm($form_state, $r $form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => isset($status[$rid]) ? $status[$rid] : array()); $form['role_names'][$rid] = array('#value' => $name, '#tree' => TRUE); } - $form['submit'] = array('#type' => 'submit', '#value' => t('Save permissions')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); return $form; } @@ -641,11 +641,11 @@ function user_admin_role() { ); $form['submit'] = array( '#type' => 'submit', - '#value' => t('Save role'), + '#value' => t('Save'), ); $form['delete'] = array( '#type' => 'submit', - '#value' => t('Delete role'), + '#value' => t('Delete'), ); } else { @@ -666,7 +666,7 @@ function user_admin_role() { function user_admin_role_validate($form, &$form_state) { if ($form_state['values']['name']) { - if ($form_state['values']['op'] == t('Save role')) { + if ($form_state['values']['op'] == t('Save')) { if (db_result(db_query("SELECT COUNT(*) FROM {role} WHERE name = '%s' AND rid != %d", $form_state['values']['name'], $form_state['values']['rid']))) { form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name']))); } @@ -683,11 +683,11 @@ function user_admin_role_validate($form, } function user_admin_role_submit($form, &$form_state) { - if ($form_state['values']['op'] == t('Save role')) { + if ($form_state['values']['op'] == t('Save')) { db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $form_state['values']['name'], $form_state['values']['rid']); drupal_set_message(t('The role has been renamed.')); } - else if ($form_state['values']['op'] == t('Delete role')) { + else if ($form_state['values']['op'] == t('Delete')) { db_query('DELETE FROM {role} WHERE rid = %d', $form_state['values']['rid']); db_query('DELETE FROM {permission} WHERE rid = %d', $form_state['values']['rid']); // Update the users who have this role set: @@ -752,7 +752,7 @@ function user_admin_access_edit($aid = 0 else { $edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid)); } - return drupal_get_form('user_admin_access_edit_form', $edit, t('Save rule')); + return drupal_get_form('user_admin_access_edit_form', $edit, t('Save')); } /**