From 045eb93e3c9613d6660899bb97db0232d171b00c Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Thu, 14 Jan 2010 00:00:44 +0000
Subject: [PATCH] Switch from "preferences" to "Settings" to conform to
 platform standards

---
 res/menu/accounts_option.xml | 4 ++--
 res/values/strings.xml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index b419e95f7..5e478187b 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -28,8 +28,8 @@
 	-->
         <item android:id="@+id/edit_prefs"
         android:title="@string/preferences_action" 
-		android:icon="@drawable/ic_menu_preferences"
-/>
+        android:icon="@android:drawable/ic_menu_preferences"
+    />
 	<item
 		android:id="@+id/about"
         android:title="@string/about_action"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 01f65e377..8e32dc4f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="compose_action">Compose</string>
     <string name="search_action">Search</string>
     <string name="search_results">Search results</string>
-    <string name="preferences_action">Preferences</string>
+    <string name="preferences_action">Settings</string>
     <string name="open_action">Open</string>
     <string name="account_settings_action">Account settings</string>
     <string name="folder_settings_action">Folder settings</string>