brave · bbondy · Oct 30, 2018 · Oct 26, 2018 · Oct 26, 2018 · Oct 26, 2018
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -120,7 +120,6 @@ void BraveMainDelegate::PreSandboxStartup() {
 bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
   base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-  command_line.AppendSwitch(switches::kEnableTabAudioMuting);
   command_line.AppendSwitch(switches::kDisableDomainReliability);
   command_line.AppendSwitch(switches::kDisableChromeGoogleURLTrackingClient);
   command_line.AppendSwitch(switches::kNoPings);
@@ -129,7 +128,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
   enabled_features << features::kEnableEmojiContextMenu.name
     << "," << features::kDesktopPWAWindowing.name
     << "," << password_manager::features::kFillOnAccountSelect.name
-    << "," << extensions::features::kNewExtensionUpdaterService.name;
+    << "," << extensions_features::kNewExtensionUpdaterService.name;
 
   std::stringstream disabled_features;
   disabled_features << features::kSharedArrayBuffer.name

@@ -219,6 +219,9 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
           Brave OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>, as is <ph name="BEGIN_LINK_LINUX_OSS">&lt;a target="_blank" href="$2"&gt;</ph>Linux (Beta)<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
         </message>
       </if>
+      <message name="IDS_ABOUT_SAFETY_INFORMATION" desc="The safety label in the About box." translateable="false">
+        Not used in Brave. Placeholder to keep resource maps in sync.
+      </message>
       <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box." translateable="false">
         Not used in Brave. Placeholder to keep resource maps in sync. It expects one argument: <ph name="ARGUMENT">$1</ph>.
       </message>

@@ -12,6 +12,9 @@
   <message name="IDS_MEDIA_ROUTER_MENU_ITEM_TITLE" desc="Title of menu item for Media Router, which appears in the overflow menu and page contextual menus.">
     &amp;Cast...
   </message>
+  <message name="IDS_MEDIA_ROUTER_CAST_DIALOG_TITLE" desc="Title of the dialog with which users can cast media contents to Bravecast and other devices. This text is shown at the top of the dialog on its own line, and should be considered a verb.">
+    Cast
+  </message>
 
   <!-- Button Titles -->
   <message name="IDS_MEDIA_ROUTER_BACK_BUTTON_TITLE" desc="Back button title, which is spoken when a screen reader is being used.">
@@ -29,6 +32,9 @@
   <message name="IDS_MEDIA_ROUTER_VIEW_DEVICE_LIST_BUTTON_TITLE" desc="View device list button title, which is spoken when a screen reader is being used.">
     View device list
   </message>
+  <message name="IDS_MEDIA_ROUTER_STOP_CASTING_BUTTON_ACCESSIBLE_NAME" desc="A label for the stop button that is read by screen readers when the button is in focus. It mentions device name and status to indicate which device the button is for.">
+    Stop, <ph name="SINK_NAME">$1<ex>Living Room TV</ex></ph>, <ph name="SINK_STATUS">$2<ex>Casting YouTube</ex></ph>
+  </message>
 
   <!-- Cast Modes -->
   <message name="IDS_MEDIA_ROUTER_AUTO_CAST_MODE" desc="Title for auto cast mode that appears as the header of a list of devices. This represents the mode that will be initially shown, if the list of sinks supports more than one of the cast modes below. Note that auto mode is not a real cast mode and merely serves as a proxy for the other cast modes. This is NOT shown as a dropdown option.">
@@ -86,6 +92,9 @@
   <message name="IDS_MEDIA_ROUTER_SHOWN_BY_POLICY" desc="Title of a menu item, which indicates that the Media Router action icon was added to the toolbar by the policy enabled by the user's administrator.">
     Added by your administrator
   </message>
+  <message name="IDS_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING" desc="Title of a menu item which, on click, toggles (enables or disables) the feature to optimize casting fullscreen videos to a Bravecast device. This menu item has a checkmark when the feature is enabled.">
+    Optimize fullscreen videos
+  </message>
 
   <!-- First Run Flow -->
   <message name="IDS_MEDIA_ROUTER_FIRST_RUN_FLOW_CLOUD_PREF_TEXT" desc="Text of the cloud services preferences text in the first run flow, which is shown to the user if they are currently signed in and have enabled sync.">
@@ -202,6 +211,9 @@
   <message name="IDS_MEDIA_ROUTER_STATUS_NO_DEVICES_FOUND" desc="Status text shown to indicate that no Cast device was found.">
     No devices found
   </message>
+  <message name="IDS_MEDIA_ROUTER_NO_DEVICES_FOUND_BUTTON" desc="The accessibility label that gets read by screen readers for a button shown when no Cast device was found. Clicking on the button opens a new tab.">
+    No devices found. Open a help center article in a new tab.
+  </message>
   <message name="IDS_MEDIA_ROUTER_DESTINATION_MISSING" desc="Link to display when no Cast destinations are found which, on click, opens a page to the Bravecast help center explaining possible reasons why none are detected.">
     No Cast destinations found. Need help?
   </message>

@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--This file is created by l10nUtil.js. Do not edit manually.-->
+<grit-part>
+  <!-- NUX email provider selection module -->
+  <message name="IDS_NUX_EMAIL_GET_STARTED" desc="Label for a confirmation button to finish adding a bookmark and get the user started with using the browser.">
+    Get started
+  </message>
+  <message name="IDS_NUX_EMAIL_PROMPT" desc="Text shown to prompt the users to select an email service to add as bookmark. This is the subheader for IDS_NUX_EMAIL_WELCOME_TITLE.">
+    Choose your email service for quick access
+  </message>
+  <message name="IDS_NUX_EMAIL_WELCOME_TITLE" desc="Text shown to welcome the users to chrome.">
+    Make Brave your own
+  </message>
+  <message name="IDS_NUX_EMAIL_BOOKMARK_ADDED" desc="String read for accessibility to inform the user a bookmark was added.">
+    Bookmark added
+  </message>
+  <message name="IDS_NUX_EMAIL_BOOKMARK_REMOVED" desc="String read for accessibility to inform the user a bookmark was removed.">
+    Bookmark removed
+  </message>
+  <message name="IDS_NUX_EMAIL_BOOKMARK_REPLACED" desc="String read for accessibility to inform the user a bookmark was replaced.">
+    Bookmark replaced
+  </message>
+
+  <!-- NUX Brave apps selection module -->
+  <message name="IDS_NUX_GOOGLE_APPS_GET_STARTED" desc="Message for a confirmation button that will add the selected apps from a list.">
+    Get started
+  </message>
+  <message name="IDS_NUX_GOOGLE_APPS_DESCRIPTION" desc="Description of what this section in the onboarding workflow does.">
+    Add bookmarks to your favorite Brave Apps
+  </message>
+  <message name="IDS_NUX_GOOGLE_APPS_DESCRIPTION_PROMO_BUBBLE" desc="Text shown when Brave Apps have been added to highlight where bookmarks have been placed.">
+    Open apps easily with bookmarks
+  </message>
+</grit-part>
@@ -13,7 +13,7 @@
 
   <!-- Print Preview -->
   <message name="IDS_PRINT_INVALID_PRINTER_SETTINGS" desc="Message to display when selected printer is not reachable or its settings are invalid.">
-    The selected printer is not available or not installed correctly.  Check your printer or try selecting another printer.
+    The selected printer is not available or not installed correctly. <ph name="BR">&lt;br&gt;</ph> Check your printer or try selecting another printer.
   </message>
 
   <if expr="enable_print_preview">
@@ -27,7 +27,7 @@
       Print preview failed.
     </message>
     <message name="IDS_PRINT_PREVIEW_UNSUPPORTED_CLOUD_PRINTER" desc="Message to display when an unsupported cloud printer is selected.">
-      The selected Brave Cloud Print device is no longer supported. Try setting up the printer in your computer's system settings.
+      The selected Brave Cloud Print device is no longer supported. <ph name="BR">&lt;br&gt;</ph> Try setting up the printer in your computer's system settings.
     </message>
     <message name="IDS_PRINT_PREVIEW_PRINT_BUTTON" desc="Print button.">
       Print
@@ -44,6 +44,9 @@
     <message name="IDS_PRINT_PREVIEW_OPTION_ALL_PAGES" desc="Option to print all pages.">
       All
     </message>
+    <message name="IDS_PRINT_PREVIEW_OPTION_CUSTOM_PAGES" desc="Option to print custom pages.">
+      Custom
+    </message>
     <message name="IDS_PRINT_PREVIEW_DESTINATION_LABEL" desc="Destination option label. It is displayed right on top of the available printers list.">
       Destination
     </message>
@@ -78,7 +81,7 @@
       Scale
     </message>
     <message name="IDS_PRINT_PREVIEW_PAGES_PER_SHEET_LABEL" desc="Pages per sheet option label.">
-      Pages Per Sheet
+      Pages per sheet
     </message>
     <message name="IDS_PRINT_PREVIEW_EXAMPLE_PAGE_RANGE_TEXT" desc="Example page range text.">
       e.g. 1-5, 8, 11-13
@@ -189,7 +192,7 @@
       <ph name="DPI">$1<ex>300</ex></ph> dpi
     </message>
     <message name="IDS_PRINT_PREVIEW_NATIVE_DIALOG" desc="Option offering the user to open the native print dialog, displayed when the PDF viewer is missing or when print preview fails.">
-      Print using system dialog…
+      Print using system dialog
     </message>
     <message name="IDS_PRINT_PREVIEW_DESTINATION_SEARCH_TITLE" desc="Title of the destination search UI component.">
       Select a destination
@@ -213,7 +216,7 @@
       Show All...
     </message>
     <message name="IDS_PRINT_PREVIEW_DESTINATION_COUNT" desc="Message to show how many print destinations the user has.">
-      (<ph name="COUNT">$1<ex>154</ex></ph> total)
+      (<ph name="COUNT">$1<ex>154</ex></ph>)
     </message>
     <message name="IDS_PRINT_PREVIEW_RECENT_DESTINATIONS_TITLE" desc="Title of the section in the Print Preview dialog that lists recently used printers that the user can print to. 'Destinations' is used because the list may include 'Saving as PDF' or other options that are not physical printers.">
       Recent Destinations
@@ -278,6 +281,9 @@
     <message name="IDS_PRINT_PREVIEW_SHOW_ADVANCED_OPTIONS" desc="The text for the button to open the printer's advanced settings dialog.">
       Change printer options...
     </message>
+    <message name="IDS_PRINT_PREVIEW_NEW_SHOW_ADVANCED_OPTIONS" desc="The text for the button to open the printer's advanced settings dialog in the new UI.">
+      Advanced printer options
+    </message>
     <message name="IDS_PRINT_PREVIEW_ACCEPT_INVITE" desc="Text for the button to accept the printer-sharing invitation.">
       Accept
     </message>
@@ -299,12 +305,18 @@
     <message name="IDS_PRINT_PREVIEW_BUTTON_GO_BACK" desc="Label for a button in a dialog asking a user to confirm selection of a printer in print preview UI. Clicking the button will cancel printer selection, close the dialog and go back to the list of printers available for selection.">
       Back
     </message>
+    <message name="IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_DIALOG_TITLE" desc="Title of the dialog used to resolve extension destination USB permissions.">
+      Extension printers
+    </message>
     <message name="IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_PERMISSION_MESSAGE" desc="Warning shown to the user when they attempt to select a USB printer supported by an extension, but for which the extension doesn't yet have access permission. The user is warned that selecting the printer would grant the extension access to the USB device and asked to confirm or cancel the selection. The extension name will be shown in the paragraph immediately bellow this message.">
       By selecting this printer, you are giving the following extension the permission to access your printer:
     </message>
     <message name="IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_ERROR_MESSAGE" desc="Message shown to the user when they attempt to select a USB pinter supported by an extension, but for which the extension does not yet have access permission. The message is shown if the user grants the extension access to the USB device (by confirming printer selection), but the extension is not able to retrieve information about the printer, and an error is reported. The message contains a placeholder for the name of the extension.">
       <ph name="EXTENSION_NAME">$1<ex>Print app</ex></ph> could not communicate with this printer. Make sure the printer is plugged in and try again.
     </message>
+    <message name="IDS_PRINT_PREVIEW_MANAGED_OPTION_TEXT" desc="Text shown when hovering over managed setting icon">
+      This setting is managed
+    </message>
     <if expr="chromeos">
       <message name="IDS_PRINT_CONFIGURING_IN_PROGRESS_TEXT" desc="Message shown to user while their printer is being setup in Brave OS.">
         Setting up

@@ -51,21 +51,9 @@
     People
   </message>
   <if expr="is_macosx">
-    <message name="IDS_PROFILES_BUBBLE_ACCESSIBLE_NAME" desc="Title of the avatar bubble menu for accessibility">
-      Switch Users
-    </message>
-    <message name="IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION" desc="The help text for the avatar bubble.">
-      Switch to a different user.
-    </message>
     <message name="IDS_PROFILES_CREATE_NEW_PROFILE_OPTION" desc="In Title Case. Create new profile menu item and button title.">
       Add Person...
     </message>
-    <message name="IDS_PROFILES_NEW_AVATAR_BUTTON_ACCESSIBLE_NAME" desc="Title of the avatar button for accessibility">
-      <ph name="PROFILE_NAME">$1<ex>User</ex></ph> Switch person
-    </message>
-    <message name="IDS_PROFILES_ACCOUNT_BUTTON_AUTH_ERROR_ACCESSIBLE_NAME" desc="Title of the avatar button for accessibility">
-      <ph name="PROFILE_NAME">$1<ex>User</ex></ph>: sign in error
-    </message>
   </if>
   <message name="IDS_PROFILES_PROFILE_SIGNOUT_BUTTON" desc="Button in the avatar menu bubble view to sign-out the current profile.">
     Exit and childlock
@@ -119,7 +107,7 @@
     Payment methods
   </message>
   <message name="IDS_PROFILES_ADDRESSES_LINK" desc="Text of the menu item leading to the list of autofill addresses.">
-    Addresses
+    Addresses and more
   </message>
   <if expr="not use_titlecase">
     <message name="IDS_PROFILES_DICE_SIGNIN_WITH_ANOTHER_ACCOUNT_BUTTON" desc="Button to sign in and turn on Sync with another web account.">

diff --git a/app/resources/brave_generated_resources_am.xtb b/app/resources/brave_generated_resources_am.xtb
@@ -1,4 +1,53 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="am">
+<translation id="3333887201479867589">የብሬቭ ሽልማት</translation>
+<translation id="7942180974165298215">ብሬቭ ኣድ ብሎክ</translation>
+<translation id="7450557937477381864">ክሮም ዝጋ</translation>
+<translation id="7008934821596358692">ማስተላለፍ ለመጨረስ፣ ሁሉኑም የክሮም ዊንደው ይዝጉ፡፡</translation>
+<translation id="7753103220327065417">ብሬቭ ይዝጉ</translation>
+<translation id="5588481533147090393">ኢምፖርቲንግ ለመጨረስ፣ ብሬቭ ዊንደው ይዘጉ፡፡</translation>
+<translation id="6447842834002726250">ኮኪስ</translation>
+<translation id="4983925687993168579">ሁነት</translation>
+<translation id="9173846700806833701">ዊንድቪን አልተገጠመም</translation>
+<translation id="2433569048491784801">ዊንድቬን አልተገጠመም፡፡</translation>
+<translation id="3699882589215410581">ዊንድቬን ገጥመው ይክፈቱ</translation>
+<translation id="8410111618231938546">Google Widevine የዲጂታል መብት አስተዳደር (DRM) አካል የሆነ ኮድ ሲሆን እኛ ብሬቭ ሶፍትዌር ባለቤትነት የሌለንና ምርመራ ማካሄድ አንችልም፡፡ Google Widevine ኮድ ከኛ ሰርቨር ሳይሆን ከ Google ሰርቨር ማግኘት ይችላሉ፡፡ የሚጀምረው ይህን አማራጭ ካበራቹህ ብቻ ነው፡፡ DRM እንዲጠቀሙ አናበረታታም፣ ቢሆንም የተጠቃሚዎቻችንን ምርጫ እናከብራለን እንዲሁም አንድ አንድ የብሬቭ ተጠቃሚዎች ይህን የሚጠይቅ አገልግሎት መጠቀም እንደሚፈልጉ እውቅና እነሰታለን፡፡
+
+ ይህን ቅጥያ ሲገጥሙ፣ በGoogle Widevine የአጠቃቀም ሕግ እየተስማሙ ነው፡፡ ከGoogle Widevine ሲጠቀሙ ለሚገጥሞት አደጋ ወይ የግንኙነት መቋረጥ ብሬቭ ሀላፊነት እንደማይወስድ ይስማማሉ፡፡</translation>
+<translation id="939305735877869636">ብሬቭ</translation>
+<translation id="3198814717959506569">ከብሬቭ ኢምፖርት የተደረገ</translation>
+<translation id="453977518730680921">ሚድያ አውቶፕለይ</translation>
+<translation id="410351446219883937">አውቶፕለይ</translation>
+<translation id="2240268017737062801">ድህረ ገፁ ሚድያ አውቶ ፕለይ ማድረግ ሲፈልግ ጠይቅ</translation>
+<translation id="3371702087847741961">ሳይት ሚድያ አውቶፕለይ ማድረግ ሲፈልግ ይጠይቁ (ይመከለራል)</translation>
+<translation id="3218385319396786393">በዚህ ገፅ ላይ አውቶፕለይ ይከላከሉ</translation>
+<translation id="4150684676757176434">አውቶለይ መከላከሉን ይቀጥል</translation>
+<translation id="2044383478723007273">የብሬቭ ቀለም</translation>
+<translation id="5341901626640816374">ሰፊ የአካባቢ ባር ይጠቀሙ</translation>
+<translation id="7965178729203412357">አዲስ ቶር ተለይቷል</translation>
+<translation id="8784924142044142231">ከቶር ይውጡ</translation>
+<translation id="5410152065859052603">ቶር</translation>
+<translation id="3696187925156352769">ቶር ዊንደው ይክፈቱ</translation>
+<translation id="3155170474926428993">ቶር ማስጀመርያ</translation>
+<translation id="7372129767729198111">የብሬቭ ጥበቃ ዲፎልት</translation>
+<translation id="8029018702721078742">የማሰወታወቅያ መቆጣጠርያ</translation>
+<translation id="3544462288910360084">ኩኪ መቆጣጠርያ</translation>
+<translation id="8919235146866304148">የጣት አሻራ ጥበቃ</translation>
+<translation id="520895744850022668">HTTPS ሁሉም ቦታ</translation>
+<translation id="5259716416204774556">ስክሪፕት መከላከል</translation>
+<translation id="6067014455220527258">ማስታወቅያ ይከላከሉ</translation>
+<translation id="6985711843506827936">ማስታወቅያና መከታተል ይፍቀዱ</translation>
+<translation id="6132506775968708399">የ3ኛ ወገን ኩኪ ይከላከሉ</translation>
+<translation id="5657156137487675418">ለሁሉም ኩኪ ይፍቀዱ</translation>
+<translation id="6883611015375728278">ሁሉን ኩኪ ይከላከሉ</translation>
+<translation id="1442559343076146186">3ኛ አካል የእጅ አሻራ ይከላከሉ</translation>
+<translation id="8034285923190068220">የጣት አሻራ ይፍቀዱ</translation>
+<translation id="4540198958192073185">ሁሉንም የጣት አሻራ ይከላከሉ</translation>
+<translation id="8942080017911802454">WebRTC IP ማስተዳደርያ ፖሊሲ</translation>
+<translation id="6165508094623778733">በተጨማሪ ይወቁ</translation>
+<translation id="8798099450830957504">ዲፎልት</translation>
+<translation id="1822560017823072927">ዲፎልት የጋራና የግል ኢንተርፈረንስ</translation>
+<translation id="5825943197137337319">የጋራ ዲፎልት አጠቃቀም መጋራት ብቻ</translation>
+<translation id="1689062823386843231">ሮክሲ የሌለው UDP ያጥፉ</translation>
 </translationbundle>