Remove a bunch of unused resources

Change-Id: I3ae05b530046a087f150da0ceb8b59f7970da817

16 files changed, 2 insertions, 766 deletions

diff --git a/res/layout/account_settings.xml b/res/layout/account_settings.xml
deleted file mode 100644
index 5231ea69f..000000000
--- a/res/layout/account_settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Simple layout for account preferences, consisting entirely of a single fragment -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <fragment
-        android:id="@+id/settings_fragment"
-        class="com.android.email.activity.setup.AccountSettingsFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-    />
-</FrameLayout>
diff --git a/res/layout/account_shortcut_picker.xml b/res/layout/account_shortcut_picker.xml
deleted file mode 100644
index da04b06e9..000000000
--- a/res/layout/account_shortcut_picker.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-    <FrameLayout
-        android:id="@+id/shortcut_list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        />
-    <!-- TODO selectableItemBackground is a placeholder for the new "cancel" style -->
-    <Button
-        android:id="@+id/cancel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/cancel_action"
-        android:background="?android:attr/selectableItemBackground"
-        />
-</LinearLayout>
diff --git a/res/layout/connection_error_banner.xml b/res/layout/connection_error_banner.xml
deleted file mode 100644
index 1e34302c1..000000000
--- a/res/layout/connection_error_banner.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- header area -->
-    <TextView android:id="@+id/connection_error_text"
-        style="?android:attr/listViewWhiteStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:gravity="center"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        android:textAppearance="?android:attr/textAppearanceSmallInverse"
-        android:background="@color/connection_error_banner" />
-
-</merge>
diff --git a/res/layout/insert_quick_response.xml b/res/layout/insert_quick_response.xml
deleted file mode 100644
index 887cb04b1..000000000
--- a/res/layout/insert_quick_response.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/quick_response_text"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:padding="9dip"
-    android:gravity="center_vertical"
-    android:lines="2"
-    android:ellipsize="end"
-    />
\ No newline at end of file
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
deleted file mode 100644
index 0f423b8a1..000000000
--- a/res/values-land/dimensions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- non-xlarge, landscape -->
-<resources>
-    <dimen name="mailbox_list_width">160dip</dimen>
-    <dimen name="message_list_width">160dip</dimen>
-    <dimen name="action_bar_account_name_max_width">100dip</dimen>
-    <dimen name="action_bar_mailbox_name_max_width">100dip</dimen>
-    <dimen name="action_bar_mailbox_name_left_margin">8dip</dimen>
-
-    <style name="SearchBar">
-        <item name="android:layout_width">360dip</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
-
-    <dimen name="compose_scrollview_width">800dip</dimen>
-</resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
deleted file mode 100644
index deb62c96e..000000000
--- a/res/values-land/styles.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <style name="action_bar_unread_count">
-        <item name="android:includeFontPadding">false</item>
-        <item name="android:textSize">30sp</item>
-        <item name="android:textColor">@color/text_ternary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
-        <item name="android:layout_width">32dip</item>
-        <item name="android:layout_height">24dip</item>
-        <item name="android:layout_marginLeft">8dip</item>
-        <item name="android:layout_marginRight">8dip</item>
-        <item name="android:padding">2dip</item>
-    </style>
-</resources>
diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml
deleted file mode 100644
index 279fbd790..000000000
--- a/res/values-port/dimensions.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- non-xlarge, portrait -->
-<resources>
-    <dimen name="mailbox_list_width">100dip</dimen>
-    <dimen name="message_list_width">100dip</dimen>
-    <dimen name="action_bar_account_name_max_width">100dip</dimen>
-    <dimen name="action_bar_mailbox_name_max_width">100dip</dimen>
-    <dimen name="action_bar_mailbox_name_left_margin">8dip</dimen>
-</resources>
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index 1ba14b685..ef396dc6f 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -46,8 +46,4 @@
     <dimen name="setup_padding_top">16dip</dimen>
     <dimen name="setup_padding_left">64dip</dimen>
     <dimen name="setup_padding_right">64dip</dimen>
-
-    <!-- Message list items -->
-    <dimen name="replystate_margin_top">3sp</dimen>
-    <dimen name="replystate_margin_right">16dip</dimen>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 52338942d..c9c263cca 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -16,11 +16,6 @@
 
 <!-- Specializations for tablet screens - most colors are in values/colors.xml -->
 <resources>
-    <!-- The headline at the top of every account settings fragments (in preferences) -->
-    <style name="accountSettingsHeadline">
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-    </style>
-
     <!-- The large headline at the top of every account setup screen -->
     <style name="accountSetupHeadline">
         <item name="android:textSize">30sp</item>
@@ -46,9 +41,4 @@
         <item name="android:layout_height">48sp</item>
         <item name="android:textSize">18sp</item>
     </style>
-
-    <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
-        <item name="android:layout_toRightOf">@+id/main_content"</item>
-        <item name="android:layout_alignParentRight">true</item>
-    </style>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9bbc2759e..6416d1dad 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -105,16 +105,6 @@
         <item>6</item>
     </string-array>
 
-    <!-- Auto-advance option values (DO NOT change the order.  Code assumes this order)-->
-    <string-array translatable="false" name="general_preference_auto_advance_values">
-        <!-- Move to newer -->
-        <item>newer</item>
-        <!-- Move to older -->
-        <item>older</item>
-        <!-- Move to message list -->
-        <item>list</item>
-    </string-array>
-
     <!-- Text Zoom options (DO NOT change the order.  Code assumes this order)-->
     <string-array name="general_preference_text_zoom_entries">
         <item>@string/general_preference_text_zoom_tiny</item>
@@ -133,27 +123,6 @@
         <item>huge</item>
     </string-array>
 
