Update strings for ash palette and rename options/settings files.

ash/common/system/chromeos/palette/palette_tray.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/palette/palette_tray.h"
 
 #include "ash/common/palette_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 54 matching lines @@
   explicit TitleView(PaletteTray* palette_tray) : palette_tray_(palette_tray) {
     auto& rb = ui::ResourceBundle::GetSharedInstance();
 
     auto* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     SetLayoutManager(box_layout);
     SetBorder(views::Border::CreateEmptyBorder(
         0, ash::kTrayPopupPaddingHorizontal, 0, 0));
 
     views::Label* text_label =
-        new views::Label(l10n_util::GetStringUTF16(IDS_ASH_PALETTE_TITLE));
+        new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE));
     text_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     text_label->SetFontList(rb.GetFontList(ui::ResourceBundle::BoldFont));
     AddChildView(text_label);
     box_layout->SetFlexForView(text_label, 1);
 
     help_button_ = new ash::TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_HELP,
                                                   IDS_ASH_STATUS_TRAY_HELP);
     help_button_->SetTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SHUTDOWN));
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP));
     AddChildView(help_button_);
 
     AddChildView(CreateSeparator(views::Separator::VERTICAL));
 
     settings_button_ = new ash::TrayPopupHeaderButton(
         this, IDR_AURA_UBER_TRAY_SETTINGS, IDS_ASH_STATUS_TRAY_SETTINGS);
     settings_button_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SETTINGS));
     AddChildView(settings_button_);
   }
@@ skipping 120 matching lines @@
 void PaletteTray::SessionStateChanged(
     SessionStateDelegate::SessionState state) {
   UpdateIconVisibility();
 }
 
 void PaletteTray::ClickedOutsideBubble() {
   bubble_.reset();
 }
 
 base::string16 PaletteTray::GetAccessibleNameForTray() {
-  return l10n_util::GetStringUTF16(IDS_ASH_PALETTE_TITLE);
+  return l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE);
 }
 
 void PaletteTray::HideBubbleWithView(const views::TrayBubbleView* bubble_view) {
   if (bubble_->bubble_view() == bubble_view)
     bubble_.reset();
 }
 
 void PaletteTray::BubbleViewDestroyed() {
   palette_tool_manager_->NotifyViewsDestroyed();
   SetDrawBackgroundAsActive(false);
@@ skipping 105 matching lines @@
       WmShell::Get()->GetSessionStateDelegate();
 
   SetVisible(!session_state_delegate->IsScreenLocked() &&
              session_state_delegate->GetSessionState() ==
                  SessionStateDelegate::SESSION_STATE_ACTIVE &&
              WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
                  LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash