From 968682dea6237da12c88e5e66549f916252ee678 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 14 Feb 2008 00:39:38 +0000
Subject: [PATCH] Options are called Settings now. Props hansengel. see #5850

git-svn-id: http://svn.automattic.com/wordpress/trunk@6833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-discussion.php |  8 ++++----
 wp-admin/options-general.php    | 10 +++++-----
 wp-admin/options-head.php       |  2 +-
 wp-admin/options-misc.php       |  8 ++++----
 wp-admin/options-permalink.php  |  4 ++--
 wp-admin/options-privacy.php    |  6 +++---
 wp-admin/options-reading.php    |  8 ++++----
 wp-admin/options-writing.php    |  8 ++++----
 wp-admin/options.php            |  8 ++++----
 9 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 78deefddd..bb1299faf 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -1,17 +1,17 @@
 <?php
 require_once('admin.php');
 
-$title = __('Discussion Options');
+$title = __('Discussion Settings');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Discussion Options') ?></h2>
+<h2><?php _e('Discussion Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend>
 <ul>
@@ -78,7 +78,7 @@ include('admin-header.php');
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" />
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" />
 </p>
 </form>
 </div>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index eac43ad39..58959305c 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -1,17 +1,17 @@
 <?php
 require_once('./admin.php');
 
-$title = __('General Options');
+$title = __('General Settings');
 $parent_file = 'options-general.php';
 
 include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('General Options') ?></h2>
+<h2><?php _e('General Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
 <table class="niceblue">
 <tr valign="top">
 <th scope="row"><?php _e('Blog title:') ?></th>
@@ -75,7 +75,7 @@ include('./admin-header.php');
 </tr>
 <tr>
 <th scope="row">&nbsp;</th>
-<td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Update options" to update sample output.') ?> </td>
+<td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') ?> </td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Weeks in the calendar should start on:') ?></th>
@@ -90,7 +90,7 @@ endfor;
 </tr>
 </table>
 
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" />
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="<?php if ( ! defined( 'WP_SITEURL' ) ) echo 'siteurl,'; if ( ! defined( 'WP_HOME' ) ) echo 'home,'; ?>blogname,blogdescription,admin_email,users_can_register,gmt_offset,date_format,time_format,start_of_week,comment_registration,default_role" />
 </p>
diff --git a/wp-admin/options-head.php b/wp-admin/options-head.php
index 11d82e877..779edca44 100644
--- a/wp-admin/options-head.php
+++ b/wp-admin/options-head.php
@@ -1,5 +1,5 @@
 <?php wp_reset_vars(array('action', 'standalone', 'option_group_id')); ?>
 
 <?php if (isset($_GET['updated'])) : ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
+<div id="message" class="updated fade"><p><strong><?php _e('Settings saved.') ?></strong></p></div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index e3cd61355..e8e93e8c5 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -1,7 +1,7 @@
 <?php
 require_once('admin.php');
 
-$title = __('Miscellaneous Options');
+$title = __('Miscellaneous Settings');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
@@ -9,10 +9,10 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Miscellaneous Options') ?></h2>
+<h2><?php _e('Miscellaneous Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Uploading'); ?></legend>
 <table class="niceblue">
@@ -51,7 +51,7 @@ include('admin-header.php');
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path,upload_url_path" />
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" />
 </p>
 </form>
 </div>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 01919feb8..fcffa4baf 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -1,7 +1,7 @@
 <?php
 require_once('admin.php');
 
-$title = __('Permalink Options');
+$title = __('Permalink Settings');
 $parent_file = 'options-general.php';
 
 function add_js() {
@@ -127,7 +127,7 @@ $structures = array(
 	$prefix . '/archives/%post_id%'
 	);
 ?>
-<h3><?php _e('Common options:'); ?></h3>
+<h3><?php _e('Common settings:'); ?></h3>
 <p>
 	<label>
 <input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> />
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index f791d00a4..138227c02 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -1,14 +1,14 @@
 <?php
 require_once('./admin.php');
 
-$title = __('Privacy Options');
+$title = __('Privacy Settings');
 $parent_file = 'options-general.php';
 
 include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Privacy Options') ?></h2>
+<h2><?php _e('Privacy Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <table class="niceblue">
@@ -24,7 +24,7 @@ include('./admin-header.php');
 </tr>
 </table>
 
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" />
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="blog_public" />
 </p>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 1b5fd809b..9d263dd7f 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -1,17 +1,17 @@
 <?php
 require_once('admin.php');
 
-$title = __('Reading Options');
+$title = __('Reading Settings');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Reading Options') ?></h2>
+<h2><?php _e('Reading Settings') ?></h2>
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
 <?php if ( get_pages() ): ?>
 <fieldset class="options">
 <legend><?php _e('Front Page') ?></legend>
@@ -119,7 +119,7 @@ endforeach;
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts,show_avatars,avatar_rating" />
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" />
 </p>
 </form>
 </div>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index c0a9439b4..a337e35e2 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -1,17 +1,17 @@
 <?php
 require_once('admin.php');
 
-$title = __('Writing Options');
+$title = __('Writing Settings');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Writing Options') ?></h2>
+<h2><?php _e('Writing Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Settings &raquo;') ?>" /></p>
 
 <table class="niceblue">
 <tr valign="top">
@@ -117,7 +117,7 @@ endforeach;
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category" />
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" />
 </p>
 </form>
 </div>
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 7fa05bbf4..97c0dfa27 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -1,7 +1,7 @@
 <?php
 require_once('admin.php');
 
-$title = __('Options');
+$title = __('Settings');
 $this_file = 'options.php';
 $parent_file = 'options-general.php';
 
@@ -44,11 +44,11 @@ default:
 	include('admin-header.php'); ?>
 
 <div class="wrap">
-  <h2><?php _e('All Options'); ?></h2>
+  <h2><?php _e('All Settings'); ?></h2>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('update-options') ?>
   <input type="hidden" name="action" value="update" />
-	<p class="submit"><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p>
+	<p class="submit"><input type="submit" name="Update" value="<?php _e('Save Changes &raquo;') ?>" /></p>
   <table width="98%">
 <?php
 $options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
@@ -86,7 +86,7 @@ endforeach;
 ?>
   </table>
 <?php $options_to_update = implode(',', $options_to_update); ?>
-<p class="submit"><input type="hidden" name="page_options" value="<?php echo $options_to_update; ?>" /><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="hidden" name="page_options" value="<?php echo $options_to_update; ?>" /><input type="submit" name="Update" value="<?php _e('Save Changes &raquo;') ?>" /></p>
   </form>
 </div>