-    <!-- Arrays "mailbox_display_names" and "mailbox_display_icons" MUST match the order
-         of the types of mailboxes defined in EmailContent -->
-    <string-array name="mailbox_display_names" translatable="false">
-        <!-- TYPE_INBOX = 0 -->
-        <item>@string/mailbox_name_display_inbox</item>
-        <!-- TYPE_MAIL = 1 -->
-        <item></item>
-        <!-- TYPE_PARENT = 2 -->
-        <item></item>
-        <!-- TYPE_DRAFTS = 3 -->
-        <item>@string/mailbox_name_display_drafts</item>
-        <!-- TYPE_OUTBOX = 4 -->
-        <item>@string/mailbox_name_display_outbox</item>
-        <!-- TYPE_SENT = 5 -->
-        <item>@string/mailbox_name_display_sent</item>
-        <!-- TYPE_TRASH = 6 -->
-        <item>@string/mailbox_name_display_trash</item>
-        <!-- TYPE_JUNK = 7 -->
-        <item>@string/mailbox_name_display_junk</item>
-    </string-array>
-
     <!-- A small number of default quick responses -->
     <string-array name="default_quick_responses">
         <item>@string/quick_1</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index bd6292462..d2011aac8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,10 +17,6 @@
 <!-- Defines attributes for custom views -->
 
 <resources>
-    <declare-styleable name="SizeBoundingFrameLayout_attributes">
-        <attr name="maxWidth" format="dimension"/>
-        <attr name="maxHeight" format="dimension"/>
-    </declare-styleable>
     <declare-styleable name="EmailServiceInfo">
         <attr name="protocol" format="string"/>
         <attr name="name" format="string"/>
diff --git a/res/values/build_number.xml b/res/values/build_number.xml
deleted file mode 100644
index 9c414d2a2..000000000
--- a/res/values/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-	<string name="build_number" translatable="false">20080722-0001</string>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a50494161..b15fb6590 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,12 +23,8 @@
     <color name="account_setup_label_text_color">#666666</color>
     <color name="account_setup_divider_color">#CCCCCC</color>
 
-    <!-- Main UI -->
-    <color name="connection_error_banner">#fffff1a8</color>
-
     <!-- Standard text colors -->
     <color name="text_secondary_color">#666666</color>
-    <color name="text_ternary_color">#aaaaaa</color>
 
     <!-- Account color chips on combined view -->
     <color name="combined_view_account_color_1">#ff71aea7</color>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 02cbbb1d9..531014f1a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -18,12 +18,6 @@
 
 <resources>
     <dimen name="button_minWidth">100sp</dimen>
-    <dimen name="message_list_item_height_wide">70sp</dimen>
-    <dimen name="message_list_item_height_normal">70sp</dimen>
-    <dimen name="message_list_item_color_tip_width">35dip</dimen>
-    <dimen name="message_list_item_color_tip_height">6dip</dimen>
-    <dimen name="message_list_badge_margin">4dip</dimen>
-    <dimen name="message_list_icon_padding_compensation">3dip</dimen>
 
     <!-- Account settings fragments -->
     <dimen name="settings_fragment_padding_top">16dip</dimen>
@@ -46,11 +40,6 @@
     <!-- Username/password entry -->
     <dimen name="setup_credentials_input_width">340dip</dimen>
 
-    <!-- Message list items -->
-    <dimen name="replystate_margin_left">8dip</dimen>
-    <dimen name="replystate_margin_right">0dip</dimen>
-    <dimen name="replystate_margin_top">10sp</dimen>
-
     <!-- Notification dialog -->
     <dimen name="dialog_text_size">10sp</dimen>
     <dimen name="dialog_padding_left">10sp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 77b0533e0..b4ae05087 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -34,8 +34,6 @@
 
     <!-- Name of application on Home screen -->
     <string name="app_name">Email</string>
-    <!-- Title of compose screen -->
-    <string name="compose_title">Compose</string>
     <!-- Title of debug screen -->
     <string name="debug_title">Debug</string>
 
@@ -50,79 +48,20 @@
     <string name="cancel_action">Cancel</string>
     <!-- Button name used to move to previous step during setup sequence [CHAR_LIMIT=16] -->
     <string name="previous_action">Previous</string>
-    <!-- Menu item/button name -->
-    <string name="send_action">Send</string>
-    <!-- Menu item/button name -->
-    <string name="reply_action">Reply</string>
-    <!-- Menu item/button name -->
-    <string name="reply_all_action">Reply all</string>
-    <!-- Menu item/button name -->
-    <string name="delete_action">Delete</string>
-    <!-- Menu item/button name -->
-    <string name="forward_action">Forward</string>
-    <!-- Menu/Button item name and label for marking a message as a favorite
-         (usually called starred) [CHAR LIMIT=40] -->
-    <string name="favorite_action">Star</string>
     <!--  Button name used to complete a multi-step process -->
     <string name="done_action">Done</string>
     <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
     <string name="create_action">Create new</string>
-    <!--  Button name used to delete a quick response [CHAR_LIMIT=16] -->
-    <string name="delete_quick_response_action">Delete</string>
     <!-- Message informing user when a list that would contain quick responses
             is empty [CHAR_LIMIT=80] -->
     <string name="quick_responses_empty_view">No quick responses.</string>
-    <!-- Menu item/button name -->
-    <string name="discard_action">Discard</string>
-    <!-- Menu item/button name [CHAR_LIMIT=16] -->
-    <string name="save_draft_action">Save draft</string>
-    <!-- Menu item/button name. Pressing will insert previously saved text
-            into message body. [CHAR_LIMIT=24] -->
-    <string name="show_quick_text_list_dialog_action">Insert quick response</string>
-    <!-- Menu item/button name -->
-    <string name="read_action">Mark read</string>
-    <!-- Menu item/button name -->
-    <string name="unread_action">Mark unread</string>
-    <!-- Menu item/button name -->
-    <string name="set_star_action">Add star</string>
-    <!-- Menu item/button name -->
-    <string name="remove_star_action">Remove star</string>
-    <!-- Menu item -->
-    <string name="refresh_action">Refresh</string>
-    <!-- Menu item -->
-    <string name="compose_action">Compose</string>
-    <!-- Menu item/button name -->
-    <string name="search_action">Search</string>
     <!-- Menu item -->
     <string name="account_settings_action">Account settings</string>
