Window to Tab string change

 Bug: 5145162
 Part of this also involved unifying the wording between tablet and
 phones menu, which revealed some unused assets. Combined bookmark
 phone and tablet menus into one xml, with bool switches to turn
 items on/off as needed instead of having 2 very similar files

Change-Id: I700d5c5b3b7f9aefe9c96a0c79c140e3bf09ce6f
diff --git a/res/values-sw600dp/bools.xml b/res/values-sw600dp/bools.xml
index 3218656..50f87a7 100644
--- a/res/values-sw600dp/bools.xml
+++ b/res/values-sw600dp/bools.xml
@@ -13,4 +13,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <bool name="isTablet">true</bool>
+    <!-- Browser menu toggles -->
+    <bool name="menu_show_navigation">false</bool>
+    <bool name="menu_show_bookmarks">false</bool>
 </resources>
diff --git a/res/values-sw600dp/strings.xml b/res/values-sw600dp/strings.xml
deleted file mode 100644
index cb0d8a4..0000000
--- a/res/values-sw600dp/strings.xml
+++ /dev/null
@@ -1,39 +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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Name of menu item of a new tab.
-         Also used in the title bar when displaying a new tab [CHAR LIMIT=30] -->
-    <string name="new_tab">New tab</string>
-    <!-- Name of menu item of a new incognito tab.  Also used in the
-         title bar when displaying a new tab [CHAR LIMIT=30] -->
-    <string name="new_incognito_tab">New incognito tab</string>
-    <!-- Name of menu item which brings up a list of the currently active tabs -->
-    <string name="active_tabs">Tabs</string>
-    <!-- Context Menu item to open the currently selected link in a new
-         window. [CHAR LIMIT=30] -->
-    <string name="contextmenu_openlink_newwindow">Open in new tab</string>
-    <!-- Context Menu item to open the currently selected link in a new
-         background window. [CHAR LIMIT=50] -->
-    <string name="contextmenu_openlink_newwindow_background">Open in new background tab</string>
-    <!-- Context menu item to open every bookmark in a folder in new tabs [CHAR LIMIT=50] -->
-    <string name="open_all_in_new_window">Open all in new tabs</string>
-    <!-- Settings summary CHAR LIMIT=50]-->
-    <string name="pref_content_open_in_background_summary">Open new tabs behind the current one</string>
-    <!-- Recover tabs after a crash dialog title [CHAR LIMIT=32] -->
-    <string name="recover_title">Restore tabs?</string>
-    <!-- Recover tabs after a crash dialog prompt [CHAR LIMIT=none] -->
-    <string name="recover_prompt">Would you like to restore your browser tabs from last time?</string>
-</resources>