Cleanup STOPSHIPs in strings.xml

* cleaned out old placeholders
* moved a bunch of unused strings into placeholders
* moved three strings into active status.

Bug: 3335092
Change-Id: Ibb0690f7cc9ddd1b8f7f337964faff6471be880c

1 files changed, 20 insertions, 54 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4356ed4b..5e12b15b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,51 +19,21 @@
     <!-- Deprecated strings - Move the identifiers to this section, mark as DO NOT TRANSLATE,
          and remove the actual text.  These will be removed in a bulk operation. -->
     <!-- Do Not Translate.  Unused string. -->
-    <string name="account_setup_basics_email_hint" translatable="false"></string>
+    <string name="status_sending_messages"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="account_setup_basics_password_hint" translatable="false"></string>
+    <string name="message_list_send_pending_messages_action"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="account_settings_exchange_summary" translatable="false"></string>
+    <string name="message_view_fetching_attachment_toast"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="message_compose_attachments_skipped_toast" translatable="false"></string>
+    <string name="message_view_fetching_attachment_progress"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="status_loading_more" translatable="false"></string>
+    <string name="read_attachment_label"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="account_setup_check_settings_canceling_msg" translatable="false"></string>
+    <string name="read_attachment_desc"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="message_view_show_pictures_instructions" translatable="false"></string>
+    <string name="permission_access_provider_label"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="provider_note_yahoo" translatable="false"></string>
-    <!-- Do Not Translate.  Unused string. -->
-    <string name="provider_note_yahoo_uk" translatable="false"></string>
-    <!-- Do Not Translate.  Unused string. -->
-    <plurals name="notification_sender_name_multi_messages" translatable="false" />
-    <!-- Do Not Translate.  Unused string. -->
-    <plurals name="notification_num_new_messages_single_account" translatable="false" />
-    <!-- Do Not Translate.  Unused string. -->
-    <plurals name="notification_num_new_messages_multi_account" translatable="false" />
-
-    <!-- Messages that are not currently used, but will probably reused in the near future -->
-    <!-- STOPSHIP Remove them if they're not used after all -->
-    <!-- Appears in message list view of outbox while messages are being sent -->
-    <string name="status_sending_messages">Sending messages\u2026</string>
-    <!-- Command shown on Outbox to send all pending messages [CHAR_LIMIT=15] -->
-    <string name="message_list_send_pending_messages_action">Send all</string>
-    <!-- Toast while fetching attachment -->
-    <string name="message_view_fetching_attachment_toast">Fetching attachment.</string>
-    <!-- Appears progress dialog for fetching attachment -->
-    <string name="message_view_fetching_attachment_progress">Fetching attachment <xliff:g
-        id="filename">%s</xliff:g></string>
-    <!-- Permissions label for reading attachments -->
-    <string name="read_attachment_label">Read Email attachments</string>
-    <!-- Permissions description for reading attachments -->
-    <string name="read_attachment_desc">Allows this application to read your Email
-        attachments.</string>
-    <!-- Permissions label for accessing the main provider -->
-    <string name="permission_access_provider_label">Access Email provider data</string>
-    <!-- Permissions description for accessing the main provider -->
-    <string name="permission_access_provider_desc">Allows this application to access your Email
-        database, including received messages, sent messages, usernames and passwords.</string>
+    <string name="permission_access_provider_desc"></string>
 
     <!-- Name of application on Home screen -->
     <string name="app_name">Email</string>
@@ -164,6 +134,18 @@
         <item quantity="other">Move <xliff:g id="num_message" example="3">%1$d</xliff:g> messages
         </item>
     </plurals>
+    <!-- Toast shown when a message(s) can't be moved because it's not supported by the POP3
+        protocol. [CHAR LIMIT=none]-->
+    <string name="cannot_move_protocol_not_supported_toast">Move is not supported on POP3 accounts.
+        </string>
+    <!-- Toast shown when messages can't be moved because the selection contains multiple accounts'
+        messages. [CHAR LIMIT=none]-->
+    <string name="cannot_move_multiple_accounts_toast">Cannot move.  Selection contains multiple
+        accounts.</string>
+    <!-- Toast shown when messages can't be moved because they're in a special mailbox.  "Drafts",
+        "Outbox" and "Sent". [CHAR LIMIT=none]-->
+    <string name="cannot_move_special_mailboxes_toast">Messages in Drafts, Outbox and Sent cannot be
+        moved.</string>
 
     <!-- Notification message in notifications window when one account has
          one or more new messages; e.g, "279 unread (someone@google.com)". -->
@@ -1007,20 +989,4 @@ save attachment.</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>
 
-    <!--
-        Strings for temporary UI
-        STOPSHIP Remove them or move them up and make translatable
-    -->
-    <!-- Toast shown when a message(s) can't be moved because it's not supported
-         on the POP3 protocol. [CHAR LIMIT=none]-->
-    <string name="cannot_move_protocol_not_supported_toast" translatable="false">
-        Move is not supported on POP3 accounts.</string>
-    <!-- Toast shown when messages can't be moved because the selection contains
-         multiple accounts' messages. [CHAR LIMIT=none]-->
-    <string name="cannot_move_multiple_accounts_toast" translatable="false">
-        Cannot move.  Selection contains multiple accounts.</string>
-    <!-- Toast shown when messages can't be moved because they're in a special
-         mailbox.  Do not translate "Drafts", "Outbox" and "Sent". [CHAR LIMIT=none]-->
-    <string name="cannot_move_special_messages" translatable="false">
-        Messages in Drafts, Outbox and Sent cannot be moved.</string>
 </resources>