-    <!-- Menu item for settings [CHAR LIMIT=40]-->
-    <string name="settings_action">Settings</string>
     <!-- Menu item: options for this mailbox. [CHAR LIMIT = 32] -->
     <string name="menu_folder_options">Sync options</string>
-    <!-- Menu item -->
-    <string name="mark_as_unread_action">Mark as unread</string>
-    <!-- Menu item for moving messages to folders [CHAR LIMIT=10] -->
-    <string name="move_action">Move</string>
-    <!-- Menu item label for adding CC/BCC fields on message compose. [CHAR LIMIT=20] -->
-    <string name="add_cc_bcc_menu">Add Cc/Bcc</string>
-    <!-- Menu item label for adding an attachment on message compose. [CHAR LIMIT=20] -->
-    <string name="add_file_attachment">Attach file</string>
-    <!-- Generic button [CHAR LIMIT=16] -->
-    <string name="close_action">Close</string>
-    <!-- Command shown on Outbox to send all pending messages [CHAR LIMIT=20] -->
-    <string name="message_list_send_pending_messages_action">Send all messages</string>
-    <!-- Appears in choose attachment dialog title -->
-    <string name="choose_attachment_dialog_title">Choose attachment</string>
-    <!-- Dialog title to select a mailbox to which the user moves messages [CHAR LIMIT=20] -->
-    <string name="move_to_folder_dialog_title">Move to</string>
-    <!-- Appears in message list view while messages are being loaded [CHAR LIMIT=260dip] -->
-    <string name="status_loading_messages">Loading messages\u2026</string>
     <!-- Appears in message list view when there's a network error. -->
     <!-- Also appears in a toast, in the message viewer, when there's a network error. -->
     <string name="status_network_error">Connection problem.</string>
-    <!-- Dialog text when we are unable to load the message for display -->
-    <string name="error_loading_message_body">Couldn\'t load the message text. The message
-        may be too large to view.</string>
     <!-- Text shown with dragged messages to indicate how many are being dragged [CHAR LIMIT=40]-->
     <plurals name="move_messages">
         <item quantity="one">Move message</item>
@@ -141,42 +80,6 @@
     <string name="cannot_move_special_mailboxes_toast">Messages in Drafts, Outbox, and Sent can\'t be
         moved.</string>
 
-    <!-- Notification message in notifications window when one account has
-         one or more new messages; e.g, "279 unread (someone@google.com)". -->
-    <plurals name="notification_new_one_account_fmt">
-        <!-- Case of one new message. -->
-        <item quantity="one"><xliff:g id="unread_message_count" example="1">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
-
-        <!-- Case of "few" (small number of) new messages. -->
-        <item quantity="few"><xliff:g id="unread_message_count" example="2">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
-
-        <!-- Case of a plural number of new messages. -->
-        <item quantity="other"><xliff:g id="unread_message_count" example="279">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
-    </plurals>
-
-    <!-- Notification message in notifications window when 2+ accounts have new mail; e.g, "in 3 accounts". -->
-    <plurals name="notification_new_multi_account_fmt">
-        <!-- Case of "few" (small number of) accounts with unread messages. -->
-        <item quantity="few">in <xliff:g id="number_accounts" example="2">%d</xliff:g> accounts</item>
-        <!-- Case of plural number of accounts with unread messages. -->
-        <item quantity="other">in <xliff:g id="number_accounts" example="10">%d</xliff:g> accounts</item>
-    </plurals>
-    <!-- String to indicate which account received a new message. [CHAR LIMIT=none] -->
-    <string name="notification_to_account">to <xliff:g id="receiver_name"
-            example="Main">%1$s</xliff:g></string>
-
-    <!-- Notification for multiple messages [CHAR LIMIT=60] -->
-    <string name="notification_multiple_new_messages_fmt">
-        <xliff:g example="2">%1$d</xliff:g> new messages</string>
-
-    <!-- Name given to "all accounts" in the account picker for shortcuts and widget [CHAR LIMIT=20] -->
-    <string name="account_name_display_all">All accounts</string>
-
-    <!-- The number of accounts configured. [CHAR LIMIT=16] -->
-    <plurals name="number_of_accounts">
-        <item quantity="one"><xliff:g id="num_accounts" example="1">%1$d</xliff:g> account</item>
-        <item quantity="other"><xliff:g id="num_accounts" example="2">%1$d</xliff:g> accounts</item>
-    </plurals>
     <!-- The next set of strings are used in local display and may be localized. -->
     <!-- In the UI, the inbox will be displayed with this name -->
     <string name="mailbox_name_display_inbox">Inbox</string>
@@ -194,20 +97,7 @@
     <string name="mailbox_name_display_starred">Starred</string>
     <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
     <string name="mailbox_name_display_unread">Unread</string>
-    <!-- In the shortcut/widget configuration UI, the label for selecting only the unread messages in an account's inbox [CHAR LIMIT=30] -->
-    <string name="picker_mailbox_name_all_unread">Inbox (unread)</string>
-    <!-- In the shortcut/widget configuration UI, the label for selecting all messages in an account's inbox [CHAR LIMIT=30] -->
-    <string name="picker_mailbox_name_all_inbox">Inbox (all)</string>
-    <!-- In the shortcut/widget configuration UI, use this for the "all accounts" account list item [CHAR LIMIT=30] -->
-    <string name="picker_combined_view_fmt">Combined view (<xliff:g id="count">%s</xliff:g>)</string>
-    <!-- Count of accounts; used in picker_combined_view_fmt -->
-    <plurals name="picker_combined_view_account_count">
-        <item quantity="one"  ><xliff:g id="account_count" example="1">%d</xliff:g> account</item>
-        <item quantity="other"><xliff:g id="account_count" example="9">%d</xliff:g> accounts</item>
-    </plurals>
 
-    <!-- Version number, shown only on debug screen -->
-    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
     <string name="debug_enable_debug_logging_label" translatable="false">
         Enable extra debug logging?</string>
@@ -245,197 +135,19 @@
     <!-- Label shown in the account selector to select "Combined view", which contains
          Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
     <string name="mailbox_list_account_selector_combined_view">Combined view</string>
-    <!-- Label shown in the account/mailbox selector to switch to the show all the top-level mailboxes. [CHAR LIMIT=30] -->
-    <string name="mailbox_list_account_selector_show_all_folders">Show all folders</string>
-    <!-- Account list header in the account/mailbox selector. [CHAR LIMIT=30] -->
-    <string name="mailbox_list_account_selector_account_header">Accounts</string>
-    <!-- Recent mailbox header in the account/mailbox selector. [CHAR LIMIT=30] -->
-    <string name="mailbox_list_account_selector_mailbox_header_fmt">
-        Recent folders (<xliff:g id="email_address">%s</xliff:g>)</string>
-
-    <!-- Mailbox list header for user folders [CHAR LIMIT=30] -->
-    <string name="mailbox_list_user_mailboxes">All folders</string>
-    <!-- Mailbox list header for recent folders [CHAR LIMIT=30] -->
-    <string name="mailbox_list_recent_mailboxes">Recent folders</string>
-
-    <!-- Announces the subject field for a message for users with accessibility requirements -->
-    <string name="message_subject_description">Subject</string>
-    <!-- Announces that a message has no sender or subject
-            to users with accessibility requirements -->
-    <string name="message_is_empty_description">No subject</string>
-    <!-- Appears at the bottom of list of messages; user selects to load more messages from that folder. -->
-    <string name="message_list_load_more_messages_action">Load more messages</string>
-    <!--  The number of messages that are currently selected for various operations such as
-          "delete message(s)" [CHAR LIMIT=32] -->
-    <plurals name="message_view_selected_message_count">
-        <item quantity="one"  ><xliff:g id="message_count" example="1">%d</xliff:g> selected</item>
-        <item quantity="other"><xliff:g id="message_count" example="9">%d</xliff:g> selected</item>
-    </plurals>
-    <!-- Message to show when there are no messages (emails) in the selected mailbox.
-         [CHAR LIMIT=26] -->
-    <string name="message_list_no_messages">No messages</string>
-    <!-- Hint text in To field -->
-    <string name="message_compose_to_hint">To</string>
-    <!-- Hint text in Cc field -->
-    <string name="message_compose_cc_hint">Cc</string>
-    <!-- Hint text in Bcc field -->
-    <string name="message_compose_bcc_hint">Bcc</string>
-    <!-- Hint text in Subject field -->
-    <string name="message_compose_subject_hint">Subject</string>
-    <!-- Label for From field [CHAR LIMIT=12] -->
-    <string name="message_compose_from_label">From:</string>
-    <!-- Label for To field [CHAR LIMIT=12] -->
-    <string name="to">To</string>
-    <!-- Label for Cc field [CHAR LIMIT=12] -->
-    <string name="cc">Cc</string>
-    <!-- Label for Bcc field [CHAR LIMIT=12] -->
-    <string name="bcc">Bcc</string>
-    <!-- Label for Subject field [CHAR LIMIT=12] -->
-    <string name="subject_hint">Subject</string>
-    <!-- Hint text in Message composer body field -->
-    <string name="body_hint">Compose email</string>
+
     <!-- Header for forwarded original messages -->
     <string name="message_compose_fwd_header_fmt">\n\n-------- Original Message --------\nSubject: <xliff:g id="subject">%1$s</xliff:g>\nFrom: <xliff:g id="sender">%2$s</xliff:g>\nTo: <xliff:g id="to">%3$s</xliff:g>\nCC: <xliff:g id="cc">%4$s</xliff:g>\n\n</string>
-    <!-- Header for replied-to messages -->
-    <string name="message_compose_reply_header_fmt">\n\n<xliff:g id="sender">%s</xliff:g> wrote:\n\n</string>
-    <!-- Heading that appears before forwarded text -->
-    <string name="message_compose_quoted_text_label">Include quoted text</string>
-    <!-- Label of checkbox to include original message in a forwarded/replied message
-         [CHAR_LIMIT=32] -->
-    <string name="message_compose_include_quoted_text_checkbox_label">Include text</string>
-    <!-- Toast that appears if you try to send with no recipients. -->
-    <string name="message_compose_error_no_recipients">Add at least one recipient.</string>
-    <!-- An address field contains invalid email addresses. -->
-    <string name="message_compose_error_invalid_email">Some email addresses are invalid.</string>
-    <!-- Toast that appears when an attachment is too big to send. -->
-    <string name="message_compose_attachment_size">File too large to attach.</string>
     <!-- Title for dialog containing list of quick responses that user may insert
             into message body. [CHAR_LIMIT=30] -->
     <string name="message_compose_insert_quick_response_list_title">Insert quick response</string>
     <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
     <string name="message_compose_insert_quick_response_menu_title">Insert quick response</string>
-    <!-- Display name for composed message, indicating the destination of the message.
-      e.g. "John and 2 others" -->
-    <string name="message_compose_display_name"><xliff:g id="name" example="John">%1$s</xliff:g> and <xliff:g id="number" example="27">%2$d</xliff:g> others</string>
-    <!-- Label for To field in read message view -->
-    <string name="message_view_to_label">To:</string>
-    <!-- Label for CC field in read message view -->
-    <string name="message_view_cc_label">Cc:</string>
-    <string name="message_view_bcc_label">Bcc:</string>
-    <!-- Label for the date field. [CHAR LIMIT=20]-->
-    <string name="message_view_date_label">Date:</string>
-    <!-- Label for the from field. [CHAR LIMIT=20]-->
-    <string name="message_view_from_label">From:</string>
-    <!-- Label for the subject field. [CHAR LIMIT=20]-->
-    <string name="message_view_subject_label">Subject:</string>
-    <!-- Button name to view an attachment [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_view_action">View</string>
-    <!-- Button name to install an .apk attachment [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_install_action">Install</string>
-    <!-- Button name to play a media (i.e. audio/video) attachment [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_play_action">Play</string>
-    <!-- Button name, to load an attachment from the mail server [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_load_action">Load</string>
-    <!-- Button name, to show info about an attachment from the mail server [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_info_action">Info</string>
-    <!-- Button name, to save the attachment to SD card [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_save_action">Save</string>
-    <!-- Disabled button text to indicate an attachment has been saved [CHAR LIMIT=10] -->
-    <string name="message_view_attachment_saved">Saved</string>
-    <!-- Button name, to cancel a queued attachment download [CHAR LIMIT=10]-->
-    <string name="message_view_attachment_cancel_action">Stop</string>
-    <!-- Toast after saving attachment [CHAR LIMIT=30] -->
-    <string name="message_view_status_attachment_saved">Attachment saved
-as <xliff:g id="filename">%s</xliff:g>.</string>
-    <!-- Toast after attachment could not be saved [CHAR LIMIT=30] -->
-    <string name="message_view_status_attachment_not_saved">Couldn\'t save attachment.</string>
     <!-- Toast upon using "send" when one or more attachments will need to be background loaded
       [CHAR LIMIT=none]-->
     <string name="message_view_attachment_background_load">One or more attachments in your
         forwarded message will be downloaded prior to sending.</string>
-    <!--Button on the message view screen to show the message content [CHAR LIMIT=16] -->
-    <string name="message_view_show_message_action">Message</string>
-    <!--Button on the message view screen to show the calendar invite [CHAR LIMIT=16] -->
-    <string name="message_view_show_invite_action">Invite</string>
-    <!--Button on the message view screen to show the attachments [CHAR LIMIT=16] -->
-    <plurals name="message_view_show_attachments_action">
-        <item quantity="one">Attachment <xliff:g id="num_attachment" example="1" >%1$d</xliff:g>
-            </item>
-        <item quantity="other">Attachments <xliff:g id="num_attachment" example="3" >%1$d</xliff:g>
-            </item>
-    </plurals>
-    <!-- Button on the message view screen to show the embedded pictures [CHAR LIMIT=16] -->
-    <string name="message_view_show_pictures_action">Show pictures</string>
-    <!-- Button on the message view screen to always show pictures from the given
-         sender [CHAR LIMIT=32] -->
-    <string name="message_view_always_show_pictures_button">Always show</string>
-    <!-- Prompt on the message view screen whether or not to always show pictures from the
-         given sender [CHAR LIMIT=80] -->
-    <string name="message_view_always_show_pictures_prompt"
-        >Always show pictures from this sender</string>
-    <!-- Confirmation toast to indicate that the user has chosen to always show
-         pictures from the given sender [CHAR LIMIT=160] -->
-    <string name="message_view_always_show_pictures_confirmation"
-      >Pictures from this sender will be shown automatically.</string>
-    <!-- Calendar invitation, label of the button to open in calendar [CHAR LIMIT=24] -->
-    <string name="message_view_invite_view">View in Calendar</string>
-    <!-- String shown with a calendar invitation. -->
-    <string name="message_view_invite_title">Calendar invite</string>
-    <!-- String shown with a calendar invitation. -->
-    <string name="message_view_invite_text">Going?</string>
-    <!-- Button text: Calendar invitation: Accept. The leading space is used for spacing -->
-    <string name="message_view_invite_accept">" Yes"</string>
-    <!-- Button text: Calendar invitation: Maybe. The leading space is used for spacing -->
-    <string name="message_view_invite_maybe">" Maybe"</string>
-    <!-- Button text: Calendar invitation: Decline. The leading space is used for spacing -->
-    <string name="message_view_invite_decline">" No"</string>
-    <!-- Toast shown following a meeting invite reply, accepted -->
-    <string name="message_view_invite_toast_yes">You\'ve accepted this invitation.</string>
-    <!-- Toast shown following a meeting invite reply, maybe -->
-    <string name="message_view_invite_toast_maybe">
-        You\'ve replied \"maybe\" to this invitation.</string>
-    <!-- Toast shown following a meeting invite reply, declined -->
-    <string name="message_view_invite_toast_no">You\'ve declined this invitation.</string>
-    <!--Confirmation dialog title shown when user tries to delete messages.  [CHAR LIMIT=16] -->
-    <!-- Link label to show to/cc/bcc of the curent message [CHAR LIMIT=32] -->
-    <string name="message_view_show_details">Show details</string>
-    <!-- Title of the dialog box to show to/cc/bcc of the message.  [CHAR LIMIT=32] -->
-    <string name="message_view_message_details_dialog_title">Message details</string>
-
-    <!-- Title for most attachment info dialogs [CHAR LIMIT=32] -->
-    <string name="attachment_info_dialog_default_title">Attachment info</string>
-    <!-- Title when Wi-Fi settings prevent attachments from downloading [CHAR LIMIT=32] -->
-    <string name="attachment_info_dialog_wifi_title">Wi-Fi connection required</string>
-    <!-- Text of button to launch the Wi-Fi settings activity [CHAR LIMIT=24] -->
-    <string name="attachment_info_wifi_settings">Wi-Fi settings</string>
-    <!-- Text of button to launch the application settings activity [CHAR LIMIT=24] -->
-    <string name="attachment_info_application_settings">App settings</string>
-    <!-- Message body when we don't know exactly why an attachment can't be shown -->
-    <string name="attachment_info_unknown">Can\'t open attachment.</string>
-    <!-- Message body when the attachment is suspected of being malware -->
-    <string name="attachment_info_malware">
-            You can\'t save or open this file because this type of attachment
-            might contain malicious software.</string>
-    <!-- Message body when the attachment can't be loaded due to security policy restrictions -->
-    <string name="attachment_info_policy">
-            This attachment can\'t be saved or opened because of
-            this account\'s security policies.</string>
-    <!-- Message body when the attachment can only be downloaded over Wi-Fi -->
-    <string name="attachment_info_wifi_only">
-            This attachment is too large to download over a mobile network.
-            You can download it the next time you connect to a Wi-Fi network.</string>
-    <!-- Message body when no activities can open the attachment -->
-    <string name="attachment_info_no_intent">
-            There is no installed app that can open this attachment.
-            Try downloading an appropriate app from Android Market.</string>
-    <!-- Message body when the attachment is an application, but, side loading is disabled -->
-    <string name="attachment_info_sideload_disabled">
-            This attachment is an app. You must check Unknown Sources
-            in Settings &gt; Apps before you can install it.</string>
-    <!-- Message body when the attachment is an application, and side loading is enabled -->
-    <string name="attachment_info_apk_install_disabled">
-            Apps can\'t be installed directly from email. First save
-            this app and then install it using the Downloads app.</string>
+
     <!-- Error banner when an attachment could not be downloaded due to a problem at the server
             [CHAR LIMIT=100] -->
     <string name="attachment_not_found">Couldn\'t download the attachment.</string>
@@ -444,41 +156,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
          data was received.) [CHAR LIMIT=none] -->
     <string name="message_decode_error">There was an error while decoding the message.</string>
 
-    <!-- Title of the EML viewer activity. [CHAR LIMIT=32] -->
-    <string name="eml_view_title">Viewing
-            <xliff:g id="filename" example="test.eml">%s</xliff:g></string>
-
-    <string name="message_delete_dialog_title"></string>
-    <!--Confirmation dialog text shown when user tries to delete messages.  [CHAR LIMIT=32] -->
-    <plurals name="message_delete_confirm">
-        <item quantity="one">Delete this message?</item>
-        <item quantity="other">Delete these messages?</item>
-    </plurals>
-    <!-- Toast shown briefly while deleting a message -->
-    <plurals name="message_deleted_toast">
-        <item quantity="one">Message deleted.</item>
-        <item quantity="other">Messages deleted.</item>
-    </plurals>
-    <!-- Toast shown briefly while deleting an unsent (draft) message -->
-    <string name="message_discarded_toast">Message discarded.</string>
-    <!-- Toast shown briefly while saving a draft -->
-    <string name="message_saved_toast">Message saved as draft.</string>
-    <!-- String that is displayed when the attachment could not be displayed. -->
-    <string name="message_view_display_attachment_toast">Can\'t display
-        attachment.</string>
-    <!-- String that is displayed when the attachment could not be loaded.[CHAR LIMIT=none] -->
-    <string name="message_view_load_attachment_failed_toast">Couldn\'t load attachment \"
-        <xliff:g id="filename">%s</xliff:g>\".</string>
-    <!-- String that is displayed when a long message is being parsed. [CHAR LIMIT=none] -->
-    <string name="message_view_parse_message_toast">Opening message\u2026</string>
-    <!-- Toast shown after moving a message to a different mailbox. [CHAR LIMIT=none]-->
-    <plurals name="message_moved_toast">
-        <item quantity="one"  ><xliff:g id="num_message" example="1" >%1$d</xliff:g>
-        message moved to <xliff:g id="mailbox_name" example="Inbox" >%2$s</xliff:g></item>
-        <item quantity="other"  ><xliff:g id="num_message" example="5" >%1$d</xliff:g>
-        messages moved to <xliff:g id="mailbox_name" example="Inbox" >%2$s</xliff:g></item>
-    </plurals>
-
     <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
     <string name="forward_download_failed_ticker">Couldn\'t forward one or more attachments.</string>
     <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
@@ -511,15 +188,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
         <item quantity="other"><xliff:g id="size_in_gigabytes" example="279">%d</xliff:g>GB</item>
     </plurals>
 
-    <!-- The label of the next button on the message view screen. -->
-    <string name="message_view_move_to_newer">Newer</string>
-    <!-- The label of the previous button on the message view screen. -->
-    <string name="message_view_move_to_older">Older</string>
-
-    <!-- A simple divider between subject and message snippet in the message list view
-        [CHAR LIMIT=4]-->
-    <string name="message_list_subject_snippet_divider">\u0020\u2014\u0020</string>
-
     <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
     <string name="account_setup_basics_title">Account setup</string>
     <!-- Headline of screen when setting up new email account (large text over divider)
@@ -532,9 +200,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="account_setup_basics_email_label">Email address</string>
     <!-- On "Set up email" screen, hint for account email password text field -->
     <string name="account_setup_basics_password_label">Password</string>
-    <!-- On "Set up email" screen, checkbox label for making the new account the default account -->
-    <string name="account_setup_basics_default_label">
-        Send email from this account by default</string>
     <!-- Button name on "Set up email" screen [CHAR LIMIT=20] -->
     <string name="account_setup_basics_manual_setup_action">Manual setup</string>
     <!-- Toast when we can't build a URI from the given email & password -->
@@ -589,20 +254,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- "Add new email account" screen, text that appears on screen -->
     <string name="account_setup_account_type_instructions">What type of account is this?</string>
 
-    <!-- Do Not Translate. "Add new email account" screen, button name in response to what
-         type of account this is -->
-    <string name="account_setup_account_type_pop_action" translatable="false">POP3</string>
-    <!-- Do Not Translate. "Add new email account" screen, button name in response to what
-         type of account this is -->
-    <string name="account_setup_account_type_imap_action" translatable="false">IMAP</string>
-    <!-- Do Not Translate. "Add new email account" screen, button name in response to what
-         type of account this is -->
-    <string name="account_setup_account_type_exchange_action" translatable="false">Exchange</string>
-    <!-- Do Not Translate. "Add new email account" screen, button name in
-         response to what type of account this is -->
-    <string name="account_setup_account_type_exchange_action_alternate"
-         translatable="false">Microsoft Exchange ActiveSync</string>
-
     <!-- "Incoming server settings" screen, title [CHAR LIMIT=45] -->
     <string name="account_setup_incoming_title">Account setup</string>
     <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
@@ -667,18 +318,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- On "Outgoing server settings" screen, label for text field -->
     <string name="account_setup_outgoing_password_label">Password</string>
 
-    <!-- Title of "Exchange server settings" screen [CHAR LIMIT=45] -->
-    <string name="account_setup_exchange_title">Account setup</string>
-    <!-- Headline of "Exchange server settings" screen (text over divider) [CHAR LIMIT=none] -->
-    <string name="account_setup_exchange_headline">Server settings</string>
-    <!-- On "Exchange" setup screen, the name of the server -->
-    <string name="account_setup_exchange_server_label">Server</string>
-    <!-- On "Exchange" setup screen, the domain\\username -->
-    <string name="account_setup_exchange_username_label">Domain\\Username</string>
-    <!-- On "Exchange" setup screen, the use-SSL checkbox label -->
-    <string name="account_setup_exchange_ssl_label">Use secure connection (SSL)</string>
-    <!-- On "Exchange" setup screen, the trust ssl certificates checkbox label -->
-    <string name="account_setup_exchange_trust_certificates_label">Accept all SSL certificates</string>
     <!-- On "Exchange" setup screen, a heading title for the current client certificate [CHAR LIMIT=50] -->
     <string name="account_setup_exchange_certificate_title">Client certificate</string>
     <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
@@ -995,23 +634,11 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="account_settings_ringtone">Choose ringtone</string>
     <!-- On Settings screen, section heading -->
     <string name="account_settings_servers">Server settings</string>
-    <!-- Title of Remove account confirmation dialog box -->
-    <string name="account_delete_dlg_title">Remove account</string>
-    <!-- Message of Remove account confirmation dialog box -->
-    <string name="account_delete_dlg_instructions_fmt">
-    The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from Email.</string>
-
-    <!-- On Settings screen, section heading for delete account [CHAR LIMIT=none] -->
-    <string name="account_settings_category_delete_account">Remove account</string>
-    <!-- On Settings screen, settings option for delete account [CHAR LIMIT=none] -->
-    <string name="account_settings_delete_account_label">Remove account</string>
 
     <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
     <string name="mailbox_settings_activity_title">Sync options</string>
     <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
     <string name="mailbox_settings_activity_title_with_mailbox">Sync options (<xliff:g id="mailboxx_name" example="Family">%s</xliff:g>)</string>
-    <!-- Mailbox "sync settings" preference header [CHAR LIMIT=none] -->
-    <string name="mailbox_preferences_header">Sync settings</string>
     <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
     <string name="mailbox_settings_sync_enabled_label">Sync this folder</string>
     <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
@@ -1035,24 +662,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- Dialog title for the choosing whether to show checkboxes or sender image [CHAR LIMIT=200] -->
     <string name="prefDialogTitle_conversationListIcon">Sender image</string>
 
-    <!-- Strings used for account shortcut picker -->
-    <!-- String displayed in launcher [CHAR_LIMIT=10] -->
-    <string name="account_shortcut_picker_name">Email account</string>
-    <!-- Title of the account list for the shortcut picker [CHAR_LIMIT=20] -->
-    <string name="account_shortcut_picker_title">Choose an account</string>
-    <!-- Title of mailbox list for the shortcut picker [CHAR_LIMIT=20] -->
-    <string name="mailbox_shortcut_picker_title">Select a folder</string>
-
-    <!-- Toast shown when the selected account no longer exists.  This is used when, for example,
-         a shotcut or a widget is stale and points at a deleted account.
-         [CHAR_LIMIT=none]-->
-    <string name="toast_account_not_found">Account wasn\'t found. It may have been removed.</string>
-
-    <!-- Toast shown when the selected folder no longer exists.  This is used when, for example,
-         a shotcut or a widget is stale and points at a deleted folder.
-         [CHAR_LIMIT=none]-->
-    <string name="toast_mailbox_not_found">Folder wasn\'t found. It may have been removed.</string>
-
     <!-- Message that appears when adding a Windows Live Hotmail Plus account -->
     <string name="provider_note_live">Only some \"Plus\" accounts include POP access
         allowing this program to connect. If you\'re not able to sign in with
@@ -1076,32 +685,12 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
     <string name="device_admin_description">Enables server-specified security policies</string>
 
-    <!-- Strings used for GAL access -->
-
-    <!-- Displayed in small separator in to/cc/bcc dropdowns, when searching GAL begins.
-         Example:  "Searching bigcompany.com..." -->
-    <string name="gal_searching_fmt">Searching <xliff:g id="domain">%s</xliff:g>\u2026</string>
-    <!-- Displayed in small separator in to/cc/bcc dropdowns, when searching GAL completes,
-         and all of the server results are being displayed.  Example:
-         "5 results from bigcompany.com..."  -->
-    <plurals name="gal_completed_fmt">
-        <!-- Case of one result from server. -->
-        <item quantity="one"><xliff:g id="results" example="1">%1$d</xliff:g> result
-        from <xliff:g id="domain">%2$s</xliff:g></item>
-
-        <!-- Case of multiple results from server -->
-        <item quantity="other"><xliff:g id="results" example="20">%1$d</xliff:g> results
-        from <xliff:g id="domain">%2$s</xliff:g></item>
-    </plurals>
-
     <!-- Settings activity title [CHAR LIMIT=40]-->
     <string name="settings_activity_title">Settings</string>
 
     <!-- General Preferences Screen -->
     <!-- Label in preferences header to describe general preferences [CHAR LIMIT=32] -->
     <string name="header_label_general_preferences">General settings</string>
-    <!-- First category in general preferences [CHAR LIMIT=64] -->
-    <string name="category_general_preferences">Application</string>
 
     <!-- General preference: Label of the setting for requiring confirmation before
          message deletion [CHAR LIMIT=32] -->
@@ -1152,38 +741,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- General preference:  Text zoom.  Value is "huge" (+2) [CHAR LIMIT=32] -->
     <string name="general_preference_text_zoom_huge">Huge</string>
 
-    <!-- Settings screen, summary for clearing the settings for the list of
-         senders to automatically show pictures for [CHAR LIMIT=160] -->
-    <string name="general_preferences_clear_trusted_senders_summary"
-        >Pictures in messages won\'t be shown automatically</string>
-
-    <!-- Generic string for "current position" / "total number" [CHAR LIMIT=12] -->
-    <string name="position_of_count"><xliff:g example="1">%1$d</xliff:g> of <xliff:g
-            example="12">%2$s</xliff:g></string>
-
-    <!-- Message shown during the first sync after an account is set up.  [CHAR LIMIT=NONE] -->
-    <string name="waitinf_for_sync_message_1">Waiting for sync</string>
-    <!-- Message shown during the first sync after an account is set up.  [CHAR LIMIT=NONE] -->
-    <string name="waitinf_for_sync_message_2">Your email will appear soon.</string>
-
-    <!-- Widget -->
-    <!-- Instruction for how to move to different widget views [CHAR LIMIT=20] -->
-    <string name="widget_other_views">Touch icon to change.</string>
-    <!-- Header for the "Combined Inbox" view (showing mail in all inboxes) [CHAR LIMIT=20] -->
-    <string name="widget_all_mail">Combined Inbox</string>
-    <!-- Header for the "Unread" widget view (showing all unread mail) [CHAR LIMIT=20] -->
-    <string name="widget_unread">Unread</string>
-    <!-- Header for the "Starred" widget view (showing all starred mail) [CHAR LIMIT=20] -->
-    <string name="widget_starred">Starred</string>
-    <!-- Shown when waiting for mail data to be loaded into the widget list view [CHAR LIMIT=20] -->
-    <string name="widget_loading">Loading\u2026</string>
-    <!-- Shown when no accounts are configured and the widget supports changing
-         on the fly [CHAR LIMIT=35] -->
-    <string name="widget_touch_to_configure">Touch to set up.</string>
-    <!-- Shown in a toast when no accounts are configured and the Email widget
-         cannot be created in the first place [CHAR LIMIT=none] -->
-    <string name="widget_no_accounts">You haven\'t set up an email account yet.</string>
-
     <!-- Generic string shown instead of regular numbers, when a number is larger than 999.
          This should not be altered if the original string ("999+") makes sense in the
          target language. Typical alternatives include "+999" and ">999".  [CHAR_LIMIT=4] -->
@@ -1192,28 +749,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- The hint used in the search box when searching all mailboxes [CHAR LIMIT=35] -->
     <string name="search_hint">Search email</string>
 
-    <!-- The hint used in the search box when searching a single mailbox [CHAR LIMIT=35] -->
-    <string name="search_mailbox_hint">Search <xliff:g example="Inbox">%1$s</xliff:g></string>
-
-    <!-- The title above the messages list when showing search results. [CHAR LIMIT=50] -->
-    <string name="search_header_text_fmt"
-          >Search results for \"<xliff:g example="search query">%1$s</xliff:g>\"</string>
-
-    <!-- A warning title to show to the user when search results are taking a long
-         time. [CHAR LIMIT=NONE] -->
-    <string name="search_slow_warning_title">Waiting for results</string>
-
-    <!-- A warning message to show to the user when search results are taking a long
-         time. [CHAR LIMIT=NONE] -->
-    <string name="search_slow_warning_message">Some servers may take a long time.</string>
-
-    <!-- Title shown on the action bar on the mailbox list screen. [CHAR LIMIT=16] -->
-    <string name="action_bar_mailbox_list_title">Folders</string>
-
-    <!-- A long placeholder string to be used in template XML files message_list_item_*.xml.
-         Used only in layout computation, and never actually exposed to the user. -->
-    <string name="long_string" translatable="false">looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong</string>
-
     <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
     <string name="policy_dont_allow_camera">Disallow use of the device\'s camera</string>
     <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
@@ -1263,7 +798,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="trash_folder_selection_title">Select server trash folder for <xliff:g id="account">%s</xliff:g></string>
     <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
     <string name="sent_folder_selection_title">Select server sent items folder for <xliff:g id="account">%s</xliff:g></string>
-    <string name="create_new_folder">Create folder</string>
     <string name="account_waiting_for_folders_msg">Loading folder list&#8230;</string>
 
     <!-- Feedback uri to be used when feedback is enabled -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4f79c127d..546d9a5e8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,12 +16,6 @@
 
 <!-- non-xlarge.  See also values-xlarge for specializations for xlarge screens -->
 <resources>
-    <!-- The headline at the top of every account settings fragments (in preferences) -->
-    <!-- TODO these are estimates for the phone UX - final sizes TBD -->
-    <style name="accountSettingsHeadline">
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-    </style>
-
     <!-- The large headline at the top of every account setup screen -->
     <!-- TODO these are estimates for the phone UX - final sizes TBD -->
     <style name="accountSetupHeadline">