summaryrefslogtreecommitdiff
path: root/chromium/ash
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-11-21 14:09:57 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-11-29 15:14:36 +0100
commiteb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch)
tree2c7c940e1dbee81b89d935626110816b494aa32c /chromium/ash
parent9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff)
downloadqtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/ash')
-rw-r--r--chromium/ash/ash.gyp12
-rw-r--r--chromium/ash/ash_switches.cc13
-rw-r--r--chromium/ash/ash_switches.h6
-rw-r--r--chromium/ash/display/display_controller.cc61
-rw-r--r--chromium/ash/display/display_controller.h6
-rw-r--r--chromium/ash/display/display_controller_unittest.cc37
-rw-r--r--chromium/ash/display/display_info.cc15
-rw-r--r--chromium/ash/display/display_info.h8
-rw-r--r--chromium/ash/display/display_info_unittest.cc8
-rw-r--r--chromium/ash/display/display_manager.cc102
-rw-r--r--chromium/ash/display/display_manager.h8
-rw-r--r--chromium/ash/display/display_manager_unittest.cc57
-rw-r--r--chromium/ash/display/mouse_cursor_event_filter.cc7
-rw-r--r--chromium/ash/display/mouse_cursor_event_filter_unittest.cc4
-rw-r--r--chromium/ash/display/resolution_notification_controller_unittest.cc53
-rw-r--r--chromium/ash/display/screen_position_controller.cc4
-rw-r--r--chromium/ash/display/screen_position_controller_unittest.cc8
-rw-r--r--chromium/ash/extended_desktop_unittest.cc8
-rw-r--r--chromium/ash/keyboard_controller_proxy_stub.cc34
-rw-r--r--chromium/ash/keyboard_controller_proxy_stub.h33
-rw-r--r--chromium/ash/launcher/launcher_button.cc6
-rw-r--r--chromium/ash/launcher/launcher_view.cc8
-rw-r--r--chromium/ash/resources/ash_resources.grd9
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom.pngbin0 -> 94 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_left.pngbin0 -> 144 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_right.pngbin0 -> 152 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_center.pngbin0 -> 74 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_left.pngbin0 -> 91 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_right.pngbin0 -> 92 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top.pngbin0 -> 94 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_left.pngbin0 -> 128 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_right.pngbin0 -> 138 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.pngbin88 -> 89 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.pngbin125 -> 131 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.pngbin135 -> 141 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.pngbin74 -> 74 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.pngbin86 -> 85 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.pngbin89 -> 86 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.pngbin92 -> 87 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.pngbin118 -> 119 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.pngbin117 -> 125 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.pngbin88 -> 88 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.pngbin125 -> 103 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.pngbin135 -> 105 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.pngbin74 -> 74 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.pngbin86 -> 84 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.pngbin89 -> 83 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.pngbin92 -> 87 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.pngbin118 -> 103 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.pngbin125 -> 105 bytes
-rw-r--r--chromium/ash/resources/default_100_percent/cros/status/status_managed_mode_user.pngbin336 -> 3095 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom.pngbin0 -> 111 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_left.pngbin0 -> 241 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_right.pngbin0 -> 236 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_center.pngbin0 -> 76 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_left.pngbin0 -> 100 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_right.pngbin0 -> 103 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top.pngbin0 -> 101 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_left.pngbin0 -> 197 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_right.pngbin0 -> 212 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.pngbin104 -> 99 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.pngbin250 -> 181 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.pngbin247 -> 190 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.pngbin91 -> 76 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.pngbin112 -> 90 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.pngbin121 -> 93 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.pngbin102 -> 90 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.pngbin212 -> 159 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.pngbin236 -> 162 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.pngbin104 -> 91 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.pngbin240 -> 123 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.pngbin241 -> 125 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.pngbin91 -> 76 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.pngbin116 -> 88 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.pngbin125 -> 88 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.pngbin99 -> 90 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.pngbin201 -> 130 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.pngbin228 -> 127 bytes
-rw-r--r--chromium/ash/resources/default_200_percent/cros/status/status_managed_mode_user.pngbin668 -> 3432 bytes
-rw-r--r--chromium/ash/root_window_controller.cc46
-rw-r--r--chromium/ash/root_window_controller.h7
-rw-r--r--chromium/ash/root_window_controller_unittest.cc79
-rw-r--r--chromium/ash/shelf/shelf_layout_manager.cc144
-rw-r--r--chromium/ash/shelf/shelf_layout_manager.h20
-rw-r--r--chromium/ash/shelf/shelf_layout_manager_unittest.cc146
-rw-r--r--chromium/ash/shelf/shelf_widget.cc42
-rw-r--r--chromium/ash/shelf/shelf_widget.h8
-rw-r--r--chromium/ash/shell.cc4
-rw-r--r--chromium/ash/shell/shell_delegate_impl.cc33
-rw-r--r--chromium/ash/shell_window_ids.h39
-rw-r--r--chromium/ash/strings/ash_strings_am.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ar.xtb105
-rw-r--r--chromium/ash/strings/ash_strings_bg.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_bn.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ca.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_cs.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_da.xtb41
-rw-r--r--chromium/ash/strings/ash_strings_de.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_el.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_en-GB.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_es-419.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_es.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_et.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_fa.xtb101
-rw-r--r--chromium/ash/strings/ash_strings_fi.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_fil.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_fr.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_gu.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_hi.xtb49
-rw-r--r--chromium/ash/strings/ash_strings_hr.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_hu.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_id.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_it.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_iw.xtb123
-rw-r--r--chromium/ash/strings/ash_strings_ja.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_kn.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ko.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_lt.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_lv.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ml.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_mr.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ms.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_nl.xtb55
-rw-r--r--chromium/ash/strings/ash_strings_no.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_pl.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_pt-BR.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_pt-PT.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ro.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ru.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_sk.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_sl.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_sr.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_sv.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_sw.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_ta.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_te.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_th.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_tr.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_uk.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_vi.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_zh-CN.xtb37
-rw-r--r--chromium/ash/strings/ash_strings_zh-TW.xtb37
-rw-r--r--chromium/ash/system/chromeos/network/network_connect.cc36
-rw-r--r--chromium/ash/system/chromeos/network/network_connect.h2
-rw-r--r--chromium/ash/system/chromeos/network/network_icon.cc5
-rw-r--r--chromium/ash/system/chromeos/network/network_state_notifier.cc8
-rw-r--r--chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc5
-rw-r--r--chromium/ash/system/chromeos/network/sms_observer.h26
-rw-r--r--chromium/ash/system/chromeos/network/tray_sms.cc47
-rw-r--r--chromium/ash/system/chromeos/network/tray_sms.h11
-rw-r--r--chromium/ash/system/chromeos/settings/tray_settings.cc3
-rw-r--r--chromium/ash/system/logout_button/logout_button_tray.cc158
-rw-r--r--chromium/ash/system/logout_button/logout_button_tray.h62
-rw-r--r--chromium/ash/system/logout_button/tray_logout_button.cc168
-rw-r--r--chromium/ash/system/logout_button/tray_logout_button.h44
-rw-r--r--chromium/ash/system/status_area_widget.cc16
-rw-r--r--chromium/ash/system/status_area_widget.h5
-rw-r--r--chromium/ash/system/tray/system_tray.cc2
-rw-r--r--chromium/ash/system/tray/system_tray.h1
-rw-r--r--chromium/ash/system/tray/system_tray_delegate.h13
-rw-r--r--chromium/ash/system/tray/system_tray_notifier.cc13
-rw-r--r--chromium/ash/system/tray/system_tray_notifier.h7
-rw-r--r--chromium/ash/system/tray/test_system_tray_delegate.cc13
-rw-r--r--chromium/ash/system/tray/test_system_tray_delegate.h5
-rw-r--r--chromium/ash/system/tray/tray_background_view.h3
-rw-r--r--chromium/ash/system/tray/tray_constants.cc9
-rw-r--r--chromium/ash/system/tray/tray_constants.h4
-rw-r--r--chromium/ash/system/tray/tray_image_item.cc22
-rw-r--r--chromium/ash/system/tray/tray_image_item.h3
-rw-r--r--chromium/ash/system/user/tray_user.cc29
-rw-r--r--chromium/ash/system/web_notification/web_notification_tray.cc75
-rw-r--r--chromium/ash/system/web_notification/web_notification_tray.h1
-rw-r--r--chromium/ash/system/web_notification/web_notification_tray_unittest.cc119
-rw-r--r--chromium/ash/wm/boot_splash_screen.cc (renamed from chromium/ash/wm/boot_splash_screen_chromeos.cc)9
-rw-r--r--chromium/ash/wm/boot_splash_screen.h (renamed from chromium/ash/wm/boot_splash_screen_chromeos.h)8
-rw-r--r--chromium/ash/wm/dock/docked_window_layout_manager.cc350
-rw-r--r--chromium/ash/wm/dock/docked_window_layout_manager.h57
-rw-r--r--chromium/ash/wm/dock/docked_window_layout_manager_unittest.cc91
-rw-r--r--chromium/ash/wm/dock/docked_window_resizer.cc220
-rw-r--r--chromium/ash/wm/dock/docked_window_resizer.h25
-rw-r--r--chromium/ash/wm/dock/docked_window_resizer_unittest.cc56
-rw-r--r--chromium/ash/wm/event_client_impl.cc43
-rw-r--r--chromium/ash/wm/frame_painter.h2
-rw-r--r--chromium/ash/wm/frame_painter_unittest.cc58
-rw-r--r--chromium/ash/wm/panels/panel_layout_manager_unittest.cc2
-rw-r--r--chromium/ash/wm/status_area_layout_manager.cc2
-rw-r--r--chromium/ash/wm/window_animations.cc3
-rw-r--r--chromium/ash/wm/window_resizer.cc23
-rw-r--r--chromium/ash/wm/window_selector.cc8
-rw-r--r--chromium/ash/wm/window_selector.h2
-rw-r--r--chromium/ash/wm/window_util.cc22
-rw-r--r--chromium/ash/wm/window_util.h12
-rw-r--r--chromium/ash/wm/workspace/phantom_window_controller.cc92
-rw-r--r--chromium/ash/wm/workspace/phantom_window_controller.h41
-rw-r--r--chromium/ash/wm/workspace/workspace_layout_manager.cc34
-rw-r--r--chromium/ash/wm/workspace/workspace_layout_manager_unittest.cc9
-rw-r--r--chromium/ash/wm/workspace/workspace_window_resizer.cc26
-rw-r--r--chromium/ash/wm/workspace/workspace_window_resizer.h5
-rw-r--r--chromium/ash/wm/workspace/workspace_window_resizer_unittest.cc173
-rw-r--r--chromium/ash/wm/workspace_controller.cc2
-rw-r--r--chromium/ash/wm/workspace_controller_unittest.cc8
201 files changed, 2665 insertions, 2884 deletions
diff --git a/chromium/ash/ash.gyp b/chromium/ash/ash.gyp
index 2fba6f3122a..7a3f1be87e8 100644
--- a/chromium/ash/ash.gyp
+++ b/chromium/ash/ash.gyp
@@ -130,8 +130,6 @@
'host/root_window_host_factory.cc',
'host/root_window_host_factory.h',
'host/root_window_host_factory_win.cc',
- 'keyboard_controller_proxy_stub.cc',
- 'keyboard_controller_proxy_stub.h',
'keyboard_overlay/keyboard_overlay_delegate.cc',
'keyboard_overlay/keyboard_overlay_delegate.h',
'keyboard_overlay/keyboard_overlay_view.cc',
@@ -209,7 +207,7 @@
'system/brightness/brightness_observer.h',
'system/brightness/brightness_control_delegate.h',
'system/brightness/tray_brightness.cc',
- 'system/brightness/tray_brightness.h',
+ 'system/brightness/tray_brightness.h',
'system/chromeos/audio/tray_audio.cc',
'system/chromeos/audio/tray_audio.h',
'system/chromeos/enterprise/enterprise_domain_observer.h',
@@ -279,8 +277,8 @@
'system/locale/locale_notification_controller.cc',
'system/locale/locale_notification_controller.h',
'system/logout_button/logout_button_observer.h',
- 'system/logout_button/logout_button_tray.cc',
- 'system/logout_button/logout_button_tray.h',
+ 'system/logout_button/tray_logout_button.cc',
+ 'system/logout_button/tray_logout_button.h',
'system/monitor/tray_monitor.cc',
'system/monitor/tray_monitor.h',
'system/session_length_limit/session_length_limit_observer.h',
@@ -384,8 +382,8 @@
'wm/ash_focus_rules.h',
'wm/base_layout_manager.cc',
'wm/base_layout_manager.h',
- 'wm/boot_splash_screen_chromeos.cc',
- 'wm/boot_splash_screen_chromeos.h',
+ 'wm/boot_splash_screen.cc',
+ 'wm/boot_splash_screen.h',
'wm/capture_controller.cc',
'wm/capture_controller.h',
'wm/coordinate_conversion.cc',
diff --git a/chromium/ash/ash_switches.cc b/chromium/ash/ash_switches.cc
index c328b59ef35..b47ba5090d4 100644
--- a/chromium/ash/ash_switches.cc
+++ b/chromium/ash/ash_switches.cc
@@ -159,10 +159,6 @@ const char kAshTouchHud[] = "ash-touch-hud";
// crbug's [244983, 244990, 244994, 245005, 245012]
const char kAshUseAlternateShelfLayout[] = "ash-use-alternate-shelf";
-// Flags explicitly show or hide the shelf alignment menu.
-const char kShowShelfAlignmentMenu[] = "show-launcher-alignment-menu";
-const char kHideShelfAlignmentMenu[] = "hide-launcher-alignment-menu";
-
// Uses the 1st display in --ash-host-window-bounds as internal display.
// This is for debugging on linux desktop.
const char kAshUseFirstDisplayAsInternal[] =
@@ -191,12 +187,7 @@ const char kForcedMaximizeMode[] = "forced-maximize-mode";
bool UseAlternateShelfLayout() {
return CommandLine::ForCurrentProcess()->
- HasSwitch(ash::switches::kAshUseAlternateShelfLayout);
-}
-
-bool ShowShelfAlignmentMenu() {
- return CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kShowShelfAlignmentMenu);
+ HasSwitch(ash::switches::kAshUseAlternateShelfLayout);
}
#if defined(OS_CHROMEOS)
@@ -207,7 +198,7 @@ bool ShowAudioDeviceMenu() {
bool UseUsbChargerNotification() {
return !CommandLine::ForCurrentProcess()->
- HasSwitch(ash::switches::kAshDisableUsbChargerNotification);
+ HasSwitch(ash::switches::kAshDisableUsbChargerNotification);
}
#endif
diff --git a/chromium/ash/ash_switches.h b/chromium/ash/ash_switches.h
index df615b87f76..7e5d471339b 100644
--- a/chromium/ash/ash_switches.h
+++ b/chromium/ash/ash_switches.h
@@ -68,15 +68,9 @@ ASH_EXPORT extern const char kForceAshToDesktop[];
#endif
ASH_EXPORT extern const char kForcedMaximizeMode[];
-ASH_EXPORT extern const char kShowShelfAlignmentMenu[];
-ASH_EXPORT extern const char kHideShelfAlignmentMenu[];
-
// Returns true if the alternate shelf layout should be used.
ASH_EXPORT bool UseAlternateShelfLayout();
-// Returns true if side shelf alignment is enabled.
-ASH_EXPORT bool ShowShelfAlignmentMenu();
-
#if defined(OS_CHROMEOS)
// Returns true if new audio handler should be used.
ASH_EXPORT bool UseNewAudioHandler();
diff --git a/chromium/ash/display/display_controller.cc b/chromium/ash/display/display_controller.cc
index f0ac711e991..fce5a82ed46 100644
--- a/chromium/ash/display/display_controller.cc
+++ b/chromium/ash/display/display_controller.cc
@@ -288,14 +288,15 @@ int DisplayController::GetNumDisplays() {
}
void DisplayController::InitPrimaryDisplay() {
- const gfx::Display& primary_candidate =
+ const gfx::Display* primary_candidate =
GetDisplayManager()->GetPrimaryDisplayCandidate();
- primary_display_id = primary_candidate.id();
- AddRootWindowForDisplay(primary_candidate);
+ primary_display_id = primary_candidate->id();
+ AddRootWindowForDisplay(*primary_candidate);
}
void DisplayController::InitSecondaryDisplays() {
internal::DisplayManager* display_manager = GetDisplayManager();
+ UpdateDisplayBoundsForLayout();
for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
const gfx::Display& display = display_manager->GetDisplayAt(i);
if (primary_display_id != display.id()) {
@@ -303,6 +304,13 @@ void DisplayController::InitSecondaryDisplays() {
Shell::GetInstance()->InitRootWindowForSecondaryDisplay(root);
}
}
+ if (display_manager->GetNumDisplays() > 1) {
+ DisplayIdPair pair = GetCurrentDisplayIdPair();
+ DisplayLayout layout = GetCurrentDisplayLayout();
+ SetPrimaryDisplayId(
+ layout.primary_id == gfx::Display::kInvalidDisplayID ?
+ pair.first : layout.primary_id);
+ }
UpdateHostWindowNames();
}
@@ -379,7 +387,7 @@ void DisplayController::SetLayoutForCurrentDisplays(
if (GetDisplayManager()->GetNumDisplays() < 2)
return;
const gfx::Display& primary = GetPrimaryDisplay();
- const DisplayIdPair pair = GetDisplayManager()->GetCurrentDisplayIdPair();
+ const DisplayIdPair pair = GetCurrentDisplayIdPair();
// Invert if the primary was swapped.
DisplayLayout to_set = pair.first == primary.id() ?
layout_relative_to_primary : layout_relative_to_primary.Invert();
@@ -404,6 +412,40 @@ void DisplayController::SetLayoutForCurrentDisplays(
}
}
+DisplayLayout DisplayController::GetCurrentDisplayLayout() {
+ DCHECK_EQ(2U, GetDisplayManager()->num_connected_displays());
+ // Invert if the primary was swapped.
+ if (GetDisplayManager()->num_connected_displays() > 1) {
+ DisplayIdPair pair = GetCurrentDisplayIdPair();
+ return GetDisplayManager()->layout_store()->
+ ComputeDisplayLayoutForDisplayIdPair(pair);
+ }
+ NOTREACHED() << "DisplayLayout is requested for single display";
+ // On release build, just fallback to default instead of blowing up.
+ DisplayLayout layout =
+ GetDisplayManager()->layout_store()->default_display_layout();
+ layout.primary_id = primary_display_id;
+ return layout;
+}
+
+DisplayIdPair DisplayController::GetCurrentDisplayIdPair() const {
+ internal::DisplayManager* display_manager = GetDisplayManager();
+ const gfx::Display& primary = GetPrimaryDisplay();
+ if (display_manager->IsMirrored()) {
+ return std::make_pair(primary.id(),
+ display_manager->mirrored_display().id());
+ }
+
+ const gfx::Display& secondary = ScreenAsh::GetSecondaryDisplay();
+ if (primary.IsInternal() ||
+ GetDisplayManager()->first_display_id() == primary.id()) {
+ return std::make_pair(primary.id(), secondary.id());
+ } else {
+ // Display has been Swapped.
+ return std::make_pair(secondary.id(), primary.id());
+ }
+}
+
void DisplayController::ToggleMirrorMode() {
internal::DisplayManager* display_manager = GetDisplayManager();
if (display_manager->num_connected_displays() <= 1)
@@ -500,7 +542,7 @@ void DisplayController::SetPrimaryDisplay(
primary_display_id = new_primary_display.id();
GetDisplayManager()->layout_store()->UpdatePrimaryDisplayId(
- display_manager->GetCurrentDisplayIdPair(), primary_display_id);
+ GetCurrentDisplayIdPair(), primary_display_id);
UpdateWorkAreaOfDisplayNearestWindow(
primary_root, old_primary_display.GetWorkAreaInsets());
@@ -741,7 +783,7 @@ void DisplayController::PostDisplayConfigurationChange() {
internal::DisplayManager* display_manager = GetDisplayManager();
internal::DisplayLayoutStore* layout_store = display_manager->layout_store();
if (display_manager->num_connected_displays() > 1) {
- DisplayIdPair pair = display_manager->GetCurrentDisplayIdPair();
+ DisplayIdPair pair = GetCurrentDisplayIdPair();
layout_store->UpdateMirrorStatus(pair, display_manager->IsMirrored());
DisplayLayout layout = layout_store->GetRegisteredDisplayLayout(pair);
@@ -795,15 +837,14 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay(
}
void DisplayController::UpdateDisplayBoundsForLayout() {
- internal::DisplayManager* display_manager = GetDisplayManager();
if (Shell::GetScreen()->GetNumDisplays() < 2 ||
- display_manager->num_connected_displays() < 2) {
+ GetDisplayManager()->num_connected_displays() < 2) {
return;
}
DCHECK_EQ(2, Shell::GetScreen()->GetNumDisplays());
- const DisplayLayout layout = display_manager->GetCurrentDisplayLayout();
- display_manager->UpdateDisplayBoundsForLayoutById(
+ const DisplayLayout layout = GetCurrentDisplayLayout();
+ Shell::GetInstance()->display_manager()->UpdateDisplayBoundsForLayoutById(
layout, GetPrimaryDisplay(),
ScreenAsh::GetSecondaryDisplay().id());
}
diff --git a/chromium/ash/display/display_controller.h b/chromium/ash/display/display_controller.h
index 97620fc93b0..f67f27dfeaa 100644
--- a/chromium/ash/display/display_controller.h
+++ b/chromium/ash/display/display_controller.h
@@ -133,6 +133,12 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
// the locaion of the secondary display relative to the primary.
void SetLayoutForCurrentDisplays(const DisplayLayout& layout);
+ // Returns the display layout used for current displays.
+ DisplayLayout GetCurrentDisplayLayout();
+
+ // Returns the current display pair.
+ DisplayIdPair GetCurrentDisplayIdPair() const;
+
// Checks if the mouse pointer is on one of displays, and moves to
// the center of the nearest display if it's outside of all displays.
void EnsurePointerInDisplays();
diff --git a/chromium/ash/display/display_controller_unittest.cc b/chromium/ash/display/display_controller_unittest.cc
index 7e6a0480ec0..9131468c969 100644
--- a/chromium/ash/display/display_controller_unittest.cc
+++ b/chromium/ash/display/display_controller_unittest.cc
@@ -416,6 +416,31 @@ TEST_F(DisplayControllerTest, BoundsUpdated) {
EXPECT_EQ(0, observer.CountAndReset());
}
+TEST_F(DisplayControllerTest, MirroredLayout) {
+ if (!SupportsMultipleDisplays())
+ return;
+
+ DisplayController* display_controller =
+ Shell::GetInstance()->display_controller();
+ UpdateDisplay("500x500,400x400");
+ EXPECT_FALSE(display_controller->GetCurrentDisplayLayout().mirrored);
+ EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
+ EXPECT_EQ(
+ 2U, Shell::GetInstance()->display_manager()->num_connected_displays());
+
+ UpdateDisplay("1+0-500x500,1+0-500x500");
+ EXPECT_TRUE(display_controller->GetCurrentDisplayLayout().mirrored);
+ EXPECT_EQ(1, Shell::GetScreen()->GetNumDisplays());
+ EXPECT_EQ(
+ 2U, Shell::GetInstance()->display_manager()->num_connected_displays());
+
+ UpdateDisplay("500x500,500x500");
+ EXPECT_FALSE(display_controller->GetCurrentDisplayLayout().mirrored);
+ EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
+ EXPECT_EQ(
+ 2U, Shell::GetInstance()->display_manager()->num_connected_displays());
+}
+
TEST_F(DisplayControllerTest, InvertLayout) {
EXPECT_EQ("left, 0",
DisplayLayout(DisplayLayout::RIGHT, 0).Invert().ToString());
@@ -452,8 +477,6 @@ TEST_F(DisplayControllerTest, SwapPrimary) {
DisplayController* display_controller =
Shell::GetInstance()->display_controller();
- internal::DisplayManager* display_manager =
- Shell::GetInstance()->display_manager();
UpdateDisplay("200x200,300x300");
gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
@@ -483,12 +506,12 @@ TEST_F(DisplayControllerTest, SwapPrimary) {
EXPECT_EQ("200,0 300x300", secondary_display.bounds().ToString());
EXPECT_EQ("200,0 300x252", secondary_display.work_area().ToString());
EXPECT_EQ("right, 50",
- display_manager->GetCurrentDisplayLayout().ToString());
+ display_controller->GetCurrentDisplayLayout().ToString());
// Switch primary and secondary
display_controller->SetPrimaryDisplay(secondary_display);
const DisplayLayout& inverted_layout =
- display_manager->GetCurrentDisplayLayout();
+ display_controller->GetCurrentDisplayLayout();
EXPECT_EQ("left, -50", inverted_layout.ToString());
EXPECT_EQ(secondary_display.id(),
@@ -543,8 +566,6 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
DisplayController* display_controller =
Shell::GetInstance()->display_controller();
- internal::DisplayManager* display_manager =
- Shell::GetInstance()->display_manager();
UpdateDisplay("200x200,300x300");
gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
@@ -587,7 +608,7 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
EXPECT_FALSE(secondary_root->Contains(launcher_window));
const DisplayLayout& inverted_layout =
- display_manager->GetCurrentDisplayLayout();
+ display_controller->GetCurrentDisplayLayout();
EXPECT_EQ("left, -50", inverted_layout.ToString());
@@ -613,6 +634,8 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
EXPECT_FALSE(tracker.Contains(secondary_root));
EXPECT_TRUE(primary_root->Contains(launcher_window));
+ internal::DisplayManager* display_manager =
+ Shell::GetInstance()->display_manager();
// Adding 2nd display with the same ID. The 2nd display should become primary
// since secondary id is still stored as desirable_primary_id.
std::vector<internal::DisplayInfo> display_info_list;
diff --git a/chromium/ash/display/display_info.cc b/chromium/ash/display/display_info.cc
index 5e89a0d97f6..8f71e6d0c80 100644
--- a/chromium/ash/display/display_info.cc
+++ b/chromium/ash/display/display_info.cc
@@ -96,20 +96,6 @@ DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
&device_scale_factor) >= 4) {
bounds_in_pixel.SetRect(x, y, width, height);
}
-
- std::vector<Resolution> resolutions;
- if (Tokenize(main_spec, "#", &parts) == 2) {
- main_spec = parts[0];
- std::string resolution_list = parts[1];
- count = Tokenize(resolution_list, "|", &parts);
- for (size_t i = 0; i < count; ++i) {
- std::string resolution = parts[i];
- int width, height;
- if (sscanf(resolution.c_str(), "%dx%d", &width, &height) == 2)
- resolutions.push_back(Resolution(gfx::Size(width, height), false));
- }
- }
-
if (id == gfx::Display::kInvalidDisplayID)
id = synthesized_display_id++;
DisplayInfo display_info(
@@ -118,7 +104,6 @@ DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
display_info.set_rotation(rotation);
display_info.set_ui_scale(ui_scale);
display_info.SetBounds(bounds_in_pixel);
- display_info.set_resolutions(resolutions);
// To test the overscan, it creates the default 5% overscan.
if (has_overscan) {
diff --git a/chromium/ash/display/display_info.h b/chromium/ash/display/display_info.h
index 17ba5f6cfaa..899dd1541a2 100644
--- a/chromium/ash/display/display_info.h
+++ b/chromium/ash/display/display_info.h
@@ -36,8 +36,7 @@ class ASH_EXPORT DisplayInfo {
// whose size is 1440x800 at the location (100, 200) in host coordinates.
// The format is
//
- // [origin-]widthxheight[*device_scale_factor][#resolutions list]
- // [/<properties>][@ui-scale]
+ // [origin-]widthxheight[*device_scale_factor][/<properties>][@ui-scale]
//
// where [] are optional:
// - |origin| is given in x+y- format.
@@ -47,8 +46,6 @@ class ASH_EXPORT DisplayInfo {
// (to the 'r'ight) 'u' is 180 degrees ('u'pside-down) and 'l' is
// 270 degrees (to the 'l'eft).
// - ui-scale is floating value, e.g. @1.5 or @1.25.
- // - |resolution list| is the list of size that is given in
- // |width x height| separated by '|'.
//
// A couple of examples:
// "100x100"
@@ -64,9 +61,6 @@ class ASH_EXPORT DisplayInfo {
// "10+20-300x200/u@1.5"
// 300x200 window at 10,20 origin. 1x device scale factor.
// no overscan. flipped upside-down (180 degree) and 1.5 ui scale.
- // "200x100#300x200|200x100|100x100"
- // 200x100 window at 0,0 origin, with 3 possible resolutions,
- // 300x200, 200x100 and 100x100.
static DisplayInfo CreateFromSpec(const std::string& spec);
// Creates a DisplayInfo from string spec using given |id|.
diff --git a/chromium/ash/display/display_info_unittest.cc b/chromium/ash/display/display_info_unittest.cc
index 4e9768de049..d425046c89c 100644
--- a/chromium/ash/display/display_info_unittest.cc
+++ b/chromium/ash/display/display_info_unittest.cc
@@ -43,14 +43,6 @@ TEST_F(DisplayInfoTest, CreateFromSpec) {
EXPECT_EQ("10,20 300x400", info.bounds_in_pixel().ToString());
EXPECT_EQ(gfx::Display::ROTATE_270, info.rotation());
EXPECT_EQ(1.5f, info.ui_scale());
-
- info = DisplayInfo::CreateFromSpecWithID(
- "200x200#300x200|200x200|100x100", 10);
- EXPECT_EQ("0,0 200x200", info.bounds_in_pixel().ToString());
- EXPECT_EQ(3u, info.resolutions().size());
- EXPECT_EQ("300x200", info.resolutions()[0].size.ToString());
- EXPECT_EQ("200x200", info.resolutions()[1].size.ToString());
- EXPECT_EQ("100x100", info.resolutions()[2].size.ToString());
}
} // namespace internal
diff --git a/chromium/ash/display/display_manager.cc b/chromium/ash/display/display_manager.cc
index 8953fc8ab93..5943f99b189 100644
--- a/chromium/ash/display/display_manager.cc
+++ b/chromium/ash/display/display_manager.cc
@@ -72,14 +72,6 @@ struct DisplayInfoSortFunctor {
}
};
-struct ResolutionMatcher {
- ResolutionMatcher(const gfx::Size& size) : size(size) {}
- bool operator()(const Resolution& resolution) {
- return resolution.size == size;
- }
- gfx::Size size;
-};
-
struct ScaleComparator {
ScaleComparator(float s) : scale(s) {}
@@ -95,12 +87,6 @@ gfx::Display& GetInvalidDisplay() {
return *invalid_display;
}
-void MaybeInitInternalDisplay(int64 id) {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(switches::kAshUseFirstDisplayAsInternal))
- gfx::Display::SetInternalDisplayId(id);
-}
-
// Scoped objects used to either create or close the mirror window
// at specific timing.
class MirrorWindowCreator {
@@ -215,8 +201,9 @@ void DisplayManager::InitFromCommandLine() {
iter != parts.end(); ++iter) {
info_list.push_back(DisplayInfo::CreateFromSpec(*iter));
}
- if (info_list.size())
- MaybeInitInternalDisplay(info_list[0].id());
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ if (command_line->HasSwitch(switches::kAshUseFirstDisplayAsInternal))
+ gfx::Display::SetInternalDisplayId(info_list[0].id());
OnNativeDisplaysChanged(info_list);
}
@@ -249,38 +236,6 @@ bool DisplayManager::IsInternalDisplayId(int64 id) const {
return gfx::Display::InternalDisplayId() == id;
}
-DisplayLayout DisplayManager::GetCurrentDisplayLayout() {
- DCHECK_EQ(2U, num_connected_displays());
- // Invert if the primary was swapped.
- if (num_connected_displays() > 1) {
- DisplayIdPair pair = GetCurrentDisplayIdPair();
- return layout_store_->ComputeDisplayLayoutForDisplayIdPair(pair);
- }
- NOTREACHED() << "DisplayLayout is requested for single display";
- // On release build, just fallback to default instead of blowing up.
- DisplayLayout layout =
- layout_store_->default_display_layout();
- layout.primary_id = displays_[0].id();
- return layout;
-}
-
-DisplayIdPair DisplayManager::GetCurrentDisplayIdPair() const {
- if (IsMirrored()) {
- int64 mirrored_id = mirrored_display().id();
- return displays_[0].id() == mirrored_id ?
- std::make_pair(displays_[1].id(), mirrored_id) :
- std::make_pair(displays_[0].id(), mirrored_id);
- } else {
- int64 id_at_zero = displays_[0].id();
- if (id_at_zero == gfx::Display::InternalDisplayId() ||
- id_at_zero == first_display_id()) {
- return std::make_pair(id_at_zero, displays_[1].id());
- } else {
- return std::make_pair(displays_[1].id(), id_at_zero);
- }
- }
-}
-
const gfx::Display& DisplayManager::GetDisplayForId(int64 id) const {
gfx::Display* display =
const_cast<DisplayManager*>(this)->FindDisplayForId(id);
@@ -371,23 +326,7 @@ void DisplayManager::SetDisplayResolution(int64 display_id,
DCHECK_NE(gfx::Display::InternalDisplayId(), display_id);
if (gfx::Display::InternalDisplayId() == display_id)
return;
- const DisplayInfo& display_info = GetDisplayInfo(display_id);
- const std::vector<Resolution>& resolutions = display_info.resolutions();
- DCHECK_NE(0u, resolutions.size());
- std::vector<Resolution>::const_iterator iter =
- std::find_if(resolutions.begin(),
- resolutions.end(),
- ResolutionMatcher(resolution));
- if (iter == resolutions.end()) {
- LOG(WARNING) << "Unsupported resolution was requested:"
- << resolution.ToString();
- return;
- } else if (iter == resolutions.begin()) {
- // The best resolution was set, so forget it.
- resolutions_.erase(display_id);
- } else {
- resolutions_[display_id] = resolution;
- }
+ resolutions_[display_id] = resolution;
#if defined(OS_CHROMEOS) && defined(USE_X11)
if (base::chromeos::IsRunningOnChromeOS())
Shell::GetInstance()->output_configurator()->ScheduleConfigureOutputs();
@@ -456,7 +395,6 @@ void DisplayManager::OnNativeDisplaysChanged(
if (displays_.empty()) {
std::vector<DisplayInfo> init_displays;
init_displays.push_back(DisplayInfo::CreateFromSpec(std::string()));
- MaybeInitInternalDisplay(init_displays[0].id());
OnNativeDisplaysChanged(init_displays);
} else {
// Otherwise don't update the displays when all displays are disconnected.
@@ -704,13 +642,28 @@ const gfx::Display& DisplayManager::GetDisplayAt(size_t index) const {
return displays_[index];
}
-const gfx::Display& DisplayManager::GetPrimaryDisplayCandidate() const {
- if (GetNumDisplays() == 1) {
- return displays_[0];
+const gfx::Display* DisplayManager::GetPrimaryDisplayCandidate() const {
+ const gfx::Display* primary_candidate = &displays_[0];
+#if defined(OS_CHROMEOS)
+ if (base::chromeos::IsRunningOnChromeOS()) {
+ // On ChromeOS device, root windows are stacked vertically, and
+ // default primary is the one on top.
+ int count = GetNumDisplays();
+ int y = GetDisplayInfo(primary_candidate->id()).bounds_in_pixel().y();
+ for (int i = 1; i < count; ++i) {
+ const gfx::Display* display = &displays_[i];
+ const DisplayInfo& display_info = GetDisplayInfo(display->id());
+ if (display->IsInternal()) {
+ primary_candidate = display;
+ break;
+ } else if (display_info.bounds_in_pixel().y() < y) {
+ primary_candidate = display;
+ y = display_info.bounds_in_pixel().y();
+ }
+ }
}
- DisplayLayout layout = layout_store_->GetRegisteredDisplayLayout(
- GetCurrentDisplayIdPair());
- return GetDisplayForId(layout.primary_id);
+#endif
+ return primary_candidate;
}
size_t DisplayManager::GetNumDisplays() const {
@@ -780,7 +733,7 @@ void DisplayManager::SetMirrorMode(bool mirrored) {
void DisplayManager::AddRemoveDisplay() {
DCHECK(!displays_.empty());
std::vector<DisplayInfo> new_display_info_list;
- const DisplayInfo& first_display = GetDisplayInfo(displays_[0].id());
+ DisplayInfo first_display = GetDisplayInfo(displays_[0].id());
new_display_info_list.push_back(first_display);
// Add if there is only one display connected.
if (num_connected_displays() == 1) {
@@ -899,9 +852,6 @@ bool DisplayManager::UpdateSecondaryDisplayBoundsForLayout(
primary_index = 1;
secondary_index = 0;
}
- // This function may be called before the secondary display is
- // registered. The bounds is empty in that case and will
- // return true.
gfx::Rect bounds =
GetDisplayForId(displays->at(secondary_index).id()).bounds();
UpdateDisplayBoundsForLayout(
diff --git a/chromium/ash/display/display_manager.h b/chromium/ash/display/display_manager.h
index f7554a79705..24303e1909b 100644
--- a/chromium/ash/display/display_manager.h
+++ b/chromium/ash/display/display_manager.h
@@ -107,12 +107,6 @@ class ASH_EXPORT DisplayManager
bool IsInternalDisplayId(int64 id) const;
- // Returns the display layout used for current displays.
- DisplayLayout GetCurrentDisplayLayout();
-
- // Returns the current display pair.
- DisplayIdPair GetCurrentDisplayIdPair() const;
-
// Returns display for given |id|;
const gfx::Display& GetDisplayForId(int64 id) const;
@@ -176,7 +170,7 @@ class ASH_EXPORT DisplayManager
// no longer considered "primary".
const gfx::Display& GetDisplayAt(size_t index) const;
- const gfx::Display& GetPrimaryDisplayCandidate() const;
+ const gfx::Display* GetPrimaryDisplayCandidate() const;
// Returns the logical number of displays. This returns 1
// when displays are mirrored.
diff --git a/chromium/ash/display/display_manager_unittest.cc b/chromium/ash/display/display_manager_unittest.cc
index f7b6d1ded4f..33ca06e70d2 100644
--- a/chromium/ash/display/display_manager_unittest.cc
+++ b/chromium/ash/display/display_manager_unittest.cc
@@ -717,42 +717,6 @@ TEST_F(DisplayManagerTest, NativeDisplaysChangedAfterPrimaryChange) {
EXPECT_EQ("0,0 100x100", GetDisplayForId(10).bounds().ToString());
}
-TEST_F(DisplayManagerTest, DontRememberBestResolution) {
- int display_id = 1000;
- DisplayInfo native_display_info =
- CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
- std::vector<Resolution> resolutions;
- resolutions.push_back(Resolution(gfx::Size(1000, 500), false));
- resolutions.push_back(Resolution(gfx::Size(800, 300), false));
- resolutions.push_back(Resolution(gfx::Size(400, 500), false));
-
- native_display_info.set_resolutions(resolutions);
-
- std::vector<DisplayInfo> display_info_list;
- display_info_list.push_back(native_display_info);
- display_manager()->OnNativeDisplaysChanged(display_info_list);
-
- gfx::Size selected;
- EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
- display_id, &selected));
-
- // Unsupported resolution.
- display_manager()->SetDisplayResolution(display_id, gfx::Size(800, 4000));
- EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
- display_id, &selected));
-
- // Supported resolution.
- display_manager()->SetDisplayResolution(display_id, gfx::Size(800, 300));
- EXPECT_TRUE(display_manager()->GetSelectedResolutionForDisplayId(
- display_id, &selected));
- EXPECT_EQ("800x300", selected.ToString());
-
- // Best resolution.
- display_manager()->SetDisplayResolution(display_id, gfx::Size(1000, 500));
- EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
- display_id, &selected));
-}
-
TEST_F(DisplayManagerTest, Rotate) {
if (!SupportsMultipleDisplays())
return;
@@ -1027,26 +991,5 @@ TEST_F(DisplayManagerTest, SoftwareMirroring) {
Shell::GetScreen()->RemoveObserver(&display_observer);
}
-TEST_F(DisplayManagerTest, MirroredLayout) {
- if (!SupportsMultipleDisplays())
- return;
-
- DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- UpdateDisplay("500x500,400x400");
- EXPECT_FALSE(display_manager->GetCurrentDisplayLayout().mirrored);
- EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
- EXPECT_EQ(2U, display_manager->num_connected_displays());
-
- UpdateDisplay("1+0-500x500,1+0-500x500");
- EXPECT_TRUE(display_manager->GetCurrentDisplayLayout().mirrored);
- EXPECT_EQ(1, Shell::GetScreen()->GetNumDisplays());
- EXPECT_EQ(2U, display_manager->num_connected_displays());
-
- UpdateDisplay("500x500,500x500");
- EXPECT_FALSE(display_manager->GetCurrentDisplayLayout().mirrored);
- EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
- EXPECT_EQ(2U, display_manager->num_connected_displays());
-}
-
} // namespace internal
} // namespace ash
diff --git a/chromium/ash/display/mouse_cursor_event_filter.cc b/chromium/ash/display/mouse_cursor_event_filter.cc
index f3c3a746d47..419ea783207 100644
--- a/chromium/ash/display/mouse_cursor_event_filter.cc
+++ b/chromium/ash/display/mouse_cursor_event_filter.cc
@@ -5,7 +5,6 @@
#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/display/display_controller.h"
-#include "ash/display/display_manager.h"
#include "ash/display/mirror_window_controller.h"
#include "ash/display/shared_display_edge_indicator.h"
#include "ash/screen_ash.h"
@@ -58,7 +57,7 @@ void MouseCursorEventFilter::ShowSharedEdgeIndicator(
drag_source_root_ = from;
DisplayLayout::Position position = Shell::GetInstance()->
- display_manager()->GetCurrentDisplayLayout().position;
+ display_controller()->GetCurrentDisplayLayout().position;
if (position == DisplayLayout::TOP || position == DisplayLayout::BOTTOM)
UpdateHorizontalIndicatorWindowBounds();
else
@@ -159,7 +158,7 @@ void MouseCursorEventFilter::UpdateHorizontalIndicatorWindowBounds() {
Shell::GetScreen()->GetPrimaryDisplay().bounds();
const gfx::Rect secondary_bounds = ScreenAsh::GetSecondaryDisplay().bounds();
DisplayLayout::Position position = Shell::GetInstance()->
- display_manager()->GetCurrentDisplayLayout().position;
+ display_controller()->GetCurrentDisplayLayout().position;
src_indicator_bounds_.set_x(
std::max(primary_bounds.x(), secondary_bounds.x()));
@@ -188,7 +187,7 @@ void MouseCursorEventFilter::UpdateVerticalIndicatorWindowBounds() {
Shell::GetScreen()->GetPrimaryDisplay().bounds();
const gfx::Rect secondary_bounds = ScreenAsh::GetSecondaryDisplay().bounds();
DisplayLayout::Position position = Shell::GetInstance()->
- display_manager()->GetCurrentDisplayLayout().position;
+ display_controller()->GetCurrentDisplayLayout().position;
int upper_shared_y = std::max(primary_bounds.y(), secondary_bounds.y());
int lower_shared_y = std::min(primary_bounds.bottom(),
diff --git a/chromium/ash/display/mouse_cursor_event_filter_unittest.cc b/chromium/ash/display/mouse_cursor_event_filter_unittest.cc
index e4c1f554ed8..db4c5dc1c70 100644
--- a/chromium/ash/display/mouse_cursor_event_filter_unittest.cc
+++ b/chromium/ash/display/mouse_cursor_event_filter_unittest.cc
@@ -108,7 +108,7 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentSizeDisplays) {
Shell::GetInstance()->mouse_cursor_filter();
ASSERT_EQ(
DisplayLayout::RIGHT,
- Shell::GetInstance()->display_manager()->
+ Shell::GetInstance()->display_controller()->
GetCurrentDisplayLayout().position);
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ -143,7 +143,7 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentScaleDisplays) {
Shell::GetInstance()->mouse_cursor_filter();
ASSERT_EQ(
DisplayLayout::RIGHT,
- Shell::GetInstance()->display_manager()->
+ Shell::GetInstance()->display_controller()->
GetCurrentDisplayLayout().position);
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
diff --git a/chromium/ash/display/resolution_notification_controller_unittest.cc b/chromium/ash/display/resolution_notification_controller_unittest.cc
index 036cce0d85c..3a479f98fd3 100644
--- a/chromium/ash/display/resolution_notification_controller_unittest.cc
+++ b/chromium/ash/display/resolution_notification_controller_unittest.cc
@@ -43,18 +43,16 @@ class ResolutionNotificationControllerTest : public ash::test::AshTestBase {
// OnConfigurationChanged event won't be emitted in the test environment,
// so invoke UpdateDisplay() to emit that event explicitly.
- std::vector<DisplayInfo> info_list;
+ std::string display_spec;
for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
+ if (i > 0)
+ display_spec.append(",");
int64 id = display_manager->GetDisplayAt(i).id();
- DisplayInfo info = display_manager->GetDisplayInfo(id);
- if (display.id() == id) {
- gfx::Rect bounds = info.bounds_in_pixel();
- bounds.set_size(new_resolution);
- info.SetBounds(bounds);
- }
- info_list.push_back(info);
+ gfx::Size size = (display.id() == id) ?
+ new_resolution : display_manager->GetDisplayInfo(id).size_in_pixel();
+ display_spec.append(size.ToString());
}
- display_manager->OnNativeDisplaysChanged(info_list);
+ UpdateDisplay(display_spec);
RunAllPendingInMessageLoop();
}
@@ -106,7 +104,7 @@ TEST_F(ResolutionNotificationControllerTest, Basic) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300|200x200,250x250#250x250|200x200");
+ UpdateDisplay("100x100,150x150");
int64 id2 = ash::ScreenAsh::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -123,20 +121,21 @@ TEST_F(ResolutionNotificationControllerTest, Basic) {
display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
EXPECT_EQ("200x200", resolution.ToString());
- // Click the revert button, which reverts to the best resolution.
+ // Click the revert button, which reverts the resolution.
ClickOnNotificationButton(0);
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- EXPECT_FALSE(
+ EXPECT_TRUE(
display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("150x150", resolution.ToString());
}
TEST_F(ResolutionNotificationControllerTest, ClickMeansAccept) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300|200x200,250x250#250x250|200x200");
+ UpdateDisplay("100x100,150x150");
int64 id2 = ash::ScreenAsh::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -170,7 +169,7 @@ TEST_F(ResolutionNotificationControllerTest, AcceptButton) {
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
- UpdateDisplay("300x300#300x300|200x200");
+ UpdateDisplay("100x100");
const gfx::Display& display = ash::Shell::GetScreen()->GetPrimaryDisplay();
SetDisplayResolutionAndNotify(display, gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
@@ -187,7 +186,7 @@ TEST_F(ResolutionNotificationControllerTest, AcceptButton) {
EXPECT_EQ("200x200", resolution.ToString());
// In that case the second button is revert.
- UpdateDisplay("300x300#300x300|200x200");
+ UpdateDisplay("100x100");
SetDisplayResolutionAndNotify(display, gfx::Size(200, 200));
EXPECT_TRUE(IsNotificationVisible());
@@ -195,8 +194,9 @@ TEST_F(ResolutionNotificationControllerTest, AcceptButton) {
ClickOnNotificationButton(1);
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(1, accept_count());
- EXPECT_FALSE(display_manager->GetSelectedResolutionForDisplayId(
+ EXPECT_TRUE(display_manager->GetSelectedResolutionForDisplayId(
display.id(), &resolution));
+ EXPECT_EQ("100x100", resolution.ToString());
}
TEST_F(ResolutionNotificationControllerTest, Close) {
@@ -232,7 +232,7 @@ TEST_F(ResolutionNotificationControllerTest, Timeout) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300|200x200");
+ UpdateDisplay("100x100");
const gfx::Display& display = ash::Shell::GetScreen()->GetPrimaryDisplay();
SetDisplayResolutionAndNotify(display, gfx::Size(200, 200));
@@ -247,38 +247,39 @@ TEST_F(ResolutionNotificationControllerTest, Timeout) {
gfx::Size resolution;
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
- EXPECT_FALSE(display_manager->GetSelectedResolutionForDisplayId(
+ EXPECT_TRUE(display_manager->GetSelectedResolutionForDisplayId(
display.id(), &resolution));
+ EXPECT_EQ("100x100", resolution.ToString());
}
TEST_F(ResolutionNotificationControllerTest, DisplayDisconnected) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300|200x200,200x200#250x250|200x200|100x100");
+ UpdateDisplay("100x100,150x150");
int64 id2 = ash::ScreenAsh::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
SetDisplayResolutionAndNotify(
- ScreenAsh::GetSecondaryDisplay(), gfx::Size(100, 100));
+ ScreenAsh::GetSecondaryDisplay(), gfx::Size(200, 200));
ASSERT_TRUE(IsNotificationVisible());
// Disconnects the secondary display and verifies it doesn't cause crashes.
- UpdateDisplay("300x300#300x300|200x200");
+ UpdateDisplay("100x100");
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
gfx::Size resolution;
EXPECT_TRUE(
display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
- EXPECT_EQ("200x200", resolution.ToString());
+ EXPECT_EQ("150x150", resolution.ToString());
}
TEST_F(ResolutionNotificationControllerTest, MultipleResolutionChange) {
if (!SupportsMultipleDisplays())
return;
- UpdateDisplay("300x300#300x300|200x200,250x250#250x250|200x200");
+ UpdateDisplay("100x100,150x150");
int64 id2 = ash::ScreenAsh::GetSecondaryDisplay().id();
ash::internal::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
@@ -296,8 +297,9 @@ TEST_F(ResolutionNotificationControllerTest, MultipleResolutionChange) {
// visible.
SetDisplayResolutionAndNotify(
ScreenAsh::GetSecondaryDisplay(), gfx::Size(250, 250));
- EXPECT_FALSE(
+ EXPECT_TRUE(
display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("250x250", resolution.ToString());
// Then, click the revert button. Although |old_resolution| for the second
// SetDisplayResolutionAndNotify is 200x200, it should revert to the original
@@ -306,8 +308,9 @@ TEST_F(ResolutionNotificationControllerTest, MultipleResolutionChange) {
RunAllPendingInMessageLoop();
EXPECT_FALSE(IsNotificationVisible());
EXPECT_EQ(0, accept_count());
- EXPECT_FALSE(
+ EXPECT_TRUE(
display_manager->GetSelectedResolutionForDisplayId(id2, &resolution));
+ EXPECT_EQ("150x150", resolution.ToString());
}
} // namespace internal
diff --git a/chromium/ash/display/screen_position_controller.cc b/chromium/ash/display/screen_position_controller.cc
index 8c37efeebe4..03033b4135d 100644
--- a/chromium/ash/display/screen_position_controller.cc
+++ b/chromium/ash/display/screen_position_controller.cc
@@ -170,6 +170,10 @@ void ScreenPositionController::SetBounds(aura::Window* window,
aura::Window* dst_container = NULL;
if (dst_root != window->GetRootWindow()) {
int container_id = window->parent()->id();
+ // Dragging a docked window to another root window should show it floating
+ // rather than docked in another screen's dock.
+ if (container_id == kShellWindowId_DockedContainer)
+ container_id = kShellWindowId_DefaultContainer;
// All containers that uses screen coordinates must have valid window ids.
DCHECK_GE(container_id, 0);
// Don't move modal background.
diff --git a/chromium/ash/display/screen_position_controller_unittest.cc b/chromium/ash/display/screen_position_controller_unittest.cc
index 260590ac5d3..3b62f52b27b 100644
--- a/chromium/ash/display/screen_position_controller_unittest.cc
+++ b/chromium/ash/display/screen_position_controller_unittest.cc
@@ -34,11 +34,11 @@ namespace test {
namespace {
void SetSecondaryDisplayLayout(DisplayLayout::Position position) {
- DisplayLayout layout =
- Shell::GetInstance()->display_manager()->GetCurrentDisplayLayout();
+ DisplayController* display_controller =
+ Shell::GetInstance()->display_controller();
+ DisplayLayout layout = display_controller->GetCurrentDisplayLayout();
layout.position = position;
- Shell::GetInstance()->display_controller()->
- SetLayoutForCurrentDisplays(layout);
+ display_controller->SetLayoutForCurrentDisplays(layout);
}
internal::ScreenPositionController* GetScreenPositionController() {
diff --git a/chromium/ash/extended_desktop_unittest.cc b/chromium/ash/extended_desktop_unittest.cc
index d36e8240893..36161e046d0 100644
--- a/chromium/ash/extended_desktop_unittest.cc
+++ b/chromium/ash/extended_desktop_unittest.cc
@@ -36,11 +36,11 @@ namespace ash {
namespace {
void SetSecondaryDisplayLayout(DisplayLayout::Position position) {
- DisplayLayout layout =
- Shell::GetInstance()->display_manager()->GetCurrentDisplayLayout();
+ DisplayController* display_controller =
+ Shell::GetInstance()->display_controller();
+ DisplayLayout layout = display_controller->GetCurrentDisplayLayout();
layout.position = position;
- Shell::GetInstance()->display_controller()->
- SetLayoutForCurrentDisplays(layout);
+ display_controller->SetLayoutForCurrentDisplays(layout);
}
internal::DisplayManager* GetDisplayManager() {
diff --git a/chromium/ash/keyboard_controller_proxy_stub.cc b/chromium/ash/keyboard_controller_proxy_stub.cc
deleted file mode 100644
index caaa3dd8a2e..00000000000
--- a/chromium/ash/keyboard_controller_proxy_stub.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 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/keyboard_controller_proxy_stub.h"
-
-#include "ash/shell.h"
-#include "ui/views/corewm/input_method_event_filter.h"
-
-using namespace content;
-
-namespace ash {
-
-KeyboardControllerProxyStub::KeyboardControllerProxyStub() {
-}
-
-KeyboardControllerProxyStub::~KeyboardControllerProxyStub() {
-}
-
-BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() {
- return Shell::GetInstance()->browser_context();
-}
-
-ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() {
- return Shell::GetInstance()->input_method_filter()->input_method();
-}
-
-void KeyboardControllerProxyStub::RequestAudioInput(
- WebContents* web_contents,
- const MediaStreamRequest& request,
- const MediaResponseCallback& callback) {
-}
-
-} // namespace ash
diff --git a/chromium/ash/keyboard_controller_proxy_stub.h b/chromium/ash/keyboard_controller_proxy_stub.h
deleted file mode 100644
index 25310d71601..00000000000
--- a/chromium/ash/keyboard_controller_proxy_stub.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
-#define ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
-
-#include "ash/ash_export.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
-
-namespace ash {
-
-// Stub implementation of KeyboardControllerProxy
-class ASH_EXPORT KeyboardControllerProxyStub
- : public keyboard::KeyboardControllerProxy {
- public:
- KeyboardControllerProxyStub();
- virtual ~KeyboardControllerProxyStub();
-
- private:
- // Overridden from keyboard::KeyboardControllerProxy:
- virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
- virtual ui::InputMethod* GetInputMethod() OVERRIDE;
- virtual void RequestAudioInput(content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback) OVERRIDE;
-
- DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub);
-};
-
-} // namespace ash
-
-#endif // ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
diff --git a/chromium/ash/launcher/launcher_button.cc b/chromium/ash/launcher/launcher_button.cc
index 26677aef06a..2859d98c361 100644
--- a/chromium/ash/launcher/launcher_button.cc
+++ b/chromium/ash/launcher/launcher_button.cc
@@ -439,12 +439,6 @@ void LauncherButton::Layout() {
icon_width,
icon_height));
- // Icon size has been incorrect when running
- // PanelLayoutManagerTest.PanelAlignmentSecondDisplay on valgrind bot, see
- // http://crbug.com/234854.
- DCHECK_LE(icon_width, kIconSize);
- DCHECK_LE(icon_height, kIconSize);
-
bar_->SetBarBoundsRect(button_bounds);
UpdateState();
diff --git a/chromium/ash/launcher/launcher_view.cc b/chromium/ash/launcher/launcher_view.cc
index 1ec3e9461eb..82f75bed49e 100644
--- a/chromium/ash/launcher/launcher_view.cc
+++ b/chromium/ash/launcher/launcher_view.cc
@@ -1521,11 +1521,6 @@ void LauncherView::ButtonPressed(views::Button* sender,
case TYPE_TABBED:
case TYPE_APP_PANEL:
delegate_->ItemSelected(model_->items()[view_index], event);
- // Don't show the menu when the user creates a new browser using ctrl
- // click.
- if (model_->items()[view_index].type != TYPE_BROWSER_SHORTCUT ||
- !(event.flags() & ui::EF_CONTROL_DOWN))
- ShowListMenuForView(model_->items()[view_index], sender, event);
break;
case TYPE_APP_LIST:
@@ -1535,6 +1530,9 @@ void LauncherView::ButtonPressed(views::Button* sender,
break;
}
}
+
+ if (model_->items()[view_index].type != TYPE_APP_LIST)
+ ShowListMenuForView(model_->items()[view_index], sender, event);
}
bool LauncherView::ShowListMenuForView(const LauncherItem& item,
diff --git a/chromium/ash/resources/ash_resources.grd b/chromium/ash/resources/ash_resources.grd
index 991c895a8d0..166fe5f7fb4 100644
--- a/chromium/ash/resources/ash_resources.grd
+++ b/chromium/ash/resources/ash_resources.grd
@@ -113,6 +113,15 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_GUEST_ICON" file="cros/status/status_guest_icon.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_GUEST_ICON_LARGE" file="common/alt_launcher/status_guest_icon.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_BOTTOM" file="cros/status/status_logout_button_hover_bottom.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_BOTTOM_LEFT" file="cros/status/status_logout_button_hover_bottom_left.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_BOTTOM_RIGHT" file="cros/status/status_logout_button_hover_bottom_right.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_CENTER" file="cros/status/status_logout_button_hover_center.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_LEFT" file="cros/status/status_logout_button_hover_left.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_RIGHT" file="cros/status/status_logout_button_hover_right.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_TOP" file="cros/status/status_logout_button_hover_top.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_TOP_LEFT" file="cros/status/status_logout_button_hover_top_left.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_TOP_RIGHT" file="cros/status/status_logout_button_hover_top_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM" file="cros/status/status_logout_button_pushed_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT" file="cros/status/status_logout_button_pushed_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT" file="cros/status/status_logout_button_pushed_bottom_right.png" />
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom.png
new file mode 100644
index 00000000000..4bfbaeb55d3
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_left.png
new file mode 100644
index 00000000000..5a96fee74f6
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_right.png
new file mode 100644
index 00000000000..a5ddc1c7237
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_bottom_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_center.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_center.png
new file mode 100644
index 00000000000..18ef4f8bb84
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_center.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_left.png
new file mode 100644
index 00000000000..d806c99e202
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_right.png
new file mode 100644
index 00000000000..2baa507df09
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top.png
new file mode 100644
index 00000000000..2752a48b452
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_left.png
new file mode 100644
index 00000000000..71d450df94a
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_right.png
new file mode 100644
index 00000000000..3270b26e38a
--- /dev/null
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_hover_top_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png
index 48a9b785df4..76c31f3da51 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png
index ed08895c1dc..64dd932a5b3 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png
index 5c411664aba..4ece433cd11 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_bottom_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png
index 674a2caf3ed..18ef4f8bb84 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_center.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png
index 0ca8c152c87..5decc7d040f 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png
index 107f25ee038..22b08962394 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png
index 0c882a30355..8100431a445 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png
index a2885849256..acd66413134 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png
index ac7c0dffecc..63e7c5180b7 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_normal_top_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png
index 07b1a81db81..cb40232c22f 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png
index a0c58bbca50..59664ce57c8 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png
index f20a29d47e6..b6a2d429033 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_bottom_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png
index 948a9225cbc..95e1357234b 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_center.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png
index e896e8105e6..6ff819e654d 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png
index 47e1e4ba51f..c1e9dda476f 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png
index 6e304f22192..f2b8fc513a4 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png
index aecbe19888c..7aa3057f727 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png
index 535677029ef..6d610d5150b 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_logout_button_pushed_top_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png b/chromium/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png
index 51104172bbd..684702b6242 100644
--- a/chromium/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png
+++ b/chromium/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom.png
new file mode 100644
index 00000000000..d15cb08743a
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_left.png
new file mode 100644
index 00000000000..40de4bb4838
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_right.png
new file mode 100644
index 00000000000..216bffd3734
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_bottom_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_center.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_center.png
new file mode 100644
index 00000000000..eb3f2c83973
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_center.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_left.png
new file mode 100644
index 00000000000..bc35d9dc9c0
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_right.png
new file mode 100644
index 00000000000..55ae12825f8
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top.png
new file mode 100644
index 00000000000..a4b48b2e5dd
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_left.png
new file mode 100644
index 00000000000..8d3823c18aa
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_right.png
new file mode 100644
index 00000000000..b73cd7e0640
--- /dev/null
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_hover_top_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png
index 679ebe905cd..a6a2e668849 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png
index 7b615e65c83..47768bcdf8f 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png
index 149b4a9c5dd..3cd5993e361 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_bottom_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png
index 436c2ac18a1..eb3f2c83973 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_center.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png
index c58ee946b2e..dbc95d67135 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png
index 5f7d6500ff8..0dc53850876 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png
index cc114446f6a..6b9e0865411 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png
index 05dfa2f90cd..3d9ff7fb1fa 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png
index bf15dcdec00..6f263c28bb4 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_normal_top_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png
index 0e23e565c4c..211e85791c7 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png
index 79f2792aa6b..615d7ca5bf8 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png
index d6aa1a4f511..e9a05e16fb5 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_bottom_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png
index 41a39c92caf..22b0846c757 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_center.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png
index 1617280c4f7..6c22eee78ef 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png
index c5a5730fdfa..315bd16343b 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png
index b340b1bc287..e46313972a6 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png
index 787ef70d361..3dede73f9f9 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_left.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png
index 5d5f6349fa6..3d9e5d9adb2 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_logout_button_pushed_top_right.png
Binary files differ
diff --git a/chromium/ash/resources/default_200_percent/cros/status/status_managed_mode_user.png b/chromium/ash/resources/default_200_percent/cros/status/status_managed_mode_user.png
index b0b522db0a2..02eb311e8b8 100644
--- a/chromium/ash/resources/default_200_percent/cros/status/status_managed_mode_user.png
+++ b/chromium/ash/resources/default_200_percent/cros/status/status_managed_mode_user.png
Binary files differ
diff --git a/chromium/ash/root_window_controller.cc b/chromium/ash/root_window_controller.cc
index dd237436cff..e0c631ebf11 100644
--- a/chromium/ash/root_window_controller.cc
+++ b/chromium/ash/root_window_controller.cc
@@ -4,6 +4,7 @@
#include "ash/root_window_controller.h"
+#include <queue>
#include <vector>
#include "ash/ash_constants.h"
@@ -27,6 +28,7 @@
#include "ash/touch/touch_observer_hud.h"
#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/base_layout_manager.h"
+#include "ash/wm/boot_splash_screen.h"
#include "ash/wm/dock/docked_window_layout_manager.h"
#include "ash/wm/panels/panel_layout_manager.h"
#include "ash/wm/panels/panel_window_event_handler.h"
@@ -44,11 +46,13 @@
#include "base/command_line.h"
#include "base/time/time.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/drag_drop_client.h"
#include "ui/aura/client/tooltip_client.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_observer.h"
+#include "ui/aura/window_tracker.h"
#include "ui/base/hit_test.h"
#include "ui/base/models/menu_model.h"
#include "ui/gfx/screen.h"
@@ -59,20 +63,14 @@
#include "ui/views/view_model.h"
#include "ui/views/view_model_utils.h"
-#if defined(OS_CHROMEOS)
-#include "ash/wm/boot_splash_screen_chromeos.h"
-#endif
-
namespace ash {
namespace {
-#if defined(OS_CHROMEOS)
// Duration for the animation that hides the boot splash screen, in
// milliseconds. This should be short enough in relation to
// wm/window_animation.cc's brightness/grayscale fade animation that the login
// background image animation isn't hidden by the splash screen animation.
const int kBootSplashScreenHideDurationMs = 500;
-#endif
// Creates a new window for use as a container.
aura::Window* CreateContainer(int window_id,
@@ -261,12 +259,17 @@ void RootWindowController::Shutdown() {
wallpaper_controller_.reset();
animating_wallpaper_controller_.reset();
- CloseChildWindows();
+ // Change the active root window before closing child windows. If any child
+ // being removed triggers a relayout of the shelf it will try to build a
+ // window list adding windows from the active root window's containers which
+ // may have already gone away.
if (Shell::GetActiveRootWindow() == root_window_) {
Shell::GetInstance()->set_active_root_window(
Shell::GetPrimaryRootWindow() == root_window_.get() ?
NULL : Shell::GetPrimaryRootWindow());
}
+
+ CloseChildWindows();
SetRootWindowController(root_window_.get(), NULL);
screen_dimmer_.reset();
workspace_controller_.reset();
@@ -350,7 +353,6 @@ void RootWindowController::UpdateAfterLoginStatusChange(
}
void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() {
-#if defined(OS_CHROMEOS)
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshAnimateFromBootSplashScreen) &&
boot_splash_screen_.get()) {
@@ -359,15 +361,12 @@ void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() {
boot_splash_screen_->StartHideAnimation(
base::TimeDelta::FromMilliseconds(kBootSplashScreenHideDurationMs));
}
-#endif
}
void RootWindowController::OnWallpaperAnimationFinished(views::Widget* widget) {
// Make sure the wallpaper is visible.
system_background_->SetColor(SK_ColorBLACK);
-#if defined(OS_CHROMEOS)
boot_splash_screen_.reset();
-#endif
Shell::GetInstance()->user_wallpaper_delegate()->
OnWallpaperAnimationFinished();
@@ -404,6 +403,8 @@ void RootWindowController::CloseChildWindows() {
docked_layout_manager_ = NULL;
}
+ aura::client::SetDragDropClient(root_window_.get(), NULL);
+
// TODO(harrym): Remove when Status Area Widget is a child view.
shelf_->ShutdownStatusAreaWidget();
@@ -417,10 +418,26 @@ void RootWindowController::CloseChildWindows() {
workspace_controller_.reset();
aura::client::SetTooltipClient(root_window_.get(), NULL);
- while (!root_window_->children().empty()) {
- aura::Window* child = root_window_->children()[0];
- delete child;
+ // Remove all toplevel windows first.
+ std::queue<aura::Window*> non_toplevel_windows;
+ non_toplevel_windows.push(root_window_.get());
+ while (!non_toplevel_windows.empty()) {
+ aura::Window* non_toplevel_window = non_toplevel_windows.front();
+ non_toplevel_windows.pop();
+ aura::WindowTracker toplevel_windows;
+ for (size_t i = 0; i < non_toplevel_window->children().size(); ++i) {
+ aura::Window* child = non_toplevel_window->children()[i];
+ if (child->delegate())
+ toplevel_windows.Add(child);
+ else
+ non_toplevel_windows.push(child);
+ }
+ while (!toplevel_windows.windows().empty())
+ delete *toplevel_windows.windows().begin();
}
+ // And then remove the containers.
+ while (!root_window_->children().empty())
+ delete root_window_->children()[0];
shelf_.reset(NULL);
}
@@ -496,7 +513,6 @@ void RootWindowController::InitKeyboard() {
aura::Window* keyboard_container =
keyboard_controller_->GetContainerWindow();
- keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
parent->AddChild(keyboard_container);
keyboard_container->SetBounds(parent->bounds());
}
diff --git a/chromium/ash/root_window_controller.h b/chromium/ash/root_window_controller.h
index 140a7d26c17..bbf29ce1e34 100644
--- a/chromium/ash/root_window_controller.h
+++ b/chromium/ash/root_window_controller.h
@@ -50,6 +50,7 @@ namespace internal {
class AlwaysOnTopController;
class AnimatingDesktopController;
+class BootSplashScreen;
class DesktopBackgroundWidgetController;
class DockedWindowLayoutManager;
class PanelLayoutManager;
@@ -63,10 +64,6 @@ class TouchHudDebug;
class TouchHudProjection;
class WorkspaceController;
-#if defined(USE_X11)
-class BootSplashScreen;
-#endif
-
// This class maintains the per root window state for ash. This class
// owns the root window and other dependent objects that should be
// deleted upon the deletion of the root window. The RootWindowController
@@ -258,9 +255,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
PanelLayoutManager* panel_layout_manager_;
scoped_ptr<SystemBackgroundController> system_background_;
-#if defined(USE_X11)
scoped_ptr<BootSplashScreen> boot_splash_screen_;
-#endif
scoped_ptr<ScreenDimmer> screen_dimmer_;
scoped_ptr<WorkspaceController> workspace_controller_;
diff --git a/chromium/ash/root_window_controller_unittest.cc b/chromium/ash/root_window_controller_unittest.cc
index b4c16e35f2a..0d40125b90f 100644
--- a/chromium/ash/root_window_controller_unittest.cc
+++ b/chromium/ash/root_window_controller_unittest.cc
@@ -13,7 +13,6 @@
#include "ash/wm/system_modal_container_layout_manager.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
-#include "base/command_line.h"
#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
@@ -23,7 +22,6 @@
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tracker.h"
-#include "ui/keyboard/keyboard_switches.h"
#include "ui/views/controls/menu/menu_controller.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -82,36 +80,6 @@ class DeleteOnBlurDelegate : public aura::test::TestWindowDelegate,
DISALLOW_COPY_AND_ASSIGN(DeleteOnBlurDelegate);
};
-class ClickTestWindow : public views::WidgetDelegateView {
- public:
- ClickTestWindow() : mouse_presses_(0) {}
- virtual ~ClickTestWindow() {}
-
- // Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() OVERRIDE {
- return this;
- }
-
- aura::Window* CreateTestWindowWithParent(aura::Window* parent) {
- DCHECK(parent);
- views::Widget* widget = Widget::CreateWindowWithParent(this, parent);
- return widget->GetNativeView();
- }
-
- // Overridden from views::View:
- virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
- mouse_presses_++;
- return false;
- }
-
- int mouse_presses() const { return mouse_presses_; }
-
- private:
- int mouse_presses_;
-
- DISALLOW_COPY_AND_ASSIGN(ClickTestWindow);
-};
-
} // namespace
namespace test {
@@ -524,52 +492,5 @@ TEST_F(NoSessionRootWindowControllerTest, Event) {
gfx::Point(size.width() - 1, size.height() - 1)));
}
-class VirtualKeyboardRootWindowControllerTest : public test::AshTestBase {
- public:
- VirtualKeyboardRootWindowControllerTest() {};
- virtual ~VirtualKeyboardRootWindowControllerTest() {};
-
- virtual void SetUp() OVERRIDE {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- keyboard::switches::kEnableVirtualKeyboard);
- test::AshTestBase::SetUp();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardRootWindowControllerTest);
-};
-
-// Test for http://crbug.com/263599. Virtual keyboard should be able to receive
-// events at blocked user session.
-TEST_F(VirtualKeyboardRootWindowControllerTest,
- ClickVirtualKeyboardInBlockedWindow) {
- aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
- aura::Window* keyboard_container = Shell::GetContainer(root_window,
- internal::kShellWindowId_VirtualKeyboardContainer);
- ASSERT_TRUE(keyboard_container);
- keyboard_container->Show();
-
- ClickTestWindow* main_delegate = new ClickTestWindow();
- scoped_ptr<aura::Window> keyboard_window(
- main_delegate->CreateTestWindowWithParent(keyboard_container));
- keyboard_container->layout_manager()->OnWindowResized();
- keyboard_window->Show();
- aura::test::EventGenerator event_generator(root_window,
- keyboard_window.get());
- event_generator.ClickLeftButton();
- int expected_mouse_presses = 1;
- EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
-
- for (int block_reason = FIRST_BLOCK_REASON;
- block_reason < NUMBER_OF_BLOCK_REASONS;
- ++block_reason) {
- BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
- event_generator.ClickLeftButton();
- expected_mouse_presses++;
- EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
- UnblockUserSession();
- }
-}
-
} // namespace test
} // namespace ash
diff --git a/chromium/ash/shelf/shelf_layout_manager.cc b/chromium/ash/shelf/shelf_layout_manager.cc
index a507da648a8..e392cc27417 100644
--- a/chromium/ash/shelf/shelf_layout_manager.cc
+++ b/chromium/ash/shelf/shelf_layout_manager.cc
@@ -197,7 +197,7 @@ class ShelfLayoutManager::UpdateShelfObserver
ShelfLayoutManager::ShelfLayoutManager(ShelfWidget* shelf)
: root_window_(shelf->GetNativeView()->GetRootWindow()),
- updating_bounds_(false),
+ in_layout_(false),
auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_NEVER),
alignment_(SHELF_ALIGNMENT_BOTTOM),
shelf_(shelf),
@@ -272,20 +272,34 @@ gfx::Rect ShelfLayoutManager::GetIdealBounds() {
}
void ShelfLayoutManager::LayoutShelf() {
+ base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
+ StopAnimating();
TargetBounds target_bounds;
CalculateTargetBounds(state_, &target_bounds);
- UpdateBoundsAndOpacity(target_bounds, false, NULL);
-
- if (shelf_->launcher()) {
- // This is not part of UpdateBoundsAndOpacity() because
- // SetLauncherViewBounds() sets the bounds immediately and does not animate.
- // The height of the LauncherView for a horizontal shelf and the width of
- // the LauncherView for a vertical shelf are set when |shelf_|'s bounds
- // are changed via UpdateBoundsAndOpacity(). This sets the origin and the
- // dimension in the other direction.
+ GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
+ shelf_->SetWidgetBounds(
+ ScreenAsh::ConvertRectToScreen(
+ shelf_->GetNativeView()->parent(),
+ target_bounds.shelf_bounds_in_root));
+ if (shelf_->launcher())
shelf_->launcher()->SetLauncherViewBounds(
target_bounds.launcher_bounds_in_shelf);
- }
+ GetLayer(shelf_->status_area_widget())->SetOpacity(
+ target_bounds.status_opacity);
+ // TODO(harrym): Once status area widget is a child view of shelf
+ // this can be simplified.
+ gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
+ status_bounds.set_x(status_bounds.x() +
+ target_bounds.shelf_bounds_in_root.x());
+ status_bounds.set_y(status_bounds.y() +
+ target_bounds.shelf_bounds_in_root.y());
+ shelf_->status_area_widget()->SetBounds(
+ ScreenAsh::ConvertRectToScreen(
+ shelf_->status_area_widget()->GetNativeView()->parent(),
+ status_bounds));
+ Shell::GetInstance()->SetDisplayWorkAreaInsets(
+ root_window_, target_bounds.work_area_insets);
+ UpdateHitTestBounds();
}
ShelfVisibilityState ShelfLayoutManager::CalculateShelfVisibility() {
@@ -467,12 +481,17 @@ void ShelfLayoutManager::CompleteGestureDrag(const ui::GestureEvent& gesture) {
else
UpdateVisibilityState();
gesture_drag_status_ = GESTURE_DRAG_NONE;
+ LayoutShelf();
}
void ShelfLayoutManager::CancelGestureDrag() {
- gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS;
- UpdateVisibilityState();
gesture_drag_status_ = GESTURE_DRAG_NONE;
+ ui::ScopedLayerAnimationSettings
+ launcher_settings(GetLayer(shelf_)->GetAnimator()),
+ status_settings(GetLayer(shelf_->status_area_widget())->GetAnimator());
+ LayoutShelf();
+ UpdateVisibilityState();
+ UpdateShelfBackground(BackgroundAnimator::CHANGE_ANIMATE);
}
////////////////////////////////////////////////////////////////////////////////
@@ -500,7 +519,7 @@ void ShelfLayoutManager::SetChildBounds(aura::Window* child,
SetChildBoundsDirect(child, requested_bounds);
// We may contain other widgets (such as frame maximize bubble) but they don't
// effect the layout in anyway.
- if (!updating_bounds_ &&
+ if (!in_layout_ &&
((shelf_->GetNativeView() == child) ||
(shelf_->status_area_widget()->GetNativeView() == child))) {
LayoutShelf();
@@ -557,13 +576,7 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
state.window_state = workspace_controller_ ?
workspace_controller_->GetWindowState() : WORKSPACE_WINDOW_STATE_DEFAULT;
- // Force an update because gesture drags affect the shelf bounds and we
- // should animate back to the normal bounds at the end of a gesture.
- bool force_update =
- (gesture_drag_status_ == GESTURE_DRAG_CANCEL_IN_PROGRESS ||
- gesture_drag_status_ == GESTURE_DRAG_COMPLETE_IN_PROGRESS);
-
- if (!force_update && state_.Equals(state))
+ if (state_.Equals(state))
return; // Nothing changed.
FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,
@@ -582,6 +595,26 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
State old_state = state_;
state_ = state;
+ TargetBounds target_bounds;
+ CalculateTargetBounds(state_, &target_bounds);
+
+ ui::ScopedLayerAnimationSettings launcher_animation_setter(
+ GetLayer(shelf_)->GetAnimator());
+ launcher_animation_setter.SetTransitionDuration(
+ base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
+ launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
+ launcher_animation_setter.SetPreemptionStrategy(
+ ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+ GetLayer(shelf_)->SetBounds(
+ target_bounds.shelf_bounds_in_root);
+ GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
+ ui::ScopedLayerAnimationSettings status_animation_setter(
+ GetLayer(shelf_->status_area_widget())->GetAnimator());
+ status_animation_setter.SetTransitionDuration(
+ base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
+ status_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
+ status_animation_setter.SetPreemptionStrategy(
+ ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
BackgroundAnimator::ChangeType change_type =
BackgroundAnimator::CHANGE_ANIMATE;
@@ -611,6 +644,7 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
update_shelf_observer_->Detach();
// UpdateShelfBackground deletes itself when the animation is done.
update_shelf_observer_ = new UpdateShelfObserver(this);
+ status_animation_setter.AddObserver(update_shelf_observer_);
} else {
UpdateShelfBackground(change_type);
}
@@ -619,10 +653,18 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
state.visibility_state == SHELF_VISIBLE &&
state.window_state == WORKSPACE_WINDOW_STATE_MAXIMIZED);
- TargetBounds target_bounds;
- CalculateTargetBounds(state_, &target_bounds);
- UpdateBoundsAndOpacity(target_bounds, true,
- delay_background_change ? update_shelf_observer_ : NULL);
+ ui::Layer* layer = GetLayer(shelf_->status_area_widget());
+ // TODO(harrym): Remove when status_area is view (crbug.com/180422).
+ gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
+ status_bounds.set_x(status_bounds.x() +
+ target_bounds.shelf_bounds_in_root.x());
+ status_bounds.set_y(status_bounds.y() +
+ target_bounds.shelf_bounds_in_root.y());
+ layer->SetBounds(status_bounds);
+ layer->SetOpacity(target_bounds.status_opacity);
+ Shell::GetInstance()->SetDisplayWorkAreaInsets(
+ root_window_, target_bounds.work_area_insets);
+ UpdateHitTestBounds();
// OnAutoHideStateChanged Should be emitted when:
// - firstly state changed to auto-hide from other state
@@ -635,58 +677,6 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
}
}
-void ShelfLayoutManager::UpdateBoundsAndOpacity(
- const TargetBounds& target_bounds,
- bool animate,
- ui::ImplicitAnimationObserver* observer) {
- base::AutoReset<bool> auto_reset_updating_bounds(&updating_bounds_, true);
-
- ui::ScopedLayerAnimationSettings launcher_animation_setter(
- GetLayer(shelf_)->GetAnimator());
- ui::ScopedLayerAnimationSettings status_animation_setter(
- GetLayer(shelf_->status_area_widget())->GetAnimator());
- if (animate) {
- launcher_animation_setter.SetTransitionDuration(
- base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
- launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
- launcher_animation_setter.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- status_animation_setter.SetTransitionDuration(
- base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
- status_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
- status_animation_setter.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- } else {
- StopAnimating();
- launcher_animation_setter.SetTransitionDuration(base::TimeDelta());
- status_animation_setter.SetTransitionDuration(base::TimeDelta());
- }
- if (observer)
- status_animation_setter.AddObserver(observer);
-
- GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
- shelf_->SetBounds(ScreenAsh::ConvertRectToScreen(
- shelf_->GetNativeView()->parent(),
- target_bounds.shelf_bounds_in_root));
-
- GetLayer(shelf_->status_area_widget())->SetOpacity(
- target_bounds.status_opacity);
- // TODO(harrym): Once status area widget is a child view of shelf
- // this can be simplified.
- gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
- status_bounds.set_x(status_bounds.x() +
- target_bounds.shelf_bounds_in_root.x());
- status_bounds.set_y(status_bounds.y() +
- target_bounds.shelf_bounds_in_root.y());
- shelf_->status_area_widget()->SetBounds(
- ScreenAsh::ConvertRectToScreen(
- shelf_->status_area_widget()->GetNativeView()->parent(),
- status_bounds));
- Shell::GetInstance()->SetDisplayWorkAreaInsets(
- root_window_, target_bounds.work_area_insets);
- UpdateHitTestBounds();
-}
-
void ShelfLayoutManager::StopAnimating() {
GetLayer(shelf_)->GetAnimator()->StopAnimating();
GetLayer(shelf_->status_area_widget())->GetAnimator()->StopAnimating();
diff --git a/chromium/ash/shelf/shelf_layout_manager.h b/chromium/ash/shelf/shelf_layout_manager.h
index 56d7032f3db..467fe1a7424 100644
--- a/chromium/ash/shelf/shelf_layout_manager.h
+++ b/chromium/ash/shelf/shelf_layout_manager.h
@@ -33,15 +33,12 @@ class RootWindow;
namespace ui {
class GestureEvent;
-class ImplicitAnimationObserver;
}
namespace ash {
class ScreenAsh;
class ShelfLayoutManagerObserver;
class ShelfWidget;
-FORWARD_DECLARE_TEST(WebNotificationTrayTest, PopupAndFullscreen);
-
namespace internal {
class PanelLayoutManagerTest;
@@ -101,7 +98,7 @@ class ASH_EXPORT ShelfLayoutManager :
workspace_controller_ = controller;
}
- bool updating_bounds() const { return updating_bounds_; }
+ bool in_layout() const { return in_layout_; }
// Clears internal data for shutdown process.
void PrepareForShutdown();
@@ -214,7 +211,6 @@ class ASH_EXPORT ShelfLayoutManager :
friend class ash::ScreenAsh;
friend class PanelLayoutManagerTest;
friend class ShelfLayoutManagerTest;
- FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen);
struct TargetBounds {
TargetBounds();
@@ -255,13 +251,6 @@ class ASH_EXPORT ShelfLayoutManager :
// Sets the visibility of the shelf to |state|.
void SetState(ShelfVisibilityState visibility_state);
- // Updates the bounds and opacity of the launcher and status widgets.
- // If |observer| is specified, it will be called back when the animations, if
- // any, are complete.
- void UpdateBoundsAndOpacity(const TargetBounds& target_bounds,
- bool animate,
- ui::ImplicitAnimationObserver* observer);
-
// Stops any animations and progresses them to the end.
void StopAnimating();
@@ -330,9 +319,9 @@ class ASH_EXPORT ShelfLayoutManager :
// deleted too.
aura::RootWindow* root_window_;
- // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
- // UpdateBoundsAndOpacity() again from SetChildBounds().
- bool updating_bounds_;
+ // True when inside LayoutShelf method. Used to prevent calling LayoutShelf
+ // again from SetChildBounds().
+ bool in_layout_;
// See description above setter.
ShelfAutoHideBehavior auto_hide_behavior_;
@@ -371,7 +360,6 @@ class ASH_EXPORT ShelfLayoutManager :
enum GestureDragStatus {
GESTURE_DRAG_NONE,
GESTURE_DRAG_IN_PROGRESS,
- GESTURE_DRAG_CANCEL_IN_PROGRESS,
GESTURE_DRAG_COMPLETE_IN_PROGRESS
};
GestureDragStatus gesture_drag_status_;
diff --git a/chromium/ash/shelf/shelf_layout_manager_unittest.cc b/chromium/ash/shelf/shelf_layout_manager_unittest.cc
index e44fe347a68..e62bcec4f37 100644
--- a/chromium/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/chromium/ash/shelf/shelf_layout_manager_unittest.cc
@@ -70,66 +70,6 @@ SystemTray* GetSystemTray() {
return Shell::GetPrimaryRootWindowController()->GetSystemTray();
}
-// Class which waits till the shelf finishes animating to the target size and
-// counts the number of animation steps.
-class ShelfAnimationWaiter : views::WidgetObserver {
- public:
- explicit ShelfAnimationWaiter(const gfx::Rect& target_bounds)
- : target_bounds_(target_bounds),
- animation_steps_(0),
- done_waiting_(false) {
- GetShelfWidget()->AddObserver(this);
- }
-
- virtual ~ShelfAnimationWaiter() {
- GetShelfWidget()->RemoveObserver(this);
- }
-
- // Wait till the shelf finishes animating to its expected bounds.
- void WaitTillDoneAnimating() {
- if (IsDoneAnimating())
- done_waiting_ = true;
- else
- base::MessageLoop::current()->Run();
- }
-
- // Returns true if the animation has completed and it was valid.
- bool WasValidAnimation() const {
- return done_waiting_ && animation_steps_ > 0;
- }
-
- private:
- // Returns true if shelf has finished animating to the target size.
- bool IsDoneAnimating() const {
- ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
- gfx::Rect current_bounds = GetShelfWidget()->GetWindowBoundsInScreen();
- int size = layout_manager->PrimaryAxisValue(current_bounds.height(),
- current_bounds.width());
- int desired_size = layout_manager->PrimaryAxisValue(target_bounds_.height(),
- target_bounds_.width());
- return (size == desired_size);
- }
-
- // views::WidgetObserver override.
- virtual void OnWidgetBoundsChanged(views::Widget* widget,
- const gfx::Rect& new_bounds) OVERRIDE {
- if (done_waiting_)
- return;
-
- ++animation_steps_;
- if (IsDoneAnimating()) {
- done_waiting_ = true;
- base::MessageLoop::current()->Quit();
- }
- }
-
- gfx::Rect target_bounds_;
- int animation_steps_;
- bool done_waiting_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfAnimationWaiter);
-};
-
class ShelfDragCallback {
public:
ShelfDragCallback(const gfx::Rect& not_visible, const gfx::Rect& visible)
@@ -1489,7 +1429,7 @@ TEST_F(ShelfLayoutManagerTest, WindowVisibilityDisablesAutoHide) {
window1->Minimize();
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- // both minimized => disable auto hide
+ // both minimzed => disable auto hide
window2->Minimize();
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
@@ -1504,84 +1444,14 @@ TEST_F(ShelfLayoutManagerTest, WindowVisibilityDisablesAutoHide) {
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
}
-// Test that the shelf animates back to its normal position upon a user
-// completing a gesture drag.
-TEST_F(ShelfLayoutManagerTest, ShelfAnimatesWhenGestureComplete) {
- if (!SupportsHostWindowResize())
- return;
-
- // Test the shelf animates back to its original visible bounds when it is
- // dragged when there are no visible windows.
- ShelfLayoutManager* shelf = GetShelfLayoutManager();
- shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
- EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
- gfx::Rect visible_bounds = GetShelfWidget()->GetWindowBoundsInScreen();
- {
- // Enable animations so that we can make sure that they occur.
- ui::ScopedAnimationDurationScaleMode regular_animations(
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
-
- aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
- gfx::Rect shelf_bounds_in_screen =
- GetShelfWidget()->GetWindowBoundsInScreen();
- gfx::Point start(shelf_bounds_in_screen.CenterPoint());
- gfx::Point end(start.x(), shelf_bounds_in_screen.bottom());
- generator.GestureScrollSequence(start, end,
- base::TimeDelta::FromMilliseconds(10), 1);
- EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
-
- ShelfAnimationWaiter waiter(visible_bounds);
- // Wait till the animation completes and check that it occurred.
- waiter.WaitTillDoneAnimating();
- EXPECT_TRUE(waiter.WasValidAnimation());
- }
-
- // Create a visible window so auto-hide behavior is enforced.
- CreateTestWidget();
-
- // Get the bounds of the shelf when it is hidden.
- EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- gfx::Rect auto_hidden_bounds = GetShelfWidget()->GetWindowBoundsInScreen();
-
- {
- // Enable the animations so that we can make sure they do occur.
- ui::ScopedAnimationDurationScaleMode regular_animations(
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
-
- gfx::Point start =
- GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint();
- gfx::Point end(start.x(), start.y() - 100);
- aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-
- // Test that the shelf animates to the visible bounds after a swipe up on
- // the auto hidden shelf.
- generator.GestureScrollSequence(start, end,
- base::TimeDelta::FromMilliseconds(10), 1);
- EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
- ShelfAnimationWaiter waiter1(visible_bounds);
- waiter1.WaitTillDoneAnimating();
- EXPECT_TRUE(waiter1.WasValidAnimation());
-
- // Test that the shelf animates to the auto hidden bounds after a swipe up
- // on the visible shelf.
- EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
- generator.GestureScrollSequence(start, end,
- base::TimeDelta::FromMilliseconds(10), 1);
- EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- ShelfAnimationWaiter waiter2(auto_hidden_bounds);
- waiter2.WaitTillDoneAnimating();
- EXPECT_TRUE(waiter2.WasValidAnimation());
- }
-}
-
-TEST_F(ShelfLayoutManagerTest, GestureRevealsTrayBubble) {
- if (!SupportsHostWindowResize())
- return;
+#if defined(OS_WIN)
+// RootWindow and Display can't resize on Windows Ash. http://crbug.com/165962
+#define MAYBE_GestureRevealsTrayBubble DISABLED_GestureRevealsTrayBubble
+#else
+#define MAYBE_GestureRevealsTrayBubble GestureRevealsTrayBubble
+#endif
+TEST_F(ShelfLayoutManagerTest, MAYBE_GestureRevealsTrayBubble) {
ShelfLayoutManager* shelf = GetShelfLayoutManager();
shelf->LayoutShelf();
diff --git a/chromium/ash/shelf/shelf_widget.cc b/chromium/ash/shelf/shelf_widget.cc
index 8c7733ff2d6..d16f876bcd3 100644
--- a/chromium/ash/shelf/shelf_widget.cc
+++ b/chromium/ash/shelf/shelf_widget.cc
@@ -4,7 +4,6 @@
#include "ash/shelf/shelf_widget.h"
-#include "ash/ash_switches.h"
#include "ash/focus_cycler.h"
#include "ash/launcher/launcher_delegate.h"
#include "ash/launcher/launcher_model.h"
@@ -16,7 +15,6 @@
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
-#include "ash/system/tray/test_system_tray_delegate.h"
#include "ash/wm/property_util.h"
#include "ash/wm/status_area_layout_manager.h"
#include "ash/wm/window_properties.h"
@@ -256,6 +254,9 @@ class ShelfWidget::DelegateView : public views::WidgetDelegate,
void SetDimmed(bool dimmed);
bool GetDimmed() const;
+ // Set the bounds of the widget.
+ void SetWidgetBounds(const gfx::Rect bounds);
+
void SetParentLayer(ui::Layer* layer);
// views::View overrides:
@@ -358,6 +359,11 @@ bool ShelfWidget::DelegateView::GetDimmed() const {
return dimmer_.get() && dimmer_->IsVisible();
}
+void ShelfWidget::DelegateView::SetWidgetBounds(const gfx::Rect bounds) {
+ if (dimmer_)
+ dimmer_->SetBounds(bounds);
+}
+
void ShelfWidget::DelegateView::SetParentLayer(ui::Layer* layer) {
layer->Add(&opaque_background_);
ReorderLayers();
@@ -424,8 +430,6 @@ void ShelfWidget::DelegateView::ReorderChildLayers(ui::Layer* parent_layer) {
void ShelfWidget::DelegateView::OnBoundsChanged(const gfx::Rect& old_bounds) {
opaque_background_.SetBounds(GetLocalBounds());
- if (dimmer_)
- dimmer_->SetBounds(GetBoundsInScreen());
}
void ShelfWidget::DelegateView::ForceUndimming(bool force) {
@@ -524,31 +528,6 @@ ShelfBackgroundType ShelfWidget::GetBackgroundType() const {
return SHELF_BACKGROUND_DEFAULT;
}
-// static
-bool ShelfWidget::ShelfAlignmentAllowed() {
- if (!ash::switches::ShowShelfAlignmentMenu())
- return false;
- user::LoginStatus login_status =
- Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
-
- switch (login_status) {
- case user::LOGGED_IN_USER:
- case user::LOGGED_IN_OWNER:
- return true;
- case user::LOGGED_IN_LOCKED:
- case user::LOGGED_IN_PUBLIC:
- case user::LOGGED_IN_LOCALLY_MANAGED:
- case user::LOGGED_IN_GUEST:
- case user::LOGGED_IN_RETAIL_MODE:
- case user::LOGGED_IN_KIOSK_APP:
- case user::LOGGED_IN_NONE:
- return false;
- }
-
- DCHECK(false);
- return false;
-}
-
ShelfAlignment ShelfWidget::GetAlignment() const {
return shelf_layout_manager_->GetAlignment();
}
@@ -623,6 +602,11 @@ void ShelfWidget::ShutdownStatusAreaWidget() {
status_area_widget_ = NULL;
}
+void ShelfWidget::SetWidgetBounds(const gfx::Rect& rect) {
+ Widget::SetBounds(rect);
+ delegate_view_->SetWidgetBounds(rect);
+}
+
void ShelfWidget::ForceUndimming(bool force) {
delegate_view_->ForceUndimming(force);
}
diff --git a/chromium/ash/shelf/shelf_widget.h b/chromium/ash/shelf/shelf_widget.h
index c7adb742555..392264ab4c2 100644
--- a/chromium/ash/shelf/shelf_widget.h
+++ b/chromium/ash/shelf/shelf_widget.h
@@ -34,11 +34,6 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
internal::WorkspaceController* workspace_controller);
virtual ~ShelfWidget();
- // Returns if shelf alignment option is enabled, and the user is able
- // to adjust the alignment (guest and supervised mode users cannot for
- // example).
- static bool ShelfAlignmentAllowed();
-
void SetAlignment(ShelfAlignment alignmnet);
ShelfAlignment GetAlignment() const;
@@ -79,6 +74,9 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
// TODO(harrym): Remove when Status Area Widget is a child view.
void ShutdownStatusAreaWidget();
+ // Set the bounds of the widget and the dim shelf overlay.
+ void SetWidgetBounds(const gfx::Rect& rect);
+
// Force the shelf to be presented in an undimmed state.
void ForceUndimming(bool force);
diff --git a/chromium/ash/shell.cc b/chromium/ash/shell.cc
index 996c817213c..57e73c56bb0 100644
--- a/chromium/ash/shell.cc
+++ b/chromium/ash/shell.cc
@@ -283,6 +283,9 @@ Shell::~Shell() {
locale_notification_controller_.reset();
+ // Drag-and-drop must be canceled prior to close all windows.
+ drag_drop_controller_.reset();
+
// Destroy all child windows including widgets.
display_controller_->CloseChildWindows();
@@ -293,7 +296,6 @@ Shell::~Shell() {
// These need a valid Shell instance to clean up properly, so explicitly
// delete them before invalidating the instance.
// Alphabetical. TODO(oshima): sort.
- drag_drop_controller_.reset();
magnification_controller_.reset();
partial_magnification_controller_.reset();
resize_shadow_controller_.reset();
diff --git a/chromium/ash/shell/shell_delegate_impl.cc b/chromium/ash/shell/shell_delegate_impl.cc
index 471f5acbb50..20d0a7f65f6 100644
--- a/chromium/ash/shell/shell_delegate_impl.cc
+++ b/chromium/ash/shell/shell_delegate_impl.cc
@@ -8,7 +8,6 @@
#include "ash/caps_lock_delegate_stub.h"
#include "ash/host/root_window_host_factory.h"
-#include "ash/keyboard_controller_proxy_stub.h"
#include "ash/session_state_delegate.h"
#include "ash/session_state_delegate_stub.h"
#include "ash/shell/context_menu.h"
@@ -19,9 +18,39 @@
#include "ash/wm/window_util.h"
#include "base/message_loop/message_loop.h"
#include "ui/aura/window.h"
+#include "ui/keyboard/keyboard_controller_proxy.h"
#include "ui/views/corewm/input_method_event_filter.h"
namespace ash {
+
+namespace {
+
+class DummyKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
+ public:
+ DummyKeyboardControllerProxy() {}
+ virtual ~DummyKeyboardControllerProxy() {}
+
+ private:
+ // Overridden from keyboard::KeyboardControllerProxy:
+ virtual content::BrowserContext* GetBrowserContext() OVERRIDE {
+ return Shell::GetInstance()->browser_context();
+ }
+
+ virtual ui::InputMethod* GetInputMethod() OVERRIDE {
+ return Shell::GetInstance()->input_method_filter()->input_method();
+ }
+
+ virtual void RequestAudioInput(content::WebContents* web_contents,
+ const content::MediaStreamRequest& request,
+ const content::MediaResponseCallback& callback) OVERRIDE {
+ return;
+ }
+
+ DISALLOW_COPY_AND_ASSIGN(DummyKeyboardControllerProxy);
+};
+
+} // namespace
+
namespace shell {
ShellDelegateImpl::ShellDelegateImpl()
@@ -99,7 +128,7 @@ void ShellDelegateImpl::ShowKeyboardOverlay() {
keyboard::KeyboardControllerProxy*
ShellDelegateImpl::CreateKeyboardControllerProxy() {
- return new KeyboardControllerProxyStub();
+ return new DummyKeyboardControllerProxy();
}
void ShellDelegateImpl::ShowTaskManager() {
diff --git a/chromium/ash/shell_window_ids.h b/chromium/ash/shell_window_ids.h
index 1c1c396cbbc..406f417f4cf 100644
--- a/chromium/ash/shell_window_ids.h
+++ b/chromium/ash/shell_window_ids.h
@@ -36,68 +36,65 @@ const int kShellWindowId_UnparentedControlContainer = 3;
// The desktop background window.
const int kShellWindowId_DesktopBackgroundContainer = 4;
-// The virtual keyboard container.
-const int kShellWindowId_VirtualKeyboardContainer = 5;
-
// TODO(sky): rename kShellWindowId_DefaultContainer.
// The container for standard top-level windows.
-const int kShellWindowId_DefaultContainer = 6;
+const int kShellWindowId_DefaultContainer = 5;
// The container for top-level windows with the 'always-on-top' flag set.
-const int kShellWindowId_AlwaysOnTopContainer = 7;
+const int kShellWindowId_AlwaysOnTopContainer = 6;
// The container for windows docked to either side of the desktop.
-const int kShellWindowId_DockedContainer = 8;
+const int kShellWindowId_DockedContainer = 7;
// The container for panel windows.
-const int kShellWindowId_PanelContainer = 9;
+const int kShellWindowId_PanelContainer = 8;
// The container for the shelf.
-const int kShellWindowId_ShelfContainer = 10;
+const int kShellWindowId_ShelfContainer = 9;
// The container for the app list.
-const int kShellWindowId_AppListContainer = 11;
+const int kShellWindowId_AppListContainer = 10;
// The container for user-specific modal windows.
-const int kShellWindowId_SystemModalContainer = 12;
+const int kShellWindowId_SystemModalContainer = 11;
// The container for input method components such like candidate windows. They
// are almost panels but have no activations/focus, and they should appear over
// the AppList and SystemModal dialogs.
-const int kShellWindowId_InputMethodContainer = 13;
+const int kShellWindowId_InputMethodContainer = 12;
// The container for the lock screen background.
-const int kShellWindowId_LockScreenBackgroundContainer = 14;
+const int kShellWindowId_LockScreenBackgroundContainer = 13;
// The container for the lock screen.
-const int kShellWindowId_LockScreenContainer = 15;
+const int kShellWindowId_LockScreenContainer = 14;
// The container for the lock screen modal windows.
-const int kShellWindowId_LockSystemModalContainer = 16;
+const int kShellWindowId_LockSystemModalContainer = 15;
// The container for the status area.
-const int kShellWindowId_StatusContainer = 17;
+const int kShellWindowId_StatusContainer = 16;
// The container for menus.
-const int kShellWindowId_MenuContainer = 18;
+const int kShellWindowId_MenuContainer = 17;
// The container for drag/drop images and tooltips.
-const int kShellWindowId_DragImageAndTooltipContainer = 19;
+const int kShellWindowId_DragImageAndTooltipContainer = 18;
// The container for bubbles briefly overlaid onscreen to show settings changes
// (volume, brightness, etc.).
-const int kShellWindowId_SettingBubbleContainer = 20;
+const int kShellWindowId_SettingBubbleContainer = 19;
// The container for special components overlaid onscreen, such as the
// region selector for partial screenshots.
-const int kShellWindowId_OverlayContainer = 21;
+const int kShellWindowId_OverlayContainer = 20;
// ID of the window created by PhantomWindowController or DragWindowController.
-const int kShellWindowId_PhantomWindow = 22;
+const int kShellWindowId_PhantomWindow = 21;
// The topmost container, used for power off animation.
-const int kShellWindowId_PowerButtonAnimationContainer = 23;
+const int kShellWindowId_PowerButtonAnimationContainer = 22;
} // namespace internal
diff --git a/chromium/ash/strings/ash_strings_am.xtb b/chromium/ash/strings/ash_strings_am.xtb
index b0c6c3803be..13c5bb4bde9 100644
--- a/chromium/ash/strings/ash_strings_am.xtb
+++ b/chromium/ash/strings/ash_strings_am.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="am">
<translation id="3595596368722241419">ባትሪ ሙሉ ነው</translation>
-<translation id="5250713215130379958">አስጀማሪን ራስ-ደብቅ</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> እና <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">የመተላለፊያ ሁኔታ</translation>
<translation id="30155388420722288">የትርፍ ፍሰት አዝራር</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">ብሉቱዝ ነቅቷል</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> ወደ <ph name="ROTATION"/> ዞሯል</translation>
<translation id="9074739597929991885">ብሉቱዝ</translation>
<translation id="2268130516524549846">ብሉቱዝ ተሰናክሏል</translation>
+<translation id="7165320105431587207">አውታረ መረቡን ማዋቀር አልተሳካም</translation>
<translation id="3775358506042162758">በአንድ ጊዜ ብዙ መግባት ላይ እስከ ሶስት መለያዎች ድረስ ብቻ ነው ሊኖርዎ የሚችለው።</translation>
<translation id="370649949373421643">Wi-Fi ያንቁ</translation>
<translation id="3626281679859535460">ብሩህነት</translation>
+<translation id="595202126637698455">አፈጻጸም መከታተያ ነቅቷል</translation>
<translation id="8054466585765276473">የባትሪ ጊዜን በማስላት ላይ።</translation>
<translation id="7982789257301363584">አውታረ መረብ</translation>
<translation id="5565793151875479467">ተኪ...</translation>
<translation id="938582441709398163">የቁልፍ ሰሌዳ ተደራቢ</translation>
<translation id="4387004326333427325">የማረጋገጫ ምስክር ወረቀት በርቀት ተቀባይነት አላገኘም</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> ጥራት ወደ <ph name="RESOLUTION"/> ተለውጧል</translation>
<translation id="6943836128787782965">ኤች ቲ ቲ ፒ ማግኘት አልተሳካም</translation>
<translation id="2297568595583585744">የሁኔታ መሳቢያ</translation>
<translation id="1661867754829461514">ፒን ይጎድላል</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">አነስተኛ ኃይል ያለው ባትሪ መሙያ</translation>
<translation id="3846575436967432996">ምንም የአውታረ መረብ መረጃ አይገኝም</translation>
<translation id="3026237328237090306">የተንቀሳቃሽ ስልክ ውሂብ ያዋቅሩ</translation>
+<translation id="5871632337994001636">መሳሪያዎችን ያስተዳድሩ...</translation>
<translation id="785750925697875037">የተንቀሳቃሽ መለያ ይመልከቱ</translation>
<translation id="153454903766751181">ተንቀሳቃሽ ሞደምን በማስጀመር ላይ...</translation>
<translation id="4628814525959230255">የማያ ገጽዎ ቁጥጥር በHangouts በኩል ለ<ph name="HELPER_NAME"/> በማጋራት ላይ።</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ዞሯል</translation>
<translation id="7864539943188674973">ብሉቱዝን ያሰናክሉ</translation>
<translation id="939252827960237676">ቅጽበታዊ ገጽ እይታን ማስቀመጥ አልተቻለም</translation>
<translation id="3126069444801937830">ለማዘመን ዳግም ያስጀምሩ</translation>
<translation id="2268813581635650749">ሁሉንም ዘግተህ ውጣ</translation>
<translation id="735745346212279324">የቪ ፒ ኤን ግንኙነት ተቋርጧል</translation>
<translation id="7320906967354320621">ስራ ፈት</translation>
-<translation id="6303423059719347535">ባትሪ <ph name="PERCENTAGE"/>% ሙሉ ነው</translation>
<translation id="15373452373711364">ትልቅ የመዳፊት ጠቋሚ</translation>
-<translation id="2778346081696727092">በተሰጠው የተጠቃሚ ስም ወይም ይለፍ ቃል ማረጋገጥ አልተቻለም</translation>
<translation id="3294437725009624529">እንግዳ</translation>
<translation id="8190698733819146287">ቋንቋዎችን እና ግብአቶችን አብጅ...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">የመደርደሪያ አቀማመጥ</translation>
<translation id="2903907270192926896">ግብዓት</translation>
<translation id="8676770494376880701">አነስተኛ ኃይል ያለው ባትሪ መሙያ ተገናኝቷል</translation>
<translation id="7170041865419449892">ከክልል ውጪ</translation>
<translation id="4804818685124855865">ግንኙነት አቋርጥ</translation>
<translation id="2544853746127077729">የማረጋገጫ ምስክር ወረቀት በአውታረ መረቡ ተቀባይነት አላገኘም</translation>
<translation id="5222676887888702881">ዘግተህ ውጣ</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">ውቅር</translation>
<translation id="1272079795634619415">አቁም</translation>
<translation id="4957722034734105353">ተጨማሪ ለመረዳት...</translation>
<translation id="2964193600955408481">Wi-Fiን አሰናክል</translation>
-<translation id="811680302244032017">መሣሪያ ያክሉ...</translation>
<translation id="4279490309300973883">በማንጸባረቅ ላይ</translation>
+<translation id="7973962044839454485">PPP ማረጋገጫ በተሳሳተ የተጠቃሚ ስም ወይም የይለፍ ቃል ምክንያት አልተሳካም</translation>
<translation id="2509468283778169019">CAPS LOCK በርቷል</translation>
<translation id="3892641579809465218">የውስጥ ማሳያ</translation>
<translation id="7823564328645135659">ቅንብሮችዎ ከተመሳሰሉ በኋላ ቋንቋው ከ«<ph name="FROM_LOCALE"/> ወደ «<ph name="TO_LOCALE"/>» ተቀይሯል።</translation>
<translation id="3368922792935385530">ተያይዟል</translation>
<translation id="8340999562596018839">የተነገረ ግብረ መልስ</translation>
<translation id="8654520615680304441">Wi-Fi አብራ...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">የግቤት ስልትዎ ወደ <ph name="INPUT_METHOD_ID"/> ተቀይሯል።
ለመቀየር Shift + Alt ይጫኑ።</translation>
<translation id="2562916301614567480">የግል አውታረ መረብ</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% ይቀራል</translation>
<translation id="9089416786594320554">የግቤት ስልቶች</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">መደርደሪያ</translation>
<translation id="2614835198358683673">የእርስዎ Chromebook በርቶ ሳለ ባትሪ ላይሞላ ይችላል። ዋናውን ባትሪ መሙያ መጠቀሙን ያስቡበት።</translation>
<translation id="1895658205118569222">አጥፋ</translation>
<translation id="4430019312045809116">ድምፅ</translation>
+<translation id="8681498213689260554">ለማዘመን ዳግም ያስጀምሩና በሃይል ይጠቡ</translation>
<translation id="4442424173763614572">የዲ ኤን ኤስ ፍለጋ አልተሳካም</translation>
-<translation id="6356500677799115505">ባትሪ ሙሉ እና ኃይል እየሞላ ነው።</translation>
<translation id="7874779702599364982">የድምጸ ተያያዥ ሞደም አውታረ መረቦችን በመፈለግ ላይ...</translation>
<translation id="583281660410589416">ያልታወቀ</translation>
<translation id="1383876407941801731">ፍለጋ</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">የአውታረ መረብ መረጃ</translation>
<translation id="1621499497873603021">ባትሪ ባዶ እስኪሆን ድረስ የቀረው ጊዜ፣ <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">ከእንግዳ ውጣ</translation>
-<translation id="4471417012762451363">ባትሪ <ph name="PERCENTAGE"/>% ሙሉ እና ኃይል እየሞላ ነው</translation>
<translation id="8308637677604853869">ቀዳሚ ምናሌ</translation>
<translation id="4666297444214622512">ወደ ሌላ መለያ መግባት አይቻልም።</translation>
<translation id="1346748346194534595">ቀኝ</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">ያልታወቀ የአውታረ መረብ ስህተት</translation>
<translation id="1467432559032391204">ግራ</translation>
<translation id="5543001071567407895">ኤስ ኤም ኤስ</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/>ን በማግበር ላይ</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">አስፋ</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">አነስተኛ ኃይል ወዳለው ባትሪ መሙያ ተሰክቷል። የባትሪ መሙላት አስተማማኝ ላይሆን ይችላል።</translation>
<translation id="3784455785234192852">ቆልፍ</translation>
<translation id="2805756323405976993">መተግበሪያዎች</translation>
-<translation id="8871072142849158571">የ<ph name="DISPLAY_NAME"/> መጠን ወደ <ph name="RESOLUTION"/> ተቀይሯል</translation>
<translation id="1512064327686280138">የማግበር አለመሳካት</translation>
<translation id="5097002363526479830">ከአውታረ መረብ «<ph name="NAME"/>» ጋር መገናኘት አልተሳካም፦ <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi ጠፍቷል።</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">ልጣፍ አዘጋጅ...</translation>
<translation id="8678698760965522072">የመስመር ላይ ሁኔታ</translation>
<translation id="2532589005999780174">ባለከፍተኛ ንፅፅር ሁነታ</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>፣ <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">ውስጣዊ ስህተት</translation>
<translation id="3019353588588144572">ባትሪ ሙሉ ኃይል እስኪኖረው ድረስ የሚቀረው ጊዜ፣ <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">የማያ ገጽ ማጉያ</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">ከክፍለ-ጊዜ ውጣ</translation>
<translation id="8454013096329229812">Wi-Fi በርቷል።</translation>
<translation id="4872237917498892622">Alt+Search ወይም Shift</translation>
+<translation id="9201131092683066720">ባትሪው <ph name="PERCENTAGE"/>% ሙሉ ነው።</translation>
<translation id="2983818520079887040">ቅንብሮች ...</translation>
+<translation id="1195412055398077112">ትርፍ ቅኝት</translation>
<translation id="1717216362413677834">የመትከያ ሁነታ</translation>
+<translation id="112308213915226829">መደርደሪያን በራስ ሰር ደብቅ</translation>
<translation id="8927026611342028580">መገናኘት ተጠይቋል</translation>
<translation id="8300849813060516376">OTASP አልተሳካም</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> ፋይል/ፋይሎችን በማመሳሰል ላይ</translation>
+<translation id="5958529069007801266">ክትትል የሚደረግበት ተጠቃሚ</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK ጠፍቷል</translation>
<translation id="6248847161401822652">ለመተው Control Shift Qን ሁለት ጊዜ ይጫኑ።</translation>
+<translation id="6785414152754474415">ባትሪው <ph name="PERCENTAGE"/>% ሙሉ ሆኖ በተጨማሪም ኃይል እየሞላ ነው።</translation>
<translation id="6267036997247669271"><ph name="NAME"/>፦ በማግበር ላይ...</translation>
+<translation id="4895488851634969361">ባትሪው ሙሉ ነው።</translation>
<translation id="1391854757121130358">የተንቀሳቃሽ ስልክ ውሂብ ገደብዎን ጨርሰው ሊሆን ይችላል።</translation>
-<translation id="5413208160176941586">በአካባቢው የሚተዳደር ተጠቃሚ</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>፦ <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">የአስጀማሪው ቦታ</translation>
+<translation id="5947494881799873997">አድህር</translation>
<translation id="7593891976182323525">Search ወይም Shift</translation>
<translation id="7649070708921625228">እገዛ</translation>
<translation id="3050422059534974565">CAPS LOCK በርቷል።
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">መጥፎ የይለፍ ሐረግ</translation>
<translation id="6165508094623778733">ተጨማሪ ለመረዳት</translation>
<translation id="9046895021617826162">ማገናኘት አልተሳካም</translation>
+<translation id="7168224885072002358">በ<ph name="TIMEOUT_SECONDS"/> ውስጥ ወደ ቀድሞው ጥራት በመመለስ ላይ</translation>
<translation id="973896785707726617">ይህ ክፍለ ጊዜ በ<ph name="SESSION_TIME_REMAINING"/> ጊዜ ውስጥ ያልቃል። በራስ-ሰር እንዲወጡ ይደረጋሉ።</translation>
<translation id="8372369524088641025">መጥፎ የWEP ቁልፍ</translation>
<translation id="6636709850131805001">ያልታወቀ ሁኔታ</translation>
<translation id="3573179567135747900">ወደ «<ph name="FROM_LOCALE"/>» መልሰህ ቀይር (ዳግም ማስጀመር ይፈልጋል)</translation>
<translation id="8103386449138765447">የኤስ ኤም ኤስ መልዕክቶች፦ <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">የGoogle Drive ቅንብሮች...</translation>
-<translation id="1510238584712386396">ማስጀመሪያ</translation>
<translation id="7209101170223508707">CAPS LOCK በርቷል።
ለመሰረዝ Alt+Search ወይም Shift ይጫኑ።</translation>
<translation id="8940956008527784070">ባትሪ ዝቅተኛ ነው (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">ይቀበሉ</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> ቀርቷል</translation>
<translation id="520760366042891468">የማያ ገጽዎን ቁጥጥር በHangouts በኩል በማጋራት ላይ።</translation>
<translation id="8000066093800657092">ምንም አውታረ መረብ የለም</translation>
<translation id="4015692727874266537">ሌላ መለያ ያስገቡ...</translation>
<translation id="5941711191222866238">አሳንስ</translation>
<translation id="6911468394164995108">ሌላ ይቀላቀሉ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>፦ <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">ሙሉ እስኪሆን ድረስ <ph name="HOUR"/>ሰ <ph name="MINUTE"/>ደ</translation>
<translation id="6359806961507272919">ኤስ ኤም ኤስ ከ<ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">ድምጸ ተያያዥ ሞደም</translation>
diff --git a/chromium/ash/strings/ash_strings_ar.xtb b/chromium/ash/strings/ash_strings_ar.xtb
index 7be62a6e682..db45e7dafc7 100644
--- a/chromium/ash/strings/ash_strings_ar.xtb
+++ b/chromium/ash/strings/ash_strings_ar.xtb
@@ -2,23 +2,27 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ar">
<translation id="3595596368722241419">البطارية ممتلئة</translation>
-<translation id="5250713215130379958">إخفاء المشغل تلقائيًا</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> و<ph name="MINUTE"/></translation>
<translation id="7880025619322806991">حالة المدخل</translation>
<translation id="30155388420722288">زر التدفق</translation>
+<translation id="8673028979667498656">270 درجة</translation>
<translation id="5571066253365925590">تم تمكين البلوتوث</translation>
+<translation id="6310121235600822547">تم تدوير <ph name="DISPLAY_NAME"/> إلى <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">بلوتوث</translation>
<translation id="2268130516524549846">تم تعطيل البلوتوث</translation>
+<translation id="7165320105431587207">أخفقت تهيئة الشبكة</translation>
<translation id="3775358506042162758">يُمكنك تسجيل الدخول المتعدد باستخدام ثلاثة حسابات كحد أقصى.</translation>
-<translation id="370649949373421643">تمكين Wi-Fi</translation>
+<translation id="370649949373421643">‏تمكين Wi-Fi</translation>
<translation id="3626281679859535460">السطوع</translation>
+<translation id="595202126637698455">تم تمكين تتبع مستوى الأداء</translation>
<translation id="8054466585765276473">يجري حساب وقت البطارية.</translation>
<translation id="7982789257301363584">الشبكة</translation>
<translation id="5565793151875479467">الخادم الوكيل...</translation>
<translation id="938582441709398163">تراكب لوحة المفاتيح</translation>
<translation id="4387004326333427325">تم رفض شهادة المصادقة عن بُعد</translation>
<translation id="6979158407327259162">Google Drive</translation>
-<translation id="6943836128787782965">أخفق الحصول على HTTP</translation>
+<translation id="3683428399328702079">تم تغيير درجة دقة <ph name="DISPLAY_NAME"/> إلى <ph name="RESOLUTION"/></translation>
+<translation id="6943836128787782965">‏أخفق الحصول على HTTP</translation>
<translation id="2297568595583585744">علبة الحالة</translation>
<translation id="1661867754829461514">رقم التعريف الشخصي غير موجود</translation>
<translation id="4508225577814909926"><ph name="NAME"/>: جارٍ الاتصال...</translation>
@@ -26,48 +30,50 @@
<translation id="2946640296642327832">تمكين البلوتوث</translation>
<translation id="6459472438155181876">تمديد الشاشة إلى <ph name="DISPLAY_NAME"/></translation>
<translation id="8206859287963243715">خلوي</translation>
-<translation id="6596816719288285829">عنوان IP</translation>
+<translation id="6596816719288285829">‏عنوان IP</translation>
<translation id="4508265954913339219">أخفقت عملية التنشيط</translation>
<translation id="3621712662352432595">إعدادات الصوت</translation>
-<translation id="1812696562331527143">تم تغيير أسلوب الإدخال إلى <ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>جهة خارجية<ph name="END_LINK"/>).
+<translation id="1812696562331527143">‏تم تغيير أسلوب الإدخال إلى <ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>جهة خارجية<ph name="END_LINK"/>).
اضغط على Shift + Alt للتبديل.</translation>
<translation id="2127372758936585790">شاحن منخفض الطاقة</translation>
<translation id="3846575436967432996">لا توجد معلومات متاحة حول الشبكة</translation>
<translation id="3026237328237090306">إعداد بيانات الجوال</translation>
+<translation id="5871632337994001636">إدارة الأجهزة...</translation>
<translation id="785750925697875037">عرض حساب الجوال</translation>
<translation id="153454903766751181">جارٍ تهيئة المودم الخلوي...</translation>
-<translation id="4628814525959230255">مشاركة التحكم في الشاشة مع <ph name="HELPER_NAME"/> عبر Hangouts.</translation>
-<translation id="8343941333792395995">تمّ تدوير <ph name="DISPLAY_NAME"/></translation>
+<translation id="4628814525959230255">‏مشاركة التحكم في الشاشة مع <ph name="HELPER_NAME"/> عبر Hangouts.</translation>
<translation id="7864539943188674973">تعطيل البلوتوث</translation>
<translation id="939252827960237676">أخفق حفظ لقطة الشاشة</translation>
<translation id="3126069444801937830">إعادة التشغيل للتحديث</translation>
<translation id="2268813581635650749">خروج الجميع</translation>
<translation id="735745346212279324">تم قطع اتصال الشبكة الظاهرية الخاصة</translation>
<translation id="7320906967354320621">في وضع الخمول</translation>
-<translation id="6303423059719347535">اكتمل شحن <ph name="PERCENTAGE"/>% من البطارية</translation>
<translation id="15373452373711364">مؤشر الماوس الكبير</translation>
-<translation id="2778346081696727092">أخفقت المصادقة باستخدام اسم المستخدم أو كلمة المرور المقدمين</translation>
<translation id="3294437725009624529">ضيف</translation>
<translation id="8190698733819146287">تخصيص اللغات والإدخال...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">وضع الرف</translation>
<translation id="2903907270192926896">الإرسال</translation>
<translation id="8676770494376880701">تمّ توصيل شاحن منخفض الطاقة</translation>
<translation id="7170041865419449892">خارج النطاق</translation>
<translation id="4804818685124855865">قطع الاتصال</translation>
<translation id="2544853746127077729">تمّ رفض شهادة المصادقة بواسطة الشبكة</translation>
<translation id="5222676887888702881">الخروج</translation>
+<translation id="2391579633712104609">180 درجة</translation>
<translation id="2688477613306174402">تهيئة</translation>
<translation id="1272079795634619415">إيقاف</translation>
<translation id="4957722034734105353">مزيد من المعلومات...</translation>
-<translation id="2964193600955408481">تعطيل Wi-Fi</translation>
-<translation id="811680302244032017">إضافة جهاز...</translation>
+<translation id="2964193600955408481">‏تعطيل Wi-Fi</translation>
<translation id="4279490309300973883">النسخ المطابق</translation>
-<translation id="2509468283778169019">مفتاح CAPS LOCK قيد التشغيل</translation>
+<translation id="7973962044839454485">‏أخفقت مصادقة PPP نظرًا لوجود خطأ في اسم المستخدم أو كلمة المرور</translation>
+<translation id="2509468283778169019">‏مفتاح CAPS LOCK قيد التشغيل</translation>
<translation id="3892641579809465218">العرض الداخلي</translation>
<translation id="7823564328645135659">تم تغيير اللغة من &quot;<ph name="FROM_LOCALE"/>&quot; إلى &quot;<ph name="TO_LOCALE"/>&quot; بعد مزامنة إعداداتك.</translation>
<translation id="3368922792935385530">متصل</translation>
<translation id="8340999562596018839">التعليقات المنطوقة</translation>
-<translation id="8654520615680304441">تشغيل شبكة Wi-Fi...</translation>
-<translation id="5825747213122829519">تم تغيير أسلوب الإدخال إلى <ph name="INPUT_METHOD_ID"/>.
+<translation id="8654520615680304441">‏تشغيل شبكة Wi-Fi...</translation>
+<translation id="8828714802988429505">90 درجة</translation>
+<translation id="5825747213122829519">‏تم تغيير أسلوب الإدخال إلى <ph name="INPUT_METHOD_ID"/>.
اضغط على Shift + Alt للتبديل.</translation>
<translation id="2562916301614567480">الشبكة الخاصة</translation>
<translation id="6549021752953852991">لا تتوفر شبكة خلوية</translation>
@@ -77,17 +83,18 @@
<translation id="3742055079367172538">تم التقاط لقطة الشاشة</translation>
<translation id="8878886163241303700">توسيع الشاشة</translation>
<translation id="5271016907025319479">لم تتم تهيئة الشبكة الظاهرية الخاصة.</translation>
-<translation id="372094107052732682">للإنهاء، اضغط على Ctrl+Shift+Q مرتين.</translation>
+<translation id="372094107052732682">‏للإنهاء، اضغط على Ctrl+Shift+Q مرتين.</translation>
<translation id="6803622936009808957">تعذر إجراء النسخ المطابق للعروض نظرًا لعدم العثور على درجات دقة متوافقة. تم الدخول إلى سطح المكتب الممتد بدلاً من ذلك.</translation>
<translation id="1480041086352807611">الوضع التجريبي</translation>
<translation id="3626637461649818317">باقٍ <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">أساليب الإدخال</translation>
<translation id="6247708409970142803">%<ph name="PERCENTAGE"/></translation>
-<translation id="2614835198358683673">قد لا يستجيب جهاز Chromebook لعملية الشحن وهو قيد التشغيل. مع مراعاة استخدام الشاحن المخصص للجهاز.</translation>
+<translation id="2825619548187458965">الرف</translation>
+<translation id="2614835198358683673">‏قد لا يستجيب جهاز Chromebook لعملية الشحن وهو قيد التشغيل. مع مراعاة استخدام الشاحن المخصص للجهاز.</translation>
<translation id="1895658205118569222">إيقاف التشغيل</translation>
<translation id="4430019312045809116">مستوى الصوت</translation>
+<translation id="8681498213689260554">‏إعادة التشغيل وإجراء Powerwash للتحديث</translation>
<translation id="4442424173763614572">أخفق البحث في نظام أسماء النطاقات</translation>
-<translation id="6356500677799115505">البطارية مملوءة ويتم شحنها.</translation>
<translation id="7874779702599364982">جارٍ البحث عن شبكات للهاتف الجوال...</translation>
<translation id="583281660410589416">غير محدّد</translation>
<translation id="1383876407941801731">البحث</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">معلومات الشبكة</translation>
<translation id="1621499497873603021">الوقت المتبقي حتى تصبح البطارية فارغة <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">إنهاء جلسة الضيف</translation>
-<translation id="4471417012762451363">اكتمل شحن <ph name="PERCENTAGE"/>% من البطارية ويتم شحنها</translation>
<translation id="8308637677604853869">القائمة السابقة</translation>
<translation id="4666297444214622512">يتعذّر تسجيل الدخول إلى حساب آخر.</translation>
<translation id="1346748346194534595">يمين</translation>
@@ -106,16 +112,17 @@
<translation id="8428213095426709021">الإعدادات</translation>
<translation id="2372145515558759244">جارٍ مزامنة التطبيقات...</translation>
<translation id="7256405249507348194">خطأ غير معروف: <ph name="DESC"/></translation>
-<translation id="7925247922861151263">أخفق فحص AAA</translation>
+<translation id="7925247922861151263">‏أخفق فحص AAA</translation>
<translation id="8456362689280298700">حتى الاكتمال: <ph name="HOUR"/>:<ph name="MINUTE"/> ‏</translation>
-<translation id="5787281376604286451">تم تمكين التعليقات المنطوقة.
+<translation id="5787281376604286451">‏تم تمكين التعليقات المنطوقة.
يمكنك الضغط على Ctrl+Alt+Z لتعطيلها.</translation>
<translation id="4479639480957787382">إيثرنت</translation>
<translation id="6312403991423642364">خطأ غير معروف</translation>
<translation id="1467432559032391204">اليسار</translation>
-<translation id="5543001071567407895">الرسائل القصيرة SMS</translation>
+<translation id="5543001071567407895">‏الرسائل القصيرة SMS</translation>
+<translation id="1957803754585243749">0 درجة</translation>
<translation id="2354174487190027830">تنشيط <ph name="NAME"/></translation>
-<translation id="8814190375133053267">لاسلكي، Wi-Fi</translation>
+<translation id="8814190375133053267">‏لاسلكي، Wi-Fi</translation>
<translation id="1398853756734560583">تكبير</translation>
<translation id="2692809339924654275"><ph name="BLUETOOTH"/>: جارٍ التوصيل...</translation>
<translation id="252373100621549798">شاشة عرض غير معروفة</translation>
@@ -123,14 +130,14 @@
<translation id="2727977024730340865">تمّ توصيل شاحن منخفض الطاقة. لذا قد لا تكون عملية شحن البطارية جديرة بالثقة.</translation>
<translation id="3784455785234192852">قفل</translation>
<translation id="2805756323405976993">تطبيقات</translation>
-<translation id="8871072142849158571">تمّ تغيير حجم <ph name="DISPLAY_NAME"/> إلى <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">إخفاق في عملية التنشيط</translation>
<translation id="5097002363526479830">أخفق الاتصال بشبكة &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
-<translation id="1850504506766569011">تم إيقاف تشغيل Wi-Fi.</translation>
+<translation id="1850504506766569011">‏تم إيقاف تشغيل Wi-Fi.</translation>
<translation id="8132793192354020517">تم الاتصال بالموقع <ph name="NAME"/></translation>
<translation id="7052914147756339792">تعيين خلفية...</translation>
<translation id="8678698760965522072">الحالة متصل</translation>
<translation id="2532589005999780174">وضع التباين العالي</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>، <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">خطأ داخلي</translation>
<translation id="3019353588588144572">الوقت المتبقي حتى يتم شحن البطارية بالكامل <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">مكبّر الشاشة</translation>
@@ -144,55 +151,61 @@
<translation id="4032485810211612751"><ph name="HOURS"/>:<ph name="MINUTES"/>:<ph name="SECONDS"/></translation>
<translation id="225680501294068881">جارٍ البحث عن أجهزة...</translation>
<translation id="5597451508971090205"><ph name="SHORT_WEEKDAY"/>، <ph name="DATE"/></translation>
-<translation id="4448844063988177157">جارِ البحث عن شبكات Wi-Fi...</translation>
+<translation id="4448844063988177157">‏جارِ البحث عن شبكات Wi-Fi...</translation>
<translation id="8401662262483418323">أخفق الاتصال بـ &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/> رسالة الخادم: <ph name="SERVER_MSG"/></translation>
<translation id="2475982808118771221">حدث خطأ</translation>
-<translation id="7229570126336867161">يلزم توفر EVDO</translation>
+<translation id="7229570126336867161">‏يلزم توفر EVDO</translation>
<translation id="2999742336789313416"><ph name="DISPLAY_NAME"/> هي جلسة عامة يديرها <ph name="DOMAIN"/></translation>
<translation id="7029814467594812963">إنهاء الجلسة</translation>
-<translation id="8454013096329229812">تم تشغيل Wi-Fi.</translation>
-<translation id="4872237917498892622">Alt+مفتاح البحث أو Shift</translation>
+<translation id="8454013096329229812">‏تم تشغيل Wi-Fi.</translation>
+<translation id="4872237917498892622">‏Alt+مفتاح البحث أو Shift</translation>
+<translation id="9201131092683066720">اكتمل شحن <ph name="PERCENTAGE"/>% من البطارية.</translation>
<translation id="2983818520079887040">الإعدادات...</translation>
+<translation id="1195412055398077112">الخروج عن إطار الشاشة</translation>
<translation id="1717216362413677834">وضع الإرساء</translation>
+<translation id="112308213915226829">الإخفاء التلقائي للرف</translation>
<translation id="8927026611342028580">الاتصال مطلوب</translation>
-<translation id="8300849813060516376">أخفقت OTASP</translation>
-<translation id="2792498699870441125">Alt+مفتاح البحث</translation>
+<translation id="8300849813060516376">‏أخفقت OTASP</translation>
+<translation id="2792498699870441125">‏Alt+مفتاح البحث</translation>
<translation id="8660803626959853127">جارٍ مزامنة <ph name="COUNT"/> من الملفات</translation>
-<translation id="3709443003275901162">‎9+‎‏</translation>
-<translation id="639644700271529076">مفتاح CAPS LOCK قيد الإيقاف</translation>
-<translation id="6248847161401822652">للإنهاء، اضغط على Control Shift Q مرتين.</translation>
+<translation id="5958529069007801266">مستخدم يخضع للإدارة</translation>
+<translation id="3709443003275901162">‏‎9+‎‏</translation>
+<translation id="639644700271529076">‏مفتاح CAPS LOCK قيد الإيقاف</translation>
+<translation id="6248847161401822652">‏للإنهاء، اضغط على Control Shift Q مرتين.</translation>
+<translation id="6785414152754474415">اكتمل شحن <ph name="PERCENTAGE"/>% من البطارية ويجري شحنها.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: جارٍ التنشيط...</translation>
+<translation id="4895488851634969361">البطارية مملوءة.</translation>
<translation id="1391854757121130358">ربما تكون قد استخدمت حصة بيانات الجوال المخصصة لك.</translation>
-<translation id="5413208160176941586">حساب مستخدم يخضع لإدارة محلية</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">موضع المشغل</translation>
-<translation id="7593891976182323525">مفتاح البحث أو Shift</translation>
+<translation id="5947494881799873997">التراجع عن الإجراء</translation>
+<translation id="7593891976182323525">‏مفتاح البحث أو Shift</translation>
<translation id="7649070708921625228">مساعدة</translation>
-<translation id="3050422059534974565">المفتاح CAPS LOCK في وضع التشغيل، اضغط على مفتاح البحث أو المفتاح Shift لإلغاء التشغيل.</translation>
+<translation id="3050422059534974565">‏المفتاح CAPS LOCK في وضع التشغيل، اضغط على مفتاح البحث أو المفتاح Shift لإلغاء التشغيل.</translation>
<translation id="397105322502079400">جارٍ الحساب...</translation>
<translation id="158849752021629804">يلزم توفر الشبكة الرئيسية</translation>
<translation id="6857811139397017780">تنشيط <ph name="NETWORKSERVICE"/></translation>
-<translation id="5864471791310927901">أخفق بحث DHCP</translation>
+<translation id="5864471791310927901">‏أخفق بحث DHCP</translation>
<translation id="5812035014844949013">الاستماع</translation>
<translation id="6692173217867674490">عبارة مرور غير صالحة</translation>
<translation id="6165508094623778733">مزيد من المعلومات</translation>
<translation id="9046895021617826162">أخفق الاتصال</translation>
+<translation id="7168224885072002358">سيتم الرجوع إلى درجة الدقة القديمة في غضون <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">ستنتهي هذه الجلسة في <ph name="SESSION_TIME_REMAINING"/>. سيتم الخروج تلقائيًا.</translation>
-<translation id="8372369524088641025">مفتاح WEP غير صالح</translation>
+<translation id="8372369524088641025">‏مفتاح WEP غير صالح</translation>
<translation id="6636709850131805001">حالة غير معروفة</translation>
<translation id="3573179567135747900">التغيير مرة أخرى إلى &quot;<ph name="FROM_LOCALE"/>&quot; (يتطلب إعادة التشغيل)</translation>
-<translation id="8103386449138765447">الرسائل القصيرة SMS: <ph name="MESSAGE_COUNT"/></translation>
-<translation id="5045002648206642691">إعدادات Google Drive...</translation>
-<translation id="1510238584712386396">المشغّل</translation>
-<translation id="7209101170223508707">المفتاح CAPS LOCK في وضع التشغيل. اضغط على Alt+مفتاح البحث، أو اضغط على المفتاح Shift لإلغاء التشغيل.</translation>
+<translation id="8103386449138765447">‏الرسائل القصيرة SMS: <ph name="MESSAGE_COUNT"/></translation>
+<translation id="5045002648206642691">‏إعدادات Google Drive...</translation>
+<translation id="7209101170223508707">‏المفتاح CAPS LOCK في وضع التشغيل. اضغط على Alt+مفتاح البحث، أو اضغط على المفتاح Shift لإلغاء التشغيل.</translation>
<translation id="8940956008527784070">طاقة البطارية منخفضة (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">قبول</translation>
<translation id="5102001756192215136">الوقت المتبقي: <ph name="HOUR"/>:<ph name="MINUTE"/> ‏</translation>
-<translation id="520760366042891468">مشاركة التحكم في الشاشة عبر Hangouts.</translation>
+<translation id="520760366042891468">‏مشاركة التحكم في الشاشة عبر Hangouts.</translation>
<translation id="8000066093800657092">لا شبكة</translation>
<translation id="4015692727874266537">تسجيل الدخول لحساب آخر...</translation>
<translation id="5941711191222866238">تصغير</translation>
<translation id="6911468394164995108">الانضمام إلى شبكة أخرى...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>س <ph name="MINUTE"/>د حتى الاكتمال</translation>
-<translation id="6359806961507272919">رسالة قصيرة SMS من الهاتف رقم <ph name="PHONE_NUMBER"/></translation>
+<translation id="6359806961507272919">‏رسالة قصيرة SMS من الهاتف رقم <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">شركة اتصالات</translation>
</translationbundle> \ No newline at end of file
diff --git a/chromium/ash/strings/ash_strings_bg.xtb b/chromium/ash/strings/ash_strings_bg.xtb
index b7c4b204a5a..24aef8cddac 100644
--- a/chromium/ash/strings/ash_strings_bg.xtb
+++ b/chromium/ash/strings/ash_strings_bg.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="bg">
<translation id="3595596368722241419">Батерията е заредена</translation>
-<translation id="5250713215130379958">Автоматично скриване на стартовия панел</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> и <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Състояние на портала</translation>
<translation id="30155388420722288">Бутон „Препълване“</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth е активиран</translation>
+<translation id="6310121235600822547">Завъртяхте „<ph name="DISPLAY_NAME"/>“ на <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth е деактивиран</translation>
+<translation id="7165320105431587207">Конфигурирането на мрежата не бе успешно</translation>
<translation id="3775358506042162758">В централизирания вход можете да имате най-много три профила.</translation>
<translation id="370649949373421643">Активиране на Wi-Fi</translation>
<translation id="3626281679859535460">Яркост</translation>
+<translation id="595202126637698455">Проследяването на ефективността е активирано</translation>
<translation id="8054466585765276473">Издръжливостта на батерията се изчислява.</translation>
<translation id="7982789257301363584">Мрежа</translation>
<translation id="5565793151875479467">Прокси сървър...</translation>
<translation id="938582441709398163">Наслагване върху клавиатурата</translation>
<translation id="4387004326333427325">Сертификатът за удостоверяване бе отхвърлен отдалечено</translation>
<translation id="6979158407327259162">Google Диск</translation>
+<translation id="3683428399328702079">Променихте разделителната способност на „<ph name="DISPLAY_NAME"/>“ на <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Получаването на HTTP не бе успешно</translation>
<translation id="2297568595583585744">Област на състоянието</translation>
<translation id="1661867754829461514">Липсва PIN</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Зарядно устройство с малка мощност</translation>
<translation id="3846575436967432996">Не е налице информация за мрежата</translation>
<translation id="3026237328237090306">Настройка на мобилните данни</translation>
+<translation id="5871632337994001636">Управление на устройствата...</translation>
<translation id="785750925697875037">Преглед на мобилния профил</translation>
<translation id="153454903766751181">Клетъчният модем се подготвя за работа...</translation>
<translation id="4628814525959230255">Контролът върху екрана ви се споделя с/ъс <ph name="HELPER_NAME"/> чрез Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> бе завъртян</translation>
<translation id="7864539943188674973">Деактивиране на Bluetooth</translation>
<translation id="939252827960237676">Запазването на екранната снимка не бе успешно</translation>
<translation id="3126069444801937830">Рестартирайте, за да актуализирате</translation>
<translation id="2268813581635650749">Изход за всички</translation>
<translation id="735745346212279324">Връзката с виртуалната частна мрежа (VPN) е прекъсната</translation>
<translation id="7320906967354320621">Неактивна</translation>
-<translation id="6303423059719347535">Батерията е <ph name="PERCENTAGE"/>% пълна</translation>
<translation id="15373452373711364">Голям курсор на мишката</translation>
-<translation id="2778346081696727092">Удостоверяването с предоставеното потребителско име или парола не бе успешно</translation>
<translation id="3294437725009624529">Гост</translation>
<translation id="8190698733819146287">Персонализиране на езиците и въвеждането...</translation>
+<translation id="1279938420744323401">„<ph name="DISPLAY_NAME"/>“ (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Позиция на лавицата</translation>
<translation id="2903907270192926896">ВХОД</translation>
<translation id="8676770494376880701">Свързано е зарядно устройство с малка мощност</translation>
<translation id="7170041865419449892">Извън обхват</translation>
<translation id="4804818685124855865">Изключване</translation>
<translation id="2544853746127077729">Сертификатът за удостоверяване бе отхвърлен от мрежата</translation>
<translation id="5222676887888702881">Изход</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Конфигурация</translation>
<translation id="1272079795634619415">Стоп</translation>
<translation id="4957722034734105353">Научете повече...</translation>
<translation id="2964193600955408481">Деактивиране на Wi-Fi</translation>
-<translation id="811680302244032017">Добавяне на устройство...</translation>
<translation id="4279490309300973883">Дублиране</translation>
+<translation id="7973962044839454485">Удостоверяването през PPP не бе успешно поради неправилно потребителско име или парола</translation>
<translation id="2509468283778169019">„CAPS LOCK“ е включен</translation>
<translation id="3892641579809465218">Показване на вътрешна информация</translation>
<translation id="7823564328645135659">Езикът се промени от „<ph name="FROM_LOCALE"/>“ на „<ph name="TO_LOCALE"/>“ след синхронизирането на настройките ви.</translation>
<translation id="3368922792935385530">Установена е връзка</translation>
<translation id="8340999562596018839">Обратна връзка с говор</translation>
<translation id="8654520615680304441">Включване на Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Методът ви на въвеждане се промени на <ph name="INPUT_METHOD_ID"/>.
Натиснете „Shift + Alt“, за да превключите.</translation>
<translation id="2562916301614567480">Частна мрежа</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Остава/т <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Методи за въвеждане</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Лавица</translation>
<translation id="2614835198358683673">Възможно е вашият Chromebook да не се зарежда, докато е включен. Помислете за използване на официалното зарядно устройство.</translation>
<translation id="1895658205118569222">Изключване</translation>
<translation id="4430019312045809116">Звук</translation>
+<translation id="8681498213689260554">Рестартирайте и извършете Powerwash, за да актуализирате</translation>
<translation id="4442424173763614572">Търсенето в DNS не бе успешно</translation>
-<translation id="6356500677799115505">Батерията е пълна и се зарежда.</translation>
<translation id="7874779702599364982">Търсят се мобилни мрежи...</translation>
<translation id="583281660410589416">Неизвестно</translation>
<translation id="1383876407941801731">Търсене</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Информация за мрежата</translation>
<translation id="1621499497873603021">Оставащо време до изразходването на батерията: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Изход от сесията като гост</translation>
-<translation id="4471417012762451363">Батерията е <ph name="PERCENTAGE"/>% пълна и се зарежда</translation>
<translation id="8308637677604853869">Предишно меню</translation>
<translation id="4666297444214622512">Не може да влезете в друг профил.</translation>
<translation id="1346748346194534595">Надясно</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">Неизвестна мрежова грешка</translation>
<translation id="1467432559032391204">Наляво</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">„<ph name="NAME"/>“ се активира</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Увеличаване</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">Използва се зарядно устройство с малка мощност. Зареждането на батерията може да не е надеждно.</translation>
<translation id="3784455785234192852">Заключване</translation>
<translation id="2805756323405976993">Приложения</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> бе преоразмерен на <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Неуспех при активирането</translation>
<translation id="5097002363526479830">Свързването с мрежата „<ph name="NAME"/>“ не бе успешно: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi е изключен.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">Задаване на тапет...</translation>
<translation id="8678698760965522072">Състояние: Онлайн</translation>
<translation id="2532589005999780174">Режим на висок контраст</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Вътрешна грешка</translation>
<translation id="3019353588588144572">Оставащо време до пълното зареждане на батерията: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Екранна лупа</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">Изход от сесията</translation>
<translation id="8454013096329229812">Wi-Fi е включен.</translation>
<translation id="4872237917498892622">„Alt + търсене“ или „Shift“</translation>
+<translation id="9201131092683066720">Батерията е <ph name="PERCENTAGE"/>% пълна.</translation>
<translation id="2983818520079887040">Настройки...</translation>
+<translation id="1195412055398077112">допълнителна област</translation>
<translation id="1717216362413677834">Режим на работа с докинг станция</translation>
+<translation id="112308213915226829">Автоматично скриване на лавицата</translation>
<translation id="8927026611342028580">Заявено е свързване</translation>
<translation id="8300849813060516376">Безжичното осигуряване на услуга не бе успешно</translation>
<translation id="2792498699870441125">Alt + търсене</translation>
<translation id="8660803626959853127">Синхронизира/т се <ph name="COUNT"/> файл/а</translation>
+<translation id="5958529069007801266">Контролиран потребител</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">„CAPS LOCK“ е изключен</translation>
<translation id="6248847161401822652">За изход натиснете два пъти Ctrl+Shift+Q.</translation>
+<translation id="6785414152754474415">Батерията е <ph name="PERCENTAGE"/>% пълна и се зарежда.</translation>
<translation id="6267036997247669271">„<ph name="NAME"/>“: Активира се...</translation>
+<translation id="4895488851634969361">Батерията е пълна.</translation>
<translation id="1391854757121130358">Може да сте изразходили отпуснатите ви мобилни данни.</translation>
-<translation id="5413208160176941586">Локално управляван потребител</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Позиция на стартовия панел</translation>
+<translation id="5947494881799873997">Възстановяване</translation>
<translation id="7593891976182323525">„търсене“ или „Shift“</translation>
<translation id="7649070708921625228">Помощ</translation>
<translation id="3050422059534974565">„CAPS LOCK“ е включен.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">Паролата е неправилна</translation>
<translation id="6165508094623778733">Научете повече</translation>
<translation id="9046895021617826162">Свързването не бе успешно</translation>
+<translation id="7168224885072002358">Старата разделителна способност ще се възстанови след <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Тази сесия ще приключи след <ph name="SESSION_TIME_REMAINING"/>. Ще излезете автоматично от нея.</translation>
<translation id="8372369524088641025">Ключът за WEP е неправилен</translation>
<translation id="6636709850131805001">Неразпознато състояние</translation>
<translation id="3573179567135747900">Връщане към „<ph name="FROM_LOCALE"/>“ (изисква рестартиране)</translation>
<translation id="8103386449138765447">SMS съобщения: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Настройки за Google Диск...</translation>
-<translation id="1510238584712386396">Стартов панел</translation>
<translation id="7209101170223508707">„CAPS LOCK“ е включен.
Натиснете „Alt + търсене“ или „Shift“, за да анулирате.</translation>
<translation id="8940956008527784070">Батерията е изтощена (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Приемам</translation>
<translation id="5102001756192215136">Остава/т <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Контролът върху екрана ви се споделя чрез Hangouts.</translation>
<translation id="8000066093800657092">Няма мрежа</translation>
<translation id="4015692727874266537">Вход в друг профил...</translation>
<translation id="5941711191222866238">Намаляване</translation>
<translation id="6911468394164995108">Присъединяване другаде...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> ч <ph name="MINUTE"/> м до пълно зареждане</translation>
<translation id="6359806961507272919">SMS от <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Оператор</translation>
diff --git a/chromium/ash/strings/ash_strings_bn.xtb b/chromium/ash/strings/ash_strings_bn.xtb
index 44496f3ec74..fde6ff9b1c5 100644
--- a/chromium/ash/strings/ash_strings_bn.xtb
+++ b/chromium/ash/strings/ash_strings_bn.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="bn">
<translation id="3595596368722241419">ব্যাটারি পুরো চার্জ</translation>
-<translation id="5250713215130379958">লঞ্চার স্বয়ংক্রিয়ভাবে লুকান</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> এবং <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">পোর্টাল স্থিতি</translation>
<translation id="30155388420722288">ওভারফ্লো বোতাম</translation>
+<translation id="8673028979667498656">২৭০°</translation>
<translation id="5571066253365925590">ব্লুটুথ সক্ষমিত</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> <ph name="ROTATION"/> আবর্তিত হয়েছে</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">ব্লুটুথ অক্ষমিত</translation>
+<translation id="7165320105431587207">নেটওয়ার্ক কনফিগার করা যায়নি</translation>
<translation id="3775358506042162758">একাধিক সাইন ইনে আপনার কেবলমাত্র তিনটি অ্যাকাউন্ট থাকতে পারে৷</translation>
<translation id="370649949373421643">Wi-fi সক্ষম করুন</translation>
<translation id="3626281679859535460">উজ্জ্বলতা</translation>
+<translation id="595202126637698455">কার্য-সম্পাদনা ট্রেস করা সক্ষম রয়েছে</translation>
<translation id="8054466585765276473">ব্যাটারি সময় গণনা করা হচ্ছে।</translation>
<translation id="7982789257301363584">নেটওয়ার্ক</translation>
<translation id="5565793151875479467">প্রক্সি...</translation>
<translation id="938582441709398163">কীবোর্ড ওভারলে</translation>
<translation id="4387004326333427325">দূরবর্তী অবস্থান থেকে প্রমাণীকরণ শংসাপত্র প্রত্যাখ্যান করা হয়েছে</translation>
<translation id="6979158407327259162">Google ড্রাইভ</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> এর রেসুলিউশান বদল করে <ph name="RESOLUTION"/> করা হয়েছে</translation>
<translation id="6943836128787782965">HTTP ব্যর্থ হয়েছে</translation>
<translation id="2297568595583585744">স্থিতি ট্রে</translation>
<translation id="1661867754829461514">PIN হারিয়েছে</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">নিম্ন শক্তির চার্জার</translation>
<translation id="3846575436967432996">কোনো নেটওয়ার্ক সংক্রান্ত তথ্য উপলব্ধ নেই</translation>
<translation id="3026237328237090306">মোবাইল ডেটা সেটআপ করুন</translation>
+<translation id="5871632337994001636">ডিভাইসগুলি পরিচালন করুন...</translation>
<translation id="785750925697875037">মোবাইল অ্যাকাউন্ট দেখুন</translation>
<translation id="153454903766751181">সেলুলার মোডেম আরম্ভ করা হচ্ছে...</translation>
<translation id="4628814525959230255">Hangouts এর মাধ্যমে <ph name="HELPER_NAME"/> এর সঙ্গে আপনার স্ক্রীন নিয়ন্ত্রণ ভাগ করা হচ্ছে৷</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ঘোরানো হয়েছে</translation>
<translation id="7864539943188674973">ব্লুটুথ অক্ষম করুন</translation>
<translation id="939252827960237676">স্ক্রীনশট সংরক্ষণ করতে ব্যর্থ হয়েছে</translation>
<translation id="3126069444801937830">আপডেট করার জন্য পুনরারম্ভ করুন</translation>
<translation id="2268813581635650749">সবগুলি সাইন আউট করুন</translation>
<translation id="735745346212279324">VPN সংযোগ বিচ্ছিন্ন করা হয়েছে</translation>
<translation id="7320906967354320621">নিষ্ক্রিয়</translation>
-<translation id="6303423059719347535">ব্যাটারি <ph name="PERCENTAGE"/>% পরিপূর্ণ</translation>
<translation id="15373452373711364">বড় মাউস কার্সার</translation>
-<translation id="2778346081696727092">সরবরাহ করা ব্যবহারকারীর নাম বা পাসওয়ার্ড সহ প্রমাণীকরণ ব্যর্থ</translation>
<translation id="3294437725009624529">অতিথি</translation>
<translation id="8190698733819146287">ভাষা এবং ইনপুট কাস্টমাইজ করুন...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">শেল্ফ অবস্থান</translation>
<translation id="2903907270192926896">ইনপুট</translation>
<translation id="8676770494376880701">নিম্ন শক্তির চার্জার সংযুক্ত করা হয়েছে</translation>
<translation id="7170041865419449892">সীমার বাইরে</translation>
<translation id="4804818685124855865">সংযোগ বিচ্ছিন্ন</translation>
<translation id="2544853746127077729">নেটওয়ার্কের দ্বারা প্রমাণীকরণ শংসাপত্র প্রত্যাখ্যান করা হয়েছে</translation>
<translation id="5222676887888702881">সাইন আউট</translation>
+<translation id="2391579633712104609">১৮০°</translation>
<translation id="2688477613306174402">কনফিগারেশন</translation>
<translation id="1272079795634619415">বন্ধ</translation>
<translation id="4957722034734105353">আরো জানুন...</translation>
<translation id="2964193600955408481">Wi-Fi অক্ষম করুন</translation>
-<translation id="811680302244032017">ডিভাইস জুড়ুন...</translation>
<translation id="4279490309300973883">অনুকরণ করা হচ্ছে</translation>
+<translation id="7973962044839454485">একটি ভুল ব্যবহারকারী নাম বা পাসওয়ার্ডের কারণে PPP প্রমাণীকরণ ব্যর্থ হয়েছে৷</translation>
<translation id="2509468283778169019">CAPS LOCK চালু</translation>
<translation id="3892641579809465218">অভ্যন্তরীণ প্রদর্শন</translation>
<translation id="7823564328645135659">আপনার সেটিংস সিঙ্ক করার পরে ভাষা &quot;<ph name="FROM_LOCALE"/>&quot; থেকে &quot;<ph name="TO_LOCALE"/>&quot; এ পরিবর্তন করা হয়েছে৷</translation>
<translation id="3368922792935385530">সংযুক্ত</translation>
<translation id="8340999562596018839">কথ্য প্রতিক্রিয়া</translation>
<translation id="8654520615680304441">Wi-Fi চালু করুন...</translation>
+<translation id="8828714802988429505">৯০°</translation>
<translation id="5825747213122829519">আপনার ইনপুট পদ্ধতি <ph name="INPUT_METHOD_ID"/> এ পরিবর্তিত হয়েছে৷
স্যুইচ করতে Shift + Alt টিপুন৷</translation>
<translation id="2562916301614567480">ব্যক্তিগত নেটওয়ার্ক</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% বাকি আছে</translation>
<translation id="9089416786594320554">ইনপুট পদ্ধতিসমূহ</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">শেল্ফ</translation>
<translation id="2614835198358683673">চালু থাকার সময় আপনার Chromebook চার্জ নাও হতে পারে৷ এটির নিজস্ব চার্জার ব্যবহার করার কথা বিবেচনা করুন৷</translation>
<translation id="1895658205118569222">শাটডাউন</translation>
<translation id="4430019312045809116">ভলিউম</translation>
+<translation id="8681498213689260554">আপডেট করার জন্য আবার শুরু করুন এবং পাওয়ারওয়াশ করুন</translation>
<translation id="4442424173763614572">DNS খোঁজ ব্যর্থ হয়েছে</translation>
-<translation id="6356500677799115505">ব্যাটারি পরিপূর্ণ এবং চার্জ হচ্ছে৷</translation>
<translation id="7874779702599364982">সেলুলার নেটওয়ার্কগুলির জন্য অনুসন্ধান করছে...</translation>
<translation id="583281660410589416">অজানা</translation>
<translation id="1383876407941801731">অনুসন্ধান</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">নেটওয়ার্ক তথ্য</translation>
<translation id="1621499497873603021">ব্যাটারি শেষ হতে <ph name="TIME_LEFT"/> সময় বাকি আছে</translation>
<translation id="5980301590375426705">অতিথি থেকে প্রস্থান</translation>
-<translation id="4471417012762451363">ব্যাটারি <ph name="PERCENTAGE"/>% পরিপূর্ণ এবং চার্জ হচ্ছে</translation>
<translation id="8308637677604853869">পূর্ববর্তী মেনু</translation>
<translation id="4666297444214622512">অন্য একটি অ্যাকাউন্টে সাইন ইন করতে পারবেন না৷</translation>
<translation id="1346748346194534595">ডান</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">অজানা নেটওয়ার্ক ত্রুটি</translation>
<translation id="1467432559032391204">বাম</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">০°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> সক্রিয় করা হচ্ছে</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">বড় করুন</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">একটি নিম্ন শক্তির চার্জার প্লাগইন করা হয়েছে৷ বিশ্বস্ত ব্যাটারি চার্জ নাও হতে পারে৷</translation>
<translation id="3784455785234192852">লক করুন</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> এর আকার পরিবর্তন করে <ph name="RESOLUTION"/> করা হয়েছে</translation>
<translation id="1512064327686280138">সক্রিয়করণে ব্যর্থতা</translation>
<translation id="5097002363526479830">নেটওয়ার্কের সাথে সংযোগ করতে ব্যর্থ '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi বন্ধ আছে৷</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">ওয়ালপেপার সেট করুন...</translation>
<translation id="8678698760965522072">অনলাইন স্থিতি</translation>
<translation id="2532589005999780174">উচ্চ কনট্রাস্ট মোড</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">অভ্যন্তরীণ ত্রুটি</translation>
<translation id="3019353588588144572">ব্যাটারি পরিপূর্ণ চার্জ হতে, <ph name="TIME_REMAINING"/> সময় বাকি আছে</translation>
<translation id="3473479545200714844">স্ক্রীন ম্যাগনিফায়ার</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">সেশন থেকে প্রস্থান</translation>
<translation id="8454013096329229812">Wi-Fi চালু আছে৷</translation>
<translation id="4872237917498892622">Alt+Search অথবা Shift</translation>
+<translation id="9201131092683066720">ব্যাটারি <ph name="PERCENTAGE"/>% পূর্ণ৷</translation>
<translation id="2983818520079887040">সেটিংস...</translation>
+<translation id="1195412055398077112">ওভারস্ক্যান</translation>
<translation id="1717216362413677834">ডক মোড</translation>
+<translation id="112308213915226829">শেল্ফ স্বয়ংক্রিয়ভাবে লুকান</translation>
<translation id="8927026611342028580">সংযুক্ত করার অনুরোধ করা হয়েছে</translation>
<translation id="8300849813060516376">OTASP ব্যর্থ</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/>টি ফাইল (গুলি) সিঙ্ক হচ্ছে</translation>
+<translation id="5958529069007801266">তত্ত্বাবধানে থাকা ব্যবহারকারী</translation>
<translation id="3709443003275901162">৯+</translation>
<translation id="639644700271529076">CAPS LOCK বন্ধ আছে</translation>
<translation id="6248847161401822652">প্রস্থান করার জন্য দুবার Control Shift Q টিপুন৷</translation>
+<translation id="6785414152754474415">ব্যাটারি <ph name="PERCENTAGE"/>% পূর্ণ এবং চার্জ হচ্ছে৷</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: সক্রিয় করা হচ্ছে...</translation>
+<translation id="4895488851634969361">ব্যাটারি পূর্ণ৷</translation>
<translation id="1391854757121130358">আপনি হয়তো আপনার মোবাইল ডেটা অ্যালাউন্স ব্যবহার করেছেন৷</translation>
-<translation id="5413208160176941586">স্থানীয়ভাবে পরিচালিত ব্যবহারকারী</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">লঞ্চার অবস্থান</translation>
+<translation id="5947494881799873997">ফেরান</translation>
<translation id="7593891976182323525">Search অথবা Shift</translation>
<translation id="7649070708921625228">সহায়তা</translation>
<translation id="3050422059534974565">CAPS LOCK চালু আছে৷
@@ -179,22 +190,24 @@ Search অথবা বাতিল করতে Shift টিপুন৷</trans
<translation id="6692173217867674490">খারাপ পাসফ্রেজ</translation>
<translation id="6165508094623778733">আরো জানুন</translation>
<translation id="9046895021617826162">সংযোগ ব্যর্থ হয়েছে</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> এ পুরানো রেসুলিউশানে ফেরানো হচ্ছে</translation>
<translation id="973896785707726617">এই সেশনটি <ph name="SESSION_TIME_REMAINING"/> এর মধ্যে সমাপ্ত হবে৷ আপনি স্বয়ংক্রিয়ভাবে সাইন আউট হয়ে যাবেন৷</translation>
<translation id="8372369524088641025">খারাপ WEP কী</translation>
<translation id="6636709850131805001">অস্বীকৃত স্থিতি</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; তে ফেরান (পুনর্সূচনা প্রয়োজন)</translation>
<translation id="8103386449138765447">SMS বার্তা: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google ড্রাইভ সেটিংস ...</translation>
-<translation id="1510238584712386396">লঞ্চার</translation>
<translation id="7209101170223508707">CAPS LOCK চালু আছে৷
Alt+Search অথবা বাতিল করতে Shift টিপুন৷</translation>
<translation id="8940956008527784070">(<ph name="PERCENTAGE"/>%) কম ব্যাটারি</translation>
+<translation id="4918086044614829423">স্বীকার</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> বাকি</translation>
<translation id="520760366042891468">Hangouts এর মাধ্যমে আপনার স্ক্রীন নিয়ন্ত্রণ ভাগ করা হচ্ছে৷</translation>
<translation id="8000066093800657092">কোনও নেটওয়ার্ক নেই</translation>
<translation id="4015692727874266537">অন্য একটি অ্যাকাউন্টে সাইন ইন করুন...</translation>
<translation id="5941711191222866238">ছোট করুন</translation>
<translation id="6911468394164995108">অন্যান্য যোগদান ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>ঘন্টা <ph name="MINUTE"/> মিনিট পর্যন্ত পূর্ণ</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/>-এর থেকে SMS...</translation>
<translation id="1244147615850840081">কেরিয়ার</translation>
diff --git a/chromium/ash/strings/ash_strings_ca.xtb b/chromium/ash/strings/ash_strings_ca.xtb
index 325713c2dff..f7e60ca8d53 100644
--- a/chromium/ash/strings/ash_strings_ca.xtb
+++ b/chromium/ash/strings/ash_strings_ca.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ca">
<translation id="3595596368722241419">Bateria carregada.</translation>
-<translation id="5250713215130379958">Oculta automàticament la barra d'execució ràpida</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> i <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Estat del portal</translation>
<translation id="30155388420722288">Botó de desbordament</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">S'ha activat el Bluetooth</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> s'ha canviat a <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">S'ha desactivat el Bluetooth</translation>
+<translation id="7165320105431587207">No s'ha pogut configurar la xarxa</translation>
<translation id="3775358506042162758">Només podeu tenir tres comptes com a màxim en un inici de sessió múltiple.</translation>
<translation id="370649949373421643">Activa la Wi-Fi</translation>
<translation id="3626281679859535460">Brillantor</translation>
+<translation id="595202126637698455">Seguiment del rendiment activat</translation>
<translation id="8054466585765276473">S'està calculant el temps de la bateria.</translation>
<translation id="7982789257301363584">Xarxa</translation>
<translation id="5565793151875479467">Servidor intermediari...</translation>
<translation id="938582441709398163">Superposició de teclat</translation>
<translation id="4387004326333427325">S'ha rebutjat el certificat d'autenticació de manera remota</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">La resolució de <ph name="DISPLAY_NAME"/> ha canviat a <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">La sol·licitud HTTP ha fallat</translation>
<translation id="2297568595583585744">Safata d'estat</translation>
<translation id="1661867754829461514">Falta el PIN</translation>
@@ -34,39 +38,41 @@ Premeu Maj+Alt per canviar-lo.</translation>
<translation id="2127372758936585790">Carregador de baix consum</translation>
<translation id="3846575436967432996">No hi ha informació de xarxa disponible</translation>
<translation id="3026237328237090306">Configura les dades mòbils</translation>
+<translation id="5871632337994001636">Gestiona els dispositius...</translation>
<translation id="785750925697875037">Mostra el compte mòbil</translation>
<translation id="153454903766751181">S'està inicialitzant el mòdem mòbil...</translation>
<translation id="4628814525959230255">Comparteix el control de la pantalla amb <ph name="HELPER_NAME"/> mitjançant Hangouts.</translation>
-<translation id="8343941333792395995">S'ha girat <ph name="DISPLAY_NAME"/></translation>
<translation id="7864539943188674973">Desactiva el Bluetooth</translation>
<translation id="939252827960237676">S'ha produït un error en desar la captura de pantalla.</translation>
<translation id="3126069444801937830">Reinicia per actualitzar</translation>
<translation id="2268813581635650749">Tanca la sessió de tots els usuaris</translation>
<translation id="735745346212279324">VPN desconnectada</translation>
<translation id="7320906967354320621">Inactiu</translation>
-<translation id="6303423059719347535">La bateria està carregada fins al <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Cursor del ratolí gran</translation>
-<translation id="2778346081696727092">No s'ha pogut autenticar amb el nom d'usuari o amb la contrasenya que heu proporcionat</translation>
<translation id="3294437725009624529">Convidat</translation>
<translation id="8190698733819146287">Personalitza els idiomes i l'entrada...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posició del prestatge</translation>
<translation id="2903907270192926896">ENTRADA</translation>
<translation id="8676770494376880701">S'ha connectat un carregador de baix consum</translation>
<translation id="7170041865419449892">Fora de l'interval</translation>
<translation id="4804818685124855865">Desconnecta</translation>
<translation id="2544853746127077729">La xarxa ha rebutjat el certificat d'autenticació</translation>
<translation id="5222676887888702881">Tanca la sessió</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuració</translation>
<translation id="1272079795634619415">Atura</translation>
<translation id="4957722034734105353">Més informació...</translation>
<translation id="2964193600955408481">Desactiva la Wi-Fi</translation>
-<translation id="811680302244032017">Afegeix un dispositiu...</translation>
<translation id="4279490309300973883">S'està creant una rèplica</translation>
+<translation id="7973962044839454485">L'autenticació de PPA ha fallat perquè el nom d'usuari o la contrasenya no eren correctes</translation>
<translation id="2509468283778169019">BLOQ MAJ està activat.</translation>
<translation id="3892641579809465218">Pantalla interna</translation>
<translation id="7823564328645135659">L'idioma ha canviat de &quot;<ph name="FROM_LOCALE"/>&quot; a &quot;<ph name="TO_LOCALE"/>&quot; després de sincronitzar la vostra configuració.</translation>
<translation id="3368922792935385530">Connectat</translation>
<translation id="8340999562596018839">Comentaris de veu</translation>
<translation id="8654520615680304441">Activa la Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">El mètode d'entrada ha canviat a <ph name="INPUT_METHOD_ID"/>.
Premeu Maj+Alt per canviar-lo.</translation>
<translation id="2562916301614567480">Xarxa privada</translation>
@@ -83,11 +89,12 @@ Premeu Maj+Alt per canviar-lo.</translation>
<translation id="3626637461649818317">Queda un <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Mètodes d'introducció</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Prestatge</translation>
<translation id="2614835198358683673">És possible que el vostre Chromebook no es carregui mentre estigui encès. Proveu de fer servir un carregador oficial.</translation>
<translation id="1895658205118569222">Aturada</translation>
<translation id="4430019312045809116">Volum</translation>
+<translation id="8681498213689260554">Reinicieu i feu un Powerwash per actualitzar</translation>
<translation id="4442424173763614572">La cerca de DNS ha fallat</translation>
-<translation id="6356500677799115505">La bateria és plena i s'està carregant.</translation>
<translation id="7874779702599364982">S'estan cercant xarxes mòbils...</translation>
<translation id="583281660410589416">Desconegut</translation>
<translation id="1383876407941801731">Cerca</translation>
@@ -96,7 +103,6 @@ Premeu Maj+Alt per canviar-lo.</translation>
<translation id="2204305834655267233">Informació de la xarxa</translation>
<translation id="1621499497873603021">Temps que queda fins que no s'esgoti la bateria: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Surt de la sessió de convidat</translation>
-<translation id="4471417012762451363">La bateria està carregada fins al <ph name="PERCENTAGE"/>% i s'està carregant</translation>
<translation id="8308637677604853869">Menú anterior</translation>
<translation id="4666297444214622512">No podeu iniciar la sessió en un altre compte.</translation>
<translation id="1346748346194534595">A la dreta</translation>
@@ -114,6 +120,7 @@ Premeu Ctrl+Alt+Z per desactivar-los.</translation>
<translation id="6312403991423642364">Error de xarxa desconegut</translation>
<translation id="1467432559032391204">A l'esquerra</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">S'està activant <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximitza</translation>
@@ -123,7 +130,6 @@ Premeu Ctrl+Alt+Z per desactivar-los.</translation>
<translation id="2727977024730340865">S'ha connectat a un carregador de baix consum. És possible que la càrrega de la bateria no sigui fiable.</translation>
<translation id="3784455785234192852">Bloqueja</translation>
<translation id="2805756323405976993">Aplicacions</translation>
-<translation id="8871072142849158571">S'ha canviat la resolució de <ph name="DISPLAY_NAME"/> a <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Error d'activació</translation>
<translation id="5097002363526479830">S'ha produït un error en connectar amb la xarxa &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">La Wi-Fi està desactivada.</translation>
@@ -131,6 +137,7 @@ Premeu Ctrl+Alt+Z per desactivar-los.</translation>
<translation id="7052914147756339792">Defineix l'empaperat...</translation>
<translation id="8678698760965522072">Estat en línia</translation>
<translation id="2532589005999780174">Mode de contrast elevat</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Error intern</translation>
<translation id="3019353588588144572">Temps restant fins que la bateria no estigui totalment carregada: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Augment de pantalla</translation>
@@ -153,20 +160,24 @@ Missatge del servidor: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Tanca la sessió</translation>
<translation id="8454013096329229812">La Wi-Fi està activada.</translation>
<translation id="4872237917498892622">Alt+Cerca o Maj</translation>
+<translation id="9201131092683066720">La bateria està carregada fins al <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Configuració...</translation>
+<translation id="1195412055398077112">sobreescaneig</translation>
<translation id="1717216362413677834">Mode connectat</translation>
+<translation id="112308213915226829">Amaga el prestatge automàticament</translation>
<translation id="8927026611342028580">S'ha sol·licitat la connexió</translation>
<translation id="8300849813060516376">Error d'OTASP</translation>
<translation id="2792498699870441125">Alt+Cerca</translation>
<translation id="8660803626959853127">Fitxers que s'estan sincronitzant: <ph name="COUNT"/></translation>
+<translation id="5958529069007801266">Usuari supervisat</translation>
<translation id="3709443003275901162">Més de 9</translation>
<translation id="639644700271529076">Bloq Maj està desactivat</translation>
<translation id="6248847161401822652">Premeu Control+Maj+Q dues vegades per sortir.</translation>
+<translation id="6785414152754474415">La bateria està carregada fins al <ph name="PERCENTAGE"/>% i s'està carregant.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: s'està activant...</translation>
+<translation id="4895488851634969361">La bateria està carregada.</translation>
<translation id="1391854757121130358">Pot ser que hàgiu esgotat les dades mòbils.</translation>
-<translation id="5413208160176941586">Usuari gestionat localment</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posició de la barra d'execució ràpida</translation>
+<translation id="5947494881799873997">Reverteix</translation>
<translation id="7593891976182323525">Cerca o Maj</translation>
<translation id="7649070708921625228">Ajuda</translation>
<translation id="3050422059534974565">Bloq Maj està activat.
@@ -179,22 +190,24 @@ Premeu Cerca o Maj per cancel·lar.</translation>
<translation id="6692173217867674490">Contrasenya no vàlida</translation>
<translation id="6165508094623778733">Més informació</translation>
<translation id="9046895021617826162">S'ha produït un error en la connexió</translation>
+<translation id="7168224885072002358">Es revertirà a la resolució anterior d'aquí a <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">La sessió finalitzarà d'aquí a <ph name="SESSION_TIME_REMAINING"/>. Es tancarà la sessió automàticament.</translation>
<translation id="8372369524088641025">Clau WEP no vàlida</translation>
<translation id="6636709850131805001">Estat no reconegut</translation>
<translation id="3573179567135747900">Torna a canviar a &quot;<ph name="FROM_LOCALE"/>&quot; (requereix reiniciar)</translation>
<translation id="8103386449138765447">Missatges SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Configuració de Google Drive...</translation>
-<translation id="1510238584712386396">Menú d'aplicacions</translation>
<translation id="7209101170223508707">Bloq Maj està activat.
Premeu Alt+Cerca o Maj per cancel·lar.</translation>
<translation id="8940956008527784070">Bateria baixa (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Accepta</translation>
<translation id="5102001756192215136">Temps d'autonomia: <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Compartiu el control de la pantalla mitjançant Hangouts.</translation>
<translation id="8000066093800657092">No hi ha xarxa</translation>
<translation id="4015692727874266537">Inicia la sessió amb un altre compte...</translation>
<translation id="5941711191222866238">Minimitza</translation>
<translation id="6911468394164995108">Uneix-te a una altra...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">Falten <ph name="HOUR"/> h <ph name="MINUTE"/> min fins que estigui carregada completament</translation>
<translation id="6359806961507272919">SMS de <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operador</translation>
diff --git a/chromium/ash/strings/ash_strings_cs.xtb b/chromium/ash/strings/ash_strings_cs.xtb
index cc7cafc6f7f..d5f2e98a3ae 100644
--- a/chromium/ash/strings/ash_strings_cs.xtb
+++ b/chromium/ash/strings/ash_strings_cs.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="cs">
<translation id="3595596368722241419">Baterie je nabitá</translation>
-<translation id="5250713215130379958">Automaticky skrýt spouštěč</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> a <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stav portálu</translation>
<translation id="30155388420722288">Tlačítko přetečení</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Rozhraní Bluetooth aktivováno</translation>
+<translation id="6310121235600822547">Displej <ph name="DISPLAY_NAME"/> byl otočen o <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Rozhraní Bluetooth deaktivováno</translation>
+<translation id="7165320105431587207">Konfigurace sítě se nezdařila</translation>
<translation id="3775358506042162758">V rámci vícenásobného přihlášení lze používat maximálně tři účty.</translation>
<translation id="370649949373421643">Povolit Wi-Fi</translation>
<translation id="3626281679859535460">Jas</translation>
+<translation id="595202126637698455">Sledování výkonu aktivováno</translation>
<translation id="8054466585765276473">Výpočet doby výdrže baterie.</translation>
<translation id="7982789257301363584">Síť</translation>
<translation id="5565793151875479467">Server proxy...</translation>
<translation id="938582441709398163">Překryvná klávesnice</translation>
<translation id="4387004326333427325">Ověřovací certifikát byl vzdáleně odmítnut</translation>
<translation id="6979158407327259162">Disk Google</translation>
+<translation id="3683428399328702079">Rozlišení displeje <ph name="DISPLAY_NAME"/> bylo změněno na <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Příkaz GET protokolu HTTP se nezdařil.</translation>
<translation id="2297568595583585744">Stavový panel</translation>
<translation id="1661867754829461514">Chybí kód PIN</translation>
@@ -33,39 +37,41 @@
<translation id="2127372758936585790">Nabíječka má příliš nízký výkon</translation>
<translation id="3846575436967432996">Informace o síti nejsou k dispozici</translation>
<translation id="3026237328237090306">Nastavení mobilního datového připojení</translation>
+<translation id="5871632337994001636">Spravovat zařízení...</translation>
<translation id="785750925697875037">Zobrazit mobilní účet</translation>
<translation id="153454903766751181">Inicializace mobilního modemu...</translation>
<translation id="4628814525959230255">Sdílíte ovládání obrazovky s uživatelem <ph name="HELPER_NAME"/> (prostřednictvím služby Hangouts).</translation>
-<translation id="8343941333792395995">Displej <ph name="DISPLAY_NAME"/> byl pootočen</translation>
<translation id="7864539943188674973">Vypnout Bluetooth</translation>
<translation id="939252827960237676">Uložení snímku obrazovky se nezdařilo</translation>
<translation id="3126069444801937830">Restartovat a aktualizovat</translation>
<translation id="2268813581635650749">Odhlásit vše</translation>
<translation id="735745346212279324">Síť VPN je odpojena</translation>
<translation id="7320906967354320621">Nečinnost</translation>
-<translation id="6303423059719347535">Baterie je nabitá na <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Velký kurzor myši</translation>
-<translation id="2778346081696727092">Ověření prostřednictvím uvedeného uživatelského jména nebo hesla se nepodařilo.</translation>
<translation id="3294437725009624529">Host</translation>
<translation id="8190698733819146287">Personalizovat jazyky a zadávání...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Pozice na poličce</translation>
<translation id="2903907270192926896">VSTUP</translation>
<translation id="8676770494376880701">Byla připojena nabíječka s nízkým napětím</translation>
<translation id="7170041865419449892">Mimo dosah</translation>
<translation id="4804818685124855865">Odpojit</translation>
<translation id="2544853746127077729">Ověřovací certifikát byl sítí odmítnut</translation>
<translation id="5222676887888702881">Odhlásit se</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigurace</translation>
<translation id="1272079795634619415">Zastavit</translation>
<translation id="4957722034734105353">Další informace...</translation>
<translation id="2964193600955408481">Vypnout Wi-Fi</translation>
-<translation id="811680302244032017">Přidat zařízení...</translation>
<translation id="4279490309300973883">Zrcadlení</translation>
+<translation id="7973962044839454485">Ověření PPP se nezdařilo kvůli nesprávnému uživatelskému jménu nebo heslu</translation>
<translation id="2509468283778169019">CAPS LOCK je zapnutý</translation>
<translation id="3892641579809465218">Interní displej</translation>
<translation id="7823564328645135659">Jazyk prohlížeče Chrome se po synchronizaci nastavení změnil z jazyka <ph name="FROM_LOCALE"/> na jazyk <ph name="TO_LOCALE"/>.</translation>
<translation id="3368922792935385530">Připojeno</translation>
<translation id="8340999562596018839">Hlasová odezva</translation>
<translation id="8654520615680304441">Zapnout Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Metoda zadávání se změnila na metodu <ph name="INPUT_METHOD_ID"/>. Přepnout ji můžete stisknutím klávesové zkratky Shift + Alt.</translation>
<translation id="2562916301614567480">Soukromá síť</translation>
<translation id="6549021752953852991">Není k dispozici žádná mobilní síť.</translation>
@@ -81,11 +87,12 @@
<translation id="3626637461649818317">Zbývá <ph name="PERCENTAGE"/> %</translation>
<translation id="9089416786594320554">Metody zadávání dat</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Polička</translation>
<translation id="2614835198358683673">Když bude Chromebook zapnutý, možná se nebude nabíjet. Doporučujeme použít oficiální nabíječku.</translation>
<translation id="1895658205118569222">Vypnout počítač</translation>
<translation id="4430019312045809116">Hlasitost</translation>
+<translation id="8681498213689260554">Restartovat a aktualizovat pomocí funkce Powerwash</translation>
<translation id="4442424173763614572">Nepodařilo se nalézt server DNS.</translation>
-<translation id="6356500677799115505">Baterie je plně nabitá a nabíjí se.</translation>
<translation id="7874779702599364982">Vyhledávání mobilních sítí...</translation>
<translation id="583281660410589416">Neznámý</translation>
<translation id="1383876407941801731">Vyhledávání</translation>
@@ -94,7 +101,6 @@
<translation id="2204305834655267233">Informace o síti</translation>
<translation id="1621499497873603021">Čas zbývající do vybití baterie: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Odhlásit hosta</translation>
-<translation id="4471417012762451363">Baterie je nabitá na <ph name="PERCENTAGE"/> % a nabíjí se</translation>
<translation id="8308637677604853869">Předchozí nabídka</translation>
<translation id="4666297444214622512">Nelze se přihlásit k jinému účtu.</translation>
<translation id="1346748346194534595">Doprava</translation>
@@ -112,6 +118,7 @@ Stiskem kláves Ctrl+Alt+Z ji deaktivujete.</translation>
<translation id="6312403991423642364">Neznámá chyba sítě</translation>
<translation id="1467432559032391204">Doleva</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktivace sítě <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximalizovat</translation>
@@ -121,7 +128,6 @@ Stiskem kláves Ctrl+Alt+Z ji deaktivujete.</translation>
<translation id="2727977024730340865">Byla připojena nabíječka s nízkým výkonem. Nabíjení baterie nemusí probíhat spolehlivě.</translation>
<translation id="3784455785234192852">Uzamknout</translation>
<translation id="2805756323405976993">Aplikace</translation>
-<translation id="8871072142849158571">Rozlišení displeje <ph name="DISPLAY_NAME"/> bylo změněno na <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktivace se nezdařila</translation>
<translation id="5097002363526479830">Připojení k síti <ph name="NAME"/> se nezdařilo: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Připojení Wi-Fi je vypnuto.</translation>
@@ -129,6 +135,7 @@ Stiskem kláves Ctrl+Alt+Z ji deaktivujete.</translation>
<translation id="7052914147756339792">Nastavení tapety...</translation>
<translation id="8678698760965522072">Stav online</translation>
<translation id="2532589005999780174">Režim vysokého kontrastu</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Interní chyba</translation>
<translation id="3019353588588144572">Čas zbývající do úplného nabití baterie: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa obrazovky</translation>
@@ -151,20 +158,24 @@ Zpráva serveru: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Ukončit relaci</translation>
<translation id="8454013096329229812">Připojení Wi-Fi je zapnuto.</translation>
<translation id="4872237917498892622">Alt + Vyhledávání nebo Shift</translation>
+<translation id="9201131092683066720">Baterie je nabita na <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Nastavení...</translation>
+<translation id="1195412055398077112">přesah obrazu</translation>
<translation id="1717216362413677834">Režim doku</translation>
+<translation id="112308213915226829">Automaticky skrývat poličku</translation>
<translation id="8927026611342028580">Je vyžadováno připojení</translation>
<translation id="8300849813060516376">Selhání OTASP</translation>
<translation id="2792498699870441125">Alt + Vyhledávání</translation>
<translation id="8660803626959853127">Synchronizace souborů (<ph name="COUNT"/>)</translation>
+<translation id="5958529069007801266">Uživatel pod dohledem</translation>
<translation id="3709443003275901162">&gt;9</translation>
<translation id="639644700271529076">CAPS LOCK je vypnutý</translation>
<translation id="6248847161401822652">Práci ukončíte dvojitým stisknutím kombinace kláves Ctrl+Shift+Q.</translation>
+<translation id="6785414152754474415">Baterie je nabita na <ph name="PERCENTAGE"/> % a nabíjí se.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Probíhá aktivace...</translation>
+<translation id="4895488851634969361">Baterie je plně nabita.</translation>
<translation id="1391854757121130358">Pravděpodobně jste vyčerpali povolený objem mobilních datových přenosů.</translation>
-<translation id="5413208160176941586">Místně spravovaný uživatel</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Pozice spouštěče</translation>
+<translation id="5947494881799873997">Vrátit zpět</translation>
<translation id="7593891976182323525">Vyhledávání nebo Shift</translation>
<translation id="7649070708921625228">Nápověda</translation>
<translation id="3050422059534974565">CAPS LOCK je zapnutý. Vypnete jej stisknutím klávesy Vyhledávání nebo Shift.</translation>
@@ -176,22 +187,24 @@ Zpráva serveru: <ph name="SERVER_MSG"/></translation>
<translation id="6692173217867674490">Chybné přístupové heslo</translation>
<translation id="6165508094623778733">Další informace</translation>
<translation id="9046895021617826162">Připojení selhalo</translation>
+<translation id="7168224885072002358">Původní rozlišení bude obnoveno za <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Relace bude ukončena za <ph name="SESSION_TIME_REMAINING"/>. Poté budete automaticky odhlášeni.</translation>
<translation id="8372369524088641025">Chybný klíč WEP</translation>
<translation id="6636709850131805001">Neznámý stav</translation>
<translation id="3573179567135747900">Změnit zpět na jazyk <ph name="FROM_LOCALE"/> (vyžaduje restart)</translation>
<translation id="8103386449138765447">Zprávy SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Nastavení Disku Google...</translation>
-<translation id="1510238584712386396">Spouštěč</translation>
<translation id="7209101170223508707">CAPS LOCK je zapnutý.
Vypnete jej stisknutím kombinace kláves Alt + Vyhledávání nebo Shift.</translation>
<translation id="8940956008527784070">Slabá baterie (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Přijmout</translation>
<translation id="5102001756192215136">Zbývá: <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Sdílíte ovládání obrazovky (prostřednictvím služby Hangouts).</translation>
<translation id="8000066093800657092">Žádná síť</translation>
<translation id="4015692727874266537">Přihlásit jiný účet...</translation>
<translation id="5941711191222866238">Minimalizovat</translation>
<translation id="6911468394164995108">Připojit k jiné...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h <ph name="MINUTE"/> min do nabití</translation>
<translation id="6359806961507272919">SMS z čísla <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operátor</translation>
diff --git a/chromium/ash/strings/ash_strings_da.xtb b/chromium/ash/strings/ash_strings_da.xtb
index 5b25908a370..fdb185e5c30 100644
--- a/chromium/ash/strings/ash_strings_da.xtb
+++ b/chromium/ash/strings/ash_strings_da.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="da">
<translation id="3595596368722241419">Batteri fuldt</translation>
-<translation id="5250713215130379958">Skjul automatisk applikationslisten</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> og <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Tilstand for portal</translation>
<translation id="30155388420722288">Knappen Overflow</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth er aktiveret</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> er roteret til <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth er deaktiveret</translation>
+<translation id="7165320105431587207">Netværket kunne ikke konfigureres</translation>
<translation id="3775358506042162758">Du kan kun have op til tre konti i samlet login fra flere konti.</translation>
<translation id="370649949373421643">Aktivér Wi-Fi</translation>
<translation id="3626281679859535460">Lysstyrke</translation>
+<translation id="595202126637698455">Sporing af ydelsen er aktiveret</translation>
<translation id="8054466585765276473">Beregner batteritid.</translation>
<translation id="7982789257301363584">Netværk</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Tastaturoverlejring</translation>
<translation id="4387004326333427325">Godkendelsescertifikatet blev afvist eksternt</translation>
<translation id="6979158407327259162">Google Drev</translation>
+<translation id="3683428399328702079">Opløsningen for <ph name="DISPLAY_NAME"/> er ændret til <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Det lykkedes ikke at hente HTTP</translation>
<translation id="2297568595583585744">Statusbakke</translation>
<translation id="1661867754829461514">Pinkode mangler</translation>
@@ -34,39 +38,41 @@ Tryk på Shift+Alt for at ændre den.</translation>
<translation id="2127372758936585790">Oplader ved lav kraft</translation>
<translation id="3846575436967432996">Der er ingen tilgængelige netværksoplysninger</translation>
<translation id="3026237328237090306">Konfigurer mobildata</translation>
+<translation id="5871632337994001636">Administrer enheder...</translation>
<translation id="785750925697875037">Vis mobilkonto</translation>
<translation id="153454903766751181">Initialiserer mobilmodem...</translation>
<translation id="4628814525959230255">Deler kontrollen over din skærm med <ph name="HELPER_NAME"/> via Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> er roteret</translation>
<translation id="7864539943188674973">Deaktiver Bluetooth</translation>
<translation id="939252827960237676">Skærmbilledet kunne ikke gemmes</translation>
<translation id="3126069444801937830">Genstart for at opdatere</translation>
<translation id="2268813581635650749">Log alle ud</translation>
<translation id="735745346212279324">VPN afbrudt</translation>
<translation id="7320906967354320621">Ikke aktiv</translation>
-<translation id="6303423059719347535">Batteriet er <ph name="PERCENTAGE"/> % fuldt</translation>
<translation id="15373452373711364">Stor musemarkør</translation>
-<translation id="2778346081696727092">Der kunne ikke godkendes med det angivne brugernavn eller adgangskoden</translation>
<translation id="3294437725009624529">Gæst</translation>
<translation id="8190698733819146287">Tilpas sprog og indtastning...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Hyldeplacering</translation>
<translation id="2903907270192926896">INPUT</translation>
<translation id="8676770494376880701">Oplader med lav kraft er tilsluttet</translation>
<translation id="7170041865419449892">Intet signal</translation>
<translation id="4804818685124855865">Afbryd</translation>
<translation id="2544853746127077729">Godkendelsescertifikatet blev afvist af netværk</translation>
<translation id="5222676887888702881">Log ud</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguration</translation>
<translation id="1272079795634619415">Stop</translation>
<translation id="4957722034734105353">Flere oplysninger...</translation>
<translation id="2964193600955408481">Deaktiver Wi-Fi</translation>
-<translation id="811680302244032017">Tilføj enhed...</translation>
<translation id="4279490309300973883">Spejling</translation>
+<translation id="7973962044839454485">PPP-godkendelsen mislykkedes på grund af forkert brugernavn eller adgangskode</translation>
<translation id="2509468283778169019">CAPS LOCK er slået til</translation>
<translation id="3892641579809465218">Internt display</translation>
<translation id="7823564328645135659">Sproget er blevet ændret fra &quot;<ph name="FROM_LOCALE"/>&quot; til &quot;<ph name="TO_LOCALE"/>&quot;, efter at du har synkroniseret dine indstillinger.</translation>
<translation id="3368922792935385530">Tilsluttet</translation>
<translation id="8340999562596018839">Talefeedback</translation>
<translation id="8654520615680304441">Slå Wi-Fi til...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Din inputmetode er ændret til <ph name="INPUT_METHOD_ID"/>.
Tryk på Shift+Alt for at ændre den.</translation>
<translation id="2562916301614567480">Privat netværk</translation>
@@ -83,11 +89,12 @@ Tryk på Shift+Alt for at ændre den.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/> % tilbage</translation>
<translation id="9089416786594320554">Indtastningsmetoder</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Hylde</translation>
<translation id="2614835198358683673">Din Chromebook oplades muligvis ikke, når den er tændt. Anvend eventuelt den officielle oplader.</translation>
<translation id="1895658205118569222">Nedlukning</translation>
<translation id="4430019312045809116">Lydstyrke</translation>
+<translation id="8681498213689260554">Genstart, og udfør PowerWash for at opdatere</translation>
<translation id="4442424173763614572">DNS-opslag mislykkedes</translation>
-<translation id="6356500677799115505">Batteriet er fuldt opladet og oplader.</translation>
<translation id="7874779702599364982">Søger efter mobilnetværk...</translation>
<translation id="583281660410589416">Ukendt</translation>
<translation id="1383876407941801731">Søgning</translation>
@@ -96,7 +103,6 @@ Tryk på Shift+Alt for at ændre den.</translation>
<translation id="2204305834655267233">Netværksoplysninger</translation>
<translation id="1621499497873603021">Tid tilbage, indtil batteriet er tomt, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Afslut gæstesession</translation>
-<translation id="4471417012762451363">Batteriet er <ph name="PERCENTAGE"/> % fuldt og oplader</translation>
<translation id="8308637677604853869">Forrige menu</translation>
<translation id="4666297444214622512">Kan ikke logge ind på en anden konto.</translation>
<translation id="1346748346194534595">Højre</translation>
@@ -113,7 +119,8 @@ Tryk på Ctrl+Alt+Z for at deaktivere dette.</translation>
<translation id="4479639480957787382">Ethernet</translation>
<translation id="6312403991423642364">Ukendt netværksfejl</translation>
<translation id="1467432559032391204">Venstre</translation>
-<translation id="5543001071567407895">SMS</translation>
+<translation id="5543001071567407895">sms</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktiverer <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maksimer</translation>
@@ -123,7 +130,6 @@ Tryk på Ctrl+Alt+Z for at deaktivere dette.</translation>
<translation id="2727977024730340865">Tilsluttet en oplader med lav kraft. Batteriopladningen er muligvis ikke pålidelig.</translation>
<translation id="3784455785234192852">Lås</translation>
<translation id="2805756323405976993">Applikationer</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> er blevet ændret til <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktiveringsfejl:</translation>
<translation id="5097002363526479830">Der kunne ikke oprettes forbindelse til netværket &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi er slået fra.</translation>
@@ -131,6 +137,7 @@ Tryk på Ctrl+Alt+Z for at deaktivere dette.</translation>
<translation id="7052914147756339792">Angiv baggrundsbillede...</translation>
<translation id="8678698760965522072">Onlinetilstand</translation>
<translation id="2532589005999780174">Tilstanden Høj kontrast</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Intern fejl</translation>
<translation id="3019353588588144572">Resterende tid, indtil batteriet er fuldt opladet, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Skærmforstørrer</translation>
@@ -153,20 +160,24 @@ Servermeddelelse: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Afslut session</translation>
<translation id="8454013096329229812">Wi-Fi er slået til.</translation>
<translation id="4872237917498892622">Alt+Søg eller Skift</translation>
+<translation id="9201131092683066720">Batteriet er <ph name="PERCENTAGE"/> % opladet.</translation>
<translation id="2983818520079887040">Indstillinger...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Docktilstand</translation>
+<translation id="112308213915226829">Skjul hylde automatisk</translation>
<translation id="8927026611342028580">Der er anmodet om forbindelse</translation>
<translation id="8300849813060516376">OTASP mislykkedes</translation>
<translation id="2792498699870441125">Alt+Søg</translation>
<translation id="8660803626959853127">Synkroniserer <ph name="COUNT"/> fil(er)</translation>
+<translation id="5958529069007801266">Overvåget bruger</translation>
<translation id="3709443003275901162">9 eller flere</translation>
<translation id="639644700271529076">CAPS LOCK er deaktiveret</translation>
<translation id="6248847161401822652">Tryk på Ctrl+Shift+Q to gange for at afslutte.</translation>
+<translation id="6785414152754474415">Batteriet er <ph name="PERCENTAGE"/> % opladet og oplades nu.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Aktiverer...</translation>
+<translation id="4895488851634969361">Batteriet er helt opladet.</translation>
<translation id="1391854757121130358">Du har muligvis nået din mobildatagrænse.</translation>
-<translation id="5413208160176941586">Lokalt administreret bruger</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Applikationslistens placering</translation>
+<translation id="5947494881799873997">Fortryd</translation>
<translation id="7593891976182323525">Søg eller skift</translation>
<translation id="7649070708921625228">Hjælp</translation>
<translation id="3050422059534974565">CAPS LOCK er slået til.
@@ -179,22 +190,24 @@ Tryk på Søg eller Skift for at annullere.</translation>
<translation id="6692173217867674490">Ugyldig adgangssætning</translation>
<translation id="6165508094623778733">Flere oplysninger</translation>
<translation id="9046895021617826162">Forbindelsen mislykkedes</translation>
+<translation id="7168224885072002358">Fortryder og vender tilbage til den gamle opløsning om <ph name="TIMEOUT_SECONDS"/> sekunder.</translation>
<translation id="973896785707726617">Denne session afsluttes om <ph name="SESSION_TIME_REMAINING"/>. Du logges automatisk ud.</translation>
<translation id="8372369524088641025">Ugyldig WEP-nøgle</translation>
<translation id="6636709850131805001">Tilstanden genkendes ikke</translation>
<translation id="3573179567135747900">Skift tilbage til &quot;<ph name="FROM_LOCALE"/>&quot; (kræver genstart)</translation>
-<translation id="8103386449138765447">SMS-beskeder: <ph name="MESSAGE_COUNT"/></translation>
+<translation id="8103386449138765447">sms-beskeder: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google Drev-indstillinger...</translation>
-<translation id="1510238584712386396">Applikationsliste</translation>
<translation id="7209101170223508707">CAPS LOCK er slået til.
Tryk på Alt+Søg eller Skift for at annullere.</translation>
<translation id="8940956008527784070">Batteriniveauet er lavt (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Accepter</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> tilbage</translation>
<translation id="520760366042891468">Deler kontrollen over din skærm via Hangouts.</translation>
<translation id="8000066093800657092">Intet netværk</translation>
<translation id="4015692727874266537">Log ind på en anden konto...</translation>
<translation id="5941711191222866238">Minimer</translation>
<translation id="6911468394164995108">Find andre... </translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> t <ph name="MINUTE"/> m, indtil det er fuldt opladet</translation>
<translation id="6359806961507272919">Sms fra <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Mobilselskab</translation>
diff --git a/chromium/ash/strings/ash_strings_de.xtb b/chromium/ash/strings/ash_strings_de.xtb
index aed761ffbb5..b3c6f1b2f0f 100644
--- a/chromium/ash/strings/ash_strings_de.xtb
+++ b/chromium/ash/strings/ash_strings_de.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="de">
<translation id="3595596368722241419">Akku voll</translation>
-<translation id="5250713215130379958">Übersicht automatisch ausblenden</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> und <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portal-Status</translation>
<translation id="30155388420722288">Überlaufschaltfläche</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth aktiviert</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> wurde zu <ph name="ROTATION"/> gedreht.</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth deaktiviert</translation>
+<translation id="7165320105431587207">Fehler beim Konfigurieren des Netzwerks</translation>
<translation id="3775358506042162758">Bei der Mehrfachanmeldung sind maximal drei Konten zulässig.</translation>
<translation id="370649949373421643">WLAN aktivieren</translation>
<translation id="3626281679859535460">Helligkeit</translation>
+<translation id="595202126637698455">Leistungsnachverfolgung aktiviert</translation>
<translation id="8054466585765276473">Akku-Laufzeit wird berechnet.</translation>
<translation id="7982789257301363584">Netzwerk</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Tastatur-Overlay</translation>
<translation id="4387004326333427325">Remoteablehnung des Authentifizierungszertifikats</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Auflösung von <ph name="DISPLAY_NAME"/> wurde zu <ph name="RESOLUTION"/> geändert.</translation>
<translation id="6943836128787782965">HTTP-Abruf fehlgeschlagen</translation>
<translation id="2297568595583585744">Statusleiste</translation>
<translation id="1661867754829461514">PIN fehlt</translation>
@@ -34,39 +38,41 @@ Drücken Sie zum Wechseln Umschalt+Alt.</translation>
<translation id="2127372758936585790">Schwachstrom-Ladegerät</translation>
<translation id="3846575436967432996">Keine Netzwerkinformationen verfügbar</translation>
<translation id="3026237328237090306">Mobilfunk einrichten</translation>
+<translation id="5871632337994001636">Geräte verwalten...</translation>
<translation id="785750925697875037">Mobiles Konto aufrufen</translation>
<translation id="153454903766751181">Mobilfunkmodem wird initialisiert...</translation>
<translation id="4628814525959230255">Bildschirmfreigabe für <ph name="HELPER_NAME"/> über Hangouts</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> wurde gedreht.</translation>
<translation id="7864539943188674973">Bluetooth deaktivieren</translation>
<translation id="939252827960237676">Screenshot konnte nicht gespeichert werden.</translation>
<translation id="3126069444801937830">Zum Aktualisieren neu starten</translation>
<translation id="2268813581635650749">Alle abmelden</translation>
<translation id="735745346212279324">VPN-Verbindung getrennt</translation>
<translation id="7320906967354320621">Inaktiv</translation>
-<translation id="6303423059719347535">Akku ist zu <ph name="PERCENTAGE"/> % geladen.</translation>
<translation id="15373452373711364">Großer Cursor</translation>
-<translation id="2778346081696727092">Fehler beim Authentifizieren mit dem angegebenen Nutzernamen oder Passwort</translation>
<translation id="3294437725009624529">Gast</translation>
<translation id="8190698733819146287">Sprache und Eingabe anpassen...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Ablageposition</translation>
<translation id="2903907270192926896">Eingang</translation>
<translation id="8676770494376880701">Schwachstrom-Ladegerät angeschlossen</translation>
<translation id="7170041865419449892">Außerhalb des Bereichs</translation>
<translation id="4804818685124855865">Verbindung trennen</translation>
<translation id="2544853746127077729">Ablehnung des Authentifizierungszertifikats durch das Netzwerk</translation>
<translation id="5222676887888702881">Abmelden</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguration</translation>
<translation id="1272079795634619415">Stopp</translation>
<translation id="4957722034734105353">Weitere Informationen...</translation>
<translation id="2964193600955408481">WLAN deaktivieren</translation>
-<translation id="811680302244032017">Gerät hinzufügen...</translation>
<translation id="4279490309300973883">Spiegelung</translation>
+<translation id="7973962044839454485">Fehler bei PPP-Authentifizierung aufgrund eines falschen Nutzernamens oder Passworts</translation>
<translation id="2509468283778169019">Feststelltaste An</translation>
<translation id="3892641579809465218">Interne Anzeige</translation>
<translation id="7823564328645135659">Nach der Synchronisierung Ihrer Einstellungen wurde die Sprache von &quot;<ph name="FROM_LOCALE"/>&quot; in &quot;<ph name="TO_LOCALE"/>&quot; geändert.</translation>
<translation id="3368922792935385530">Verbunden</translation>
<translation id="8340999562596018839">Gesprochenes Feedback</translation>
<translation id="8654520615680304441">WLAN aktivieren...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Ihre Eingabemethode hat sich in <ph name="INPUT_METHOD_ID"/> geändert.
Drücken Sie zum Wechseln Umschalt+Alt.</translation>
<translation id="2562916301614567480">Privates Netzwerk</translation>
@@ -83,11 +89,12 @@ Drücken Sie zum Wechseln Umschalt+Alt.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/> % verbleibend</translation>
<translation id="9089416786594320554">Eingabemethoden</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Ablage</translation>
<translation id="2614835198358683673">Ihr Chromebook kann möglicherweise nicht geladen werden, während es eingeschaltet ist. Wir empfehlen die Verwendung des Originalladegeräts.</translation>
<translation id="1895658205118569222">Herunterfahren</translation>
<translation id="4430019312045809116">Lautstärke</translation>
+<translation id="8681498213689260554">Zum Aktualisieren Neustart und Powerwash durchführen</translation>
<translation id="4442424173763614572">DNS-Suche fehlgeschlagen</translation>
-<translation id="6356500677799115505">Akku ist vollständig geladen und wird noch geladen.</translation>
<translation id="7874779702599364982">Suche nach Mobilfunknetzen läuft...</translation>
<translation id="583281660410589416">Unbekannt</translation>
<translation id="1383876407941801731">Suche</translation>
@@ -96,7 +103,6 @@ Drücken Sie zum Wechseln Umschalt+Alt.</translation>
<translation id="2204305834655267233">Netzwerkinformationen</translation>
<translation id="1621499497873603021">Verbleibende Akku-Laufzeit: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Gastsitzung beenden</translation>
-<translation id="4471417012762451363">Akku ist zu <ph name="PERCENTAGE"/> % geladen und wird geladen.</translation>
<translation id="8308637677604853869">Vorheriges Menü</translation>
<translation id="4666297444214622512">Anmeldung in weiterem Konto nicht möglich</translation>
<translation id="1346748346194534595">Nach rechts</translation>
@@ -114,6 +120,7 @@ Zum Deaktivieren Strg+Alt+Z drücken</translation>
<translation id="6312403991423642364">Unbekannter Netzwerkfehler</translation>
<translation id="1467432559032391204">Nach links</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> wird aktiviert</translation>
<translation id="8814190375133053267">WLAN</translation>
<translation id="1398853756734560583">Vergrößern</translation>
@@ -123,7 +130,6 @@ Zum Deaktivieren Strg+Alt+Z drücken</translation>
<translation id="2727977024730340865">Das Gerät ist an ein Schwachstrom-Ladegerät angeschlossen. Möglicherweise kann der Akku nicht zuverlässig aufgeladen werden.</translation>
<translation id="3784455785234192852">Sperren</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571">Die Größe von <ph name="DISPLAY_NAME"/> wurde auf <ph name="RESOLUTION"/> angepasst.</translation>
<translation id="1512064327686280138">Aktivierungsfehler</translation>
<translation id="5097002363526479830">Fehler beim Herstellen einer Verbindung mit dem Netzwerk &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">WLAN ist deaktiviert.</translation>
@@ -131,6 +137,7 @@ Zum Deaktivieren Strg+Alt+Z drücken</translation>
<translation id="7052914147756339792">Hintergrund festlegen</translation>
<translation id="8678698760965522072">Online-Status</translation>
<translation id="2532589005999780174">Modus mit hohem Kontrast</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Interner Fehler</translation>
<translation id="3019353588588144572">Verbleibende Zeit, bis der Akku vollständig geladen ist: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupe</translation>
@@ -153,20 +160,24 @@ Servernachricht: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Sitzung beenden</translation>
<translation id="8454013096329229812">WLAN ist aktiviert.</translation>
<translation id="4872237917498892622">Alt+Such- oder Umschalttaste</translation>
+<translation id="9201131092683066720">Akku ist zu <ph name="PERCENTAGE"/> % geladen.</translation>
<translation id="2983818520079887040">Einstellungen...</translation>
+<translation id="1195412055398077112">Overscan</translation>
<translation id="1717216362413677834">Dock-Modus</translation>
+<translation id="112308213915226829">Ablage automatisch ausblenden</translation>
<translation id="8927026611342028580">Verbindung angefordert</translation>
<translation id="8300849813060516376">OTASP fehlgeschlagen</translation>
<translation id="2792498699870441125">Alt+Suchtaste</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> Datei(en) wird bzw. werden synchronisiert.</translation>
+<translation id="5958529069007801266">Betreuter Nutzer</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">Feststelltaste Aus</translation>
<translation id="6248847161401822652">Drücken Sie zum Beenden zweimal Steuerung-Shift-Q.</translation>
+<translation id="6785414152754474415">Akku ist zu <ph name="PERCENTAGE"/> % geladen und wird geladen.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Wird aktiviert...</translation>
+<translation id="4895488851634969361">Akku ist vollständig geladen.</translation>
<translation id="1391854757121130358">Sie haben möglicherweise Ihr mobiles Datenvolumen aufgebraucht.</translation>
-<translation id="5413208160176941586">Lokal verwalteter Nutzer</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Position der Übersicht</translation>
+<translation id="5947494881799873997">Rückgängig machen</translation>
<translation id="7593891976182323525">Such- oder Umschalttaste</translation>
<translation id="7649070708921625228">Hilfe</translation>
<translation id="3050422059534974565">Die Feststelltaste ist aktiviert.
@@ -179,22 +190,24 @@ Drücken Sie die Such- oder die Umschalttaste, um die Aktivierung aufzuheben.</t
<translation id="6692173217867674490">Ungültige Passphrase</translation>
<translation id="6165508094623778733">Weitere Informationen</translation>
<translation id="9046895021617826162">Verbindungsaufbau fehlgeschlagen</translation>
+<translation id="7168224885072002358">Alte Auflösung wird in <ph name="TIMEOUT_SECONDS"/> wiederhergestellt.</translation>
<translation id="973896785707726617">Die Sitzung wird in <ph name="SESSION_TIME_REMAINING"/> beendet. Sie werden dann automatisch abgemeldet.</translation>
<translation id="8372369524088641025">Ungültiger WEP-Schlüssel</translation>
<translation id="6636709850131805001">Unbekannter Status</translation>
<translation id="3573179567135747900">Zurücksetzen auf &quot;<ph name="FROM_LOCALE"/>&quot; (Neustart erforderlich)</translation>
<translation id="8103386449138765447">SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google Drive-Einstellungen...</translation>
-<translation id="1510238584712386396">Übersicht</translation>
<translation id="7209101170223508707">Die Feststelltaste ist aktiviert.
Drücken Sie Alt+Such- oder Umschalttaste, um die Aktivierung aufzuheben.</translation>
<translation id="8940956008527784070">Niedriger Akkustand (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Annehmen</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> verbleiben</translation>
<translation id="520760366042891468">Bildschirmfreigabe über Hangouts</translation>
<translation id="8000066093800657092">Nicht verbunden</translation>
<translation id="4015692727874266537">Anderes Konto anmelden...</translation>
<translation id="5941711191222866238">Verkleinern</translation>
<translation id="6911468394164995108">Andere Netzwerke...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">In <ph name="HOUR"/> Std. <ph name="MINUTE"/> Min. vollständig aufgeladen</translation>
<translation id="6359806961507272919">SMS von <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Mobilfunkanbieter</translation>
diff --git a/chromium/ash/strings/ash_strings_el.xtb b/chromium/ash/strings/ash_strings_el.xtb
index b088fb0ee51..a37b5bf5254 100644
--- a/chromium/ash/strings/ash_strings_el.xtb
+++ b/chromium/ash/strings/ash_strings_el.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="el">
<translation id="3595596368722241419">Μπαταρία πλήρης</translation>
-<translation id="5250713215130379958">Αυτόματη απόκρυψη της λειτουργίας εκκίνησης</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> και <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Κατάσταση πύλης</translation>
<translation id="30155388420722288">Κουμπί επιπρόσθετης ροής</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Το Bluetooth έχει ενεργοποιηθεί</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> περιστράφηκε σε <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Το Bluetooth έχει απενεργοποιηθεί</translation>
+<translation id="7165320105431587207">Αποτυχία διαμόρφωσης δικτύου</translation>
<translation id="3775358506042162758">Μπορείτε να συνδέεστε ταυτόχρονα με έως και τρεις λογαριασμούς.</translation>
<translation id="370649949373421643">Ενεργοποίηση Wi-Fi</translation>
<translation id="3626281679859535460">Φωτεινότητα</translation>
+<translation id="595202126637698455">Η παρακολούθηση απόδοσης έχει ενεργοποιηθεί</translation>
<translation id="8054466585765276473">Υπολογισμός χρόνου μπαταρίας που απομένει.</translation>
<translation id="7982789257301363584">Δίκτυο</translation>
<translation id="5565793151875479467">Διακομιστής μεσολάβησης...</translation>
<translation id="938582441709398163">Επικάλυψη πληκτρολογίου</translation>
<translation id="4387004326333427325">Το πιστοποιητικό ελέγχου ταυτότητας απορρίφθηκε απομακρυσμένα</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Η ανάλυση <ph name="DISPLAY_NAME"/> άλλαξε σε <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Η λήψη HTTP απέτυχε</translation>
<translation id="2297568595583585744">Δίσκος κατάστασης</translation>
<translation id="1661867754829461514">Απουσιάζει το PIN </translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Χαμηλή ισχύς φορτιστή</translation>
<translation id="3846575436967432996">Δεν υπάρχουν διαθέσιμες πληροφορίες δικτύου</translation>
<translation id="3026237328237090306">Ρύθμιση δεδομένων κινητής τηλεφωνίας</translation>
+<translation id="5871632337994001636">Διαχείριση συσκευών…</translation>
<translation id="785750925697875037">Προβολή λογαριασμού κινητής τηλεφωνίας</translation>
<translation id="153454903766751181">Εκκίνηση μόντεμ δικτύου κινητής τηλεφωνίας…</translation>
<translation id="4628814525959230255">Μοιράζεστε τον έλεγχο της οθόνης σας με το χρήστη <ph name="HELPER_NAME"/> μέσω του Hangouts.</translation>
-<translation id="8343941333792395995">Η οθόνη <ph name="DISPLAY_NAME"/> έχει περιστραφεί</translation>
<translation id="7864539943188674973">Απενεργοποίηση Bluetooth</translation>
<translation id="939252827960237676">Αποτυχία αποθήκευσης στιγμιότυπου οθόνης</translation>
<translation id="3126069444801937830">Επανεκκίνηση για ενημέρωση</translation>
<translation id="2268813581635650749">Αποσύνδεση όλων</translation>
<translation id="735745346212279324">Το VPN αποσυνδέθηκε</translation>
<translation id="7320906967354320621">Αδρανές</translation>
-<translation id="6303423059719347535">Η μπαταρία είναι πλήρης <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Μεγάλος δείκτης ποντικιού</translation>
-<translation id="2778346081696727092">Δεν είναι δυνατός ο έλεγχος ταυτότητας με το όνομα χρήστη ή τον κωδικό πρόσβασης που παρέχεται</translation>
<translation id="3294437725009624529">Επισκέπτης</translation>
<translation id="8190698733819146287">Προσαρμογή γλωσσών και εισόδου...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Θέση ραφιού</translation>
<translation id="2903907270192926896">ΕΙΣΟΔΟΣ</translation>
<translation id="8676770494376880701">Ο συνδεδεμένος φορτιστής παρέχει χαμηλή ισχύ</translation>
<translation id="7170041865419449892">Εκτός εύρους τιμών</translation>
<translation id="4804818685124855865">Αποσύνδεση</translation>
<translation id="2544853746127077729">Το πιστοποιητικό ελέγχου ταυτότητας απορρίφθηκε από το δίκτυο</translation>
<translation id="5222676887888702881">Έξοδος</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Διαμόρφωση</translation>
<translation id="1272079795634619415">Διακοπή</translation>
<translation id="4957722034734105353">Μάθετε περισσότερα…</translation>
<translation id="2964193600955408481">Απενεργοποίηση Wi-Fi</translation>
-<translation id="811680302244032017">Προσθήκη συσκευής…</translation>
<translation id="4279490309300973883">Κατοπτρισμός</translation>
+<translation id="7973962044839454485">Αποτυχία ελέγχου ταυτότητας PPP λόγω εσφαλμένου ονόματος χρήστη ή κωδικού πρόσβασης</translation>
<translation id="2509468283778169019">Το CAPS LOCK είναι ενεργοποιημένο</translation>
<translation id="3892641579809465218">Εσωτερική οθόνη</translation>
<translation id="7823564328645135659">Η γλώσσα του άλλαξε από &quot;<ph name="FROM_LOCALE"/>&quot; σε &quot;<ph name="TO_LOCALE"/>&quot; μετά τον συγχρονισμό των ρυθμίσεών σας.</translation>
<translation id="3368922792935385530">Σε σύνδεση</translation>
<translation id="8340999562596018839">Προφορικά σχόλια</translation>
<translation id="8654520615680304441">Ενεργοποίηση Wi-Fi…</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Η μέθοδος εισαγωγής σας έχει αλλάξει σε <ph name="INPUT_METHOD_ID"/>.
Πατήστε Shift + Alt για εναλλαγή.</translation>
<translation id="2562916301614567480">Ιδιωτικό δίκτυο</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Υπολείπεται <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Μέθοδοι εισαγωγής</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Ράφι</translation>
<translation id="2614835198358683673">Το Chromebook ενδέχεται να μη φορτίζει ενώ είναι ενεργοποιημένο. Χρησιμοποιήστε τον αυθεντικό φορτιστή.</translation>
<translation id="1895658205118569222">Τερματισμός λειτουργίας</translation>
<translation id="4430019312045809116">Ένταση</translation>
+<translation id="8681498213689260554">Επανεκκίνηση και Powerwash για ενημέρωση</translation>
<translation id="4442424173763614572">Η αναζήτηση DNS απέτυχε</translation>
-<translation id="6356500677799115505">Η μπαταρία είναι πλήρης και φορτίζει.</translation>
<translation id="7874779702599364982">Αναζήτηση για δίκτυα κινητής τηλεφωνίας…</translation>
<translation id="583281660410589416">Άγνωστο</translation>
<translation id="1383876407941801731">Αναζήτηση</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Πληροφορίες δικτύου</translation>
<translation id="1621499497873603021">Χρόνος που απομένει μέχρι να αδειάσει η μπαταρία, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Έξοδος επισκέπτη</translation>
-<translation id="4471417012762451363">Η μπαταρία είναι πλήρης <ph name="PERCENTAGE"/>% και φορτίζει</translation>
<translation id="8308637677604853869">Προηγούμενο μενού</translation>
<translation id="4666297444214622512">Δεν είναι δυνατή η σύνδεση σε άλλο λογαριασμό.</translation>
<translation id="1346748346194534595">Δεξιά</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">Άγνωστο σφάλμα δικτύου</translation>
<translation id="1467432559032391204">Αριστερά</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Ενεργοποίηση <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Μεγιστοποίηση</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">Σύνδεση με φορτιστή χαμηλής ισχύος. Η φόρτιση της μπαταρίας ενδέχεται να μη γίνεται με αξιόπιστο τρόπο.</translation>
<translation id="3784455785234192852">Κλείδωμα</translation>
<translation id="2805756323405976993">Εφαρμογές</translation>
-<translation id="8871072142849158571">Η ανάλυση της οθόνης <ph name="DISPLAY_NAME"/> έχει αλλάξει σε <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Αποτυχία ενεργοποίησης</translation>
<translation id="5097002363526479830">Δεν ήταν δυνατή η σύνδεση στο δίκτυο '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Το Wi-Fi έχει απενεργοποιηθεί.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">Ορισμός ταπετσαρίας...</translation>
<translation id="8678698760965522072">Κατάσταση &quot;Σε σύνδεση&quot;</translation>
<translation id="2532589005999780174">Λειτουργία υψηλής αντίθεσης</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Εσωτερικό σφάλμα</translation>
<translation id="3019353588588144572">Χρόνος που απομένει μέχρι να φορτιστεί πλήρως η μπαταρία, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Μεγεθυντής οθόνης</translation>
@@ -152,20 +159,24 @@
<translation id="7029814467594812963">Έξοδος από συνεδρία</translation>
<translation id="8454013096329229812">Το Wi-Fi έχει ενεργοποιηθεί.</translation>
<translation id="4872237917498892622">Alt+Search ή Shift</translation>
+<translation id="9201131092683066720">Η μπαταρία είναι πλήρης <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Ρυθμίσεις...</translation>
+<translation id="1195412055398077112">υπερσάρωση</translation>
<translation id="1717216362413677834">Λειτουργία Dock</translation>
+<translation id="112308213915226829">Αυτόματη απόκρυψη ραφιού</translation>
<translation id="8927026611342028580">Έχει υποβληθεί αίτημα σύνδεσης</translation>
<translation id="8300849813060516376">Αποτυχία OTASP</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127">Συγχρονισμός <ph name="COUNT"/> αρχείων</translation>
+<translation id="5958529069007801266">Εποπτευόμενος χρήστης</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">Το CAPS LOCK είναι απενεργοποιημένο</translation>
<translation id="6248847161401822652">Πατήστε Control Shift Q δύο φορές για έξοδο.</translation>
+<translation id="6785414152754474415">Η μπαταρία είναι πλήρης <ph name="PERCENTAGE"/>% και φορτίζει.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Ενεργοποίηση…</translation>
+<translation id="4895488851634969361">Η μπαταρία είναι πλήρης.</translation>
<translation id="1391854757121130358">Ενδέχεται να έχετε χρησιμοποιήσει το πρόγραμμά δεδομένων της κινητής τηλεφωνίας σας.</translation>
-<translation id="5413208160176941586">Χρήστης τοπικής διαχείρισης</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Θέση λειτουργίας εκκίνησης</translation>
+<translation id="5947494881799873997">Επαναφορά</translation>
<translation id="7593891976182323525">Search ή Shift</translation>
<translation id="7649070708921625228">Βοήθεια</translation>
<translation id="3050422059534974565">Το πλήκτρο CAPS LOCK έχει ενεργοποιηθεί.
@@ -178,22 +189,24 @@
<translation id="6692173217867674490">Εσφαλμένη κωδική φράση</translation>
<translation id="6165508094623778733">Μάθετε περισσότερα</translation>
<translation id="9046895021617826162">Η σύνδεση απέτυχε</translation>
+<translation id="7168224885072002358">Επαναφορά στην προηγούμενη ανάλυση σε <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Αυτή η περίοδος σύνδεσης θα λήξει αυτόματα σε <ph name="SESSION_TIME_REMAINING"/>. Θα αποσυνδεθείτε αυτόματα.</translation>
<translation id="8372369524088641025">Εσφαλμένο κλειδί WEP</translation>
<translation id="6636709850131805001">Μη αναγνωρίσιμη κατάσταση</translation>
<translation id="3573179567135747900">Αλλάξτε το πάλι σε &quot;<ph name="FROM_LOCALE"/>&quot; (απαιτείται επανεκκίνηση)</translation>
<translation id="8103386449138765447">Μηνύματα SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Ρυθμίσεις Google Drive...</translation>
-<translation id="1510238584712386396">Λειτουργία εκκίνησης</translation>
<translation id="7209101170223508707">Το πλήκτρο CAPS LOCK έχει ενεργοποιηθεί.
Πατήστε Alt+Search ή Shift για ακύρωση.</translation>
<translation id="8940956008527784070">Χαμηλή στάθμη μπαταρίας (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Αποδοχή</translation>
<translation id="5102001756192215136">Απομένουν <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Γίνεται κοινή χρήση της οθόνης σας μέσω Hangouts.</translation>
<translation id="8000066093800657092">Κανένα δίκτυο</translation>
<translation id="4015692727874266537">Σύνδεση σε άλλο λογαριασμό…</translation>
<translation id="5941711191222866238">Ελαχιστοποίηση</translation>
<translation id="6911468394164995108">Συμμετοχή σε άλλο…</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>ω <ph name="MINUTE"/>λ μέχρι να ολοκληρωθεί η φόρτιση</translation>
<translation id="6359806961507272919">SMS από <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Εταιρεία κινητής τηλεφωνίας</translation>
diff --git a/chromium/ash/strings/ash_strings_en-GB.xtb b/chromium/ash/strings/ash_strings_en-GB.xtb
index c0e1ded60ce..d873968f172 100644
--- a/chromium/ash/strings/ash_strings_en-GB.xtb
+++ b/chromium/ash/strings/ash_strings_en-GB.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="en-GB">
<translation id="3595596368722241419">Battery full</translation>
-<translation id="5250713215130379958">Auto-hide launcher</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> and <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portal state</translation>
<translation id="30155388420722288">Overflow Button</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth enabled</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> was rotated to <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth disabled</translation>
+<translation id="7165320105431587207">Failed to configure network</translation>
<translation id="3775358506042162758">You can only have up to three accounts in multiple sign-in.</translation>
<translation id="370649949373421643">Enable Wi-Fi</translation>
<translation id="3626281679859535460">Brightness</translation>
+<translation id="595202126637698455">Performance tracing enabled</translation>
<translation id="8054466585765276473">Calculating battery time.</translation>
<translation id="7982789257301363584">Network</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Keyboard Overlay</translation>
<translation id="4387004326333427325">Authentication certificate rejected remotely</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> resolution was changed to <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP get failed</translation>
<translation id="2297568595583585744">Status tray</translation>
<translation id="1661867754829461514">PIN missing</translation>
@@ -34,39 +38,41 @@ Press Shift + Alt to switch.</translation>
<translation id="2127372758936585790">Low-power charger</translation>
<translation id="3846575436967432996">No network information available</translation>
<translation id="3026237328237090306">Set up mobile data</translation>
+<translation id="5871632337994001636">Manage devices...</translation>
<translation id="785750925697875037">View mobile account</translation>
<translation id="153454903766751181">Initialising mobile modem...</translation>
<translation id="4628814525959230255">Sharing control of your screen with <ph name="HELPER_NAME"/> via Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> has been rotated</translation>
<translation id="7864539943188674973">Disable Bluetooth</translation>
<translation id="939252827960237676">Failed to save screenshot</translation>
<translation id="3126069444801937830">Restart to update</translation>
<translation id="2268813581635650749">Sign out all</translation>
<translation id="735745346212279324">VPN disconnected</translation>
<translation id="7320906967354320621">Idle</translation>
-<translation id="6303423059719347535">Battery is <ph name="PERCENTAGE"/>% full</translation>
<translation id="15373452373711364">Large mouse cursor</translation>
-<translation id="2778346081696727092">Failed to authenticate with the provided username or password</translation>
<translation id="3294437725009624529">Guest</translation>
<translation id="8190698733819146287">Customise languages and input...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Shelf position</translation>
<translation id="2903907270192926896">INPUT</translation>
<translation id="8676770494376880701">Low-power charger connected</translation>
<translation id="7170041865419449892">Out of range</translation>
<translation id="4804818685124855865">Disconnect</translation>
<translation id="2544853746127077729">Authentication certificate rejected by network</translation>
<translation id="5222676887888702881">Sign out</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuration</translation>
<translation id="1272079795634619415">Stop</translation>
<translation id="4957722034734105353">Learn more...</translation>
<translation id="2964193600955408481">Disable Wi-Fi</translation>
-<translation id="811680302244032017">Add device ...</translation>
<translation id="4279490309300973883">Mirroring</translation>
+<translation id="7973962044839454485">PPP authentication failed due to an incorrect username or password</translation>
<translation id="2509468283778169019">CAPS LOCK is on</translation>
<translation id="3892641579809465218">Internal Display</translation>
<translation id="7823564328645135659">The language has changed from &quot;<ph name="FROM_LOCALE"/>&quot; to &quot;<ph name="TO_LOCALE"/>&quot; after syncing your settings.</translation>
<translation id="3368922792935385530">Connected</translation>
<translation id="8340999562596018839">Spoken feedback</translation>
<translation id="8654520615680304441">Turn Wi-Fi on...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Your input method has changed to <ph name="INPUT_METHOD_ID"/>.
Press Shift + Alt to switch.</translation>
<translation id="2562916301614567480">Private Network</translation>
@@ -83,11 +89,12 @@ Press Shift + Alt to switch.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% remaining</translation>
<translation id="9089416786594320554">Input methods</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Shelf</translation>
<translation id="2614835198358683673">Your Chromebook may not charge while it is turned on. Consider using the official charger.</translation>
<translation id="1895658205118569222">Shutdown</translation>
<translation id="4430019312045809116">volume</translation>
+<translation id="8681498213689260554">Restart and Powerwash to update</translation>
<translation id="4442424173763614572">DNS lookup failed</translation>
-<translation id="6356500677799115505">Battery is full and charging.</translation>
<translation id="7874779702599364982">Searching for cellular networks...</translation>
<translation id="583281660410589416">Unknown</translation>
<translation id="1383876407941801731">Search</translation>
@@ -96,7 +103,6 @@ Press Shift + Alt to switch.</translation>
<translation id="2204305834655267233">Network Info</translation>
<translation id="1621499497873603021">Time left until battery is empty, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Exit guest</translation>
-<translation id="4471417012762451363">Battery is <ph name="PERCENTAGE"/>% full and charging</translation>
<translation id="8308637677604853869">Previous menu</translation>
<translation id="4666297444214622512">Can't sign into another account.</translation>
<translation id="1346748346194534595">Right</translation>
@@ -114,6 +120,7 @@ Press Ctrl+Alt+Z to disable.</translation>
<translation id="6312403991423642364">Unknown network error</translation>
<translation id="1467432559032391204">Left</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Activating <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximise</translation>
@@ -123,7 +130,6 @@ Press Ctrl+Alt+Z to disable.</translation>
<translation id="2727977024730340865">Plugged in to a low-power charger. Battery charging may not be reliable.</translation>
<translation id="3784455785234192852">Lock</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> has been resized to <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Activation failure</translation>
<translation id="5097002363526479830">Failed to connect to the network '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi is turned off.</translation>
@@ -131,6 +137,7 @@ Press Ctrl+Alt+Z to disable.</translation>
<translation id="7052914147756339792">Set wallpaper...</translation>
<translation id="8678698760965522072">Online state</translation>
<translation id="2532589005999780174">High contrast mode</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Internal error</translation>
<translation id="3019353588588144572">Time remaining until battery is fully charged, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Screen magnifier</translation>
@@ -153,20 +160,24 @@ Server message: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Exit session</translation>
<translation id="8454013096329229812">Wi-Fi is turned on.</translation>
<translation id="4872237917498892622">Alt+Search or Shift</translation>
+<translation id="9201131092683066720">Battery is <ph name="PERCENTAGE"/>% full.</translation>
<translation id="2983818520079887040">Settings...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Dock mode</translation>
+<translation id="112308213915226829">Autohide shelf</translation>
<translation id="8927026611342028580">Connect Requested</translation>
<translation id="8300849813060516376">OTASP failed</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127">Syncing <ph name="COUNT"/> file(s)</translation>
+<translation id="5958529069007801266">Supervised user</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK is off</translation>
<translation id="6248847161401822652">Press Control Shift Q twice to exit.</translation>
+<translation id="6785414152754474415">Battery is <ph name="PERCENTAGE"/>% full and charging.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Activating...</translation>
+<translation id="4895488851634969361">Battery is full.</translation>
<translation id="1391854757121130358">You may have used up your mobile data allowance.</translation>
-<translation id="5413208160176941586">Locally managed user</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Launcher position</translation>
+<translation id="5947494881799873997">Revert</translation>
<translation id="7593891976182323525">Search or Shift</translation>
<translation id="7649070708921625228">Help</translation>
<translation id="3050422059534974565">CAPS LOCK is on.
@@ -179,22 +190,24 @@ Press Search or Shift to cancel.</translation>
<translation id="6692173217867674490">Bad passphrase</translation>
<translation id="6165508094623778733">Learn more</translation>
<translation id="9046895021617826162">Connection failed</translation>
+<translation id="7168224885072002358">Reverting to old resolution in <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">This session will end in <ph name="SESSION_TIME_REMAINING"/>. You will be automatically signed out.</translation>
<translation id="8372369524088641025">Bad WEP key</translation>
<translation id="6636709850131805001">Unrecognised state</translation>
<translation id="3573179567135747900">Change back to &quot;<ph name="FROM_LOCALE"/>&quot; (requires restart)</translation>
<translation id="8103386449138765447">SMS messages: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google Drive settings</translation>
-<translation id="1510238584712386396">Launcher</translation>
<translation id="7209101170223508707">CAPS LOCK is on.
Press Alt+Search or Shift to cancel.</translation>
<translation id="8940956008527784070">Battery low (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Accept</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> left</translation>
<translation id="520760366042891468">Sharing control of your screen via Hangouts.</translation>
<translation id="8000066093800657092">No network</translation>
<translation id="4015692727874266537">Sign in another account...</translation>
<translation id="5941711191222866238">Minimise</translation>
<translation id="6911468394164995108">Join other ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>h <ph name="MINUTE"/>m until full</translation>
<translation id="6359806961507272919">SMS from <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operator</translation>
diff --git a/chromium/ash/strings/ash_strings_es-419.xtb b/chromium/ash/strings/ash_strings_es-419.xtb
index b752b8e297c..5a285041447 100644
--- a/chromium/ash/strings/ash_strings_es-419.xtb
+++ b/chromium/ash/strings/ash_strings_es-419.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="es-419">
<translation id="3595596368722241419">Batería completa</translation>
-<translation id="5250713215130379958">Ocultar automáticamente la barra de aplicaciones</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> y <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Estado de portal</translation>
<translation id="30155388420722288">Botón de desbordamiento</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth activado</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> se giró a <ph name="ROTATION"/>.</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth desactivado</translation>
+<translation id="7165320105431587207">Error al configurar la red</translation>
<translation id="3775358506042162758">Solo puedes tener un máximo de tres cuentas en un acceso múltiple.</translation>
<translation id="370649949373421643">Habilitar Wi-Fi</translation>
<translation id="3626281679859535460">Brillo</translation>
+<translation id="595202126637698455">Seguimiento de rendimiento habilitado</translation>
<translation id="8054466585765276473">Calculando duración de la batería...</translation>
<translation id="7982789257301363584">Red</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Superposición del teclado</translation>
<translation id="4387004326333427325">Certificado de autenticación rechazado de forma remota</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">La resolución de <ph name="DISPLAY_NAME"/> se cambió por <ph name="RESOLUTION"/>.</translation>
<translation id="6943836128787782965">Error al obtener HTTP</translation>
<translation id="2297568595583585744">Bandeja de estado</translation>
<translation id="1661867754829461514">Falta el número de PIN </translation>
@@ -34,39 +38,41 @@ Para cambiarlo, presiona Shift + Alt.</translation>
<translation id="2127372758936585790">Cargador de baja potencia</translation>
<translation id="3846575436967432996">No hay información de red disponible.</translation>
<translation id="3026237328237090306">Configurar datos de dispositivos móviles</translation>
+<translation id="5871632337994001636">Administrar dispositivos…</translation>
<translation id="785750925697875037">Ver cuenta móvil</translation>
<translation id="153454903766751181">Iniciando módem celular...</translation>
<translation id="4628814525959230255">Compartir el control de la pantalla con <ph name="HELPER_NAME"/> a través de Hangouts</translation>
-<translation id="8343941333792395995">Se rotó <ph name="DISPLAY_NAME"/>.</translation>
<translation id="7864539943188674973">Desactivar Bluetooth</translation>
<translation id="939252827960237676">No se pudo guardar la captura de pantalla.</translation>
<translation id="3126069444801937830">Reinicia para actualizar.</translation>
<translation id="2268813581635650749">Salir de todo</translation>
<translation id="735745346212279324">VPN desconectada</translation>
<translation id="7320906967354320621">Inactivo</translation>
-<translation id="6303423059719347535"><ph name="PERCENTAGE"/>% de batería</translation>
<translation id="15373452373711364">Cursor del mouse grande</translation>
-<translation id="2778346081696727092">Error al autenticar con el nombre de usuario o la contraseña proporcionados.</translation>
<translation id="3294437725009624529">Invitado</translation>
<translation id="8190698733819146287">Personalizar idiomas y la entrada de datos</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posición de la biblioteca</translation>
<translation id="2903907270192926896">ENTRADA</translation>
<translation id="8676770494376880701">Cargador de baja potencia conectado</translation>
<translation id="7170041865419449892">Fuera de alcance</translation>
<translation id="4804818685124855865">Desconectar</translation>
<translation id="2544853746127077729">Certificado de autenticación rechazado por la red</translation>
<translation id="5222676887888702881">Salir</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuración</translation>
<translation id="1272079795634619415">Interrumpir</translation>
<translation id="4957722034734105353">Más información...</translation>
<translation id="2964193600955408481">Desactivar Wi-Fi</translation>
-<translation id="811680302244032017">Agregar dispositivo...</translation>
<translation id="4279490309300973883">Duplicando</translation>
+<translation id="7973962044839454485">Falló la autenticación de PPP debido a un nombre de usuario o una contraseña incorrectos.</translation>
<translation id="2509468283778169019">BLOQ MAYÚS está activado.</translation>
<translation id="3892641579809465218">Pantalla interna</translation>
<translation id="7823564328645135659">Después de sincronizar tu configuración, el idioma se cambió de &quot;<ph name="FROM_LOCALE"/>&quot; a &quot;<ph name="TO_LOCALE"/>&quot;.</translation>
<translation id="3368922792935385530">Conectado</translation>
<translation id="8340999562596018839">Comentarios por voz</translation>
<translation id="8654520615680304441">Encender Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Tu método de introducción cambió a <ph name="INPUT_METHOD_ID"/>.
Para cambiarlo, presiona Shift + Alt.</translation>
<translation id="2562916301614567480">Red privada</translation>
@@ -83,11 +89,12 @@ Para cambiarlo, presiona Shift + Alt.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% restante</translation>
<translation id="9089416786594320554">Métodos de entrada</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Biblioteca</translation>
<translation id="2614835198358683673">Es posible que tu Chromebook no se cargue mientras esté encendida. Te recomendamos que utilices el cargador oficial.</translation>
<translation id="1895658205118569222">Cierre</translation>
<translation id="4430019312045809116">Volumen</translation>
+<translation id="8681498213689260554">Reiniciar y aplicar Powerwash para actualizar</translation>
<translation id="4442424173763614572">Error al buscar DNS</translation>
-<translation id="6356500677799115505">Batería completa y cargando</translation>
<translation id="7874779702599364982">Buscando redes para celulares...</translation>
<translation id="583281660410589416">Desconocido</translation>
<translation id="1383876407941801731">Buscar</translation>
@@ -96,7 +103,6 @@ Para cambiarlo, presiona Shift + Alt.</translation>
<translation id="2204305834655267233">Información de red</translation>
<translation id="1621499497873603021">Tiempo restante hasta que se agote la batería: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Salir de la sesión de invitado</translation>
-<translation id="4471417012762451363"><ph name="PERCENTAGE"/>% de batería y cargando</translation>
<translation id="8308637677604853869">Menú anterior</translation>
<translation id="4666297444214622512">No puedes acceder a otra cuenta.</translation>
<translation id="1346748346194534595">Derecha</translation>
@@ -114,6 +120,7 @@ Para inhabilitar esta opción, presiona Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Error de red desconocido</translation>
<translation id="1467432559032391204">Izquierda</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Activación de <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximizar</translation>
@@ -123,7 +130,6 @@ Para inhabilitar esta opción, presiona Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Conexión a un cargador de baja potencia. Es posible que la carga de la batería no sea confiable.</translation>
<translation id="3784455785234192852">Bloquear</translation>
<translation id="2805756323405976993">Aplicaciones</translation>
-<translation id="8871072142849158571">Se cambió la resolución de <ph name="DISPLAY_NAME"/> a <ph name="RESOLUTION"/>.</translation>
<translation id="1512064327686280138">Fallo en la activación</translation>
<translation id="5097002363526479830">Error al conectar a la red &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi desactivada</translation>
@@ -131,6 +137,7 @@ Para inhabilitar esta opción, presiona Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Establecer fondo de pantalla...</translation>
<translation id="8678698760965522072">Estado en línea</translation>
<translation id="2532589005999780174">Modo de contraste alto</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Error interno</translation>
<translation id="3019353588588144572">Tiempo restante hasta que la batería esté completamente cargada: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Mensaje del servidor: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Salir de la sesión</translation>
<translation id="8454013096329229812">Wi-Fi activada</translation>
<translation id="4872237917498892622">Alt+tecla de búsqueda o Mayús</translation>
+<translation id="9201131092683066720">La batería tiene un <ph name="PERCENTAGE"/> % de carga.</translation>
<translation id="2983818520079887040">Configuración...</translation>
+<translation id="1195412055398077112">desajuste de dimensiones</translation>
<translation id="1717216362413677834">Modo de conector</translation>
+<translation id="112308213915226829">Ocultar la biblioteca automáticamente</translation>
<translation id="8927026611342028580">Conexión solicitada</translation>
<translation id="8300849813060516376">OTASP falló</translation>
<translation id="2792498699870441125">Alt+tecla de búsqueda</translation>
<translation id="8660803626959853127">Sincronizando <ph name="COUNT"/> archivo(s)</translation>
+<translation id="5958529069007801266">Usuario supervisado</translation>
<translation id="3709443003275901162">Más de 9</translation>
<translation id="639644700271529076">El bloqueo de mayúsculas está desactivado.</translation>
<translation id="6248847161401822652">Presiona Control+Mayús+Q dos veces para salir.</translation>
+<translation id="6785414152754474415">La batería tiene un <ph name="PERCENTAGE"/> % de carga y se está cargando.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Activando...</translation>
+<translation id="4895488851634969361">La batería está completa.</translation>
<translation id="1391854757121130358">Es posible que hayas agotado tu cuota de datos móviles.</translation>
-<translation id="5413208160176941586">Usuario administrado de forma local</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posición del selector</translation>
+<translation id="5947494881799873997">Revertir</translation>
<translation id="7593891976182323525">Tecla de búsqueda o Mayús</translation>
<translation id="7649070708921625228">Ayuda</translation>
<translation id="3050422059534974565">El BLOQUEO DE MAYÚSCULAS está activado.
@@ -179,22 +190,24 @@ Presiona Mayús o la tecla de búsqueda para cancelar la operación.</translatio
<translation id="6692173217867674490">Frase de contraseña no válida</translation>
<translation id="6165508094623778733">Más información</translation>
<translation id="9046895021617826162">No se pudo conectar</translation>
+<translation id="7168224885072002358">Se revertirá a la resolución anterior en <ph name="TIMEOUT_SECONDS"/>.</translation>
<translation id="973896785707726617">Esta sesión finalizará en <ph name="SESSION_TIME_REMAINING"/>. Saldrás automáticamente.</translation>
<translation id="8372369524088641025">Clave de WEP no válida</translation>
<translation id="6636709850131805001">Estado no reconocido</translation>
<translation id="3573179567135747900">Volver a &quot;<ph name="FROM_LOCALE"/>&quot; (debes reiniciar).</translation>
<translation id="8103386449138765447">Mensajes SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Configuración de Google Drive...</translation>
-<translation id="1510238584712386396">Selector</translation>
<translation id="7209101170223508707">El BLOQUEO DE MAYÚSCULAS está activado.
Presiona Alt y la tecla de búsqueda o Mayús para cancelar la operación.</translation>
<translation id="8940956008527784070">Batería baja (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Aceptar</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> restante</translation>
<translation id="520760366042891468">Compartir el control de la pantalla a través de Hangouts</translation>
<translation id="8000066093800657092">Sin red</translation>
<translation id="4015692727874266537">Acceder a otra cuenta</translation>
<translation id="5941711191222866238">Minimizar</translation>
<translation id="6911468394164995108">Conectarte a otra red...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>h <ph name="MINUTE"/>min para completar la carga</translation>
<translation id="6359806961507272919">SMS de <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Proveedor de servicio celular</translation>
diff --git a/chromium/ash/strings/ash_strings_es.xtb b/chromium/ash/strings/ash_strings_es.xtb
index d3cc029c9b8..e69bab48c06 100644
--- a/chromium/ash/strings/ash_strings_es.xtb
+++ b/chromium/ash/strings/ash_strings_es.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="es">
<translation id="3595596368722241419">Batería al máximo</translation>
-<translation id="5250713215130379958">Ocultar automáticamente la barra de aplicaciones</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> y <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Conectado vía portal</translation>
<translation id="30155388420722288">Botón de flujo excesivo</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth habilitado</translation>
+<translation id="6310121235600822547">Se ha modificado la rotación de <ph name="DISPLAY_NAME"/> a <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth inhabilitado</translation>
+<translation id="7165320105431587207">Error al configurar la red</translation>
<translation id="3775358506042162758">Solo puedes utilizar un máximo de tres cuentas en el inicio de sesión múltiple.</translation>
<translation id="370649949373421643">Habilitar Wi-Fi</translation>
<translation id="3626281679859535460">Brillo</translation>
+<translation id="595202126637698455">Se ha habilitado el control del rendimiento</translation>
<translation id="8054466585765276473">Calculando duración de la batería...</translation>
<translation id="7982789257301363584">Red</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Superposición de teclado</translation>
<translation id="4387004326333427325">Certificado de autenticación rechazado de forma remota</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Se ha modificado la resolución de <ph name="DISPLAY_NAME"/> a <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Error al obtener HTTP</translation>
<translation id="2297568595583585744">Bandeja de estado</translation>
<translation id="1661867754829461514">Falta el PIN.</translation>
@@ -34,39 +38,41 @@ Para cambiarlo, pulsa Mayús + Alt.</translation>
<translation id="2127372758936585790">Cargador de baja potencia</translation>
<translation id="3846575436967432996">No hay información de red disponible.</translation>
<translation id="3026237328237090306">Configurar datos móviles</translation>
+<translation id="5871632337994001636">Administrar dispositivos...</translation>
<translation id="785750925697875037">Ver cuenta móvil</translation>
<translation id="153454903766751181">Iniciando módem móvil...</translation>
<translation id="4628814525959230255">Comparte el control de tu pantalla con <ph name="HELPER_NAME"/> a través de Hangouts.</translation>
-<translation id="8343941333792395995">Se ha girado <ph name="DISPLAY_NAME"/></translation>
<translation id="7864539943188674973">Inhabilitar Bluetooth</translation>
<translation id="939252827960237676">Error al guardar captura de pantalla</translation>
<translation id="3126069444801937830">Reinicia el sistema para actualizarlo.</translation>
<translation id="2268813581635650749">Cerrar todas las sesiones</translation>
<translation id="735745346212279324">VPN desconectada</translation>
<translation id="7320906967354320621">Inactiva</translation>
-<translation id="6303423059719347535"><ph name="PERCENTAGE"/>% de batería</translation>
<translation id="15373452373711364">Cursor del ratón grande</translation>
-<translation id="2778346081696727092">Se ha producido un error al autenticar la contraseña o el nombre de usuario proporcionados.</translation>
<translation id="3294437725009624529">Invitado</translation>
<translation id="8190698733819146287">Personalizar idiomas...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posición de la estantería</translation>
<translation id="2903907270192926896">ENTRADA</translation>
<translation id="8676770494376880701">Cargador de baja potencia conectado</translation>
<translation id="7170041865419449892">Fuera del alcance</translation>
<translation id="4804818685124855865">Desvincular</translation>
<translation id="2544853746127077729">Certificado de autenticación rechazado por la red</translation>
<translation id="5222676887888702881">Cerrar sesión</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuración</translation>
<translation id="1272079795634619415">Interrumpir</translation>
<translation id="4957722034734105353">Más información...</translation>
<translation id="2964193600955408481">Inhabilitar Wi-Fi</translation>
-<translation id="811680302244032017">Añadir dispositivo...</translation>
<translation id="4279490309300973883">Duplicando</translation>
+<translation id="7973962044839454485">Se ha producido un error en la autenticación de PPP porque la contraseña o el nombre de usuario son incorrectos</translation>
<translation id="2509468283778169019">Bloqueo de mayúsculas activado</translation>
<translation id="3892641579809465218">Pantalla interna</translation>
<translation id="7823564328645135659">El idioma ha cambiado de &quot;<ph name="FROM_LOCALE"/>&quot; a &quot;<ph name="TO_LOCALE"/>&quot; después de sincronizar tu configuración.</translation>
<translation id="3368922792935385530">Con conexión</translation>
<translation id="8340999562596018839">Mensajes de voz</translation>
<translation id="8654520615680304441">Activar Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Tu método de entrada ha cambiado a <ph name="INPUT_METHOD_ID"/>.
Para cambiarlo, pulsa Mayús + Alt.</translation>
<translation id="2562916301614567480">Red privada</translation>
@@ -83,11 +89,12 @@ Para cambiarlo, pulsa Mayús + Alt.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% restante</translation>
<translation id="9089416786594320554">Métodos de entrada</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Estantería</translation>
<translation id="2614835198358683673">Es posible que tu Chromebook no se cargue mientras esté activado. Te recomendamos que utilices el cargador oficial.</translation>
<translation id="1895658205118569222">Cierre del navegador</translation>
<translation id="4430019312045809116">Volumen</translation>
+<translation id="8681498213689260554">Reinicia y aplica la función de Powerwash para actualizar el sistema</translation>
<translation id="4442424173763614572">Error al buscar DNS</translation>
-<translation id="6356500677799115505">Batería completa y cargándose</translation>
<translation id="7874779702599364982">Buscando redes móviles...</translation>
<translation id="583281660410589416">Desconocido</translation>
<translation id="1383876407941801731">Búsqueda</translation>
@@ -96,7 +103,6 @@ Para cambiarlo, pulsa Mayús + Alt.</translation>
<translation id="2204305834655267233">Información de red</translation>
<translation id="1621499497873603021">Tiempo restante hasta que se agote la batería: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Salir de la sesión de invitado</translation>
-<translation id="4471417012762451363"><ph name="PERCENTAGE"/>% de batería y cargándose</translation>
<translation id="8308637677604853869">Menú anterior</translation>
<translation id="4666297444214622512">No puedo iniciar sesión con otra cuenta.</translation>
<translation id="1346748346194534595">Derecha</translation>
@@ -114,6 +120,7 @@ Para inhabilitar esta opción, pulsa Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Error desconocido de red</translation>
<translation id="1467432559032391204">Izquierda</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Activación de <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximizar</translation>
@@ -123,7 +130,6 @@ Para inhabilitar esta opción, pulsa Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Conectado a un cargador de baja potencia. Es posible que la carga de la batería no sea fiable.</translation>
<translation id="3784455785234192852">Bloquear</translation>
<translation id="2805756323405976993">Aplicaciones</translation>
-<translation id="8871072142849158571">Se ha cambiado la resolución de <ph name="DISPLAY_NAME"/> a <ph name="RESOLUTION"/>.</translation>
<translation id="1512064327686280138">Error de activación</translation>
<translation id="5097002363526479830">Error al establecer conexión con la red &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">La conexión Wi-Fi está desactivada.</translation>
@@ -131,6 +137,7 @@ Para inhabilitar esta opción, pulsa Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Establecer fondo de pantalla...</translation>
<translation id="8678698760965522072">Estado online</translation>
<translation id="2532589005999780174">Modo de contraste alto</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Error interno</translation>
<translation id="3019353588588144572">Tiempo restante hasta que se cargue la batería por completo: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Mensaje del servidor: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Cerrar sesión</translation>
<translation id="8454013096329229812">La conexión Wi-Fi está activada.</translation>
<translation id="4872237917498892622">Alt+tecla de búsqueda o Mayús</translation>
+<translation id="9201131092683066720">La batería está al <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Configuración...</translation>
+<translation id="1195412055398077112">reajustar</translation>
<translation id="1717216362413677834">Modo de conector</translation>
+<translation id="112308213915226829">Ocultar automáticamente estantería</translation>
<translation id="8927026611342028580">Conexión solicitada</translation>
<translation id="8300849813060516376">Error de OTASP</translation>
<translation id="2792498699870441125">Alt+tecla de búsqueda</translation>
<translation id="8660803626959853127">Sincronizando <ph name="COUNT"/> archivo(s)</translation>
+<translation id="5958529069007801266">Usuario supervisado</translation>
<translation id="3709443003275901162">+9</translation>
<translation id="639644700271529076">Bloqueo de mayúsculas desactivado</translation>
<translation id="6248847161401822652">Pulsa Ctrl+Mayús+Q dos veces para salir.</translation>
+<translation id="6785414152754474415">La batería se está cargando y está al <ph name="PERCENTAGE"/>%.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Activando...</translation>
+<translation id="4895488851634969361">La batería está llena.</translation>
<translation id="1391854757121130358">Es posible que hayas agotado los datos de tu plan de datos móviles.</translation>
-<translation id="5413208160176941586">Usuario administrado de forma local</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posición de la barra de aplicaciones</translation>
+<translation id="5947494881799873997">Deshacer</translation>
<translation id="7593891976182323525">Tecla de búsqueda o Mayús</translation>
<translation id="7649070708921625228">Ayuda</translation>
<translation id="3050422059534974565">El BLOQUEO DE MAYÚSCULAS está activado.
@@ -179,22 +190,24 @@ Pulsa Mayús o la tecla de búsqueda para cancelar la operación.</translation>
<translation id="6692173217867674490">Frase de contraseña incorrecta</translation>
<translation id="6165508094623778733">Más información</translation>
<translation id="9046895021617826162">Error de conexión</translation>
+<translation id="7168224885072002358">Restableciendo la resolución anterior en <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Esta sesión finalizará en <ph name="SESSION_TIME_REMAINING"/>. La sesión se cerrará automáticamente.</translation>
<translation id="8372369524088641025">Clave WEP incorrecta</translation>
<translation id="6636709850131805001">Estado desconocido</translation>
<translation id="3573179567135747900">Cambiar de nuevo por &quot;<ph name="FROM_LOCALE"/>&quot; (requiere reiniciar)</translation>
<translation id="8103386449138765447">Mensajes SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Configuración de Google Drive...</translation>
-<translation id="1510238584712386396">Menú de aplicaciones</translation>
<translation id="7209101170223508707">El BLOQUEO DE MAYÚSCULAS está activado.
Pulsa Alt y la tecla de búsqueda o Mayús para cancelar la operación.</translation>
<translation id="8940956008527784070">Poca batería (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Aceptar</translation>
<translation id="5102001756192215136">Queda para <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Comparte el control de tu pantalla a través de Hangouts.</translation>
<translation id="8000066093800657092">Ninguna red</translation>
<translation id="4015692727874266537">Inicia sesión con otra cuenta...</translation>
<translation id="5941711191222866238">Minimizar</translation>
<translation id="6911468394164995108">Conectarse a otra red...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h y <ph name="MINUTE"/> min para completar la carga</translation>
<translation id="6359806961507272919">SMS de <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operador</translation>
diff --git a/chromium/ash/strings/ash_strings_et.xtb b/chromium/ash/strings/ash_strings_et.xtb
index 67871d1640a..6588f0e92c0 100644
--- a/chromium/ash/strings/ash_strings_et.xtb
+++ b/chromium/ash/strings/ash_strings_et.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="et">
<translation id="3595596368722241419">Aku on täis</translation>
-<translation id="5250713215130379958">Peida käiviti automaatselt</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> ja <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portaali olek</translation>
<translation id="30155388420722288">Ülevoolunupp</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth on lubatud</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> vahetati valikule <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth on keelatud</translation>
+<translation id="7165320105431587207">Võrgu seadistamine ebaõnnestus</translation>
<translation id="3775358506042162758">Saate korraga sisse logida kuni kolmele kontole.</translation>
<translation id="370649949373421643">Luba WiFi</translation>
<translation id="3626281679859535460">Eredus</translation>
+<translation id="595202126637698455">Toimivuse jälgimine on lubatud</translation>
<translation id="8054466585765276473">Aku tööaja arvutamine.</translation>
<translation id="7982789257301363584">Võrk</translation>
<translation id="5565793151875479467">Puhverserver ...</translation>
<translation id="938582441709398163">Klaviatuuri ülekate</translation>
<translation id="4387004326333427325">Autentimissertifikaat lükati kaugühenduse kaudu tagasi</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Ekraani <ph name="DISPLAY_NAME"/> eraldusvõimeks määrati <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP hankimine nurjus</translation>
<translation id="2297568595583585744">Olekusalv</translation>
<translation id="1661867754829461514">PIN-kood puudub</translation>
@@ -34,39 +38,41 @@ Selle muutmiseks vajutage klahve Tõstuklahv + Alt.</translation>
<translation id="2127372758936585790">Väikese energiakuluga laadija</translation>
<translation id="3846575436967432996">Võrguteave ei ole saadaval</translation>
<translation id="3026237328237090306">Seadista mobiilne andmeside</translation>
+<translation id="5871632337994001636">Seadmete haldamine ...</translation>
<translation id="785750925697875037">Kuva mobiilikonto</translation>
<translation id="153454903766751181">Mobiilimodemi lähtestamine ...</translation>
<translation id="4628814525959230255">Teie ekraani juhtimist jagatakse Hangoutsi kaudu kasutajaga <ph name="HELPER_NAME"/>.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> on pööratud</translation>
<translation id="7864539943188674973">Keela Bluetooth</translation>
<translation id="939252827960237676">Ekraanipilti ei õnnestunud salvestada</translation>
<translation id="3126069444801937830">Taaskäivitage värskendamiseks</translation>
<translation id="2268813581635650749">Logi kõik kasutajad välja</translation>
<translation id="735745346212279324">VPN-i ühendus on katkestatud</translation>
<translation id="7320906967354320621">Tegevusetu</translation>
-<translation id="6303423059719347535">Aku on <ph name="PERCENTAGE"/>% täis</translation>
<translation id="15373452373711364">Suur hiirekursor</translation>
-<translation id="2778346081696727092">Autentimine esitatud kasutajanime või parooliga ebaõnnestus</translation>
<translation id="3294437725009624529">Külaline</translation>
<translation id="8190698733819146287">Keelte ja sisendi kohandamine...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Riiuli positsioon</translation>
<translation id="2903907270192926896">SISEND</translation>
<translation id="8676770494376880701">Väikese energiakuluga laadija on ühendatud</translation>
<translation id="7170041865419449892">Vahemikust väljas</translation>
<translation id="4804818685124855865">Katkesta ühendus</translation>
<translation id="2544853746127077729">Võrk lükkas autentimissertifikaadi tagasi</translation>
<translation id="5222676887888702881">Logi välja</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigureerimine</translation>
<translation id="1272079795634619415">Peata</translation>
<translation id="4957722034734105353">Lisateave ...</translation>
<translation id="2964193600955408481">Keela WiFi</translation>
-<translation id="811680302244032017">Lisa seade ...</translation>
<translation id="4279490309300973883">Peegeldamine</translation>
+<translation id="7973962044839454485">PPP autentimine ebaõnnestus vale kasutajanime või parooli tõttu</translation>
<translation id="2509468283778169019">SUURTÄHELUKK on sisse lülitatud</translation>
<translation id="3892641579809465218">Sisemine kuva</translation>
<translation id="7823564328645135659">Pärast seadete sünkroonimist asendati <ph name="FROM_LOCALE"/> keel <ph name="TO_LOCALE"/> keelega.</translation>
<translation id="3368922792935385530">Ühendatud</translation>
<translation id="8340999562596018839">Suuline tagasiside</translation>
<translation id="8654520615680304441">Lülita WiFi sisse ...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Teie sisestusmeetod on nüüd <ph name="INPUT_METHOD_ID"/>.
Selle muutmiseks vajutage klahve Tõstuklahv + Alt.</translation>
<translation id="2562916301614567480">Privaatvõrk</translation>
@@ -83,11 +89,12 @@ Selle muutmiseks vajutage klahve Tõstuklahv + Alt.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% on jäänud</translation>
<translation id="9089416786594320554">Sisestusviisid</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Riiul</translation>
<translation id="2614835198358683673">Teie Chromebooki ei pruugita laadida, kui see on sisse lülitatud. Kaaluge ametliku laadija kasutamist.</translation>
<translation id="1895658205118569222">Sulgemine</translation>
<translation id="4430019312045809116">Helitugevus</translation>
+<translation id="8681498213689260554">Värskendamiseks tuleb arvuti taaskäivitada ja teha Powerwash</translation>
<translation id="4442424173763614572">DNS-i otsing nurjus</translation>
-<translation id="6356500677799115505">Aku on täis ja seda laetakse.</translation>
<translation id="7874779702599364982">Mobiilsidevõrkude otsimine ...</translation>
<translation id="583281660410589416">Tundmatu</translation>
<translation id="1383876407941801731">Otsing</translation>
@@ -96,7 +103,6 @@ Selle muutmiseks vajutage klahve Tõstuklahv + Alt.</translation>
<translation id="2204305834655267233">Võrguteave</translation>
<translation id="1621499497873603021">Aku tühjenemiseni on aega <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Välju külastajaseansist</translation>
-<translation id="4471417012762451363">Aku on <ph name="PERCENTAGE"/>% täis ja seda laetakse</translation>
<translation id="8308637677604853869">Eelmine menüü</translation>
<translation id="4666297444214622512">Teisele kontole ei saa sisse logida.</translation>
<translation id="1346748346194534595">Paremale</translation>
@@ -114,6 +120,7 @@ Keelamiseks vajutage klahvikombinatsiooni Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Tundmatu võrguviga</translation>
<translation id="1467432559032391204">Vasakule</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Võrgu <ph name="NAME"/> aktiveerimine</translation>
<translation id="8814190375133053267">WiFi</translation>
<translation id="1398853756734560583">Maksimeeri</translation>
@@ -123,7 +130,6 @@ Keelamiseks vajutage klahvikombinatsiooni Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Ühendatud väikese energiakuluga laadijaga. Aku laadimine võib olla ebastabiilne.</translation>
<translation id="3784455785234192852">Lukusta</translation>
<translation id="2805756323405976993">Rakendused</translation>
-<translation id="8871072142849158571">Kuva <ph name="DISPLAY_NAME"/> eraldusvõimeks valiti <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktiveerimise tõrge</translation>
<translation id="5097002363526479830">Võrguga „<ph name="NAME"/>” ühenduse loomine ebaõnnestus: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">WiFi on välja lülitatud.</translation>
@@ -131,6 +137,7 @@ Keelamiseks vajutage klahvikombinatsiooni Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Määra taustapilt ...</translation>
<translation id="8678698760965522072">Võrguühenduse olek</translation>
<translation id="2532589005999780174">Suure kontrastsusega režiim</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Sisemine viga</translation>
<translation id="3019353588588144572">Aku täitumiseni on aega <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Ekraanisuurendi</translation>
@@ -153,20 +160,24 @@ Serveri teade: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Välju seansist</translation>
<translation id="8454013096329229812">WiFi on sisse lülitatud.</translation>
<translation id="4872237917498892622">Alt + otsinguklahv või tõstuklahv</translation>
+<translation id="9201131092683066720">Aku on <ph name="PERCENTAGE"/>% täis.</translation>
<translation id="2983818520079887040">Seaded...</translation>
+<translation id="1195412055398077112">liighälvitus</translation>
<translation id="1717216362413677834">Dokirežiim</translation>
+<translation id="112308213915226829">Riiuli automaatne peitmine</translation>
<translation id="8927026611342028580">Ühenduse taotlus</translation>
<translation id="8300849813060516376">OTASP nurjus</translation>
<translation id="2792498699870441125">Alt + otsinguklahv</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> faili sünkroonimine</translation>
+<translation id="5958529069007801266">Valvatav kasutaja</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">SUURTÄHELUKK on välja lülitatud</translation>
<translation id="6248847161401822652">Väljumiseks vajutage kaks korda klahvikombinatsiooni Ctrl + tõstuklahv + Q.</translation>
+<translation id="6785414152754474415">Aku on <ph name="PERCENTAGE"/>% täis ja seda laetakse.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: aktiveerimine ...</translation>
+<translation id="4895488851634969361">Aku on täis.</translation>
<translation id="1391854757121130358">Tundub, et olete oma mobiilse andmesidemahu ära kasutanud.</translation>
-<translation id="5413208160176941586">Kohalikult hallatud kasutaja</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Käiviti positsioon</translation>
+<translation id="5947494881799873997">Ennista</translation>
<translation id="7593891976182323525">Otsinguklahv või tõstuklahv</translation>
<translation id="7649070708921625228">Abi</translation>
<translation id="3050422059534974565">SUURTÄHELUKK on sisse lülitatud.
@@ -179,22 +190,24 @@ Tühistamiseks vajutage otsinguklahvi või tõstuklahvi</translation>
<translation id="6692173217867674490">Halb parool</translation>
<translation id="6165508094623778733">Lisateave</translation>
<translation id="9046895021617826162">Ühendamine nurjus</translation>
+<translation id="7168224885072002358">Ekraan ennistatakse vanale eraldusvõimele <ph name="TIMEOUT_SECONDS"/> pärast</translation>
<translation id="973896785707726617">Selle seansi lõpuni on jäänud <ph name="SESSION_TIME_REMAINING"/>. Teid logitakse automaatselt välja.</translation>
<translation id="8372369524088641025">Halb WEP-võti</translation>
<translation id="6636709850131805001">Tundmatu olek</translation>
<translation id="3573179567135747900">Muuda tagasi seadele <ph name="FROM_LOCALE"/> (nõuab taaskäivitust)</translation>
<translation id="8103386449138765447">SMS-id: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google Drive'i seaded ...</translation>
-<translation id="1510238584712386396">Käivitaja</translation>
<translation id="7209101170223508707">SUURTÄHELUKK on sisse lülitatud.
Tühistamiseks vajutage klahvikombinatsiooni Alt + otsinguklahv või tõstuklahv</translation>
<translation id="8940956008527784070">Aku tühjeneb (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Nõustu</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> alles</translation>
<translation id="520760366042891468">Teie ekraani juhtimist jagatakse Hangoutsi kaudu.</translation>
<translation id="8000066093800657092">Võrku pole</translation>
<translation id="4015692727874266537">Logige sisse teise kontoga ...</translation>
<translation id="5941711191222866238">Minimeeri</translation>
<translation id="6911468394164995108">Liitu muu võrguga ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h <ph name="MINUTE"/> min aku täitumiseni</translation>
<translation id="6359806961507272919">SMS numbrilt <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Mobiilioperaator</translation>
diff --git a/chromium/ash/strings/ash_strings_fa.xtb b/chromium/ash/strings/ash_strings_fa.xtb
index 9639c888882..0707e7b6fb0 100644
--- a/chromium/ash/strings/ash_strings_fa.xtb
+++ b/chromium/ash/strings/ash_strings_fa.xtb
@@ -2,23 +2,27 @@
<!DOCTYPE translationbundle>
<translationbundle lang="fa">
<translation id="3595596368722241419">باتری پر است</translation>
-<translation id="5250713215130379958">مخفی کردن خودکار راه انداز</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> و <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">وضعیت سایت</translation>
<translation id="30155388420722288">دکمه سرریز</translation>
+<translation id="8673028979667498656">‎۲۷۰°‎</translation>
<translation id="5571066253365925590">بلوتوث فعال شد</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> به <ph name="ROTATION"/> چرخانده شد</translation>
<translation id="9074739597929991885">بلوتوث</translation>
<translation id="2268130516524549846">بلوتوث غیرفعال است</translation>
+<translation id="7165320105431587207">پیکربندی شبکه انجام نشد</translation>
<translation id="3775358506042162758">در ورود چندگانه به سیستم حداکثر می‌توانید از سه حساب استفاده کنید.</translation>
-<translation id="370649949373421643">فعال کردن Wi-Fi</translation>
+<translation id="370649949373421643">‏فعال کردن Wi-Fi</translation>
<translation id="3626281679859535460">روشنایی</translation>
+<translation id="595202126637698455">ردیابی عملکرد فعال شد</translation>
<translation id="8054466585765276473">درحال محاسبه زمان شارژ باتری.</translation>
<translation id="7982789257301363584">شبکه</translation>
<translation id="5565793151875479467">پراکسی...</translation>
<translation id="938582441709398163">هم پوشانی صفحه‌کلید</translation>
<translation id="4387004326333427325">گواهینامه تأیید اعتبار، از راه دور، رد شد</translation>
<translation id="6979158407327259162">Google Drive</translation>
-<translation id="6943836128787782965">HTTP با خطا مواجه شد</translation>
+<translation id="3683428399328702079">وضوح <ph name="DISPLAY_NAME"/> به <ph name="RESOLUTION"/> تغییر یافت</translation>
+<translation id="6943836128787782965">‏HTTP با خطا مواجه شد</translation>
<translation id="2297568595583585744">سینی وضعیت</translation>
<translation id="1661867754829461514">پین جا افتاده</translation>
<translation id="4508225577814909926"><ph name="NAME"/>: در حال اتصال...</translation>
@@ -26,47 +30,49 @@
<translation id="2946640296642327832">فعال کردن بلوتوث</translation>
<translation id="6459472438155181876">گسترش صفحه به <ph name="DISPLAY_NAME"/></translation>
<translation id="8206859287963243715">سلولی</translation>
-<translation id="6596816719288285829">آدرس IP</translation>
+<translation id="6596816719288285829">‏آدرس IP</translation>
<translation id="4508265954913339219">فعالسازی انجام نشد</translation>
<translation id="3621712662352432595">تنظیمات صوتی</translation>
-<translation id="1812696562331527143">روش ورودی شما به <ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>شخص ثالث<ph name="END_LINK"/>) تغییر یافت. Shift + Alt را برای تعویض فشار دهید.</translation>
+<translation id="1812696562331527143">‏روش ورودی شما به <ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>شخص ثالث<ph name="END_LINK"/>) تغییر یافت. Shift + Alt را برای تعویض فشار دهید.</translation>
<translation id="2127372758936585790">شارژر برق ضعیف</translation>
<translation id="3846575436967432996">اطلاعات شبکه در دسترس نیست</translation>
<translation id="3026237328237090306">تنظیم اطلاعات تلفن همراه</translation>
+<translation id="5871632337994001636">مدیریت دستگاه‌ها...</translation>
<translation id="785750925697875037">مشاهده حساب تلفن همراه</translation>
<translation id="153454903766751181">در حال راه‌اندازی مودم سلولی...</translation>
-<translation id="4628814525959230255">اشتراک‌گذاری کنترل صفحه نمایش‌تان با <ph name="HELPER_NAME"/> از طریق Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> چرخانده شده است</translation>
+<translation id="4628814525959230255">‏اشتراک‌گذاری کنترل صفحه نمایش‌تان با <ph name="HELPER_NAME"/> از طریق Hangouts.</translation>
<translation id="7864539943188674973">غیرفعال کردن بلوتوث</translation>
<translation id="939252827960237676">عکس از صفحه نمایش ذخیره نشد</translation>
<translation id="3126069444801937830">راه‌اندازی مجدد برای به‌روزرسانی</translation>
<translation id="2268813581635650749">خروج همه از سیستم</translation>
-<translation id="735745346212279324">VPN قطع شد</translation>
+<translation id="735745346212279324">‏VPN قطع شد</translation>
<translation id="7320906967354320621">بدون فعالیت</translation>
-<translation id="6303423059719347535">باتری <ph name="PERCENTAGE"/> درصد پر است</translation>
<translation id="15373452373711364">نشانگر موشواره بزرگ</translation>
-<translation id="2778346081696727092">تأیید اعتبار با نام کاربری و گذرواژه ارائه شده انجام نشد</translation>
<translation id="3294437725009624529">مهمان</translation>
<translation id="8190698733819146287">سفارشی کردن زبان‌ها و ورودی...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">موقعیت قفسه</translation>
<translation id="2903907270192926896">ورودی</translation>
<translation id="8676770494376880701">شارژر برق متصل شده ضعیف است</translation>
<translation id="7170041865419449892">خارج از محدوده</translation>
<translation id="4804818685124855865">قطع اتصال</translation>
<translation id="2544853746127077729">گواهینامه تأیید اعتبار توسط شبکه رد شد</translation>
<translation id="5222676887888702881">خروج از سیستم</translation>
+<translation id="2391579633712104609">۱۸۰°</translation>
<translation id="2688477613306174402">پیکربندی</translation>
<translation id="1272079795634619415">توقف</translation>
<translation id="4957722034734105353">اطلاعات بیشتر...</translation>
-<translation id="2964193600955408481">غیرفعال کردن Wi-Fi</translation>
-<translation id="811680302244032017">افزودن دستگاه…</translation>
+<translation id="2964193600955408481">‏غیرفعال کردن Wi-Fi</translation>
<translation id="4279490309300973883">بازتاب می‌شود</translation>
-<translation id="2509468283778169019">CAPS LOCK روشن است</translation>
+<translation id="7973962044839454485">‏احراز هویت PPP به دلیل نام کاربری یا گذرواژه نادرست انجام نشد</translation>
+<translation id="2509468283778169019">‏CAPS LOCK روشن است</translation>
<translation id="3892641579809465218">صفحه نمایش داخلی</translation>
<translation id="7823564328645135659">بعد از همگام‌سازی تنظیمات شما، زبان از «<ph name="FROM_LOCALE"/>» به «<ph name="TO_LOCALE"/>» تغییر کرد.</translation>
<translation id="3368922792935385530">متصل</translation>
<translation id="8340999562596018839">بازخورد گفتاری</translation>
-<translation id="8654520615680304441">روشن کردن Wi-Fi در...</translation>
-<translation id="5825747213122829519">روش ورودی شما به <ph name="INPUT_METHOD_ID"/> تغییر یافت. Shift + Alt را برای تعویض فشار دهید.</translation>
+<translation id="8654520615680304441">‏روشن کردن Wi-Fi در...</translation>
+<translation id="8828714802988429505">۹۰°</translation>
+<translation id="5825747213122829519">‏روش ورودی شما به <ph name="INPUT_METHOD_ID"/> تغییر یافت. Shift + Alt را برای تعویض فشار دهید.</translation>
<translation id="2562916301614567480">شبکه خصوصی</translation>
<translation id="6549021752953852991">هیچ شبکه سلولی دردسترس نیست</translation>
<translation id="4379753398862151997">نمایشگر عزیز، ما برای هم ساخته نشده‌ایم. (این نمایشگر پشتیبانی نمی‌شود)</translation>
@@ -74,18 +80,19 @@
<translation id="3087734570205094154">پایین</translation>
<translation id="3742055079367172538">عکس از صفحه نمایش گرفته شد</translation>
<translation id="8878886163241303700">صفحه گسترش یافته است</translation>
-<translation id="5271016907025319479">VPN پیکربندی نشده است.</translation>
-<translation id="372094107052732682">برای خروج Ctrl+Shift+Q را دو بار فشار دهید.</translation>
+<translation id="5271016907025319479">‏VPN پیکربندی نشده است.</translation>
+<translation id="372094107052732682">‏برای خروج Ctrl+Shift+Q را دو بار فشار دهید.</translation>
<translation id="6803622936009808957">نمایش یک تصویر واحد در چند صفحه نمایش ممکن نیست زیرا وضوح تصویر پشتیبانی شده‌ای وجود ندارد. بجای آن حالت نمایش دسک‌تاپ چند بخشی استفاده می‌شود.</translation>
<translation id="1480041086352807611">حالت نمایش</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>٪ باقیمانده</translation>
<translation id="9089416786594320554">روش‌های ورودی</translation>
<translation id="6247708409970142803">%<ph name="PERCENTAGE"/></translation>
-<translation id="2614835198358683673">وقتی Chromebook روشن است ممکن است شارژ نشود. از شارژر مخصوص دستگاه استفاده کنید.</translation>
+<translation id="2825619548187458965">قفسه</translation>
+<translation id="2614835198358683673">‏وقتی Chromebook روشن است ممکن است شارژ نشود. از شارژر مخصوص دستگاه استفاده کنید.</translation>
<translation id="1895658205118569222">بسته شدن</translation>
<translation id="4430019312045809116">میزان صدا</translation>
-<translation id="4442424173763614572">جستجوی DNS انجام نشد</translation>
-<translation id="6356500677799115505">باتری پر است و شارژ می‌شود.</translation>
+<translation id="8681498213689260554">‏راه‌اندازی مجدد و Powerwash برای به‌روزرسانی</translation>
+<translation id="4442424173763614572">‏جستجوی DNS انجام نشد</translation>
<translation id="7874779702599364982">جستجو برای شبکه‌های تلفن همراه ...</translation>
<translation id="583281660410589416">ناشناخته</translation>
<translation id="1383876407941801731">جستجو</translation>
@@ -94,7 +101,6 @@
<translation id="2204305834655267233">اطلاعات شبکه</translation>
<translation id="1621499497873603021">زمان باقیمانده تا خالی‌شدن شارژ باتری، <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">خروج از مهمان</translation>
-<translation id="4471417012762451363">باتری <ph name="PERCENTAGE"/> درصد پر است و شارژ می‌شود</translation>
<translation id="8308637677604853869">منوی قبلی</translation>
<translation id="4666297444214622512">ورود به حساب دیگر ممکن نیست.</translation>
<translation id="1346748346194534595">راست</translation>
@@ -104,14 +110,15 @@
<translation id="8428213095426709021">تنظیمات</translation>
<translation id="2372145515558759244">در حال همگام‌سازی برنامه‌ها…</translation>
<translation id="7256405249507348194">خطای نامشخص: <ph name="DESC"/></translation>
-<translation id="7925247922861151263">بررسی AAA انجام نشد</translation>
+<translation id="7925247922861151263">‏بررسی AAA انجام نشد</translation>
<translation id="8456362689280298700"><ph name="HOUR"/>:<ph name="MINUTE"/> تا پر شود</translation>
-<translation id="5787281376604286451">بازخورد گفتاری فعال است.
+<translation id="5787281376604286451">‏بازخورد گفتاری فعال است.
Ctrl+Alt+Z را فشار دید تا غیرفعال شود.</translation>
<translation id="4479639480957787382">اترنت</translation>
<translation id="6312403991423642364">خطای شبکه ناشناخته</translation>
<translation id="1467432559032391204">چپ</translation>
<translation id="5543001071567407895">پیامک</translation>
+<translation id="1957803754585243749">۰ درجه</translation>
<translation id="2354174487190027830">فعال‌سازی <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">بزرگ کردن</translation>
@@ -121,14 +128,14 @@ Ctrl+Alt+Z را فشار دید تا غیرفعال شود.</translation>
<translation id="2727977024730340865">باتری به شارژر برق ضعیف متصل است. شارژ باتری ممکن است قابل اطمینان نباشد.</translation>
<translation id="3784455785234192852">قفل</translation>
<translation id="2805756323405976993">برنامه‌ها</translation>
-<translation id="8871072142849158571">اندازه <ph name="DISPLAY_NAME"/> به <ph name="RESOLUTION"/> تغییر داده شد</translation>
<translation id="1512064327686280138">نقص در فعالسازی</translation>
<translation id="5097002363526479830">اتصال ناموفق به شبکه &quot;<ph name="NAME"/>&quot;:<ph name="DETAILS"/></translation>
-<translation id="1850504506766569011">Wi-Fi خاموش است.</translation>
+<translation id="1850504506766569011">‏Wi-Fi خاموش است.</translation>
<translation id="8132793192354020517">متصل به <ph name="NAME"/></translation>
<translation id="7052914147756339792">تنظیم کاغذدیواری...</translation>
<translation id="8678698760965522072">حالت آنلاین</translation>
<translation id="2532589005999780174">حالت کنتراست بالا</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>، <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">خطای داخلی</translation>
<translation id="3019353588588144572">زمان باقی مانده تا شارژ کامل باتری، <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">ذره‌بین صفحه</translation>
@@ -142,57 +149,63 @@ Ctrl+Alt+Z را فشار دید تا غیرفعال شود.</translation>
<translation id="4032485810211612751"><ph name="HOURS"/>:<ph name="MINUTES"/>:<ph name="SECONDS"/></translation>
<translation id="225680501294068881">درحال جستجو برای دستگاه‌ها...</translation>
<translation id="5597451508971090205"><ph name="SHORT_WEEKDAY"/>، <ph name="DATE"/></translation>
-<translation id="4448844063988177157">در حال جستجوی شبکه‌های Wi-Fi...</translation>
+<translation id="4448844063988177157">‏در حال جستجوی شبکه‌های Wi-Fi...</translation>
<translation id="8401662262483418323">اتصال به «<ph name="NAME"/>» ناموفق بود: <ph name="DETAILS"/>
پیام سرور: <ph name="SERVER_MSG"/></translation>
<translation id="2475982808118771221">یک خطا روی داد</translation>
-<translation id="7229570126336867161">EVDO مورد نیاز است</translation>
+<translation id="7229570126336867161">‏EVDO مورد نیاز است</translation>
<translation id="2999742336789313416"><ph name="DISPLAY_NAME"/> یک جلسه عمومی مدیریت‌شده توسط <ph name="DOMAIN"/> است</translation>
<translation id="7029814467594812963">خروج از جلسه</translation>
-<translation id="8454013096329229812">Wi-Fi روشن است.</translation>
-<translation id="4872237917498892622">Alt+جستجو یا Shift</translation>
+<translation id="8454013096329229812">‏Wi-Fi روشن است.</translation>
+<translation id="4872237917498892622">‏Alt+جستجو یا Shift</translation>
+<translation id="9201131092683066720">باتری <ph name="PERCENTAGE"/> درصد پر است.</translation>
<translation id="2983818520079887040">تنظیمات...</translation>
+<translation id="1195412055398077112">بزرگتر از صفحه</translation>
<translation id="1717216362413677834">حالت جایگاه اتصال</translation>
+<translation id="112308213915226829">پنهان کردن خودکار قفسه</translation>
<translation id="8927026611342028580">درخواست اتصال</translation>
-<translation id="8300849813060516376">OTASP انجام نشد</translation>
-<translation id="2792498699870441125">Alt+جستجو</translation>
+<translation id="8300849813060516376">‏OTASP انجام نشد</translation>
+<translation id="2792498699870441125">‏Alt+جستجو</translation>
<translation id="8660803626959853127">در حال همگام‌سازی فایل(های) <ph name="COUNT"/></translation>
+<translation id="5958529069007801266">کاربر نظارت‌شده</translation>
<translation id="3709443003275901162">+۹</translation>
-<translation id="639644700271529076">CAPS LOCK خاموش است</translation>
-<translation id="6248847161401822652">برای خروج Control‏، Shift و Q را دو بار فشار دهید.</translation>
+<translation id="639644700271529076">‏CAPS LOCK خاموش است</translation>
+<translation id="6248847161401822652">‏برای خروج Control‏، Shift و Q را دو بار فشار دهید.</translation>
+<translation id="6785414152754474415">باتری <ph name="PERCENTAGE"/> درصد پر و درحال شارژ است.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: در حال فعال‌سازی…</translation>
+<translation id="4895488851634969361">باتری پر است.</translation>
<translation id="1391854757121130358">ممکن است حجم مجاز داده تلفن همراه خود را مصرف کرده باشید.</translation>
-<translation id="5413208160176941586">کاربر مدیریت شده به صورت محلی</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>:‏ <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">موقعیت راه‌انداز</translation>
-<translation id="7593891976182323525">جستجو یا Shift</translation>
+<translation id="5947494881799873997">برگرداندن</translation>
+<translation id="7593891976182323525">‏جستجو یا Shift</translation>
<translation id="7649070708921625228">راهنما</translation>
-<translation id="3050422059534974565">CAPS LOCK روشن است.
+<translation id="3050422059534974565">‏CAPS LOCK روشن است.
جستجو یا Shift را برای لغو فشار دهید.</translation>
<translation id="397105322502079400">در حال محاسبه…</translation>
<translation id="158849752021629804">شبکه خانگی مورد نیاز است</translation>
<translation id="6857811139397017780">فعال سازی <ph name="NETWORKSERVICE"/></translation>
-<translation id="5864471791310927901">بررسی DHCP انجام نشد</translation>
+<translation id="5864471791310927901">‏بررسی DHCP انجام نشد</translation>
<translation id="5812035014844949013">خروجی</translation>
<translation id="6692173217867674490">کلمه عبور نادرست</translation>
<translation id="6165508094623778733">بیشتر بیاموزید</translation>
<translation id="9046895021617826162">اتصال برقرار نشد</translation>
+<translation id="7168224885072002358">برگرداندن به وضوح قدیمی در <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">این جلسه در <ph name="SESSION_TIME_REMAINING"/> به اتمام خواهد رسید. به طور خودکار از سیستم خارج خواهید شد.</translation>
-<translation id="8372369524088641025">کلید WEP نادرست</translation>
+<translation id="8372369524088641025">‏کلید WEP نادرست</translation>
<translation id="6636709850131805001">حالت ناشناس</translation>
<translation id="3573179567135747900">به &quot;<ph name="FROM_LOCALE"/>&quot; تغییر دهید (به راه‌اندازی دوباره نیاز دارد)</translation>
<translation id="8103386449138765447">پیامک‌ها: <ph name="MESSAGE_COUNT"/></translation>
-<translation id="5045002648206642691">تنظیمات Google Drive...</translation>
-<translation id="1510238584712386396">راه‌انداز</translation>
-<translation id="7209101170223508707">CAPS LOCK روشن است.
+<translation id="5045002648206642691">‏تنظیمات Google Drive...</translation>
+<translation id="7209101170223508707">‏CAPS LOCK روشن است.
Alt+جستجو یا Shift را برای لغو فشار دهید.</translation>
<translation id="8940956008527784070">باتری ضعیف است (<ph name="PERCENTAGE"/>٪)</translation>
+<translation id="4918086044614829423">پذیرش</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> باقیمانده است</translation>
-<translation id="520760366042891468">اشتراک‌گذاری کنترل صفحه نمایش شما از طریق Hangouts.</translation>
+<translation id="520760366042891468">‏اشتراک‌گذاری کنترل صفحه نمایش شما از طریق Hangouts.</translation>
<translation id="8000066093800657092">بدون شبکه</translation>
<translation id="4015692727874266537">ورود به سیستم با حسابی دیگر...</translation>
<translation id="5941711191222866238">کوچک کردن</translation>
<translation id="6911468394164995108">پیوستن به شبکه دیگر…</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>ساعت <ph name="MINUTE"/>دقیقه مانده تا باتری شارژ شود</translation>
<translation id="6359806961507272919">پیامک از <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">شرکت مخابراتی</translation>
diff --git a/chromium/ash/strings/ash_strings_fi.xtb b/chromium/ash/strings/ash_strings_fi.xtb
index d9793f2b869..9c4981dd86c 100644
--- a/chromium/ash/strings/ash_strings_fi.xtb
+++ b/chromium/ash/strings/ash_strings_fi.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="fi">
<translation id="3595596368722241419">Akku täynnä</translation>
-<translation id="5250713215130379958">Piilota käynnistyspalkki</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portaalitila</translation>
<translation id="30155388420722288">Overflow-painike</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth käytössä</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> käännettiin asentoon <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth pois käytöstä</translation>
+<translation id="7165320105431587207">Verkon asetuksien määrittäminen epäonnistui</translation>
<translation id="3775358506042162758">Sinulla voi olla enintään kolme tiliä useaan tiliin kirjautuessasi.</translation>
<translation id="370649949373421643">Ota wifi käyttöön</translation>
<translation id="3626281679859535460">Kirkkaus</translation>
+<translation id="595202126637698455">Tehokkuuden seuranta on käytössä</translation>
<translation id="8054466585765276473">Lasketaan akun kesto.</translation>
<translation id="7982789257301363584">Verkko</translation>
<translation id="5565793151875479467">Välityspalvelin...</translation>
<translation id="938582441709398163">Näppäimistön peitto</translation>
<translation id="4387004326333427325">Todennusvarmenne on hylätty etäyhteyden kautta</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Ruudun <ph name="DISPLAY_NAME"/> tarkkuudeksi vaihdettiin <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP get -toiminto epäonnistui</translation>
<translation id="2297568595583585744">Tila-alue</translation>
<translation id="1661867754829461514">PIN-koodi puuttuu</translation>
@@ -34,39 +38,41 @@ Vaihda syöttötapaa painamalla Shift + Alt.</translation>
<translation id="2127372758936585790">Pienitehoinen laturi</translation>
<translation id="3846575436967432996">Verkon tietoja ei saatavilla</translation>
<translation id="3026237328237090306">Määritä mobiilitiedonsiirron asetukset</translation>
+<translation id="5871632337994001636">Hallinnoi laitteita…</translation>
<translation id="785750925697875037">Näytä mobiilitili</translation>
<translation id="153454903766751181">Alustetaan matkapuhelinmodeemia…</translation>
<translation id="4628814525959230255">Näytönhallinnan jakaminen henkilön <ph name="HELPER_NAME"/> kanssa Hangout-keskustelujen kautta.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> on käännetty</translation>
<translation id="7864539943188674973">Poista Bluetooth käytöstä</translation>
<translation id="939252827960237676">Kuvakaappauksen tallentaminen epäonnistui</translation>
<translation id="3126069444801937830">Päivitä käynnistämällä uudelleen</translation>
<translation id="2268813581635650749">Kirjaa kaikki ulos</translation>
<translation id="735745346212279324">VPN-yhteys katkaistu</translation>
<translation id="7320906967354320621">Ei käytössä</translation>
-<translation id="6303423059719347535">Akussa on virtaa <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Suuri hiiren osoitin</translation>
-<translation id="2778346081696727092">Todennus annetulla käyttäjänimellä ja salasanalla epäonnistui.</translation>
<translation id="3294437725009624529">Vieras</translation>
<translation id="8190698733819146287">Muokkaa kieliä ja syötettä...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Hyllyn sijainti</translation>
<translation id="2903907270192926896">ÄÄNITULO</translation>
<translation id="8676770494376880701">Pienitehoinen laturi kytketty</translation>
<translation id="7170041865419449892">Katvealueella</translation>
<translation id="4804818685124855865">Katkaise yhteys</translation>
<translation id="2544853746127077729">Verkko on hylännyt todennusvarmenteen</translation>
<translation id="5222676887888702881">Kirjaudu ulos</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Määritykset</translation>
<translation id="1272079795634619415">Pysäytä</translation>
<translation id="4957722034734105353">Lisätietoja...</translation>
<translation id="2964193600955408481">Wifi pois käytöstä</translation>
-<translation id="811680302244032017">Lisää laite...</translation>
<translation id="4279490309300973883">Peilaus päällä</translation>
+<translation id="7973962044839454485">PPP-todennus epäonnistui virheellisen käyttäjänimen tai salasanan vuoksi</translation>
<translation id="2509468283778169019">CAPS LOCK on päällä</translation>
<translation id="3892641579809465218">Sisäinen näyttö</translation>
<translation id="7823564328645135659">Käyttökieli on muutettu kielestä <ph name="FROM_LOCALE"/> kieleksi <ph name="TO_LOCALE"/> asetustesi synkronoinnin yhteydessä.</translation>
<translation id="3368922792935385530">Yhdistetty</translation>
<translation id="8340999562596018839">Äänipalaute</translation>
<translation id="8654520615680304441">Ota wifi käyttöön…</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Syöttötapa on vaihtunut. Uusi syöttötapa on <ph name="INPUT_METHOD_ID"/>.
Vaihda syöttötapaa painamalla Shift + Alt.</translation>
<translation id="2562916301614567480">Yksityinen verkko</translation>
@@ -83,11 +89,12 @@ Vaihda syöttötapaa painamalla Shift + Alt.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/> % jäljellä</translation>
<translation id="9089416786594320554">Syöttötavat</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Hylly</translation>
<translation id="2614835198358683673">Chromebookisi ei välttämättä lataudu sen ollessa päällä. Harkitse virallisen laturin käyttämistä.</translation>
<translation id="1895658205118569222">Sulkeminen</translation>
<translation id="4430019312045809116">Äänenvoimakkuus</translation>
+<translation id="8681498213689260554">Käynnistä laite uudelleen ja suorita powerwash asentaaksesi päivitykset</translation>
<translation id="4442424173763614572">DNS-haku epäonnistui</translation>
-<translation id="6356500677799115505">Akku on täynnä ja laite on kytketty laturiin.</translation>
<translation id="7874779702599364982">Haetaan matkapuhelinverkkoja…</translation>
<translation id="583281660410589416">Tuntematon</translation>
<translation id="1383876407941801731">Haku</translation>
@@ -96,7 +103,6 @@ Vaihda syöttötapaa painamalla Shift + Alt.</translation>
<translation id="2204305834655267233">Verkon tiedot</translation>
<translation id="1621499497873603021">Akku on tyhjä <ph name="TIME_LEFT"/> kuluttua</translation>
<translation id="5980301590375426705">Sulje vierastila</translation>
-<translation id="4471417012762451363">Akussa on virtaa <ph name="PERCENTAGE"/> % ja laite on kytketty laturiin</translation>
<translation id="8308637677604853869">Edellinen valikko</translation>
<translation id="4666297444214622512">Toiseen tiliin kirjautuminen ei onnistunut.</translation>
<translation id="1346748346194534595">Oikealle</translation>
@@ -114,6 +120,7 @@ Poista se käytöstä painamalla Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Tuntematon verkkovirhe</translation>
<translation id="1467432559032391204">Vasemmalle</translation>
<translation id="5543001071567407895">Tekstiviesti</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktivoidaan <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wifi</translation>
<translation id="1398853756734560583">Suurenna</translation>
@@ -123,7 +130,6 @@ Poista se käytöstä painamalla Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Pienitehoinen laturi kytketty. Akku ei ehkä lataudu luotettavasti.</translation>
<translation id="3784455785234192852">Lukitse</translation>
<translation id="2805756323405976993">Sovellukset</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> on muutettu kokoon <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktivointivirhe</translation>
<translation id="5097002363526479830">Yhteyden muodostaminen verkkoon &quot;<ph name="NAME"/>&quot; epäonnistui: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wifi ei ole käytössä.</translation>
@@ -131,6 +137,7 @@ Poista se käytöstä painamalla Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Aseta taustakuva...</translation>
<translation id="8678698760965522072">Online-tila</translation>
<translation id="2532589005999780174">Suuri kontrasti -tila</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Sisäinen virhe</translation>
<translation id="3019353588588144572">Akku on ladattu <ph name="TIME_REMAINING"/> kuluttua</translation>
<translation id="3473479545200714844">Ruudun suurentaminen</translation>
@@ -153,20 +160,24 @@ Palvelimen viesti: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Sulje käyttökerta</translation>
<translation id="8454013096329229812">Wifi on käytössä.</translation>
<translation id="4872237917498892622">Alt + haku tai Shift</translation>
+<translation id="9201131092683066720">Akussa on virtaa <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Asetukset...</translation>
+<translation id="1195412055398077112">kuvasta rajataan pois osa</translation>
<translation id="1717216362413677834">Telakointitila</translation>
+<translation id="112308213915226829">Piilota hylly automaattisesti</translation>
<translation id="8927026611342028580">Yhdistä pyydetyt</translation>
<translation id="8300849813060516376">OTASP epäonnistui</translation>
<translation id="2792498699870441125">Alt + haku</translation>
<translation id="8660803626959853127">Synkronoidaan <ph name="COUNT"/> tiedosto(a)</translation>
+<translation id="5958529069007801266">Valvottu käyttäjä</translation>
<translation id="3709443003275901162">Yli 9</translation>
<translation id="639644700271529076">CAPS LOCK on pois päältä</translation>
<translation id="6248847161401822652">Lopeta painamalla kahdesti Control Shift Q.</translation>
+<translation id="6785414152754474415">Akussa on virtaa <ph name="PERCENTAGE"/> %, ja laite on kytketty laturiin.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: aktivoidaan…</translation>
+<translation id="4895488851634969361">Akku on täynnä.</translation>
<translation id="1391854757121130358">Olet ehkä käyttänyt mobiilitiedonsiirron kiintiösi.</translation>
-<translation id="5413208160176941586">Paikallisesti hallinnoitu käyttäjä</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Käynnistyspalkin sijainti</translation>
+<translation id="5947494881799873997">Palauta</translation>
<translation id="7593891976182323525">Haku tai Shift</translation>
<translation id="7649070708921625228">Ohje</translation>
<translation id="3050422059534974565">CAPS LOCK on päällä. Peruuta painamalla haku- tai Shift-näppäintä.</translation>
@@ -178,21 +189,23 @@ Palvelimen viesti: <ph name="SERVER_MSG"/></translation>
<translation id="6692173217867674490">Väärä tunnuslause</translation>
<translation id="6165508094623778733">Lisätietoja</translation>
<translation id="9046895021617826162">Yhdistäminen epäonnistui</translation>
+<translation id="7168224885072002358">Palautetaan vanha tarkkuus, aikaa palautukseen <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Istunnon loppumiseen on <ph name="SESSION_TIME_REMAINING"/>. Sinut kirjataan automaattisesti ulos.</translation>
<translation id="8372369524088641025">Väärä WEP-avain</translation>
<translation id="6636709850131805001">Tunnistamaton tila</translation>
<translation id="3573179567135747900">Vaihda takaisin kieleksi <ph name="FROM_LOCALE"/> (vaatii uudelleenkäynnistyksen)</translation>
<translation id="8103386449138765447">Tekstiviestit: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google Driven asetukset...</translation>
-<translation id="1510238584712386396">Käynnistysohjelma</translation>
<translation id="7209101170223508707">CAPS LOCK on päällä. Peruuta painamalla Alt + hakupainike tai Shift.</translation>
<translation id="8940956008527784070">Akku vähissä (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Hyväksy</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>.<ph name="MINUTE"/> jäljellä</translation>
<translation id="520760366042891468">Näytön hallinnan jakaminen Hangout-keskustelujen kautta.</translation>
<translation id="8000066093800657092">Ei verkkoa</translation>
<translation id="4015692727874266537">Kirjaudu sisään toiseen tiliin…</translation>
<translation id="5941711191222866238">Pienennä</translation>
<translation id="6911468394164995108">Liity muuhun verkkoon...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">Akku täynnä <ph name="HOUR"/> t <ph name="MINUTE"/> min kuluttua</translation>
<translation id="6359806961507272919">Tekstiviesti lähettäjältä <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operaattori</translation>
diff --git a/chromium/ash/strings/ash_strings_fil.xtb b/chromium/ash/strings/ash_strings_fil.xtb
index d3c61d5a6ff..3685689d96b 100644
--- a/chromium/ash/strings/ash_strings_fil.xtb
+++ b/chromium/ash/strings/ash_strings_fil.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="fil">
<translation id="3595596368722241419">Puno na ang baterya</translation>
-<translation id="5250713215130379958">Awtomatikong itago ang launcher</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> at <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Katayuan ng portal</translation>
<translation id="30155388420722288">Button na Overflow</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Pinapagana ang Bluetooth</translation>
+<translation id="6310121235600822547">Na-rotate ang <ph name="DISPLAY_NAME"/> sa <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Hindi pinagana ang Bluetooth</translation>
+<translation id="7165320105431587207">Nabigong ma-configure ang network</translation>
<translation id="3775358506042162758">Maaari ka lang magkaroon ng hanggang sa tatlong account sa multiple na pag-sign-in.</translation>
<translation id="370649949373421643">Paganahin ang Wi-Fi</translation>
<translation id="3626281679859535460">Tingkad</translation>
+<translation id="595202126637698455">Naka-enable ang pagte-trace sa pagganap</translation>
<translation id="8054466585765276473">Kinakalkula ang oras ng baterya.</translation>
<translation id="7982789257301363584">Network</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Overlay ng Keyboard</translation>
<translation id="4387004326333427325">Remote na tinanggihan ang certificate sa pagpapatunay</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Ginawang <ph name="RESOLUTION"/> ang resolution ng <ph name="DISPLAY_NAME"/></translation>
<translation id="6943836128787782965">Nabigo ang pagkuha ng HTTP</translation>
<translation id="2297568595583585744">Tray ng katayuan</translation>
<translation id="1661867754829461514">Nawawala ang PIN</translation>
@@ -34,39 +38,41 @@ Pindutin ang Shift + Alt upang magpalit.</translation>
<translation id="2127372758936585790">Low-power charger</translation>
<translation id="3846575436967432996">Walang available na impormasyon sa network</translation>
<translation id="3026237328237090306">I-setup ang mobile data</translation>
+<translation id="5871632337994001636">Pamahalaan ang mga device...</translation>
<translation id="785750925697875037">Tingnan ang account sa mobile</translation>
<translation id="153454903766751181">Sinisimulan ang cellular na modem...</translation>
<translation id="4628814525959230255">Ibinahagi ang kontrol sa iyong screen kay <ph name="HELPER_NAME"/> sa pamamagitan ng Hangouts.</translation>
-<translation id="8343941333792395995">Na-rotate na ang <ph name="DISPLAY_NAME"/></translation>
<translation id="7864539943188674973">Huwag Paganahin ang Bluetooth</translation>
<translation id="939252827960237676">Nabigong i-save ang screenshot</translation>
<translation id="3126069444801937830">I-restart upang mag-update</translation>
<translation id="2268813581635650749">I-sign out ang lahat</translation>
<translation id="735745346212279324">Nakadiskonekta ang VPN</translation>
<translation id="7320906967354320621">Hindi Ginagamit</translation>
-<translation id="6303423059719347535">Ang baterya ay <ph name="PERCENTAGE"/>% na puno</translation>
<translation id="15373452373711364">Malaking mouse cursor</translation>
-<translation id="2778346081696727092">Nabigong patotohanan gamit ang ibinigay na username o password</translation>
<translation id="3294437725009624529">Bisita</translation>
<translation id="8190698733819146287">I-customize ang mga wika at input...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posisyon ng shelf</translation>
<translation id="2903907270192926896">INPUT</translation>
<translation id="8676770494376880701">Nakakabit ang low-power charger</translation>
<translation id="7170041865419449892">Wala sa sakop</translation>
<translation id="4804818685124855865">I-disconnect</translation>
<translation id="2544853746127077729">Tinanggihan ng network ang certificate sa pagpapatunay</translation>
<translation id="5222676887888702881">Mag-sign out</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuration</translation>
<translation id="1272079795634619415">Stop</translation>
<translation id="4957722034734105353">Matuto nang higit pa...</translation>
<translation id="2964193600955408481">Huwag paganahin ang Wi-Fi</translation>
-<translation id="811680302244032017">Magdagdag ng device...</translation>
<translation id="4279490309300973883">Nagmi-mirror</translation>
+<translation id="7973962044839454485">Nabigo ang pagpapatotoo sa PPP dahil sa hindi tamang username o password</translation>
<translation id="2509468283778169019">Naka-on ang CAPS LOCK</translation>
<translation id="3892641579809465218">Panloob na Display</translation>
<translation id="7823564328645135659">Nagbago ang wika mula &quot;<ph name="FROM_LOCALE"/>&quot; patungong &quot;<ph name="TO_LOCALE"/>&quot; pagkatapos i-sync ang iyong mga setting.</translation>
<translation id="3368922792935385530">Nakakonekta</translation>
<translation id="8340999562596018839">Pasalitang feedback</translation>
<translation id="8654520615680304441">I-on ang Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Naging <ph name="INPUT_METHOD_ID"/> ang iyong pamamaraan ng pag-input.
Pindutin ang Shift + Alt upang magpalit.</translation>
<translation id="2562916301614567480">Pribadong Network</translation>
@@ -83,11 +89,12 @@ Pindutin ang Shift + Alt upang magpalit.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% ang natitira</translation>
<translation id="9089416786594320554">Mga pamamaraan ng pag-input</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Shelf</translation>
<translation id="2614835198358683673">Maaaring hindi mag-charge ang iyong Chromebook habang naka-on ito. Pag-isipang gamitin ang opisyal na charger.</translation>
<translation id="1895658205118569222">Shutdown</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">I-restart at I-powerwash upang ma-update</translation>
<translation id="4442424173763614572">Nabigo ang paghahanap sa DNS</translation>
-<translation id="6356500677799115505">Ang baterya ay puno at nagcha-charge.</translation>
<translation id="7874779702599364982">Naghahanap ng mga cellular network...</translation>
<translation id="583281660410589416">Hindi kilala</translation>
<translation id="1383876407941801731">Paghahanap</translation>
@@ -96,7 +103,6 @@ Pindutin ang Shift + Alt upang magpalit.</translation>
<translation id="2204305834655267233">Impormasyon ng Network</translation>
<translation id="1621499497873603021">Natitirang oras bago maubos ang baterya, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Lumabas sa session ng bisita</translation>
-<translation id="4471417012762451363">Ang baterya ay <ph name="PERCENTAGE"/>% na puno at nagcha-charge</translation>
<translation id="8308637677604853869">Nakaraang menu</translation>
<translation id="4666297444214622512">Hindi makaka-sign in sa isa pang account.</translation>
<translation id="1346748346194534595">Kanan</translation>
@@ -114,6 +120,7 @@ Pindutin ang Ctrl+Alt+Z upang huwag paganahin.</translation>
<translation id="6312403991423642364">Hindi alam na error sa network</translation>
<translation id="1467432559032391204">Kaliwa</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Ina-activate ang <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximize</translation>
@@ -123,7 +130,6 @@ Pindutin ang Ctrl+Alt+Z upang huwag paganahin.</translation>
<translation id="2727977024730340865">Naka-saksak sa isang low-power charger. Maaaring hindi maging tiyak ang pag-charge ng baterya.</translation>
<translation id="3784455785234192852">I-lock</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571">na-resize ang <ph name="DISPLAY_NAME"/> sa <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Pagkabigo ng pag-activate</translation>
<translation id="5097002363526479830">Nabigong kumonekta sa network na '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Naka-off ang Wi-Fi.</translation>
@@ -131,6 +137,7 @@ Pindutin ang Ctrl+Alt+Z upang huwag paganahin.</translation>
<translation id="7052914147756339792">Magtakda ng wallpaper...</translation>
<translation id="8678698760965522072">Katayuan online</translation>
<translation id="2532589005999780174">High contrast mode</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Panloob na error</translation>
<translation id="3019353588588144572">Natitirang oras bago ganap na ma-charge ang baterya, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Screen magnifier</translation>
@@ -153,20 +160,24 @@ Mensahe mula sa server: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Lumabas sa session</translation>
<translation id="8454013096329229812">Naka-on ang Wi-Fi.</translation>
<translation id="4872237917498892622">Alt+Search o Shift</translation>
+<translation id="9201131092683066720">Ang baterya ay <ph name="PERCENTAGE"/>% na puno.</translation>
<translation id="2983818520079887040">Mga Setting...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Dock mode</translation>
+<translation id="112308213915226829">Awtomatikong itago ang shelf</translation>
<translation id="8927026611342028580">Hiniling ang Koneksyon</translation>
<translation id="8300849813060516376">Nabigo ang OTASP</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127">Nagsi-sync ng <ph name="COUNT"/> (na) file</translation>
+<translation id="5958529069007801266">Pinangangasiwaang user</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">Naka-off ang CAPS LOCK</translation>
<translation id="6248847161401822652">Pindutin ang Control Shift Q nang dalawang beses upang lumabas.</translation>
+<translation id="6785414152754474415">Ang baterya ay <ph name="PERCENTAGE"/>% na puno at nagcha-charge.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Ina-activate...</translation>
+<translation id="4895488851634969361">Puno na ang baterya.</translation>
<translation id="1391854757121130358">Maaaring naubos mo na ang mobile data na nakalaan sa iyo.</translation>
-<translation id="5413208160176941586">Lokal na pinapamahalaang user</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posisyon ng launcher</translation>
+<translation id="5947494881799873997">I-revert</translation>
<translation id="7593891976182323525">Search or Shift</translation>
<translation id="7649070708921625228">Tulong</translation>
<translation id="3050422059534974565">Naka-on ang CAPS LOCK.
@@ -179,22 +190,24 @@ Pindutin ang Search o Shift upang kanselahin.</translation>
<translation id="6692173217867674490">Mahinang passphrase</translation>
<translation id="6165508094623778733">Matuto nang higit pa</translation>
<translation id="9046895021617826162">Nabigo ang pagkonekta</translation>
+<translation id="7168224885072002358">Magre-revert sa lumang resolution sa loob ng <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Magtatapos ang session na ito sa <ph name="SESSION_TIME_REMAINING"/>. Awtomatiko kang masa-sign out.</translation>
<translation id="8372369524088641025">Mahinang WEP key</translation>
<translation id="6636709850131805001">Di-kilalang katayuan</translation>
<translation id="3573179567135747900">Palitan pabalik sa &quot;<ph name="FROM_LOCALE"/>&quot; (kailangang i-restart)</translation>
<translation id="8103386449138765447">Mga mensaheng SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Mga setting ng Google Drive ...</translation>
-<translation id="1510238584712386396">Launcher</translation>
<translation id="7209101170223508707">Naka-on ang CAPS LOCK.
Pindutin ang Alt+Search o Shift upang kanselahin.</translation>
<translation id="8940956008527784070">Mahina na ang baterya (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Tanggapin</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> ang natitira</translation>
<translation id="520760366042891468">Ibinahagi ang kontrol sa iyong screen sa pamamagitan ng Hangouts.</translation>
<translation id="8000066093800657092">Walang network</translation>
<translation id="4015692727874266537">Mag-sign sa isa pang account...</translation>
<translation id="5941711191222866238">Minimize</translation>
<translation id="6911468394164995108">Sumali sa iba...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>o <ph name="MINUTE"/>m hanggang mapuno</translation>
<translation id="6359806961507272919">SMS mula kay <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Carrier</translation>
diff --git a/chromium/ash/strings/ash_strings_fr.xtb b/chromium/ash/strings/ash_strings_fr.xtb
index 05c9f7ce73d..812cc0ff0ec 100644
--- a/chromium/ash/strings/ash_strings_fr.xtb
+++ b/chromium/ash/strings/ash_strings_fr.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="fr">
<translation id="3595596368722241419">Batterie pleine</translation>
-<translation id="5250713215130379958">Masquer automatiquement le lanceur d'applications</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> et <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">État du portail</translation>
<translation id="30155388420722288">Bouton de dépassement de capacité</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth activé</translation>
+<translation id="6310121235600822547">L'écran &quot;<ph name="DISPLAY_NAME"/>&quot; a effectué une rotation de <ph name="ROTATION"/>.</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth désactivé</translation>
+<translation id="7165320105431587207">Échec de la configuration du réseau.</translation>
<translation id="3775358506042162758">Vous ne pouvez vous connecter qu'à trois comptes au maximum dans le cadre de la connexion multicompte.</translation>
<translation id="370649949373421643">Activer le Wi-Fi</translation>
<translation id="3626281679859535460">Luminosité</translation>
+<translation id="595202126637698455">Suivi des performances activé</translation>
<translation id="8054466585765276473">Calcul de l'autonomie de la batterie en cours…</translation>
<translation id="7982789257301363584">Réseau</translation>
<translation id="5565793151875479467">Proxy…</translation>
<translation id="938582441709398163">Clavier en superposition</translation>
<translation id="4387004326333427325">Certificat d'authentification rejeté à distance.</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">La résolution de l'écran &quot;<ph name="DISPLAY_NAME"/>&quot; est désormais définie sur <ph name="RESOLUTION"/>.</translation>
<translation id="6943836128787782965">Échec de l'obtention HTTP.</translation>
<translation id="2297568595583585744">Barre d'état</translation>
<translation id="1661867754829461514">Code secret manquant</translation>
@@ -34,39 +38,41 @@ Appuyez sur Maj + Alt pour en utiliser un autre.</translation>
<translation id="2127372758936585790">Chargeur de faible puissance</translation>
<translation id="3846575436967432996">Aucune information disponible concernant le réseau</translation>
<translation id="3026237328237090306">Configurer les données mobiles</translation>
+<translation id="5871632337994001636">Gérer les appareils…</translation>
<translation id="785750925697875037">Afficher le compte mobile</translation>
<translation id="153454903766751181">Initialisation du modem cellulaire en cours…</translation>
<translation id="4628814525959230255">Partage du contrôle de votre écran avec <ph name="HELPER_NAME"/> via Hangouts</translation>
-<translation id="8343941333792395995">Rotation de l'écran &quot;<ph name="DISPLAY_NAME"/>&quot;</translation>
<translation id="7864539943188674973">Désactiver le Bluetooth</translation>
<translation id="939252827960237676">Échec d'enregistrement de la capture d'écran.</translation>
<translation id="3126069444801937830">Redémarrez pour mettre à jour</translation>
<translation id="2268813581635650749">Déconnecter tous les utilisateurs</translation>
<translation id="735745346212279324">VPN déconnecté</translation>
<translation id="7320906967354320621">Inactif</translation>
-<translation id="6303423059719347535">La batterie est chargée à <ph name="PERCENTAGE"/> %.</translation>
<translation id="15373452373711364">Grand curseur</translation>
-<translation id="2778346081696727092">Échec de l'authentification à l'aide du nom d'utilisateur ou du mot de passe indiqués.</translation>
<translation id="3294437725009624529">Invité</translation>
<translation id="8190698733819146287">Personnaliser les langues et la saisie...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Position de l'étagère</translation>
<translation id="2903907270192926896">ENTRÉE</translation>
<translation id="8676770494376880701">Chargeur de faible puissance connecté</translation>
<translation id="7170041865419449892">Hors de portée</translation>
<translation id="4804818685124855865">Se déconnecter</translation>
<translation id="2544853746127077729">Certificat d'authentification rejeté par le réseau.</translation>
<translation id="5222676887888702881">Déconnexion</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuration en cours</translation>
<translation id="1272079795634619415">Arrêter</translation>
<translation id="4957722034734105353">En savoir plus…</translation>
<translation id="2964193600955408481">Désactiver le réseau Wi-Fi</translation>
-<translation id="811680302244032017">Ajouter un appareil…</translation>
<translation id="4279490309300973883">Mise en miroir</translation>
+<translation id="7973962044839454485">Échec de l'authentification PPP en raison de la saisie d'un nom d'utilisateur ou d'un mot de passe erronés.</translation>
<translation id="2509468283778169019">Touche VERR MAJ activée</translation>
<translation id="3892641579809465218">Affichage interne</translation>
<translation id="7823564328645135659">La langue utilisée est passée de &quot;<ph name="FROM_LOCALE"/>&quot; à &quot;<ph name="TO_LOCALE"/>&quot; après la synchronisation de vos paramètres.</translation>
<translation id="3368922792935385530">Connecté</translation>
<translation id="8340999562596018839">Commentaires audio</translation>
<translation id="8654520615680304441">Activer le Wi-Fi…</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Votre mode de saisie a été remplacé par <ph name="INPUT_METHOD_ID"/>.
Appuyez sur Maj + Alt pour en utiliser un autre.</translation>
<translation id="2562916301614567480">Réseau privé</translation>
@@ -83,11 +89,12 @@ Appuyez sur Maj + Alt pour en utiliser un autre.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/> % restant(s)</translation>
<translation id="9089416786594320554">Modes de saisie</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Étagère</translation>
<translation id="2614835198358683673">Votre Chromebook risque de ne pas charger lorsqu'il est allumé. Utilisez plutôt le chargeur officiel.</translation>
<translation id="1895658205118569222">Arrêt.</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">Redémarrer, puis lancer Powerwash pour mettre à jour le système</translation>
<translation id="4442424173763614572">Échec de la résolution DNS.</translation>
-<translation id="6356500677799115505">La batterie est pleine et en charge.</translation>
<translation id="7874779702599364982">Recherche de réseaux cellulaires en cours…</translation>
<translation id="583281660410589416">Inconnu</translation>
<translation id="1383876407941801731">Recherche</translation>
@@ -96,7 +103,6 @@ Appuyez sur Maj + Alt pour en utiliser un autre.</translation>
<translation id="2204305834655267233">Informations réseau</translation>
<translation id="1621499497873603021">Temps restant avant que la batterie ne soit vide : <ph name="TIME_LEFT"/>.</translation>
<translation id="5980301590375426705">Fermer la session Invité</translation>
-<translation id="4471417012762451363">La batterie est chargée à <ph name="PERCENTAGE"/> % et en charge.</translation>
<translation id="8308637677604853869">Menu précédent</translation>
<translation id="4666297444214622512">Impossible de se connecter à un autre compte.</translation>
<translation id="1346748346194534595">Vers la droite</translation>
@@ -114,6 +120,7 @@ Appuyez sur les touches Ctrl+Alt+Z pour les désactiver.</translation>
<translation id="6312403991423642364">Erreur de réseau inconnue.</translation>
<translation id="1467432559032391204">Vers la gauche</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Activation du réseau <ph name="NAME"/> en cours…</translation>
<translation id="8814190375133053267">Wi-Fi </translation>
<translation id="1398853756734560583">Agrandir</translation>
@@ -123,7 +130,6 @@ Appuyez sur les touches Ctrl+Alt+Z pour les désactiver.</translation>
<translation id="2727977024730340865">L'appareil est branché à un chargeur de faible puissance. Il se peut que la charge ne soit pas fiable.</translation>
<translation id="3784455785234192852">Verrouiller</translation>
<translation id="2805756323405976993">Applications</translation>
-<translation id="8871072142849158571">La résolution de l'écran &quot;<ph name="DISPLAY_NAME"/>&quot; est désormais la suivante : <ph name="RESOLUTION"/>.</translation>
<translation id="1512064327686280138">Échec de l'activation</translation>
<translation id="5097002363526479830">Échec de la connexion au réseau &quot;<ph name="NAME"/>&quot; : <ph name="DETAILS"/>.</translation>
<translation id="1850504506766569011">Le Wi-Fi est désactivé.</translation>
@@ -131,6 +137,7 @@ Appuyez sur les touches Ctrl+Alt+Z pour les désactiver.</translation>
<translation id="7052914147756339792">Définir un fond d'écran…</translation>
<translation id="8678698760965522072">En ligne</translation>
<translation id="2532589005999780174">Mode Contraste élevé</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Erreur interne.</translation>
<translation id="3019353588588144572">Temps restant avant chargement complet de la batterie : <ph name="TIME_REMAINING"/>.</translation>
<translation id="3473479545200714844">Loupe</translation>
@@ -153,20 +160,24 @@ Message du serveur : <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Quitter la session</translation>
<translation id="8454013096329229812">Le Wi-Fi est activé.</translation>
<translation id="4872237917498892622">Alt + Recherche ou Maj</translation>
+<translation id="9201131092683066720">La batterie est chargée à <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Paramètres...</translation>
+<translation id="1195412055398077112">Surbalayage</translation>
<translation id="1717216362413677834">Mode Ancrage</translation>
+<translation id="112308213915226829">Masquer automatiquement l'étagère</translation>
<translation id="8927026611342028580">Connexion demandée</translation>
<translation id="8300849813060516376">Échec de l'opération OTASP</translation>
<translation id="2792498699870441125">Alt + Recherche</translation>
<translation id="8660803626959853127">Synchronisation de <ph name="COUNT"/> fichier(s) en cours…</translation>
+<translation id="5958529069007801266">Utilisateur supervisé</translation>
<translation id="3709443003275901162">Plus de 9</translation>
<translation id="639644700271529076">La touche de verrouillage des majuscules est désactivée.</translation>
<translation id="6248847161401822652">Pour quitter, appuyez deux fois sur Ctrl+Maj+Q.</translation>
+<translation id="6785414152754474415">La batterie est chargée à <ph name="PERCENTAGE"/> % et en charge.</translation>
<translation id="6267036997247669271"><ph name="NAME"/> : activation en cours…</translation>
+<translation id="4895488851634969361">La batterie est pleine.</translation>
<translation id="1391854757121130358">Vous avez peut-être épuisé votre forfait de données mobiles.</translation>
-<translation id="5413208160176941586">Utilisateur géré localement</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/> : <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Position du lanceur</translation>
+<translation id="5947494881799873997">Rétablir</translation>
<translation id="7593891976182323525">Recherche ou Maj</translation>
<translation id="7649070708921625228">Aide</translation>
<translation id="3050422059534974565">Le VERROUILLAGE DES MAJUSCULES est activé.
@@ -179,22 +190,24 @@ Appuyez sur Search ou Maj pour le désactiver.</translation>
<translation id="6692173217867674490">Mot de passe multiterme erroné</translation>
<translation id="6165508094623778733">En savoir plus</translation>
<translation id="9046895021617826162">Échec de la connexion</translation>
+<translation id="7168224885072002358">Rétablissement de la résolution précédente dans <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Cette session se terminera dans <ph name="SESSION_TIME_REMAINING"/>. Vous serez automatiquement déconnecté.</translation>
<translation id="8372369524088641025">Clé WEP incorrecte</translation>
<translation id="6636709850131805001">État non reconnu</translation>
<translation id="3573179567135747900">Revenir à &quot;<ph name="FROM_LOCALE"/>&quot; (redémarrage requis)</translation>
<translation id="8103386449138765447">Messages SMS : <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Paramètres Google Drive…</translation>
-<translation id="1510238584712386396">Lanceur d'applications</translation>
<translation id="7209101170223508707">Le VERROUILLAGE DES MAJUSCULES est activé.
Appuyez sur Alt + Recherche ou Maj pour le désactiver.</translation>
<translation id="8940956008527784070">Batterie faible (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Accepter</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> d'autonomie</translation>
<translation id="520760366042891468">Partage du contrôle de votre écran via Hangouts</translation>
<translation id="8000066093800657092">Aucun réseau détecté</translation>
<translation id="4015692727874266537">Connecter un autre compte…</translation>
<translation id="5941711191222866238">Réduire</translation>
<translation id="6911468394164995108">Autre réseau…</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/> : <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">Encore <ph name="HOUR"/> h <ph name="MINUTE"/> min de chargement</translation>
<translation id="6359806961507272919">SMS de <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Opérateur</translation>
diff --git a/chromium/ash/strings/ash_strings_gu.xtb b/chromium/ash/strings/ash_strings_gu.xtb
index 7e3858cabca..f83fe87680c 100644
--- a/chromium/ash/strings/ash_strings_gu.xtb
+++ b/chromium/ash/strings/ash_strings_gu.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="gu">
<translation id="3595596368722241419">બૅટરી પૂર્ણ ચાર્જ</translation>
-<translation id="5250713215130379958">સ્વતઃછુપાવો લૉન્ચર</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> અને <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">પોર્ટલ સ્ટેટ</translation>
<translation id="30155388420722288">ઓવરફ્લો બટન</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth સક્ષમ છે</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> ને <ph name="ROTATION"/> પર ફેરવવામાં આવ્યું હતું</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth અક્ષમ છે</translation>
+<translation id="7165320105431587207">નેટવર્ક ગોઠવવામાં નિષ્ફળ</translation>
<translation id="3775358506042162758">તમે બહુવિધ સાઇન-ઇનમાં માત્ર ત્રણ એકાઉન્ટ્સ સુધી રાખી શકો છો.</translation>
<translation id="370649949373421643">Wi-Fi સક્ષમ કરો</translation>
<translation id="3626281679859535460">તેજ</translation>
+<translation id="595202126637698455">ભજવણી ટ્રેસિંગ સક્ષમ</translation>
<translation id="8054466585765276473">બેટરી સમયની ગણના કરે છે.</translation>
<translation id="7982789257301363584">નેટવર્ક</translation>
<translation id="5565793151875479467">પ્રોક્સી...</translation>
<translation id="938582441709398163">કીબોર્ડ ઓવરલે</translation>
<translation id="4387004326333427325">પ્રમાણીકરણ પ્રમાણપત્ર રિમોટલી નકારવામાં આવ્યું છે</translation>
<translation id="6979158407327259162">Google ડ્રાઇવ</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> ને <ph name="RESOLUTION"/> પર બદલવામાં આવ્યું હતું</translation>
<translation id="6943836128787782965">HTTP નિષ્ફળ ગયું</translation>
<translation id="2297568595583585744">સ્થિતિ ટ્રે</translation>
<translation id="1661867754829461514">PIN ખૂટે છે</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">નિમ્ન-પાવર ચાર્જર</translation>
<translation id="3846575436967432996">કોઈ નેટવર્ક માહિતી ઉપલબ્ધ નથી</translation>
<translation id="3026237328237090306">મોબાઇલ ડેટા સેટ કરો</translation>
+<translation id="5871632337994001636">ઉપકરણોનું સંચાલન કરો...</translation>
<translation id="785750925697875037">મોબાઇલ એકાઉન્ટ જુઓ</translation>
<translation id="153454903766751181">સેલ્યુલર મોડેમનો પ્રારંભ કરી રહ્યાં છે...</translation>
<translation id="4628814525959230255">Hangouts દ્વારા <ph name="HELPER_NAME"/> સાથે તમારી સ્ક્રીનનું નિયંત્રણ શેર કરવું.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ને ફેરવવામાં આવ્યું છે</translation>
<translation id="7864539943188674973">Bluetooth અક્ષમ કરો</translation>
<translation id="939252827960237676">સ્ક્રીનશૉટ સાચવવામાં નિષ્ફળ રહ્યું</translation>
<translation id="3126069444801937830">અપડેટ કરવા માટે પુનઃપ્રારંભ કરો</translation>
<translation id="2268813581635650749">બધામાંથી સાઇન આઉટ કરો</translation>
<translation id="735745346212279324">VPN ડિસ્કનેક્ટ કર્યું છે</translation>
<translation id="7320906967354320621">નિષ્ક્રિય</translation>
-<translation id="6303423059719347535">બેટરી <ph name="PERCENTAGE"/> % પૂર્ણ છે</translation>
<translation id="15373452373711364">મોટું માઉસ કર્સર</translation>
-<translation id="2778346081696727092">આપેલા વપરાશકર્તાનામ અથવા પાસવર્ડ સાથે અધિકૃત કરવામાં નિષ્ફળ રહ્યું</translation>
<translation id="3294437725009624529">અતિથિ</translation>
<translation id="8190698733819146287">ભાષાઓ અને ઇનપુટને કસ્ટમાઇઝ કરો...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">શેલ્ફ સ્થિતી</translation>
<translation id="2903907270192926896">ઇનપુટ</translation>
<translation id="8676770494376880701">નિમ્ન-પાવર ચાર્જર કનેક્ટ કર્યું છે</translation>
<translation id="7170041865419449892">પહોંચ બહાર</translation>
<translation id="4804818685124855865">ડિસ્કનેક્ટ કરો</translation>
<translation id="2544853746127077729">નેટવર્ક દ્વારા પ્રમાણીકરણ પ્રમાણપત્ર નકારવામાં આવ્યું</translation>
<translation id="5222676887888702881">સાઇન આઉટ</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">કન્ફિગરેશન</translation>
<translation id="1272079795634619415">રોકો</translation>
<translation id="4957722034734105353">વધુ જાણો...</translation>
<translation id="2964193600955408481">Wi-Fi ને અક્ષમ કરો</translation>
-<translation id="811680302244032017">ઉપકરણ ઉમેરો...</translation>
<translation id="4279490309300973883">પ્રતિબિંબત થઈ રહ્યું છે</translation>
+<translation id="7973962044839454485">ખોટા વપરાશકર્તાનામ અથવા પાસવર્ડને કારણે PPP પ્રમાણીકરણ નિષ્ફળ થયું</translation>
<translation id="2509468283778169019">CAPS LOCK ચાલુ છે</translation>
<translation id="3892641579809465218">આંતરિક પ્રદર્શન</translation>
<translation id="7823564328645135659">તમારી સેટિંગ્સ સમન્વયિત કર્યા પછી ભાષા &quot;<ph name="FROM_LOCALE"/>&quot; થી &quot;<ph name="TO_LOCALE"/>&quot; માં બદલાઈ ગઈ છે.</translation>
<translation id="3368922792935385530">કનેક્ટેડ</translation>
<translation id="8340999562596018839">બોલાયેલ પ્રતિસાદ</translation>
<translation id="8654520615680304441">Wi-Fi ચાલુ કરો...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">તમારી ઇનપુટ પદ્ધતિ <ph name="INPUT_METHOD_ID"/> માં બદલાઇ ગયેલ છે.
સ્વિચ કરવા માટે Shift + Alt દબાવો.</translation>
<translation id="2562916301614567480">ખાનગી નેટવર્ક</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% બાકી</translation>
<translation id="9089416786594320554">ઇનપુટ પદ્ધતિઓ</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">શેલ્ફ</translation>
<translation id="2614835198358683673">જ્યારે તમારી Chromebook ચાલુ હોય ત્યારે તેને ચાર્જ કરી શકાશે નહીં. અધિકૃત ચાર્જરનો ઉપયોગ કરવાનું વિચારો.</translation>
<translation id="1895658205118569222">બંધ કરો</translation>
<translation id="4430019312045809116">વૉલ્યૂમ</translation>
+<translation id="8681498213689260554">અપડેટ કરવા માટે પુનઃપ્રારંભ કરો અને પાવરવૉશ કરો</translation>
<translation id="4442424173763614572">DNS લુકઅપ નિષ્ફળ ગયું</translation>
-<translation id="6356500677799115505">બેટરી સંપૂર્ણ છે અને ચાર્જ થઈ રહી છે.</translation>
<translation id="7874779702599364982">સેલ્યુલર નેટવર્ક્સ માટે શોધી રહ્યું છે...</translation>
<translation id="583281660410589416">અજ્ઞાત</translation>
<translation id="1383876407941801731">શોધ</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">નેટવર્ક માહિતી</translation>
<translation id="1621499497873603021">બેટરી ખાલી થવામાં બાકી સમય, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">અતિથિથી બહાર નીકળો</translation>
-<translation id="4471417012762451363">બેટરી <ph name="PERCENTAGE"/> % પૂર્ણ અને ચાર્જ થઈ રહી છે</translation>
<translation id="8308637677604853869">પહેલાનું મેનૂ</translation>
<translation id="4666297444214622512">બીજા એકાઉન્ટમાં સાઇન ઇન કરી શકતા નથી.</translation>
<translation id="1346748346194534595">જમણે</translation>
@@ -113,6 +119,7 @@
<translation id="6312403991423642364">અજ્ઞાત નેટવર્ક ભૂલ</translation>
<translation id="1467432559032391204">ડાબું</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> ને સક્રિય કરી રહ્યું છે</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">મોટું કરો</translation>
@@ -122,7 +129,6 @@
<translation id="2727977024730340865">નિમ્ન-પાવર ચાર્જરમાં પ્લગ કરેલું છે. બૅટરી ચાર્જિંગ વિશ્વસનીય હશે નહીં.</translation>
<translation id="3784455785234192852">લૉક</translation>
<translation id="2805756323405976993">એપ્લિકેશન્સ</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> નું કદ <ph name="RESOLUTION"/> માં બદલવામાં આવ્યું છે</translation>
<translation id="1512064327686280138">સક્રિયતા નિષ્ફળ</translation>
<translation id="5097002363526479830">નેટવર્ક '<ph name="NAME"/>' થી કનેક્ટ કરવામાં નિષ્ફળ: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi બંધ છે.</translation>
@@ -130,6 +136,7 @@
<translation id="7052914147756339792">વૉલપેપર સેટ કરો...</translation>
<translation id="8678698760965522072">ઓનલાઇન સ્ટેટ</translation>
<translation id="2532589005999780174">ઉચ્ચ કોન્ટ્રાસ્ટ મોડ</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">આંતરિક ભૂલ</translation>
<translation id="3019353588588144572">બેટરી સંપૂર્ણપણે ચાર્જ થવામાં બાકી સમય, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">સ્ક્રીન બૃહદદર્શક</translation>
@@ -152,20 +159,24 @@
<translation id="7029814467594812963">સત્રમાંથી બહાર નીકળો</translation>
<translation id="8454013096329229812">Wi-Fi ચાલુ છે.</translation>
<translation id="4872237917498892622">Alt+Search અથવા Shift</translation>
+<translation id="9201131092683066720">બેટરી <ph name="PERCENTAGE"/> % પૂર્ણ છે.</translation>
<translation id="2983818520079887040">સેટિંગ્સ...</translation>
+<translation id="1195412055398077112">ઓવરસ્કૅન</translation>
<translation id="1717216362413677834">ડૉક મોડ</translation>
+<translation id="112308213915226829">સ્વતઃછુપાવો શેલ્ફ</translation>
<translation id="8927026611342028580">કનેક્ટ કરવાની વિનંતી કરી છે</translation>
<translation id="8300849813060516376">OTASP નિષ્ફળ</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> ફાઇલને સમન્વયિત કરી રહ્યું છે</translation>
+<translation id="5958529069007801266">નિરીક્ષણ કરેલ વપરાશકર્તા</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK બંધ છે</translation>
<translation id="6248847161401822652">છોડવા માટે બે વાર Control Shift Q દબાવો.</translation>
+<translation id="6785414152754474415">બેટરી <ph name="PERCENTAGE"/> % પૂર્ણ અને ચાર્જ થઈ રહી છે.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: સક્રિય કરી રહ્યું છે...</translation>
+<translation id="4895488851634969361">બેટરી સંપૂર્ણ છે.</translation>
<translation id="1391854757121130358">તમે તમારા મોબાઇલ ડેટા ભથ્થાનો ઉપયોગ કરી લીધો હશે.</translation>
-<translation id="5413208160176941586">સ્થાનિક રીતે સંચાલિત વપરાશકર્તા</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">લૉન્ચર સ્થિતિ</translation>
+<translation id="5947494881799873997">પાછા ફરો</translation>
<translation id="7593891976182323525">Search અથવા Shift</translation>
<translation id="7649070708921625228">સહાય</translation>
<translation id="3050422059534974565">CAPS LOCK ચાલુ છે.
@@ -178,22 +189,24 @@
<translation id="6692173217867674490">ખરાબ પાસફ્રેઝ</translation>
<translation id="6165508094623778733">વધુ જાણો</translation>
<translation id="9046895021617826162">કનેક્ટ કરવું નિષ્ફળ</translation>
+<translation id="7168224885072002358">જૂના રિઝોલ્યુશન પર પાછા ફરી રહ્યાં છે <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">આ સત્ર <ph name="SESSION_TIME_REMAINING"/> માં સમાપ્ત થશે. તમને આપમેળે સાઇન આઉટ કરવામાં આવશે.</translation>
<translation id="8372369524088641025">ખરાબ WEP કી</translation>
<translation id="6636709850131805001">અપરિચિત સ્થિતિ</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; પર પાછાં જાઓ (પુનર્પ્રારંભની જરૂર છે)</translation>
<translation id="8103386449138765447">SMS સંદેશા: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google ડ્રાઇવ સેટિંગ્સ...</translation>
-<translation id="1510238584712386396">લૉન્ચર</translation>
<translation id="7209101170223508707">CAPS LOCK ચાલુ છે.
રદ કરવા માટે Alt+Search અથવા Shift દબાવો.</translation>
<translation id="8940956008527784070">બૅટરી ઓછી (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">સ્વીકારો</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> બાકી</translation>
<translation id="520760366042891468">Hangouts દ્વારા તમારી સ્ક્રીનનું નિયંત્રણ શેર કરી રહ્યું છે.</translation>
<translation id="8000066093800657092">નેટવર્ક નથી</translation>
<translation id="4015692727874266537">બીજા એકાઉન્ટમાં સાઇન ઇન કરો...</translation>
<translation id="5941711191222866238">નાનું કરો</translation>
<translation id="6911468394164995108">અન્યથી જોડાઓ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>ક <ph name="MINUTE"/>મિ સુધીમાં પૂર્ણ</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> તરફથી SMS</translation>
<translation id="1244147615850840081">વાહક</translation>
diff --git a/chromium/ash/strings/ash_strings_hi.xtb b/chromium/ash/strings/ash_strings_hi.xtb
index d12758fd96d..7882991fab5 100644
--- a/chromium/ash/strings/ash_strings_hi.xtb
+++ b/chromium/ash/strings/ash_strings_hi.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="hi">
<translation id="3595596368722241419">बैटरी पूर्ण</translation>
-<translation id="5250713215130379958">लॉन्चर को स्वत: छिपाएं</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> और <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">पोर्टल स्थिति</translation>
<translation id="30155388420722288">ओवरफ़्लो बटन</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth सक्षम किया गया</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> को <ph name="ROTATION"/> पर घुमाया गया</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth अक्षम किया गया</translation>
+<translation id="7165320105431587207">नेटवर्क कॉन्फ़िगर करने में विफल</translation>
<translation id="3775358506042162758">एकाधिक साइन-इन में आप तीन तक खाते रख सकते हैं.</translation>
<translation id="370649949373421643">Wi-Fi सक्षम करें</translation>
<translation id="3626281679859535460">चमक</translation>
+<translation id="595202126637698455">निष्पादन ट्रेसिंग सक्षम है</translation>
<translation id="8054466585765276473">बैटरी समय की गणना की जा रही है.</translation>
<translation id="7982789257301363584">नेटवर्क</translation>
<translation id="5565793151875479467">प्रॉक्सी...</translation>
<translation id="938582441709398163">कीबोर्ड ओवरले</translation>
<translation id="4387004326333427325">प्रमाणीकरण प्रमाणपत्र को दूरस्थ रूप से अस्वीकार किया गया</translation>
<translation id="6979158407327259162">Google डिस्क</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> रिज़ॉल्यूशन को <ph name="RESOLUTION"/> में बदल दिया गया</translation>
<translation id="6943836128787782965">HTTP विफल हुआ</translation>
<translation id="2297568595583585744">स्थिति ट्रे</translation>
<translation id="1661867754829461514">पिन गुम</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">कम-शक्ति वाला चार्जर</translation>
<translation id="3846575436967432996">कोई नेटवर्क जानकारी उपलब्ध नहीं</translation>
<translation id="3026237328237090306">मोबाइल डेटा सेट करें</translation>
+<translation id="5871632337994001636">उपकरणों को प्रबंधित करें...</translation>
<translation id="785750925697875037">मोबाइल खाते देखें</translation>
<translation id="153454903766751181">सेल्युलर मॉडम प्रारंभ हो रहा है...</translation>
<translation id="4628814525959230255">Hangout के माध्यम से अपनी स्क्रीन <ph name="HELPER_NAME"/> के साथ साझा करना.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> को घुमा दिया गया है</translation>
<translation id="7864539943188674973">Bluetooth अक्षम करें</translation>
<translation id="939252827960237676">स्क्रीनशॉट सहेजने में विफल</translation>
<translation id="3126069444801937830">अपडेट करने के लिए पुनरारंभ करें</translation>
-<translation id="2268813581635650749">सभी साइन आउट करें</translation>
+<translation id="2268813581635650749">सभी प्रस्थान करें</translation>
<translation id="735745346212279324">VPN डिस्कनेक्ट है</translation>
-<translation id="7320906967354320621">निष्क्रिय</translation>
-<translation id="6303423059719347535">बैटरी <ph name="PERCENTAGE"/>% भर गई है</translation>
+<translation id="7320906967354320621">प्रयोग में नहीं</translation>
<translation id="15373452373711364">बड़ा माउस कर्सर</translation>
-<translation id="2778346081696727092">प्रदान किए गए उपयोगकर्तानाम या पासवर्ड से प्रमाणीकृत करने में विफ़ल रहा</translation>
<translation id="3294437725009624529">अतिथि</translation>
<translation id="8190698733819146287">भाषाएं और इनपुट कस्टमाइज़ करें...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">शेल्फ़ की स्थिति</translation>
<translation id="2903907270192926896">इनपुट</translation>
<translation id="8676770494376880701">कम-शक्ति वाला चार्जर</translation>
<translation id="7170041865419449892">सीमा से बाहर</translation>
<translation id="4804818685124855865">डिस्कनेक्ट करें</translation>
<translation id="2544853746127077729">नेटवर्क द्वारा प्रमाणीकरण प्रमाणपत्र अस्वीकार किया गया</translation>
-<translation id="5222676887888702881">साइन आउट करें</translation>
+<translation id="5222676887888702881">प्रस्थान करें</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">कॉन्फ़िगरेशन</translation>
<translation id="1272079795634619415">रोकें</translation>
<translation id="4957722034734105353">और जानें...</translation>
<translation id="2964193600955408481">Wi-Fi अक्षम करें</translation>
-<translation id="811680302244032017">डिवाइस जोड़ें...</translation>
<translation id="4279490309300973883">मिरर करना</translation>
+<translation id="7973962044839454485">किसी गलत उपयोगकर्ता नाम या पासवर्ड के कारण PPP प्रमाणीकरण विफल रहा</translation>
<translation id="2509468283778169019">CAPS LOCK चालू है</translation>
<translation id="3892641579809465218">आंतरिक डिस्प्ले</translation>
<translation id="7823564328645135659">आपकी सेटिंग समन्वयित करने के बाद भाषा को &quot;<ph name="FROM_LOCALE"/>&quot; से &quot;<ph name="TO_LOCALE"/>&quot; में बदल दिया गया है.</translation>
<translation id="3368922792935385530">कनेक्टेड</translation>
<translation id="8340999562596018839">बोला जाने वाला फ़ीडबैक</translation>
<translation id="8654520615680304441">Wi-Fi चालू करें...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">आपकी इनपुट विधि <ph name="INPUT_METHOD_ID"/> में बदल गई है.
स्विच करने के लिए Shift + Alt दबाएं.</translation>
<translation id="2562916301614567480">निजी नेटवर्क</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% शेष है</translation>
<translation id="9089416786594320554">इनपुट पद्धतियां</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">शेल्फ़</translation>
<translation id="2614835198358683673">हो सकता है चालू होने पर आपका Chromebook चार्ज न हो. आधिकारिक चार्जर उपयोग करें.</translation>
<translation id="1895658205118569222">बंद करें</translation>
<translation id="4430019312045809116">मात्रा</translation>
+<translation id="8681498213689260554">अपडेट करने के लिए पुनः प्रारंभ करें या पावरवॉश करें</translation>
<translation id="4442424173763614572">DNS लुकअप विफल</translation>
-<translation id="6356500677799115505">बैटरी भर गई है और चार्ज हो रही है.</translation>
<translation id="7874779702599364982">सेलुलर नेटवर्क खोज रहा है...</translation>
<translation id="583281660410589416">अज्ञात</translation>
<translation id="1383876407941801731">खोज</translation>
@@ -96,9 +103,8 @@
<translation id="2204305834655267233">नेटवर्क जानकारी</translation>
<translation id="1621499497873603021">बैटरी के खाली होने में शेष समय, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">अतिथि सत्र से बाहर निकलें</translation>
-<translation id="4471417012762451363">बैटरी <ph name="PERCENTAGE"/>% भर गई है और चार्ज हो रही है</translation>
<translation id="8308637677604853869">पिछला मेनू</translation>
-<translation id="4666297444214622512">अन्य खाते में साइन इन नहीं कर सकते.</translation>
+<translation id="4666297444214622512">अन्य खाते में प्रवेश नहीं कर सकते.</translation>
<translation id="1346748346194534595">दाएं</translation>
<translation id="1773212559869067373">प्रमाणीकरण प्रमाणपत्र को स्थानीय रूप से अस्वीकार कर दिया गया</translation>
<translation id="8528322925433439945">मोबाइल ...</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">अज्ञात नेटवर्क त्रुटि</translation>
<translation id="1467432559032391204">बाएं</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> सक्रिय हो रहा है</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">बड़ा करें</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">कम-शक्ति वाले चार्जर में प्लग इन करें. बैटरी चार्ज करना संभवत: विश्वसनीय नहीं होगा.</translation>
<translation id="3784455785234192852">लॉक करें</translation>
<translation id="2805756323405976993">एप्लिकेशन</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> का आकार बदलकर <ph name="RESOLUTION"/> कर दिया गया है</translation>
<translation id="1512064327686280138">सक्रियण विफलता</translation>
<translation id="5097002363526479830">नेटवर्क से कनेक्ट करने में विफल '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi बंद है.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">वॉलपेपर सेट करें...</translation>
<translation id="8678698760965522072">ऑनलाइन स्थिति</translation>
<translation id="2532589005999780174">उच्च कंट्रास्ट मोड</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">आंतरिक त्रुटि</translation>
<translation id="3019353588588144572">बैटरी के पूरी तरह से चार्ज होने में शेष समय, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">स्क्रीन आवर्द्धक</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">सत्र से बाहर निकलें</translation>
<translation id="8454013096329229812">Wi-Fi चालू है.</translation>
<translation id="4872237917498892622">Alt+Search या Shift</translation>
+<translation id="9201131092683066720">बैटरी <ph name="PERCENTAGE"/>% भरी हुई है.</translation>
<translation id="2983818520079887040">सेटिंग...</translation>
+<translation id="1195412055398077112">ओवरस्कैन</translation>
<translation id="1717216362413677834">डॉक मोड</translation>
+<translation id="112308213915226829">शेल्फ़ को स्वत: छिपाएं</translation>
<translation id="8927026611342028580">कनेक्ट करने का अनुरोध किया गया</translation>
<translation id="8300849813060516376">OTASP विफल</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> फ़ाइल/फ़ाइलें समन्वयित हो रही है/हो रही हैं</translation>
+<translation id="5958529069007801266">पर्यवेक्षित उपयोगकर्ता</translation>
<translation id="3709443003275901162">9 से अधिक</translation>
<translation id="639644700271529076">CAPS LOCK बंद है</translation>
<translation id="6248847161401822652">छोड़ने के लिए Control Shift Q दो बार दबाएं.</translation>
+<translation id="6785414152754474415">बैटरी <ph name="PERCENTAGE"/>% भरी हुई है और चार्ज हो रही है.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: सक्रिय हो रहा है...</translation>
+<translation id="4895488851634969361">बैटरी भरी हुई है.</translation>
<translation id="1391854757121130358">संभवत: आपने अपने मोबाइल डेटा सीमा का पूर्ण उपयोग कर लिया है.</translation>
-<translation id="5413208160176941586">स्थानीय रूप से प्रबंधित उपयोगकर्ता</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">लॉन्चर स्थिति</translation>
+<translation id="5947494881799873997">वापस लाएं</translation>
<translation id="7593891976182323525">Search या Shift</translation>
<translation id="7649070708921625228">सहायता</translation>
<translation id="3050422059534974565">CAPS LOCK चालू है.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">ख़राब पासफ़्रेज़</translation>
<translation id="6165508094623778733">अधिक जानें</translation>
<translation id="9046895021617826162">कनेक्ट करना विफल</translation>
-<translation id="973896785707726617">यह सत्र <ph name="SESSION_TIME_REMAINING"/> में समाप्त हो जाएगा. आपको स्वचालित रूप से साइन आउट कर दिया जाएगा.</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> में पुराने रिज़ॉल्यूशन में वापस लौट रहा है</translation>
+<translation id="973896785707726617">यह सत्र <ph name="SESSION_TIME_REMAINING"/> में समाप्त हो जाएगा. आपको स्वचालित रूप से प्रस्थान कर दिया जाएगा.</translation>
<translation id="8372369524088641025">ख़राब WEP कुंजी</translation>
<translation id="6636709850131805001">अपरिचित अवस्था</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; में पुन: बदलें (पुनः आरंभ करने की आवश्यकता है)</translation>
<translation id="8103386449138765447">SMS संदेश: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google डिस्क सेटिंग...</translation>
-<translation id="1510238584712386396">लॉन्चर</translation>
<translation id="7209101170223508707">CAPS LOCK चालू है.
रद्द करने के लिए Alt+Search या Shift दबाएं.</translation>
<translation id="8940956008527784070">बैटरी कम (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">स्वीकार करें</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> शेष</translation>
<translation id="520760366042891468">Hangout के माध्यम से अपनी स्क्रीन साझा करना.</translation>
<translation id="8000066093800657092">नेटवर्क नहीं है</translation>
-<translation id="4015692727874266537">अन्य खाते में साइन इन करें...</translation>
+<translation id="4015692727874266537">अन्य खाते में प्रवेश करें...</translation>
<translation id="5941711191222866238">छोटा करें</translation>
<translation id="6911468394164995108">अन्य में शामिल हों...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">पूरी तरह से चार्ज होने में <ph name="HOUR"/>घं <ph name="MINUTE"/>मि शेष</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> से SMS</translation>
<translation id="1244147615850840081">कैरियर</translation>
diff --git a/chromium/ash/strings/ash_strings_hr.xtb b/chromium/ash/strings/ash_strings_hr.xtb
index b16f82def36..5e3fbd439c8 100644
--- a/chromium/ash/strings/ash_strings_hr.xtb
+++ b/chromium/ash/strings/ash_strings_hr.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="hr">
<translation id="3595596368722241419">Baterija je puna</translation>
-<translation id="5250713215130379958">Automatski sakrij pokretač</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> i <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stanje mreže: Portal</translation>
<translation id="30155388420722288">Gumb padajućeg izbornika</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth omogućen</translation>
+<translation id="6310121235600822547">Zaslon <ph name="DISPLAY_NAME"/> rotiran je za <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth onemogućen</translation>
+<translation id="7165320105431587207">Konfiguriranje mreže nije uspjelo</translation>
<translation id="3775358506042162758">Možete imati najviše tri računa u višestrukoj prijavi.</translation>
<translation id="370649949373421643">Omogući Wi-Fi</translation>
<translation id="3626281679859535460">Svjetlina</translation>
+<translation id="595202126637698455">Omogućeno je praćenje izvedbe</translation>
<translation id="8054466585765276473">Izračun vremena baterije.</translation>
<translation id="7982789257301363584">Mreža</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Preklapanje tipkovnice</translation>
<translation id="4387004326333427325">Certifikat za autentifikaciju odbijen je daljinski</translation>
<translation id="6979158407327259162">Google disk</translation>
+<translation id="3683428399328702079">Razlučivost zaslona <ph name="DISPLAY_NAME"/> promijenjena je na <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP GET neuspješan</translation>
<translation id="2297568595583585744">Ladica statusa</translation>
<translation id="1661867754829461514">Nedostaje PIN</translation>
@@ -34,39 +38,41 @@ Pritisnite Shift + Alt za promjenu.</translation>
<translation id="2127372758936585790">Punjač male snage</translation>
<translation id="3846575436967432996">Informacije o mreži nisu dostupne</translation>
<translation id="3026237328237090306">Postavi mobilne podatke</translation>
+<translation id="5871632337994001636">Upravljanje uređajima...</translation>
<translation id="785750925697875037">Prikaz mobilnog računa</translation>
<translation id="153454903766751181">Inicijaliziranje modema mobilne mreže...</translation>
<translation id="4628814525959230255">Dijelite kontrolu nad zaslonom s korisnikom <ph name="HELPER_NAME"/> putem značajke Hangouts.</translation>
-<translation id="8343941333792395995">Prikaz <ph name="DISPLAY_NAME"/> zakrenut je</translation>
<translation id="7864539943188674973">Onemogući Bluetooth</translation>
<translation id="939252827960237676">Snimka zaslona nije spremljena</translation>
<translation id="3126069444801937830">Ponovo pokrenite za ažuriranje</translation>
<translation id="2268813581635650749">Odjavi sve</translation>
<translation id="735745346212279324">Veza s VPN-om prekinuta</translation>
<translation id="7320906967354320621">U mirovanju</translation>
-<translation id="6303423059719347535">Baterija je <ph name="PERCENTAGE"/>% puna</translation>
<translation id="15373452373711364">Veliki pokazivač miša</translation>
-<translation id="2778346081696727092">Autentifikacija s priloženim korisničkim imenom i zaporkom nije uspjela</translation>
<translation id="3294437725009624529">Gost</translation>
<translation id="8190698733819146287">Prilagodi jezike i unos...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Položaj police</translation>
<translation id="2903907270192926896">ULAZ</translation>
<translation id="8676770494376880701">Priključen je punjač male snage</translation>
<translation id="7170041865419449892">Izvan raspona</translation>
<translation id="4804818685124855865">Prekini vezu</translation>
<translation id="2544853746127077729">Mreža je odbila certifikat za autentifikaciju</translation>
<translation id="5222676887888702881">Odjava</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguracija</translation>
<translation id="1272079795634619415">Zaustavi</translation>
<translation id="4957722034734105353">Saznajte više...</translation>
<translation id="2964193600955408481">Onemogući Wi-Fi</translation>
-<translation id="811680302244032017">Dodajte uređaj...</translation>
<translation id="4279490309300973883">Zrcaljenje</translation>
+<translation id="7973962044839454485">PPP autentifikacija nije uspjela zbog netočnog korisničkog imena ili zaporke</translation>
<translation id="2509468283778169019">Opcija CAPS LOCK uključena</translation>
<translation id="3892641579809465218">Unutarnji zaslon</translation>
<translation id="7823564328645135659">Jezik je promijenjen iz: &quot;<ph name="FROM_LOCALE"/>&quot; u: &quot;<ph name="TO_LOCALE"/>&quot; nakon sinkronizacije vaših postavki.</translation>
<translation id="3368922792935385530">Spojeno</translation>
<translation id="8340999562596018839">Govorne povratne informacije</translation>
<translation id="8654520615680304441">Uključite Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Vaš je način unosa promijenjen u <ph name="INPUT_METHOD_ID"/>.
Pritisnite Shift + Alt za promjenu.</translation>
<translation id="2562916301614567480">Privatna mreža</translation>
@@ -83,11 +89,12 @@ Pritisnite Shift + Alt za promjenu.</translation>
<translation id="3626637461649818317">Preostalo <ph name="PERCENTAGE"/> %</translation>
<translation id="9089416786594320554">Načini unosa</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Polica</translation>
<translation id="2614835198358683673">Chromebook se možda neće puniti dok je uključen. Savjetujemo upotrebu službenog punjača.</translation>
<translation id="1895658205118569222">Isključivanje</translation>
<translation id="4430019312045809116">Glasnoća</translation>
+<translation id="8681498213689260554">Ponovo pokrenite sustav i Powerwash za ažuriranje</translation>
<translation id="4442424173763614572">Nije uspjelo pretraživanje DNS poslužitelja</translation>
-<translation id="6356500677799115505">Baterija je puna i puni se.</translation>
<translation id="7874779702599364982">Traženje mobilnih mreža...</translation>
<translation id="583281660410589416">Nepoznato</translation>
<translation id="1383876407941801731">Pretraživanje</translation>
@@ -96,7 +103,6 @@ Pritisnite Shift + Alt za promjenu.</translation>
<translation id="2204305834655267233">Podaci o mreži</translation>
<translation id="1621499497873603021">Baterija će se isprazniti za <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Izlazak iz sesije gosta</translation>
-<translation id="4471417012762451363">Baterija je <ph name="PERCENTAGE"/>% puna i puni se</translation>
<translation id="8308637677604853869">Prethodni izbornik</translation>
<translation id="4666297444214622512">Prijava na još jedan račun nije moguća.</translation>
<translation id="1346748346194534595">Udesno</translation>
@@ -114,6 +120,7 @@ Pritisnite Ctrl + Alt + Z da biste ih onemogućili.</translation>
<translation id="6312403991423642364">Nepoznata mrežna pogreška</translation>
<translation id="1467432559032391204">Ulijevo</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktiviranje mreže <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maksimiziraj</translation>
@@ -123,7 +130,6 @@ Pritisnite Ctrl + Alt + Z da biste ih onemogućili.</translation>
<translation id="2727977024730340865">Uređaj je priključen na punjač male snage. Punjenje baterije možda nije pouzdano.</translation>
<translation id="3784455785234192852">Zaključaj</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571">Veličina prikaza <ph name="DISPLAY_NAME"/> promijenjena je na <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Neuspjela aktivacija</translation>
<translation id="5097002363526479830">Neuspješno povezivanje s mrežom &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi je isključen.</translation>
@@ -131,6 +137,7 @@ Pritisnite Ctrl + Alt + Z da biste ih onemogućili.</translation>
<translation id="7052914147756339792">Postavljanje pozadinske slike...</translation>
<translation id="8678698760965522072">Stanje na mreži</translation>
<translation id="2532589005999780174">Način visokog kontrasta</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Interna pogreška</translation>
<translation id="3019353588588144572">Baterija će se napuniti za <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Povećalo</translation>
@@ -153,20 +160,24 @@ Poruka poslužitelja: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Izlazak iz sesije</translation>
<translation id="8454013096329229812">Wi-Fi je uključen.</translation>
<translation id="4872237917498892622">Alt + Pretraživanje ili Shift</translation>
+<translation id="9201131092683066720">Baterija je <ph name="PERCENTAGE"/>% puna.</translation>
<translation id="2983818520079887040">Postavke...</translation>
+<translation id="1195412055398077112">rubno područje zaslona</translation>
<translation id="1717216362413677834">Način rada na priključnoj stanici</translation>
+<translation id="112308213915226829">Automatski sakrij policu</translation>
<translation id="8927026611342028580">Podnesen je zahtjev za povezivanje</translation>
<translation id="8300849813060516376">OTASP nije uspio</translation>
<translation id="2792498699870441125">Alt + Pretraživanje</translation>
<translation id="8660803626959853127">Sinkroniziranje datoteka (<ph name="COUNT"/>)</translation>
+<translation id="5958529069007801266">Nadzirani korisnik</translation>
<translation id="3709443003275901162">više od 9</translation>
<translation id="639644700271529076">Tipka CAPS LOCK isključena</translation>
<translation id="6248847161401822652">Pritisnite tipke Control, Shift i Q dvaput da biste odustali.</translation>
+<translation id="6785414152754474415">Baterija je <ph name="PERCENTAGE"/>% puna i puni se.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: aktiviranje...</translation>
+<translation id="4895488851634969361">Baterija je puna.</translation>
<translation id="1391854757121130358">Možda ste potrošili dopuštenu količinu mobilnih podataka.</translation>
-<translation id="5413208160176941586">Lokalno upravljani korisnik</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Položaj pokretača</translation>
+<translation id="5947494881799873997">Vrati</translation>
<translation id="7593891976182323525">Pretraživanje ili Shift</translation>
<translation id="7649070708921625228">Pomoć</translation>
<translation id="3050422059534974565">Uključena je opcija CAPS LOCK.
@@ -179,22 +190,24 @@ Pritisnite tipke Pretraživanje ili Shift da biste ju isključili.</translation>
<translation id="6692173217867674490">Pogrešna zaporka</translation>
<translation id="6165508094623778733">Saznajte više</translation>
<translation id="9046895021617826162">Neuspjelo povezivanje</translation>
+<translation id="7168224885072002358">Vraćanje na staru razlučivost za <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Sesija će završiti za <ph name="SESSION_TIME_REMAINING"/>. Bit ćete automatski odjavljeni.</translation>
<translation id="8372369524088641025">Neispravan WEP ključ</translation>
<translation id="6636709850131805001">Neprepoznato stanje</translation>
<translation id="3573179567135747900">Vratite na &quot;<ph name="FROM_LOCALE"/>&quot; (zahtijeva ponovno pokretanje)</translation>
<translation id="8103386449138765447">SMS poruke: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Postavke Google diska...</translation>
-<translation id="1510238584712386396">Pokretač</translation>
<translation id="7209101170223508707">Uključena je opcija CAPS LOCK.
Pritisnite tipke Alt + Pretraživanje ili Shift da biste ju isključili.</translation>
<translation id="8940956008527784070">Baterija je skoro prazna (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Prihvati</translation>
<translation id="5102001756192215136">Preostalo <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Dijelite kontrolu nad zaslonom putem značajke Hangouts.</translation>
<translation id="8000066093800657092">Nema mreže</translation>
<translation id="4015692727874266537">Prijavite se na još jedan račun...</translation>
<translation id="5941711191222866238">Minimiziraj</translation>
<translation id="6911468394164995108">Pridruži se drugoj...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h <ph name="MINUTE"/> min do završetka punjenja</translation>
<translation id="6359806961507272919">SMS šalje <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Davatelj usluge</translation>
diff --git a/chromium/ash/strings/ash_strings_hu.xtb b/chromium/ash/strings/ash_strings_hu.xtb
index 560b64d7f45..376fef9e5ad 100644
--- a/chromium/ash/strings/ash_strings_hu.xtb
+++ b/chromium/ash/strings/ash_strings_hu.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="hu">
<translation id="3595596368722241419">Akkumulátor feltöltve</translation>
-<translation id="5250713215130379958">Indító automatikus elrejtése</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> és <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portál állapota</translation>
<translation id="30155388420722288">Túlcsordulás gomb</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth engedélyezve</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> elfordult erre: <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth letiltva</translation>
+<translation id="7165320105431587207">Nem sikerült konfigurálni a hálózatot</translation>
<translation id="3775358506042162758">Legfeljebb három fiókot használhat a többfiókos bejelentkezés során.</translation>
<translation id="370649949373421643">Wi-Fi engedélyezése</translation>
<translation id="3626281679859535460">Fényerő</translation>
+<translation id="595202126637698455">Teljesítménykövetés engedélyezve</translation>
<translation id="8054466585765276473">Akkumulátor-időtartam kiszámítása.</translation>
<translation id="7982789257301363584">Hálózat</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Billentyűzetkiosztás</translation>
<translation id="4387004326333427325">A hitelesítési tanúsítvány távolról elutasítva</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> felbontása erre módosult: <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">A HTTP-lekérés nem sikerült</translation>
<translation id="2297568595583585744">Állapottálca</translation>
<translation id="1661867754829461514">Hiányzó PIN kód</translation>
@@ -34,39 +38,41 @@ A váltáshoz nyomja meg a Shift + Alt billentyűkódot.</translation>
<translation id="2127372758936585790">Kis teljesítményű töltő</translation>
<translation id="3846575436967432996">Nem áll rendelkezésre hálózati információ</translation>
<translation id="3026237328237090306">Mobiladatok beállítása</translation>
+<translation id="5871632337994001636">Eszközök kezelése...</translation>
<translation id="785750925697875037">Mobil fiók megtekintése</translation>
<translation id="153454903766751181">Mobilmodem inicializálása...</translation>
<translation id="4628814525959230255"><ph name="HELPER_NAME"/> segéddel való képernyőmegosztás vezérlése a Hangoutson keresztül.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> elforgatva</translation>
<translation id="7864539943188674973">Bluetooth letiltása</translation>
<translation id="939252827960237676">Nem sikerült menteni a képernyőképet.</translation>
<translation id="3126069444801937830">Indítsa újra a frissítéshez</translation>
<translation id="2268813581635650749">Összes kijelentkeztetése</translation>
<translation id="735745346212279324">A VPN nincs csatlakoztatva</translation>
<translation id="7320906967354320621">Tétlen</translation>
-<translation id="6303423059719347535">Az akkumulátor töltöttsége: <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Nagy egérmutató</translation>
-<translation id="2778346081696727092">A hitelesítés nem sikerült a megadott felhasználónévvel vagy jelszóval</translation>
<translation id="3294437725009624529">Vendég</translation>
<translation id="8190698733819146287">Nyelvek és beviteli módok személyre szabása...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Polc pozíciója</translation>
<translation id="2903907270192926896">BEMENET</translation>
<translation id="8676770494376880701">Kis teljesítményű töltő csatlakoztatva</translation>
<translation id="7170041865419449892">Tartományon kívül</translation>
<translation id="4804818685124855865">Kapcsolat bontása</translation>
<translation id="2544853746127077729">A hálózat elutasította a hitelesítési tanúsítványt</translation>
<translation id="5222676887888702881">Kijelentkezés</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguráció</translation>
<translation id="1272079795634619415">Leállítás</translation>
<translation id="4957722034734105353">További információ...</translation>
<translation id="2964193600955408481">Wi-Fi letiltása</translation>
-<translation id="811680302244032017">Eszköz hozzáadása...</translation>
<translation id="4279490309300973883">Tükrözés</translation>
+<translation id="7973962044839454485">Nem sikerült a PPP-hitelesítés helytelen felhasználónév vagy jelszó miatt</translation>
<translation id="2509468283778169019">A CAPS LOCK be van kapcsolva</translation>
<translation id="3892641579809465218">Belső kijelző</translation>
<translation id="7823564328645135659">A beállítások szinkronizálását követően &quot;<ph name="FROM_LOCALE"/>&quot; nyelvről &quot;<ph name="TO_LOCALE"/>&quot; nyelvre változott a nyelvi beállítás.</translation>
<translation id="3368922792935385530">Kapcsolódva</translation>
<translation id="8340999562596018839">Hangos visszajelzés</translation>
<translation id="8654520615680304441">Wi-Fi bekapcsolása...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">A beviteli mód a következőre változott: <ph name="INPUT_METHOD_ID"/>.
A váltáshoz nyomja meg a Shift + Alt billentyűkódot.</translation>
<translation id="2562916301614567480">Magánhálózat</translation>
@@ -83,11 +89,12 @@ A váltáshoz nyomja meg a Shift + Alt billentyűkódot.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% maradt</translation>
<translation id="9089416786594320554">Beviteli módszerek</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Polc</translation>
<translation id="2614835198358683673">Előfordulhat, hogy a Chromebook nem töltődik, amíg be van kapcsolva. Vegye fontolóra a gyári töltő használatát.</translation>
<translation id="1895658205118569222">Kikapcsolás</translation>
<translation id="4430019312045809116">Hangerő</translation>
+<translation id="8681498213689260554">Indítsa újra, és végezze el a Powerwash folyamatot a frissítéshez</translation>
<translation id="4442424173763614572">A DNS keresése sikertelen</translation>
-<translation id="6356500677799115505">Az akkumulátor teljesen fel van töltve, és töltődik.</translation>
<translation id="7874779702599364982">Mobilhálózatok keresése...</translation>
<translation id="583281660410589416">Ismeretlen</translation>
<translation id="1383876407941801731">Keresés</translation>
@@ -96,7 +103,6 @@ A váltáshoz nyomja meg a Shift + Alt billentyűkódot.</translation>
<translation id="2204305834655267233">Hálózatinformáció</translation>
<translation id="1621499497873603021">Akkumulátor lemerüléséig hátralévő idő: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Kilépés a vendég munkamenetből</translation>
-<translation id="4471417012762451363">Az akkumulátor töltöttsége <ph name="PERCENTAGE"/>%, és töltődik</translation>
<translation id="8308637677604853869">Előző menü</translation>
<translation id="4666297444214622512">Nem lehet bejelentkezni még egy fiókba.</translation>
<translation id="1346748346194534595">Jobbra</translation>
@@ -114,6 +120,7 @@ A tiltásához nyomja le a Ctrl+Alt+Z billentyűkombinációt.</translation>
<translation id="6312403991423642364">Ismeretlen hálózati hiba</translation>
<translation id="1467432559032391204">Balra</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> aktiválása</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Teljes méret</translation>
@@ -123,7 +130,6 @@ A tiltásához nyomja le a Ctrl+Alt+Z billentyűkombinációt.</translation>
<translation id="2727977024730340865">Kis teljesítményű töltőt csatlakoztatott. Az akkumulátor töltése nem megbízható.</translation>
<translation id="3784455785234192852">Zárolás</translation>
<translation id="2805756323405976993">Programok</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> átméretezve: <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktiválási hiba</translation>
<translation id="5097002363526479830">Nem sikerült csatlakozni a(z) <ph name="NAME"/> hálózathoz: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi kikapcsolva.</translation>
@@ -131,6 +137,7 @@ A tiltásához nyomja le a Ctrl+Alt+Z billentyűkombinációt.</translation>
<translation id="7052914147756339792">Háttérkép beállítása...</translation>
<translation id="8678698760965522072">Online</translation>
<translation id="2532589005999780174">Nagy kontrasztú mód</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Belső hiba</translation>
<translation id="3019353588588144572">Akkumulátor teljes feltöltéséig hátralévő idő: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Képernyőnagyító</translation>
@@ -153,20 +160,24 @@ Szerverüzenet: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Kilépés a munkamenetből</translation>
<translation id="8454013096329229812">Wi-Fi bekapcsolva.</translation>
<translation id="4872237917498892622">Alt + Keresés vagy Shift</translation>
+<translation id="9201131092683066720">Az akkumulátor töltöttsége: <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Beállítások...</translation>
+<translation id="1195412055398077112">túlpásztázás</translation>
<translation id="1717216362413677834">Dokkolt mód</translation>
+<translation id="112308213915226829">Polc automatikus elrejtése</translation>
<translation id="8927026611342028580">Csatlakozás kérelmezve</translation>
<translation id="8300849813060516376">OTASP sikertelen</translation>
<translation id="2792498699870441125">Alt + Keresés</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> fájl szinkronizálása</translation>
+<translation id="5958529069007801266">Felügyelt felhasználó</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">A CAPS LOCK ki van kapcsolva</translation>
<translation id="6248847161401822652">A kilépéshez nyomja meg kétszer a Ctrl Shift Q billentyűkódot.</translation>
+<translation id="6785414152754474415">Az akkumulátor töltöttsége <ph name="PERCENTAGE"/>%, és töltődik.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: aktiválás...</translation>
+<translation id="4895488851634969361">Az akkumulátor feltöltve.</translation>
<translation id="1391854757121130358">Elképzelhető, hogy mobil adatforgalmi kerete elfogyott.</translation>
-<translation id="5413208160176941586">Helyileg felügyelt felhasználó</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Pozíció az Indítóban</translation>
+<translation id="5947494881799873997">Visszavonás</translation>
<translation id="7593891976182323525">Keresés vagy Shift</translation>
<translation id="7649070708921625228">Súgó</translation>
<translation id="3050422059534974565">A CAPS LOCK be van kapcsolva.
@@ -179,22 +190,24 @@ Kikapcsolásához nyomja meg a Keresés vagy a Shift billentyűt.</translation>
<translation id="6692173217867674490">Rossz összetett jelszó</translation>
<translation id="6165508094623778733">További információ</translation>
<translation id="9046895021617826162">Csatlakozás sikertelen</translation>
+<translation id="7168224885072002358">Visszaállítás a régi felbontásra <ph name="TIMEOUT_SECONDS"/> mp múlva</translation>
<translation id="973896785707726617">A munkamenet <ph name="SESSION_TIME_REMAINING"/> múlva véget ér. Ekkor a rendszer automatikusan kijelentkezteti.</translation>
<translation id="8372369524088641025">Hibás WEP kulcs</translation>
<translation id="6636709850131805001">Azonosítatlan állam</translation>
<translation id="3573179567135747900">Visszatérés ehhez: &quot;<ph name="FROM_LOCALE"/>&quot; (újraindítás szükséges)</translation>
<translation id="8103386449138765447">SMS-üzenetek: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">A Google Drive beállításai...</translation>
-<translation id="1510238584712386396">Indító</translation>
<translation id="7209101170223508707">A CAPS LOCK be van kapcsolva.
Kikapcsolásához nyomja meg az Alt + Keresés vagy a Shift billentyűt.</translation>
<translation id="8940956008527784070">Alacsony akkumulátortöltöttség (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Elfogadás</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> van hátra</translation>
<translation id="520760366042891468">Képernyő megosztásának vezérlése a Hangoutson keresztül.</translation>
<translation id="8000066093800657092">Nincs hálózat</translation>
<translation id="4015692727874266537">Bejelentkezés másik fiókba...</translation>
<translation id="5941711191222866238">Kicsinyítés</translation>
<translation id="6911468394164995108">Csatlakozás másik hálózathoz...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> ó <ph name="MINUTE"/> p a teljes feltöltésig</translation>
<translation id="6359806961507272919">SMS innen: <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Szállító</translation>
diff --git a/chromium/ash/strings/ash_strings_id.xtb b/chromium/ash/strings/ash_strings_id.xtb
index 3007b2f92bd..5d3919c2e6a 100644
--- a/chromium/ash/strings/ash_strings_id.xtb
+++ b/chromium/ash/strings/ash_strings_id.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="id">
<translation id="3595596368722241419">Baterai penuh</translation>
-<translation id="5250713215130379958">Sembunyikan peluncur secara otomatis</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> dan <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Status portal</translation>
<translation id="30155388420722288">Tombol Luapan</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth diaktifkan</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> diputar ke <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth dinonaktifkan</translation>
+<translation id="7165320105431587207">Gagal mengonfigurasi jaringan</translation>
<translation id="3775358506042162758">Anda hanya dapat memiliki paling banyak tiga akun dalam fitur masuk multipel.</translation>
<translation id="370649949373421643">Aktifkan Wi-Fi</translation>
<translation id="3626281679859535460">Kecerahan</translation>
+<translation id="595202126637698455">Kinerja pelacakan aktif</translation>
<translation id="8054466585765276473">Menghitung masa pakai baterai.</translation>
<translation id="7982789257301363584">Jaringan</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Hamparan Keyboard</translation>
<translation id="4387004326333427325">Sertifikat atutentikasi ditolak dari jarak jauh</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> resolusi diubah menjadi <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP gagal</translation>
<translation id="2297568595583585744">Baki status</translation>
<translation id="1661867754829461514">PIN hilang</translation>
@@ -34,39 +38,41 @@ Tekan Shift + Alt untuk beralih.</translation>
<translation id="2127372758936585790">Pengisi daya rendah</translation>
<translation id="3846575436967432996">Tidak tersedia informasi jaringan</translation>
<translation id="3026237328237090306">Siapkan data seluler</translation>
+<translation id="5871632337994001636">Mengelola perangkat...</translation>
<translation id="785750925697875037">Lihat akun seluler</translation>
<translation id="153454903766751181">Memulai modem seluler...</translation>
<translation id="4628814525959230255">Berbagi kontrol layar Anda dengan <ph name="HELPER_NAME"/> melalui Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> telah diputar</translation>
<translation id="7864539943188674973">Nonaktifkan Bluetooth</translation>
<translation id="939252827960237676">Gagal menyimpan tangkapan layar</translation>
<translation id="3126069444801937830">Mulai ulang untuk memperbarui</translation>
<translation id="2268813581635650749">Keluarkan semua pengguna</translation>
<translation id="735745346212279324">VPN terputus</translation>
<translation id="7320906967354320621">Menganggur</translation>
-<translation id="6303423059719347535">Baterai terisi <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Kursor mouse besar</translation>
-<translation id="2778346081696727092">Gagal mengautentikasi dengan nama pengguna atau sandi yang diberikan</translation>
<translation id="3294437725009624529">Tamu</translation>
<translation id="8190698733819146287">Sesuaikan bahasa dan masukan...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posisi rak</translation>
<translation id="2903907270192926896">MASUKAN</translation>
<translation id="8676770494376880701">Pengisi daya rendah terpasang</translation>
<translation id="7170041865419449892">Di luar jangkauan</translation>
<translation id="4804818685124855865">Putuskan</translation>
<translation id="2544853746127077729">Sertifikat autentikasi ditolak oleh jaringan</translation>
<translation id="5222676887888702881">Keluar</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigurasi</translation>
<translation id="1272079795634619415">Berhenti</translation>
<translation id="4957722034734105353">Pelajari selengkapnya...</translation>
<translation id="2964193600955408481">Nonaktifkan Wi-Fi</translation>
-<translation id="811680302244032017">Tambahkan perangkat...</translation>
<translation id="4279490309300973883">Mencerminkan</translation>
+<translation id="7973962044839454485">Autentifikasi PDB gagal karena nama pengguna dan sandi salah</translation>
<translation id="2509468283778169019">CAPS LOCK aktif</translation>
<translation id="3892641579809465218">Tampilan Internal</translation>
<translation id="7823564328645135659">Bahasa telah diubah dari &quot;<ph name="FROM_LOCALE"/>&quot; menjadi &quot;<ph name="TO_LOCALE"/>&quot; setelah menyinkronkan setelan Anda.</translation>
<translation id="3368922792935385530">Tersambung</translation>
<translation id="8340999562596018839">Masukan lisan</translation>
<translation id="8654520615680304441">Aktifkan Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Metode masukan Anda telah berubah menjadi <ph name="INPUT_METHOD_ID"/>.
Tekan Shift + Alt untuk beralih.</translation>
<translation id="2562916301614567480">Jaringan Pribadi</translation>
@@ -83,11 +89,12 @@ Tekan Shift + Alt untuk beralih.</translation>
<translation id="3626637461649818317">Sisa <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Metode masukan</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Rak</translation>
<translation id="2614835198358683673">Chromebook Anda mungkin tidak mengisi daya saat sedang menyala. Pertimbangkan untuk menggunakan pengisi daya resmi.</translation>
<translation id="1895658205118569222">Mati</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">Mulai Ulang dan Powerwash untuk memperbarui</translation>
<translation id="4442424173763614572">Pencarian DNS gagal</translation>
-<translation id="6356500677799115505">Baterai sudah penuh dan masih mengisi.</translation>
<translation id="7874779702599364982">Menelusuri jaringan seluler...</translation>
<translation id="583281660410589416">Tidak diketahui</translation>
<translation id="1383876407941801731">Penelusuran</translation>
@@ -96,7 +103,6 @@ Tekan Shift + Alt untuk beralih.</translation>
<translation id="2204305834655267233">Info Jaringan</translation>
<translation id="1621499497873603021">Waktu yang tersisa hingga baterai kosong, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Keluar dari sesi tamu</translation>
-<translation id="4471417012762451363">Baterai sudah terisi <ph name="PERCENTAGE"/>% dan masih mengisi</translation>
<translation id="8308637677604853869">Menu sebelumnya</translation>
<translation id="4666297444214622512">Tidak dapat masuk ke akun lain.</translation>
<translation id="1346748346194534595">Kanan</translation>
@@ -114,6 +120,7 @@ Tekan Ctrl+Alt+Z untuk menonaktifkan.</translation>
<translation id="6312403991423642364">Kesalahan jaringan tidak dikenal</translation>
<translation id="1467432559032391204">Kiri</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Mengaktifkan <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Perbesar</translation>
@@ -123,7 +130,6 @@ Tekan Ctrl+Alt+Z untuk menonaktifkan.</translation>
<translation id="2727977024730340865">Dipasang ke pengisi daya rendah. Pengisian daya baterai mungkin tidak dapat diandalkan.</translation>
<translation id="3784455785234192852">Kunci</translation>
<translation id="2805756323405976993">Apl</translation>
-<translation id="8871072142849158571">Ukuran <ph name="DISPLAY_NAME"/> telah diubah ke <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Kegagalan aktivasi</translation>
<translation id="5097002363526479830">Gagal menyambung ke jaringan '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi dinonaktifkan.</translation>
@@ -131,6 +137,7 @@ Tekan Ctrl+Alt+Z untuk menonaktifkan.</translation>
<translation id="7052914147756339792">Setel wallpaper...</translation>
<translation id="8678698760965522072">Status online</translation>
<translation id="2532589005999780174">Mode kontras tinggi</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Kesalahan internal</translation>
<translation id="3019353588588144572">Waktu yang tersisa hingga baterai terisi penuh, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Kaca pembesar layar</translation>
@@ -153,20 +160,24 @@ Pesan server: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Keluar dari sesi</translation>
<translation id="8454013096329229812">Wi-Fi diaktifkan.</translation>
<translation id="4872237917498892622">Alt+Telusuri atau Shift</translation>
+<translation id="9201131092683066720">Baterai terisi <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Setelan...</translation>
+<translation id="1195412055398077112">pemindaian berlebih</translation>
<translation id="1717216362413677834">Mode dok</translation>
+<translation id="112308213915226829">Sembunyikan otomatis rak</translation>
<translation id="8927026611342028580">Sambungan Diminta</translation>
<translation id="8300849813060516376">OTASP gagal</translation>
<translation id="2792498699870441125">Alt+Telusuri</translation>
<translation id="8660803626959853127">Menyinkronkan <ph name="COUNT"/> file</translation>
+<translation id="5958529069007801266">Pengguna yang diawasi</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK tidak aktif</translation>
<translation id="6248847161401822652">Tekan Control Shift Q dua kali untuk keluar.</translation>
+<translation id="6785414152754474415">Baterai sudah terisi <ph name="PERCENTAGE"/>% dan masih mengisi.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Mengaktifkan...</translation>
+<translation id="4895488851634969361">Baterai penuh.</translation>
<translation id="1391854757121130358">Anda mungkin telah menghabiskan jatah data seluler.</translation>
-<translation id="5413208160176941586">Pengguna yang dikelola secara lokal</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posisi peluncur</translation>
+<translation id="5947494881799873997">Kembalikan</translation>
<translation id="7593891976182323525">Telusuri atau Shift</translation>
<translation id="7649070708921625228">Bantuan</translation>
<translation id="3050422059534974565">CAPS LOCK aktif.
@@ -179,22 +190,24 @@ Tekan Telusuri atau Shift untuk membatalkan.</translation>
<translation id="6692173217867674490">Frasa sandi yang buruk</translation>
<translation id="6165508094623778733">Pelajari lebih lanjut</translation>
<translation id="9046895021617826162">Gagal menyambung</translation>
+<translation id="7168224885072002358">Mengembalikan ke resolusi lama dalam <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Sesi ini akan berakhir dalam <ph name="SESSION_TIME_REMAINING"/>. Anda akan otomatis dikeluarkan.</translation>
<translation id="8372369524088641025">Kunci WEP yang buruk</translation>
<translation id="6636709850131805001">Keadaan yang tidak dikenal</translation>
<translation id="3573179567135747900">Ubah kembali ke &quot;<ph name="FROM_LOCALE"/>&quot; (harus dinyalakan ulang)</translation>
<translation id="8103386449138765447">Pesan SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Setelan Google Drive...</translation>
-<translation id="1510238584712386396">Peluncur</translation>
<translation id="7209101170223508707">CAPS LOCK aktif.
Tekan Alt+Telusuri atau Shift untuk membatalkan.</translation>
<translation id="8940956008527784070">Baterai lemah (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Terima</translation>
<translation id="5102001756192215136">Sisa <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Berbagi kontrol layar Anda melalui Hangouts.</translation>
<translation id="8000066093800657092">Tidak ada jaringan</translation>
<translation id="4015692727874266537">Masuk ke akun lain...</translation>
<translation id="5941711191222866238">Perkecil</translation>
<translation id="6911468394164995108">Bergabung dengan lainnya...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>j <ph name="MINUTE"/>m sampai penuh</translation>
<translation id="6359806961507272919">SMS dari <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operator</translation>
diff --git a/chromium/ash/strings/ash_strings_it.xtb b/chromium/ash/strings/ash_strings_it.xtb
index faa8420e5ff..5ba591b6e55 100644
--- a/chromium/ash/strings/ash_strings_it.xtb
+++ b/chromium/ash/strings/ash_strings_it.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="it">
<translation id="3595596368722241419">Batteria carica</translation>
-<translation id="5250713215130379958">Nascondi automaticamente Avvio applicazioni</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> e <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stato portale</translation>
<translation id="30155388420722288">Pulsante Overflow</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth attivo</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> è stato ruotato a <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth disattivo</translation>
+<translation id="7165320105431587207">Impossibile configurare la rete</translation>
<translation id="3775358506042162758">Puoi avere massimo tre account per l'accesso simultaneo.</translation>
<translation id="370649949373421643">Attiva Wi-Fi</translation>
<translation id="3626281679859535460">Luminosità</translation>
+<translation id="595202126637698455">Rilevamento del rendimento attivo</translation>
<translation id="8054466585765276473">Calcolo della durata della batteria.</translation>
<translation id="7982789257301363584">Rete</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Overlay tastiera</translation>
<translation id="4387004326333427325">Certificato di autenticazione rifiutato da remoto</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">La risoluzione di <ph name="DISPLAY_NAME"/> è stata modificata in: <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Recupero HTTP non riuscito</translation>
<translation id="2297568595583585744">Barra di stato</translation>
<translation id="1661867754829461514">PIN mancante</translation>
@@ -34,39 +38,41 @@ Premi Maiusc+Alt per cambiare metodo.</translation>
<translation id="2127372758936585790">Caricabatterie a basso consumo</translation>
<translation id="3846575436967432996">Nessuna informazione di rete disponibile</translation>
<translation id="3026237328237090306">Configura dati mobili</translation>
+<translation id="5871632337994001636">Gestisci dispositivi...</translation>
<translation id="785750925697875037">Visualizza account per cellulari</translation>
<translation id="153454903766751181">Inizializzazione del modem per cellulari...</translation>
<translation id="4628814525959230255">Condivisione del controllo dello schermo con <ph name="HELPER_NAME"/> tramite Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ruotato</translation>
<translation id="7864539943188674973">Disattiva Bluetooth</translation>
<translation id="939252827960237676">Salvataggio dello screenshot non riuscito</translation>
<translation id="3126069444801937830">Riavvia per aggiornare</translation>
<translation id="2268813581635650749">Disconnetti tutti</translation>
<translation id="735745346212279324">VPN scollegata</translation>
<translation id="7320906967354320621">In pausa</translation>
-<translation id="6303423059719347535">La batteria è carica al <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Puntatore del mouse grande</translation>
-<translation id="2778346081696727092">Autenticazione non riuscita con il nome utente o la password forniti</translation>
<translation id="3294437725009624529">Ospite</translation>
<translation id="8190698733819146287">Personalizza lingue e immissione...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posizione shelf</translation>
<translation id="2903907270192926896">INGRESSO</translation>
<translation id="8676770494376880701">Caricabatterie a basso consumo collegato</translation>
<translation id="7170041865419449892">Fuori dal raggio d'azione</translation>
<translation id="4804818685124855865">Disconnetti</translation>
<translation id="2544853746127077729">Certificato di autenticazione rifiutato dalla rete</translation>
<translation id="5222676887888702881">Esci</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configurazione</translation>
<translation id="1272079795634619415">Interrompi</translation>
<translation id="4957722034734105353">Ulteriori informazioni...</translation>
<translation id="2964193600955408481">Disattiva Wi-Fi</translation>
-<translation id="811680302244032017">Aggiungi dispositivo...</translation>
<translation id="4279490309300973883">Mirroring</translation>
+<translation id="7973962044839454485">Autenticazione PPP non riuscita a causa di un nome utente o una password sbagliati</translation>
<translation id="2509468283778169019">BLOC MAIUSC è attivo</translation>
<translation id="3892641579809465218">Display interno</translation>
<translation id="7823564328645135659">La lingua è stata modificata da &quot;<ph name="FROM_LOCALE"/>&quot; a &quot;<ph name="TO_LOCALE"/>&quot; dopo la sincronizzazione delle impostazioni.</translation>
<translation id="3368922792935385530">Connessa</translation>
<translation id="8340999562596018839">Feedback vocale</translation>
<translation id="8654520615680304441">Attiva Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Il metodo di immissione è stato cambiato in <ph name="INPUT_METHOD_ID"/>.
Premi Maiusc+Alt per cambiare metodo.</translation>
<translation id="2562916301614567480">Rete privata</translation>
@@ -83,11 +89,12 @@ Premi Maiusc+Alt per cambiare metodo.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% rimanente</translation>
<translation id="9089416786594320554">Metodi di immissione</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Shelf</translation>
<translation id="2614835198358683673">Il Chromebook potrebbe non ricaricarsi mentre è accesso. Prova a utilizzare il caricabatterie ufficiale.</translation>
<translation id="1895658205118569222">Chiusura</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">Riavvia ed esegui Powerwash per aggiornare</translation>
<translation id="4442424173763614572">Ricerca DNS non riuscita</translation>
-<translation id="6356500677799115505">La batteria è carica e in ricarica.</translation>
<translation id="7874779702599364982">Ricerca reti cellulari...</translation>
<translation id="583281660410589416">Sconosciuto</translation>
<translation id="1383876407941801731">Ricerca</translation>
@@ -96,7 +103,6 @@ Premi Maiusc+Alt per cambiare metodo.</translation>
<translation id="2204305834655267233">Informazioni di rete</translation>
<translation id="1621499497873603021">Tempo rimanente all'esaurimento della batteria: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Esci da sessione Ospite</translation>
-<translation id="4471417012762451363">La batteria è carica al <ph name="PERCENTAGE"/>% e in ricarica</translation>
<translation id="8308637677604853869">Menu precedente</translation>
<translation id="4666297444214622512">Impossibile accedere a un altro account.</translation>
<translation id="1346748346194534595">Destra</translation>
@@ -114,6 +120,7 @@ Premi Ctrl+Alt+Z per disattivarlo.</translation>
<translation id="6312403991423642364">Errore di rete sconosciuto</translation>
<translation id="1467432559032391204">Sinistra</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Attivazione di <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Ingrandisci</translation>
@@ -123,7 +130,6 @@ Premi Ctrl+Alt+Z per disattivarlo.</translation>
<translation id="2727977024730340865">Collegato a un caricabatterie a basso consumo. La carica della batteria potrebbe non essere affidabile.</translation>
<translation id="3784455785234192852">Blocca</translation>
<translation id="2805756323405976993">Applicazioni</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> è stato ridimensionato a <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Errore di attivazione</translation>
<translation id="5097002363526479830">Connessione alla rete &quot;<ph name="NAME"/>&quot; non riuscita: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi non attivo.</translation>
@@ -131,6 +137,7 @@ Premi Ctrl+Alt+Z per disattivarlo.</translation>
<translation id="7052914147756339792">Imposta sfondo...</translation>
<translation id="8678698760965522072">Stato online</translation>
<translation id="2532589005999780174">Modalità ad alto contrasto</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Errore interno</translation>
<translation id="3019353588588144572">Tempo rimanente al caricamento completo della batteria: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Ingrandimento dello schermo</translation>
@@ -153,20 +160,24 @@ Messaggio del server: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Esci da sessione</translation>
<translation id="8454013096329229812">Wi-Fi attivo.</translation>
<translation id="4872237917498892622">Alt+tasto per la ricerca o Maiusc</translation>
+<translation id="9201131092683066720">Percentuale di caricamento della batteria: <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Impostazioni...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Modalità dock</translation>
+<translation id="112308213915226829">Nascondi automaticamente shelf</translation>
<translation id="8927026611342028580">Connessione richiesta</translation>
<translation id="8300849813060516376">OTASP non riuscito</translation>
<translation id="2792498699870441125">Alt+tasto per la ricerca</translation>
<translation id="8660803626959853127">Sincronizzazione di <ph name="COUNT"/> file in corso</translation>
+<translation id="5958529069007801266">Utente controllato</translation>
<translation id="3709443003275901162">Più di 9</translation>
<translation id="639644700271529076">Funzione BLOC MAIUSC non attiva</translation>
<translation id="6248847161401822652">Per uscire premi due volte Ctrl+Maiusc+Q.</translation>
+<translation id="6785414152754474415">Percentuale di caricamento batteria: <ph name="PERCENTAGE"/>%. La batteria è in carica.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: attivazione in corso...</translation>
+<translation id="4895488851634969361">La batteria è carica.</translation>
<translation id="1391854757121130358">Potresti avere esaurito la tua quota di dati mobili.</translation>
-<translation id="5413208160176941586">Utente gestito localmente</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posizione Avvio applicazioni</translation>
+<translation id="5947494881799873997">Ripristina</translation>
<translation id="7593891976182323525">Tasto per la ricerca o Maiusc</translation>
<translation id="7649070708921625228">Guida</translation>
<translation id="3050422059534974565">La funzione BLOC MAIUSC è attiva.
@@ -179,22 +190,24 @@ Premi il tasto per la ricerca o Maiusc per annullare.</translation>
<translation id="6692173217867674490">Passphrase non valida</translation>
<translation id="6165508094623778733">Ulteriori informazioni</translation>
<translation id="9046895021617826162">Connessione non riuscita</translation>
+<translation id="7168224885072002358">Ripristino della risoluzione precedente tra <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Questa sessione terminerà fra <ph name="SESSION_TIME_REMAINING"/>. Verrà eseguita automaticamente la disconnessione.</translation>
<translation id="8372369524088641025">Chiave WEP non valida</translation>
<translation id="6636709850131805001">Stato non riconosciuto</translation>
<translation id="3573179567135747900">Torna a &quot;<ph name="FROM_LOCALE"/>&quot; (è necessario riavviare)</translation>
<translation id="8103386449138765447">Messaggi SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Impostazioni Google Drive...</translation>
-<translation id="1510238584712386396">Avvio applicazioni</translation>
<translation id="7209101170223508707">La funzione BLOC MAIUSC è attiva.
Premi Alt+tasto per la ricerca o Maiusc per annullare.</translation>
<translation id="8940956008527784070">Batteria in esaurimento (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Accetto</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> rimanenti</translation>
<translation id="520760366042891468">Condivisione del controllo dello schermo tramite Hangouts.</translation>
<translation id="8000066093800657092">Nessuna rete</translation>
<translation id="4015692727874266537">Accedi a un altro account...</translation>
<translation id="5941711191222866238">Riduci a icona</translation>
<translation id="6911468394164995108">Connetti a un'altra...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h e <ph name="MINUTE"/> m per completare la ricarica</translation>
<translation id="6359806961507272919">SMS da <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Gestore</translation>
diff --git a/chromium/ash/strings/ash_strings_iw.xtb b/chromium/ash/strings/ash_strings_iw.xtb
index a71f1be87f8..870abf095e2 100644
--- a/chromium/ash/strings/ash_strings_iw.xtb
+++ b/chromium/ash/strings/ash_strings_iw.xtb
@@ -2,72 +2,78 @@
<!DOCTYPE translationbundle>
<translationbundle lang="iw">
<translation id="3595596368722241419">סוללה מלאה</translation>
-<translation id="5250713215130379958">הסתר אוטומטית את המפעיל</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> ו-<ph name="MINUTE"/></translation>
<translation id="7880025619322806991">מצב הפורטל</translation>
<translation id="30155388420722288">לחצן גלישה</translation>
-<translation id="5571066253365925590">Bluetooth מופעל</translation>
+<translation id="8673028979667498656">270°</translation>
+<translation id="5571066253365925590">‏Bluetooth מופעל</translation>
+<translation id="6310121235600822547">בוצע סיבוב של <ph name="DISPLAY_NAME"/> אל <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
-<translation id="2268130516524549846">Bluetooth מושבת</translation>
+<translation id="2268130516524549846">‏Bluetooth מושבת</translation>
+<translation id="7165320105431587207">כשל בהגדרת התצורה של הרשת</translation>
<translation id="3775358506042162758">ניתן לכלול עד שלושה חשבונות בלבד בכניסה עם מספר חשבונות.</translation>
-<translation id="370649949373421643">הפעל Wi-Fi</translation>
+<translation id="370649949373421643">‏הפעל Wi-Fi</translation>
<translation id="3626281679859535460">בהירות</translation>
+<translation id="595202126637698455">מעקב אחר הביצועים מופעל</translation>
<translation id="8054466585765276473">מחשב זמן סוללה</translation>
<translation id="7982789257301363584">רשת</translation>
-<translation id="5565793151875479467">שרת proxy...</translation>
+<translation id="5565793151875479467">‏שרת proxy...</translation>
<translation id="938582441709398163">שכבת על של מקלדת</translation>
<translation id="4387004326333427325">אישור האימות נדחה מרחוק</translation>
<translation id="6979158407327259162">Google Drive</translation>
-<translation id="6943836128787782965">פעולת get של HTTP נכשלה</translation>
+<translation id="3683428399328702079">הרזולוציה של <ph name="DISPLAY_NAME"/> שונתה ל-<ph name="RESOLUTION"/></translation>
+<translation id="6943836128787782965">‏פעולת get של HTTP נכשלה</translation>
<translation id="2297568595583585744">מגש סטטוס</translation>
-<translation id="1661867754829461514">חסר PIN</translation>
+<translation id="1661867754829461514">‏חסר PIN</translation>
<translation id="4508225577814909926"><ph name="NAME"/>: מתחבר...</translation>
<translation id="4237016987259239829">שגיאת חיבור רשת</translation>
-<translation id="2946640296642327832">הפעל Bluetooth</translation>
+<translation id="2946640296642327832">‏הפעל Bluetooth</translation>
<translation id="6459472438155181876">מרחיב את המסך אל <ph name="DISPLAY_NAME"/></translation>
<translation id="8206859287963243715">סלולארי</translation>
-<translation id="6596816719288285829">כתובת IP</translation>
+<translation id="6596816719288285829">‏כתובת IP</translation>
<translation id="4508265954913339219">ההפעלה נכשלה</translation>
<translation id="3621712662352432595">הגדרות אודיו</translation>
-<translation id="1812696562331527143">שיטת הקלט שלך השתנתה ל-‏<ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>צד שלישי<ph name="END_LINK"/>)‎.
+<translation id="1812696562331527143">‏שיטת הקלט שלך השתנתה ל-‏<ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>צד שלישי<ph name="END_LINK"/>)‎.
הקש Shift + Alt כדי להחליף.</translation>
<translation id="2127372758936585790">מטען בעל מתח נמוך</translation>
<translation id="3846575436967432996">אין מידע רשת זמין</translation>
<translation id="3026237328237090306">הגדר נתונים לנייד</translation>
+<translation id="5871632337994001636">נהל מכשירים...</translation>
<translation id="785750925697875037">הצג את חשבון הנייד</translation>
<translation id="153454903766751181">מאתחל מודם סלולרי...</translation>
-<translation id="4628814525959230255">משתף את השליטה במסך שלך עם <ph name="HELPER_NAME"/> באמצעות Hangouts.</translation>
-<translation id="8343941333792395995">בוצע סיבוב של <ph name="DISPLAY_NAME"/></translation>
-<translation id="7864539943188674973">השבת Bluetooth</translation>
+<translation id="4628814525959230255">‏משתף את השליטה במסך שלך עם <ph name="HELPER_NAME"/> באמצעות Hangouts.</translation>
+<translation id="7864539943188674973">‏השבת Bluetooth</translation>
<translation id="939252827960237676">שמירת צילום המסך נכשלה</translation>
<translation id="3126069444801937830">הפעל מחדש כדי לעדכן</translation>
<translation id="2268813581635650749">הוצא את כולם</translation>
-<translation id="735745346212279324">VPN מנותק</translation>
+<translation id="735745346212279324">‏VPN מנותק</translation>
<translation id="7320906967354320621">לא פעילה</translation>
-<translation id="6303423059719347535">הסוללה טעונה ב-‎<ph name="PERCENTAGE"/>%‎</translation>
<translation id="15373452373711364">סמן עכבר גדול</translation>
-<translation id="2778346081696727092">האימות נכשל עם שם המשתמש או הסיסמה שסופקו</translation>
<translation id="3294437725009624529">אורח</translation>
<translation id="8190698733819146287">התאם אישית שפה וקלט...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/>‏ (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">מיקום המדף</translation>
<translation id="2903907270192926896">קלט</translation>
<translation id="8676770494376880701">חובר מטען בעל מתח נמוך</translation>
<translation id="7170041865419449892">מחוץ לטווח</translation>
<translation id="4804818685124855865">נתק</translation>
<translation id="2544853746127077729">אישור האימות נדחה על ידי הרשת</translation>
<translation id="5222676887888702881">יציאה</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">תצורה</translation>
<translation id="1272079795634619415">הפסק</translation>
<translation id="4957722034734105353">למידע נוסף...</translation>
-<translation id="2964193600955408481">השבת Wi-Fi</translation>
-<translation id="811680302244032017">הוסף את המכשיר...</translation>
+<translation id="2964193600955408481">‏השבת Wi-Fi</translation>
<translation id="4279490309300973883">שיקוף</translation>
-<translation id="2509468283778169019">CAPS LOCK מופעל</translation>
+<translation id="7973962044839454485">‏אימות PPP נכשל בשל שם משתמש או סיסמה שגויים</translation>
+<translation id="2509468283778169019">‏CAPS LOCK מופעל</translation>
<translation id="3892641579809465218">תצוגה פנימית</translation>
-<translation id="7823564328645135659">שפת Chrome השתנתה מ&quot;<ph name="FROM_LOCALE"/>&quot; ל&quot;<ph name="TO_LOCALE"/>&quot; לאחר סנכרון ההגדרות.</translation>
+<translation id="7823564328645135659">‏שפת Chrome השתנתה מ&quot;<ph name="FROM_LOCALE"/>&quot; ל&quot;<ph name="TO_LOCALE"/>&quot; לאחר סנכרון ההגדרות.</translation>
<translation id="3368922792935385530">מחובר</translation>
<translation id="8340999562596018839">משוב קולי</translation>
-<translation id="8654520615680304441">הפעל את ה-Wi-Fi...</translation>
-<translation id="5825747213122829519">שיטת הקלט שלך השתנתה ל-<ph name="INPUT_METHOD_ID"/>.
+<translation id="8654520615680304441">‏הפעל את ה-Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
+<translation id="5825747213122829519">‏שיטת הקלט שלך השתנתה ל-<ph name="INPUT_METHOD_ID"/>.
הקש Shift + Alt כדי להחליף.</translation>
<translation id="2562916301614567480">רשת פרטית</translation>
<translation id="6549021752953852991">אין רשת סלולרית זמינה</translation>
@@ -76,18 +82,19 @@
<translation id="3087734570205094154">תחתית</translation>
<translation id="3742055079367172538">צילום המסך בוצע</translation>
<translation id="8878886163241303700">מסך מתרחב</translation>
-<translation id="5271016907025319479">לא הוגדר VPN.</translation>
-<translation id="372094107052732682">לחץ על Ctrl+Shift+Q פעמיים כדי לצאת.</translation>
+<translation id="5271016907025319479">‏לא הוגדר VPN.</translation>
+<translation id="372094107052732682">‏לחץ על Ctrl+Shift+Q פעמיים כדי לצאת.</translation>
<translation id="6803622936009808957">לא ניתן היה לשקף מסכים מכיוון שלא נמצאה רזולוציה נתמכת. במקום זאת התצוגה עברה למצב שולחן עבודה מורחב.</translation>
<translation id="1480041086352807611">מצב הדגמה</translation>
-<translation id="3626637461649818317"><ph name="PERCENTAGE"/>%‎ נותרו</translation>
+<translation id="3626637461649818317">‏<ph name="PERCENTAGE"/>%‎ נותרו</translation>
<translation id="9089416786594320554">שיטות קלט</translation>
<translation id="6247708409970142803">%<ph name="PERCENTAGE"/></translation>
-<translation id="2614835198358683673">ייתכן שה-Chromebook שלך לא ייטען בזמן שהוא מופעל. מומלץ להשתמש במטען הראשי.</translation>
+<translation id="2825619548187458965">מדף</translation>
+<translation id="2614835198358683673">‏ייתכן שה-Chromebook שלך לא ייטען בזמן שהוא מופעל. מומלץ להשתמש במטען הראשי.</translation>
<translation id="1895658205118569222">כיבוי</translation>
<translation id="4430019312045809116">עוצמת קול</translation>
-<translation id="4442424173763614572">חיפוש ה-DNS נכשל</translation>
-<translation id="6356500677799115505">הסוללה מלאה ובטעינה.</translation>
+<translation id="8681498213689260554">‏הפעל מחדש ובצע פעולת Powerwash כדי לעדכן</translation>
+<translation id="4442424173763614572">‏חיפוש ה-DNS נכשל</translation>
<translation id="7874779702599364982">מחפש רשתות סלולריות...</translation>
<translation id="583281660410589416">לא ידוע</translation>
<translation id="1383876407941801731">חיפוש</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">פרטי רשת</translation>
<translation id="1621499497873603021">הזמן שנותר עד להתרוקנות הסוללה, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">צא מהפעלת אורח</translation>
-<translation id="4471417012762451363">הסוללה טעונה ב-‎<ph name="PERCENTAGE"/>%‎ ונמצאת בטעינה</translation>
<translation id="8308637677604853869">התפריט הקודם</translation>
<translation id="4666297444214622512">לא ניתן להיכנס לחשבון אחר.</translation>
<translation id="1346748346194534595">ימינה</translation>
@@ -106,14 +112,15 @@
<translation id="8428213095426709021">הגדרות</translation>
<translation id="2372145515558759244">מסנכרן יישומים...</translation>
<translation id="7256405249507348194">שגיאה לא מזוהה: <ph name="DESC"/></translation>
-<translation id="7925247922861151263">בדיקת AAA נכשלה</translation>
+<translation id="7925247922861151263">‏בדיקת AAA נכשלה</translation>
<translation id="8456362689280298700"><ph name="HOUR"/>:<ph name="MINUTE"/> עד שמתמלא</translation>
-<translation id="5787281376604286451">משוב קולי מופעל.
+<translation id="5787281376604286451">‏משוב קולי מופעל.
הקש Ctrl+Alt+Z כדי להשבית אותו.</translation>
<translation id="4479639480957787382">אתרנט</translation>
<translation id="6312403991423642364">שגיאת רשת לא ידועה</translation>
<translation id="1467432559032391204">שמאלה</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">‎0°‎</translation>
<translation id="2354174487190027830">מפעיל את <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">הגדל</translation>
@@ -123,14 +130,14 @@
<translation id="2727977024730340865">מחובר למטען בעל מתח נמוך. ייתכן שטעינת הסוללה לא תהיה אמינה.</translation>
<translation id="3784455785234192852">נעילה</translation>
<translation id="2805756323405976993">יישומים</translation>
-<translation id="8871072142849158571">הגודל של <ph name="DISPLAY_NAME"/> השתנה ל-<ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">כשל בהפעלה</translation>
<translation id="5097002363526479830">ההתחברות לרשת נכשלה '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
-<translation id="1850504506766569011">Wi-Fi כבוי.</translation>
+<translation id="1850504506766569011">‏Wi-Fi כבוי.</translation>
<translation id="8132793192354020517">מחובר ל<ph name="NAME"/></translation>
<translation id="7052914147756339792">הגדר טפט...</translation>
<translation id="8678698760965522072">מצב מקוון</translation>
<translation id="2532589005999780174">מצב ניגודיות גבוהה</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>‏, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">שגיאה פנימית</translation>
<translation id="3019353588588144572">הזמן שנותר עד לטעינה מלאה של הסוללה, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">מגדיל התצוגה</translation>
@@ -144,58 +151,64 @@
<translation id="4032485810211612751"><ph name="HOURS"/>:<ph name="MINUTES"/>:<ph name="SECONDS"/></translation>
<translation id="225680501294068881">סורק לאיתור מכשירים...</translation>
<translation id="5597451508971090205"><ph name="SHORT_WEEKDAY"/>, <ph name="DATE"/></translation>
-<translation id="4448844063988177157">מחפש רשתות Wi-Fi...</translation>
+<translation id="4448844063988177157">‏מחפש רשתות Wi-Fi...</translation>
<translation id="8401662262483418323">הניסיון להתחבר אל '<ph name="NAME"/>' נכשל: <ph name="DETAILS"/>
הודעת השרת: <ph name="SERVER_MSG"/></translation>
<translation id="2475982808118771221">אירעה שגיאה</translation>
-<translation id="7229570126336867161">יש צורך ב-EVDO</translation>
+<translation id="7229570126336867161">‏יש צורך ב-EVDO</translation>
<translation id="2999742336789313416"><ph name="DISPLAY_NAME"/> היא הפעלה ציבורית המנוהלת על ידי <ph name="DOMAIN"/></translation>
<translation id="7029814467594812963">צא מההפעלה</translation>
-<translation id="8454013096329229812">Wi-Fi מופעל.</translation>
-<translation id="4872237917498892622">Alt + חיפוש או Shift</translation>
+<translation id="8454013096329229812">‏Wi-Fi מופעל.</translation>
+<translation id="4872237917498892622">‏Alt + חיפוש או Shift</translation>
+<translation id="9201131092683066720">‏הסוללה טעונה ברמה של ‎<ph name="PERCENTAGE"/>%‎.</translation>
<translation id="2983818520079887040">הגדרות...</translation>
+<translation id="1195412055398077112">סריקת יתר</translation>
<translation id="1717216362413677834">מצב מעגן</translation>
+<translation id="112308213915226829">הסתרה אוטומטית של המדף</translation>
<translation id="8927026611342028580">נשלחה בקשה לחיבור</translation>
-<translation id="8300849813060516376">OTASP נכשל</translation>
-<translation id="2792498699870441125">Alt + חיפוש</translation>
+<translation id="8300849813060516376">‏OTASP נכשל</translation>
+<translation id="2792498699870441125">‏Alt + חיפוש</translation>
<translation id="8660803626959853127">מסנכרן <ph name="COUNT"/> קבצים</translation>
+<translation id="5958529069007801266">משתמש מבוקר</translation>
<translation id="3709443003275901162">‎9+‎</translation>
-<translation id="639644700271529076">CAPS LOCK כבוי</translation>
-<translation id="6248847161401822652">לחץ פעמיים על Control Shift Q כדי לצאת.</translation>
+<translation id="639644700271529076">‏CAPS LOCK כבוי</translation>
+<translation id="6248847161401822652">‏לחץ פעמיים על Control Shift Q כדי לצאת.</translation>
+<translation id="6785414152754474415">‏הסוללה טעונה ברמה של ‎<ph name="PERCENTAGE"/>%‎ ומתבצעת טעינה.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: מפעיל...</translation>
+<translation id="4895488851634969361">הסוללה טעונה במלואה.</translation>
<translation id="1391854757121130358">ייתכן שכבר השתמשת בכל הקצבת הנתונים לנייד.</translation>
-<translation id="5413208160176941586">משתמש המנוהל באופן מקומי</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">מיקום המפעיל</translation>
-<translation id="7593891976182323525">חיפוש או Shift</translation>
+<translation id="5947494881799873997">חזרה לגרסה הקודמת</translation>
+<translation id="7593891976182323525">‏חיפוש או Shift</translation>
<translation id="7649070708921625228">עזרה</translation>
-<translation id="3050422059534974565">CAPS LOCK פועל.
+<translation id="3050422059534974565">‏CAPS LOCK פועל.
הקש על 'חיפוש' או על Shift כדי לבטל.</translation>
<translation id="397105322502079400">מחשב...</translation>
<translation id="158849752021629804">יש צורך ברשת ביתית</translation>
<translation id="6857811139397017780">הפעל את <ph name="NETWORKSERVICE"/></translation>
-<translation id="5864471791310927901">חיפוש DHCP נכשל</translation>
+<translation id="5864471791310927901">‏חיפוש DHCP נכשל</translation>
<translation id="5812035014844949013">פלט</translation>
<translation id="6692173217867674490">משפט-סיסמה גרוע</translation>
<translation id="6165508094623778733">למידע נוסף</translation>
<translation id="9046895021617826162">החיבור נכשל</translation>
+<translation id="7168224885072002358">חוזר לרזולוציה הקודמת בעוד <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">הפעילות הזו באתר תסתיים בעוד <ph name="SESSION_TIME_REMAINING"/>. תנותק אוטומטית.</translation>
-<translation id="8372369524088641025">מקש WEP גרוע</translation>
+<translation id="8372369524088641025">‏מקש WEP גרוע</translation>
<translation id="6636709850131805001">מצב לא מזוהה</translation>
<translation id="3573179567135747900">שנה בחזרה ל&quot;<ph name="FROM_LOCALE"/>&quot; (דורש הפעלה מחדש)</translation>
-<translation id="8103386449138765447">הודעות SMS‏: <ph name="MESSAGE_COUNT"/></translation>
-<translation id="5045002648206642691">הגדרות Google Drive...</translation>
-<translation id="1510238584712386396">מפעיל</translation>
-<translation id="7209101170223508707">CAPS LOCK פועל.
+<translation id="8103386449138765447">‏הודעות SMS‏: <ph name="MESSAGE_COUNT"/></translation>
+<translation id="5045002648206642691">‏הגדרות Google Drive...</translation>
+<translation id="7209101170223508707">‏CAPS LOCK פועל.
הקש על Alt + 'חיפוש' או Shift כדי לבטל.</translation>
-<translation id="8940956008527784070">סוללה חלשה (‎<ph name="PERCENTAGE"/>%‎)</translation>
+<translation id="8940956008527784070">‏סוללה חלשה (‎<ph name="PERCENTAGE"/>%‎)</translation>
+<translation id="4918086044614829423">אשר</translation>
<translation id="5102001756192215136">נותרו <ph name="HOUR"/> <ph name="MINUTE"/></translation>
-<translation id="520760366042891468">משתף את השליטה במסך שלך באמצעות Hangouts.</translation>
+<translation id="520760366042891468">‏משתף את השליטה במסך שלך באמצעות Hangouts.</translation>
<translation id="8000066093800657092">אין רשת</translation>
<translation id="4015692727874266537">הכנס חשבון אחר...</translation>
<translation id="5941711191222866238">מזער</translation>
<translation id="6911468394164995108">הצטרף לרשת אחרת...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>‏: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> שעות ו-<ph name="MINUTE"/> דקות עד לטעינה מלאה</translation>
-<translation id="6359806961507272919">SMS מאת <ph name="PHONE_NUMBER"/> </translation>
+<translation id="6359806961507272919">‏SMS מאת <ph name="PHONE_NUMBER"/> </translation>
<translation id="1244147615850840081">ספק</translation>
</translationbundle> \ No newline at end of file
diff --git a/chromium/ash/strings/ash_strings_ja.xtb b/chromium/ash/strings/ash_strings_ja.xtb
index c98ccb31fe1..180ae7ca056 100644
--- a/chromium/ash/strings/ash_strings_ja.xtb
+++ b/chromium/ash/strings/ash_strings_ja.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ja">
<translation id="3595596368722241419">バッテリー残量: 満</translation>
-<translation id="5250713215130379958">ランチャーを自動的に隠す</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">ポータル状態</translation>
<translation id="30155388420722288">オーバーフロー ボタン</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth オン</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> を <ph name="ROTATION"/> に回転しました</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth オフ</translation>
+<translation id="7165320105431587207">ネットワークを設定できませんでした</translation>
<translation id="3775358506042162758">マルチ ログインできるアカウントは 3 つまでです。</translation>
<translation id="370649949373421643">Wi-Fi を有効にする</translation>
<translation id="3626281679859535460">輝度</translation>
+<translation id="595202126637698455">パフォーマンス追跡機能が有効です</translation>
<translation id="8054466585765276473">バッテリーの残り時間を計算しています。</translation>
<translation id="7982789257301363584">ネットワーク</translation>
<translation id="5565793151875479467">プロキシ...</translation>
<translation id="938582441709398163">キーボード オーバーレイ</translation>
<translation id="4387004326333427325">認証証明書がリモートで拒否されました</translation>
<translation id="6979158407327259162">Google ドライブ</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> の解像度を <ph name="RESOLUTION"/> に変更しました</translation>
<translation id="6943836128787782965">HTTP を取得できませんでした</translation>
<translation id="2297568595583585744">ステータス トレイ</translation>
<translation id="1661867754829461514">PIN がありません</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">低電力の充電器</translation>
<translation id="3846575436967432996">利用可能なネットワーク情報がありません</translation>
<translation id="3026237328237090306">モバイル データをセットアップ</translation>
+<translation id="5871632337994001636">デバイスを管理...</translation>
<translation id="785750925697875037">モバイル アカウントを表示</translation>
<translation id="153454903766751181">セルラー モデムを初期化しています...</translation>
<translation id="4628814525959230255">ハングアウトを介して画面の制御を <ph name="HELPER_NAME"/> さんと共有しています。</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> は回転されました</translation>
<translation id="7864539943188674973">Bluetooth を無効にする</translation>
<translation id="939252827960237676">スクリーンショットを保存できませんでした</translation>
<translation id="3126069444801937830">再起動して更新</translation>
<translation id="2268813581635650749">すべてログアウト</translation>
<translation id="735745346212279324">VPN が切断されました</translation>
<translation id="7320906967354320621">待機中</translation>
-<translation id="6303423059719347535">バッテリー残量: <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">大きいマウス カーソル</translation>
-<translation id="2778346081696727092">入力されたユーザー名またはパスワードで認証できませんでした</translation>
<translation id="3294437725009624529">ゲスト</translation>
<translation id="8190698733819146287">言語と入力方法をカスタマイズ...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/>(<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">シェルフの位置</translation>
<translation id="2903907270192926896">入力</translation>
<translation id="8676770494376880701">低電力の充電器に接続されています</translation>
<translation id="7170041865419449892">圏外</translation>
<translation id="4804818685124855865">切断</translation>
<translation id="2544853746127077729">認証証明書がネットワークによって拒否されました</translation>
<translation id="5222676887888702881">ログアウト</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">設定</translation>
<translation id="1272079795634619415">中止</translation>
<translation id="4957722034734105353">詳細...</translation>
<translation id="2964193600955408481">Wi-Fi を無効にする</translation>
-<translation id="811680302244032017">デバイスを追加...</translation>
<translation id="4279490309300973883">ミラーリングしています</translation>
+<translation id="7973962044839454485">ユーザー名またはパスワードが正しくないため、PPP 認証に失敗しました</translation>
<translation id="2509468283778169019">Caps Lock がオンになっています</translation>
<translation id="3892641579809465218">内蔵ディスプレイ</translation>
<translation id="7823564328645135659">設定の同期後に言語が「<ph name="FROM_LOCALE"/>」から「<ph name="TO_LOCALE"/>」に変更されました。</translation>
<translation id="3368922792935385530">接続済み</translation>
<translation id="8340999562596018839">音声フィードバック</translation>
<translation id="8654520615680304441">Wi-Fi をオンにしています...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">入力方法を <ph name="INPUT_METHOD_ID"/> に変更しました。
切り替えるには Shift+Alt キーを押します。</translation>
<translation id="2562916301614567480">プライベート ネットワーク</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">残り <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">入力方法</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">シェルフ</translation>
<translation id="2614835198358683673">この充電器がオンになっている間は、Chromebook が充電されない可能性があります。正規の充電器の使用をご検討ください。</translation>
<translation id="1895658205118569222">シャットダウン</translation>
<translation id="4430019312045809116">音量</translation>
+<translation id="8681498213689260554">更新のため、再起動して Powerwash を実行してください</translation>
<translation id="4442424173763614572">DNS を検索できませんでした</translation>
-<translation id="6356500677799115505">バッテリー残量: 満(充電中)</translation>
<translation id="7874779702599364982">携帯電話ネットワークを検索しています...</translation>
<translation id="583281660410589416">不明</translation>
<translation id="1383876407941801731">検索</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">ネットワーク情報</translation>
<translation id="1621499497873603021">バッテリーが空になるまであと: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">ゲスト セッションを終了</translation>
-<translation id="4471417012762451363">バッテリー残量: <ph name="PERCENTAGE"/>%(充電中)</translation>
<translation id="8308637677604853869">前のメニュー</translation>
<translation id="4666297444214622512">別のアカウントにログインすることはできません。</translation>
<translation id="1346748346194534595">右</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">ネットワークが不明なためエラーが発生しました</translation>
<translation id="1467432559032391204">左</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> を有効にしています</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">最大化</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">低電力の充電器に接続しています。バッテリーが充電されない可能性があります。</translation>
<translation id="3784455785234192852">ロック</translation>
<translation id="2805756323405976993">アプリ</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> のサイズが <ph name="RESOLUTION"/> に変更されました</translation>
<translation id="1512064327686280138">起動失敗</translation>
<translation id="5097002363526479830">ネットワーク「<ph name="NAME"/>」に接続できませんでした: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi が無効になりました。</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">壁紙を設定...</translation>
<translation id="8678698760965522072">オンライン状態</translation>
<translation id="2532589005999780174">ハイコントラスト モード</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>、<ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">内部エラー</translation>
<translation id="3019353588588144572">バッテリーがフル充電されるまであと: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">画面拡大鏡</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">セッションを終了</translation>
<translation id="8454013096329229812">Wi-Fi が有効になりました。</translation>
<translation id="4872237917498892622">Alt+ 検索/Shift</translation>
+<translation id="9201131092683066720">バッテリー残量: <ph name="PERCENTAGE"/>%。</translation>
<translation id="2983818520079887040">設定...</translation>
+<translation id="1195412055398077112">オーバースキャン</translation>
<translation id="1717216362413677834">ドック モード</translation>
+<translation id="112308213915226829">シェルフを自動的に隠す</translation>
<translation id="8927026611342028580">接続をリクエスト済み</translation>
<translation id="8300849813060516376">OTASP に失敗しました</translation>
<translation id="2792498699870441125">Alt+ 検索</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> 個のファイルを同期中</translation>
+<translation id="5958529069007801266">監視対象ユーザー</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CapsLock 機能はオフになっています</translation>
<translation id="6248847161401822652">終了するには Ctrl+Shift+Q を 2 回押してください。</translation>
+<translation id="6785414152754474415">バッテリー残量: <ph name="PERCENTAGE"/>%、充電しています。</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: 有効にしています...</translation>
+<translation id="4895488851634969361">バッテリー残量: 満。</translation>
<translation id="1391854757121130358">モバイル データの使用量上限に達した可能性があります。</translation>
-<translation id="5413208160176941586">ローカルの管理対象ユーザー</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">ランチャーの位置</translation>
+<translation id="5947494881799873997">元に戻す</translation>
<translation id="7593891976182323525">検索/Shift</translation>
<translation id="7649070708921625228">ヘルプ</translation>
<translation id="3050422059534974565">CapsLock がオンになっています。
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">パスフレーズが正しくありません</translation>
<translation id="6165508094623778733">詳しく見る</translation>
<translation id="9046895021617826162">接続に失敗しました</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> 秒後に元の解像度に戻ります</translation>
<translation id="973896785707726617">このセッションはあと <ph name="SESSION_TIME_REMAINING"/>で終了します。終了すると、自動的にログアウトします。</translation>
<translation id="8372369524088641025">WEP キーが正しくありません</translation>
<translation id="6636709850131805001">不明な状態</translation>
<translation id="3573179567135747900">「<ph name="FROM_LOCALE"/>」に戻します(再起動が必要です)</translation>
<translation id="8103386449138765447">SMS メッセージ: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google ドライブの設定...</translation>
-<translation id="1510238584712386396">ランチャー</translation>
<translation id="7209101170223508707">CapsLock がオンになっています。
Alt+ 検索/Shift キーを押すと解除されます。</translation>
<translation id="8940956008527784070">バッテリー残量: 少(<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">承諾</translation>
<translation id="5102001756192215136">残り時間: <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">ハングアウトを介して画面の制御を共有しています。</translation>
<translation id="8000066093800657092">ネットワーク接続なし</translation>
<translation id="4015692727874266537">別のアカウントにログイン...</translation>
<translation id="5941711191222866238">最小化</translation>
<translation id="6911468394164995108">他のネットワークに接続...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">フル充電まで <ph name="HOUR"/> 時間 <ph name="MINUTE"/> 分</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> の SMS</translation>
<translation id="1244147615850840081">通信会社</translation>
diff --git a/chromium/ash/strings/ash_strings_kn.xtb b/chromium/ash/strings/ash_strings_kn.xtb
index 1b3adb9487e..a5bb15e106d 100644
--- a/chromium/ash/strings/ash_strings_kn.xtb
+++ b/chromium/ash/strings/ash_strings_kn.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="kn">
<translation id="3595596368722241419">ಬ್ಯಾಟರಿ ಭರ್ತಿಯಾಗಿದೆ</translation>
-<translation id="5250713215130379958">ಲಾಂಚರ್ ಅನ್ನು ಸ್ವಯಂಮರೆಮಾಡಿ</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> ಮತ್ತು <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">ಪೋರ್ಟಲ್ ಸ್ಥಿತಿ</translation>
<translation id="30155388420722288">ಅತ್ಯಧಿಕ ಬಟನ್</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> ಅನ್ನು <ph name="ROTATION"/> ಗೆ ತಿರುಗಿಸಲಾಗಿದೆ</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</translation>
+<translation id="7165320105431587207">ನೆಟ್‌ವರ್ಕ್ ಕಾನ್ಫಿಗರ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ</translation>
<translation id="3775358506042162758">ಬಹು ಸೈನ್-ಇನ್‌ನಲ್ಲಿ ನೀವು ಮೂರರಷ್ಟು ಖಾತೆಗಳನ್ನು ಮಾತ್ರ ಹೊಂದಬಹುದು.</translation>
<translation id="370649949373421643">Wi-Fi ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</translation>
<translation id="3626281679859535460">ಪ್ರಕಾಶಮಾನ</translation>
+<translation id="595202126637698455">ಕಾರ್ಯಕ್ಷಮತೆ ಟ್ರೇಸಿಂಗ್ ಸಕ್ರಿಯಗೊಂಡಿದೆ</translation>
<translation id="8054466585765276473">ಬ್ಯಾಟರಿ ಸಮಯವನ್ನು ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತಿದೆ.</translation>
<translation id="7982789257301363584">ನೆಟ್‌ವರ್ಕ್</translation>
<translation id="5565793151875479467">ಪ್ರಾಕ್ಸಿ...</translation>
<translation id="938582441709398163">ಕೀಬೋರ್ಡ್ ಒವರ್‌ಲೇ</translation>
<translation id="4387004326333427325">ದೃಢೀಕರಣ ಪ್ರಮಾಣಪತ್ರವನ್ನು ರಿಮೋಟ್ ಆಗಿ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ</translation>
<translation id="6979158407327259162">Google ಡ್ರೈವ್‌‌</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> ರೆಸಲ್ಯೂಷನ್ ಅನ್ನು <ph name="RESOLUTION"/> ಗೆ ಬದಲಿಸಲಾಗಿದೆ</translation>
<translation id="6943836128787782965">HTTP ವಿಫಲವಾಗಿದೆ</translation>
<translation id="2297568595583585744">ಸ್ಥಿತಿ ಟ್ರೆ</translation>
<translation id="1661867754829461514">PIN ಕಾಣೆಯಾಗಿದೆ</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">ಕಡಿಮೆ ವಿದ್ಯುತ್ ಚಾರ್ಜರ್</translation>
<translation id="3846575436967432996">ನೆಟ್‌ವರ್ಕ್ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ</translation>
<translation id="3026237328237090306">ಮೊಬೈಲ್ ಡೇಟಾವನ್ನು ಹೊಂದಿಸಿ</translation>
+<translation id="5871632337994001636">ಸಾಧನಗಳನ್ನು ನಿರ್ವಹಿಸಿ...</translation>
<translation id="785750925697875037">ಮೊಬೈಲ್ ಖಾತೆಯನ್ನು ವೀಕ್ಷಿಸಿ</translation>
<translation id="153454903766751181">ಸೆಲ್ಯುಲಾರ್ ಮೋಡೆಮ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ...</translation>
<translation id="4628814525959230255">Hangouts ಮೂಲಕ <ph name="HELPER_NAME"/> ಅವರೊಂದಿಗೆ ನಿಮ್ಮ ಪರದೆಯ ನಿಯಂತ್ರಣವನ್ನು ಹಂಚಲಾಗುತ್ತಿದೆ.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ಅನ್ನು ತಿರುಗಿಸಲಾಗಿದೆ</translation>
<translation id="7864539943188674973">bluetooth ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</translation>
<translation id="939252827960237676">ಸ್ಕ್ರೀನ್‌ಶಾಟ್ ಉಳಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ</translation>
<translation id="3126069444801937830">ನವೀಕರಿಸಲು ಮರುಪ್ರಾರಂಭಿಸಿ</translation>
<translation id="2268813581635650749">ಎಲ್ಲವನ್ನೂ ಸೈನ್ ಔಟ್ ಮಾಡಿ</translation>
<translation id="735745346212279324">VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ</translation>
<translation id="7320906967354320621">ಕಾರ್ಯನಿರತವಾಗಿಲ್ಲ</translation>
-<translation id="6303423059719347535">ಬ್ಯಾಟರಿ <ph name="PERCENTAGE"/>% ಪೂರ್ಣವಾಗಿದೆ</translation>
<translation id="15373452373711364">ದೊಡ್ಡ ಮೌಸ್ ಕರ್ಸರ್</translation>
-<translation id="2778346081696727092">ಒದಗಿಸಲಾದ ಬಳಕೆದಾರಹೆಸರು ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ನೊಂದಿಗಿನ ದೃಢೀಕರಣವು ವಿಫಲಗೊಂಡಿದೆ</translation>
<translation id="3294437725009624529">ಅತಿಥಿ</translation>
<translation id="8190698733819146287">ಭಾಷೆಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್ ಅನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">ಶೆಲ್ಫ್ ಸ್ಥಾನ</translation>
<translation id="2903907270192926896">ಇನ್‌ಪುಟ್</translation>
<translation id="8676770494376880701">ಕಡಿಮೆ ವಿದ್ಯುತ್ ಚಾರ್ಜರ್ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ</translation>
<translation id="7170041865419449892">ವ್ಯಾಪ್ತಿಯ ಹೊರಗೆ</translation>
<translation id="4804818685124855865">ಡಿಸ್‌ಕನೆಕ್ಟ್</translation>
<translation id="2544853746127077729">ದೃಢೀಕರಣ ಪ್ರಮಾಣಪತ್ರವನ್ನು ನೆಟ್‌ವರ್ಕ್‌ನಿಂದ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ</translation>
<translation id="5222676887888702881">ಸೈನ್ ಔಟ್</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">ಕಾನ್ಫಿಗರೇಶನ್</translation>
<translation id="1272079795634619415">ನಿಲ್ಲಿಸು</translation>
<translation id="4957722034734105353">ಇನ್ನಷ್ಟು ತಿಳಿದುಕೊಳ್ಳಿ...</translation>
<translation id="2964193600955408481">Wi-Fi ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</translation>
-<translation id="811680302244032017">ಸಾಧನ ಸೇರಿಸಿ...</translation>
<translation id="4279490309300973883">ಪ್ರತಿಬಿಂಬಿಸುವಿಕೆ</translation>
+<translation id="7973962044839454485">ತಪ್ಪಾದ ಬಳಕೆದಾರ ಹೆಸರು ಮತ್ತು ಪಾಸ್‌ವರ್ಡ್‌ನಿಂದಾಗಿ PPP ದೃಢೀಕರಣ ವಿಫಲವಾಗಿದೆ</translation>
<translation id="2509468283778169019">CAPS LOCK ಆನ್ ಆಗಿದೆ</translation>
<translation id="3892641579809465218">ಆಂತರಿಕ ಪ್ರದರ್ಶನ</translation>
<translation id="7823564328645135659">ನಿಮ್ಮ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸಿಂಕ್ ಮಾಡಿದ ನಂತರ ಭಾಷೆಯನ್ನು &quot;<ph name="FROM_LOCALE"/>&quot; ನಿಂದ &quot;<ph name="TO_LOCALE"/>&quot; ಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ.</translation>
<translation id="3368922792935385530">ಸಂಪರ್ಕಿಸಲಾಗಿದೆ</translation>
<translation id="8340999562596018839">ಮಾತನಾಡುವ ಪ್ರತಿಕ್ರಿಯೆ</translation>
<translation id="8654520615680304441">Wi-Fi ಆನ್ ಮಾಡಿ...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519"><ph name="INPUT_METHOD_ID"/> ಗೆ ನಿಮ್ಮ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.
ಬದಲಿಸಲು Shift + Alt ಕೀಲಿಯನ್ನು ಒತ್ತಿರಿ.</translation>
<translation id="2562916301614567480">ಖಾಸಗಿ ನೆಟ್‌ವರ್ಕ್‌</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% ಉಳಿದಿದೆ</translation>
<translation id="9089416786594320554">ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳು</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">ಶೆಲ್ಫ್</translation>
<translation id="2614835198358683673">ನಿಮ್ಮ Chromebook ಆನ್ ಆಗಿರುವಾಗ ಅದು ಚಾರ್ಜ್ ಆಗುವುದಿಲ್ಲ. ಅಧಿಕೃತ ಚಾರ್ಜರ್ ಬಳಸಿ.</translation>
<translation id="1895658205118569222">ಶಟ್‌ಡೌನ್</translation>
<translation id="4430019312045809116">ವಾಲ್ಯೂಮ್</translation>
+<translation id="8681498213689260554">ನವೀಕರಿಸಲು ಮರುಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ಪವರ್‌ವಾಶ್ ಮಾಡಿ</translation>
<translation id="4442424173763614572">DNS ಲುಕಪ್ ವಿಫಲವಾಗಿದೆ</translation>
-<translation id="6356500677799115505">ಬ್ಯಾಟರಿ ಪೂರ್ಣಗೊಂಡಿದೆ ಮತ್ತು ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ.</translation>
<translation id="7874779702599364982">ಸೆಲ್ಯುಲರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ ಹುಡುಕುತ್ತಿದೆ...</translation>
<translation id="583281660410589416">ಅಜ್ಞಾತ</translation>
<translation id="1383876407941801731">ಹುಡುಕಾಟ</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">ನೆಟ್‌ವರ್ಕ್ ಮಾಹಿತಿ</translation>
<translation id="1621499497873603021">ಬ್ಯಾಟರಿ ಖಾಲಿ ಆಗುವವರೆಗೆ ಉಳಿದಿರುವ ಸಮಯ, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">ಅತಿಥಿ ಸೆಶೆನ್‌ನಿಂದ ನಿರ್ಗಮಿಸು</translation>
-<translation id="4471417012762451363">ಬ್ಯಾಟರಿ <ph name="PERCENTAGE"/>% ಪೂರ್ಣವಾಗಿದೆ ಮತ್ತು ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ</translation>
<translation id="8308637677604853869">ಹಿಂದಿನ ಮೆನು</translation>
<translation id="4666297444214622512">ಮತ್ತೊಂದು ಖಾತೆಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ.</translation>
<translation id="1346748346194534595">ಬಲಕ್ಕೆ</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">ಅಜ್ಞಾತ ನೆಟ್‌ವರ್ಕ್ ದೋಷ</translation>
<translation id="1467432559032391204">ಎಡಕ್ಕೆ</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">ಗರಿಷ್ಠಗೊಳಿಸು</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">ಕಡಿಮೆ ವಿದ್ಯುತ್ ಚಾರ್ಜರ್‌ಗೆ ಪ್ಲಗ್ ಮಾಡಲಾಗಿದೆ. ಬ್ಯಾಟರಿ ಚಾರ್ಜಿಂಗ್ ವಿಶ್ವಾಸಾರ್ಹವಾಗಿಲ್ಲದಿರಬಹುದು.</translation>
<translation id="3784455785234192852">ಲಾಕ್ ಮಾಡಿ</translation>
<translation id="2805756323405976993">ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> ಅನ್ನು <ph name="RESOLUTION"/> ಗೆ ಮರುಗಾತ್ರಗೊಳಿಸಲಾಗಿದೆ</translation>
<translation id="1512064327686280138">ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ವಿಫಲವಾಗಿದೆ</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>' ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi ಆಫ್ ಮಾಡಲಾಗಿದೆ.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">ವಾಲ್‌ಪೇಪರ್ ಅನ್ನು ಹೊಂದಿಸಿ...</translation>
<translation id="8678698760965522072">ಆನ್‌ಲೈನ್ ಸ್ಥಿತಿ</translation>
<translation id="2532589005999780174">ಉನ್ನತ ಕಾಂಟ್ರಾಸ್ಟ್ ಮೋಡ್</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">ಆಂತರಿಕ ದೋಷ</translation>
<translation id="3019353588588144572">ಬ್ಯಾಟರಿ ಪೂರ್ಣವಾಗಿ ಚಾರ್ಜ್ ಆಗುವವರೆಗೆ ಉಳಿದಿರುವ ಸಮಯ, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">ಪರದೆ ವರ್ಧಕ</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">ಸೆಶನ್‌ನಿಂದ ನಿರ್ಗಮಿಸು</translation>
<translation id="8454013096329229812">Wi-Fi ಆನ್ ಮಾಡಲಾಗಿದೆ.</translation>
<translation id="4872237917498892622">Alt+ಹುಡುಕಾಟ ಅಥವಾ Shift</translation>
+<translation id="9201131092683066720">ಬ್ಯಾಟರಿ <ph name="PERCENTAGE"/>% ಪೂರ್ಣವಾಗಿದೆ.</translation>
<translation id="2983818520079887040">ಸೆಟ್ಟಿಂಗ್‌ಗಳು...</translation>
+<translation id="1195412055398077112">ಓವರ್‌ಸ್ಕ್ಯಾನ್</translation>
<translation id="1717216362413677834">ಡಾಕ್ ಮೋಡ್</translation>
+<translation id="112308213915226829">ಶೆಲ್ಫ್ ಅನ್ನು ಸ್ವಯಂಮರೆಮಾಡು</translation>
<translation id="8927026611342028580">ಸಂಪರ್ಕವನ್ನು ವಿನಂತಿಸಲಾಗಿದೆ</translation>
<translation id="8300849813060516376">OTASP ವಿಫಲವಾಗಿದೆ</translation>
<translation id="2792498699870441125">Alt+ಹುಡುಕಾಟ</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> ಫೈಲ್‌(ಗಳ) ಅನ್ನು ಸಿಂಕ್ ಮಾಡಲಾಗುತ್ತಿದೆ</translation>
+<translation id="5958529069007801266">ಮೇಲ್ವಿಚಾರಣೆಯ ಬಳಕೆದಾರರು</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK ಆಫ್ ಆಗಿದೆ</translation>
<translation id="6248847161401822652">ತೊರೆಯಲು Control Shift Q ಅನ್ನು ಎರಡು ಬಾರಿ ಒತ್ತಿರಿ.</translation>
+<translation id="6785414152754474415">ಬ್ಯಾಟರಿ <ph name="PERCENTAGE"/>% ಪೂರ್ಣಗೊಂಡಿದೆ ಮತ್ತು ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</translation>
+<translation id="4895488851634969361">ಬ್ಯಾಟರಿ ತುಂಬಿದೆ.</translation>
<translation id="1391854757121130358">ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಭತ್ಯೆಯನ್ನು ನೀವು ಬಳಸಿರಬಹುದು.</translation>
-<translation id="5413208160176941586">ಸ್ಥಳೀಯವಾಗಿ ನಿರ್ವಹಿಸಲಾದ ಬಳಕೆದಾರ</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">ಲಾಂಚರ್ ಸ್ಥಾನ</translation>
+<translation id="5947494881799873997">ಹಿಂತಿರುಗಿಸು</translation>
<translation id="7593891976182323525">ಹುಡುಕಾಟ ಅಥವಾ Shift</translation>
<translation id="7649070708921625228">ಸಹಾಯ</translation>
<translation id="3050422059534974565">CAPS LOCK ಆನ್ ಆಗಿದೆ.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">ಕೆಟ್ಟ ಪಾಸ್‌ಫ್ರೇಸ್</translation>
<translation id="6165508094623778733">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</translation>
<translation id="9046895021617826162">ಸಂಪರ್ಕವು ವಿಫಲವಾಗಿದೆ</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> ನಲ್ಲಿ ಹಳೆಯ ರೆಸಲ್ಯೂಷನ್‌ಗೆ ಹಿಂತಿರುಗಿಸಲಾಗುತ್ತಿದೆ</translation>
<translation id="973896785707726617">ಈ ಸೆಷನ್ <ph name="SESSION_TIME_REMAINING"/> ರಲ್ಲಿ ಮುಕ್ತಾಯಗೊಳ್ಳುತ್ತದೆ. ನಿಮ್ಮನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೈನ್ ಔಟ್ ಮಾಡಲಾಗುತ್ತದೆ.</translation>
<translation id="8372369524088641025">ಕೆಟ್ಟ WEP ಕೀ</translation>
<translation id="6636709850131805001">ಅಂಗೀಕಾರವಲ್ಲದ ರಾಜ್ಯ</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; ಗೆ ಮರುಬದಲಾಯಿಸಿ (ಮರುಪ್ರಾರಂಭಿಸುವ ಅಗತ್ಯವಿದೆ)</translation>
<translation id="8103386449138765447">SMS ಸಂದೇಶಗಳು: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google ಡ್ರೈವ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು...</translation>
-<translation id="1510238584712386396">ಲಾಂಚರ್</translation>
<translation id="7209101170223508707">CAPS LOCK ಆನ್ ಆಗಿದೆ.
ರದ್ದುಗೊಳಿಸಲು Alt+ಹುಡುಕಾಟ ಅಥವಾ Shift ಕೀಲಿಯನ್ನು ಒತ್ತಿರಿ</translation>
<translation id="8940956008527784070">ಬ್ಯಾಟರಿ ಕಡಿಮೆ (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">ಸಮ್ಮತಿಸು</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> ಉಳಿದಿದೆ</translation>
<translation id="520760366042891468">Hangouts ಮೂಲಕ ನಿಮ್ಮ ಪರದೆಯ ನಿಯಂತ್ರಣವನ್ನು ಹಂಚಲಾಗುತ್ತಿದೆ.</translation>
<translation id="8000066093800657092">ನೆಟ್‌ವರ್ಕ್ ಇಲ್ಲ</translation>
<translation id="4015692727874266537">ಮತ್ತೊಂದು ಖಾತೆಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ...</translation>
<translation id="5941711191222866238">ಕುಗ್ಗಿಸು</translation>
<translation id="6911468394164995108">ಇತರರನ್ನು ಸೇರಿ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">ಪೂರ್ಣವಾಗುವವರಗೆ <ph name="HOUR"/>ಗಂ <ph name="MINUTE"/>ನಿ</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> ನಿಂದ SMS</translation>
<translation id="1244147615850840081">ವಾಹಕ</translation>
diff --git a/chromium/ash/strings/ash_strings_ko.xtb b/chromium/ash/strings/ash_strings_ko.xtb
index bb158ca6a3e..5c77190241c 100644
--- a/chromium/ash/strings/ash_strings_ko.xtb
+++ b/chromium/ash/strings/ash_strings_ko.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ko">
<translation id="3595596368722241419">배터리 충전 완료</translation>
-<translation id="5250713215130379958">실행기 자동으로 숨기기</translation>
<translation id="7814236020522506259"><ph name="HOUR"/>시간 <ph name="MINUTE"/>분</translation>
<translation id="7880025619322806991">포털 상태</translation>
<translation id="30155388420722288">오버플로 버튼</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">블루투스를 사용함</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/>(이)가 <ph name="ROTATION"/>(으)로 회전되었습니다.</translation>
<translation id="9074739597929991885">블루투스</translation>
<translation id="2268130516524549846">블루투스를 사용 안 함</translation>
+<translation id="7165320105431587207">네트워크를 설정하지 못했습니다.</translation>
<translation id="3775358506042162758">멀티 로그인 시 계정은 최대 3개까지만 사용할 수 있습니다.</translation>
<translation id="370649949373421643">Wi-Fi 사용</translation>
<translation id="3626281679859535460">밝기</translation>
+<translation id="595202126637698455">성능 추적 사용 중</translation>
<translation id="8054466585765276473">배터리 시간 계산 중</translation>
<translation id="7982789257301363584">네트워크</translation>
<translation id="5565793151875479467">프록시...</translation>
<translation id="938582441709398163">키보드 오버레이</translation>
<translation id="4387004326333427325">인증서가 원격으로 거부됨</translation>
<translation id="6979158407327259162">Google 드라이브</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> 해상도가 <ph name="RESOLUTION"/>(으)로 변경되었습니다.</translation>
<translation id="6943836128787782965">HTTP 실패</translation>
<translation id="2297568595583585744">상태 표시줄</translation>
<translation id="1661867754829461514">PIN이 없습니다.</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">저출력 충전기</translation>
<translation id="3846575436967432996">네트워크 정보 없음</translation>
<translation id="3026237328237090306">모바일 데이터 설정</translation>
+<translation id="5871632337994001636">기기 관리...</translation>
<translation id="785750925697875037">모바일 계정 표시</translation>
<translation id="153454903766751181">휴대전화 모뎀 초기화하는 중...</translation>
<translation id="4628814525959230255">행아웃을 통해 화면 제어를 <ph name="HELPER_NAME"/>님과 공유 중</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/>이(가) 회전됨</translation>
<translation id="7864539943188674973">블루투스 사용 안 함</translation>
<translation id="939252827960237676">캡처화면을 저장하지 못했습니다.</translation>
<translation id="3126069444801937830">업데이트하려면 다시 시작</translation>
<translation id="2268813581635650749">모두 로그아웃</translation>
<translation id="735745346212279324">VPN 연결 끊김</translation>
<translation id="7320906967354320621">대기</translation>
-<translation id="6303423059719347535">배터리가 <ph name="PERCENTAGE"/>% 충전됨</translation>
<translation id="15373452373711364">큰 마우스 커서</translation>
-<translation id="2778346081696727092">제공한 사용자 이름 또는 비밀번호로 인증하지 못했습니다.</translation>
<translation id="3294437725009624529">손님</translation>
<translation id="8190698733819146287">언어 및 입력 설정...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/>(<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">서가 위치</translation>
<translation id="2903907270192926896">입력:</translation>
<translation id="8676770494376880701">저출력 충전기 연결됨</translation>
<translation id="7170041865419449892">범위를 벗어났습니다.</translation>
<translation id="4804818685124855865">연결 해제</translation>
<translation id="2544853746127077729">인증서가 네트워크에 의해 거부됨</translation>
<translation id="5222676887888702881">로그아웃</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">설정</translation>
<translation id="1272079795634619415">중지</translation>
<translation id="4957722034734105353">자세히 알아보기...</translation>
<translation id="2964193600955408481">Wi-Fi 사용 안 함</translation>
-<translation id="811680302244032017">기기 추가...</translation>
<translation id="4279490309300973883">미러링</translation>
+<translation id="7973962044839454485">사용자 이름 또는 비밀번호가 잘못되어 PPP 인증에 실패했습니다.</translation>
<translation id="2509468283778169019">CAPS LOCK이 켜져 있습니다.</translation>
<translation id="3892641579809465218">내부 디스플레이</translation>
<translation id="7823564328645135659">설정을 동기화한 뒤 Chrome의 언어가 '<ph name="FROM_LOCALE"/>'에서 '<ph name="TO_LOCALE"/>'(으)로 변경되었습니다.</translation>
<translation id="3368922792935385530">연결됨</translation>
<translation id="8340999562596018839">음성 피드백</translation>
<translation id="8654520615680304441">Wi-Fi 사용...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">입력 방법이 <ph name="INPUT_METHOD_ID"/>(으)로 변경되었습니다.
전환하려면 Shift+Alt를 누르세요.</translation>
<translation id="2562916301614567480">사설 네트워크</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% 남음</translation>
<translation id="9089416786594320554">입력 방법</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">서가</translation>
<translation id="2614835198358683673">크롬북이 켜져 있으면 충전되지 않을 수 있습니다. 공식 충전기를 사용해보세요.</translation>
<translation id="1895658205118569222">종료</translation>
<translation id="4430019312045809116">볼륨</translation>
+<translation id="8681498213689260554">업데이트하려면 다시 시작하고 Powerwash하세요.</translation>
<translation id="4442424173763614572">DNS 조회 실패</translation>
-<translation id="6356500677799115505">배터리 충전이 완료되었으며 충전 중입니다.</translation>
<translation id="7874779702599364982">휴대전화 네트워크를 검색하는 중...</translation>
<translation id="583281660410589416">알 수 없음</translation>
<translation id="1383876407941801731">검색</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">네트워크 정보</translation>
<translation id="1621499497873603021">남은 배터리 사용 시간은 <ph name="TIME_LEFT"/>입니다.</translation>
<translation id="5980301590375426705">손님 세션 종료</translation>
-<translation id="4471417012762451363">배터리가 <ph name="PERCENTAGE"/>% 충전되었으며 충전 중</translation>
<translation id="8308637677604853869">이전 메뉴</translation>
<translation id="4666297444214622512">다른 계정에 로그인할 수 없습니다.</translation>
<translation id="1346748346194534595">오른쪽</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">알려지지 않은 네트워크 오류</translation>
<translation id="1467432559032391204">왼쪽</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> 활성화 중</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">최대화</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">저출력 충전기에 연결되었습니다. 배터리 충전 상태가 불안정합니다.</translation>
<translation id="3784455785234192852">잠금</translation>
<translation id="2805756323405976993">애플리케이션</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/>의 해상도가 <ph name="RESOLUTION"/>(으)로 변경됨</translation>
<translation id="1512064327686280138">활성화 실패</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>' 네트워크에 연결하지 못했습니다: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi가 꺼져 있습니다.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">배경화면 설정...</translation>
<translation id="8678698760965522072">온라인 상태</translation>
<translation id="2532589005999780174">고대비 모드</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">내부 오류</translation>
<translation id="3019353588588144572">배터리 충전이 완료될 때까지 남은 시간은 <ph name="TIME_REMAINING"/>입니다.</translation>
<translation id="3473479545200714844">화면 돋보기</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">세션 종료</translation>
<translation id="8454013096329229812">Wi-Fi가 켜져 있습니다.</translation>
<translation id="4872237917498892622">Alt+검색 또는 Shift 키</translation>
+<translation id="9201131092683066720">배터리가 <ph name="PERCENTAGE"/>% 남았습니다.</translation>
<translation id="2983818520079887040">설정...</translation>
+<translation id="1195412055398077112">오버스캔</translation>
<translation id="1717216362413677834">도크 모드</translation>
+<translation id="112308213915226829">서가 자동 숨김</translation>
<translation id="8927026611342028580">연결 요청됨</translation>
<translation id="8300849813060516376">OTASP 실패</translation>
<translation id="2792498699870441125">Alt+검색 키</translation>
<translation id="8660803626959853127">파일 <ph name="COUNT"/>개를 동기화 중</translation>
+<translation id="5958529069007801266">관리 대상 사용자</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK이 꺼져 있음</translation>
<translation id="6248847161401822652">종료하려면 Ctrl+Shift+Q를 두 번 누릅니다.</translation>
+<translation id="6785414152754474415">배터리가 <ph name="PERCENTAGE"/>% 충전되었으며 충전 중입니다.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: 활성화 중...</translation>
+<translation id="4895488851634969361">배터리 충전이 완료되었습니다.</translation>
<translation id="1391854757121130358">모바일 데이터 사용량을 모두 사용했을 수 있습니다.</translation>
-<translation id="5413208160176941586">로컬 관리 사용자</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">실행기 위치</translation>
+<translation id="5947494881799873997">되돌리기</translation>
<translation id="7593891976182323525">검색 또는 Shift 키</translation>
<translation id="7649070708921625228">도움말</translation>
<translation id="3050422059534974565">CAPS LOCK이 켜져 있습니다.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">잘못된 암호</translation>
<translation id="6165508094623778733">자세히 알아보기</translation>
<translation id="9046895021617826162">연결 실패</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/>초 후 기존 해상도로 돌아갑니다.</translation>
<translation id="973896785707726617">이 세션은 <ph name="SESSION_TIME_REMAINING"/> 후에 종료되어 자동으로 로그아웃됩니다.</translation>
<translation id="8372369524088641025">잘못된 WEP 키</translation>
<translation id="6636709850131805001">인식할 수 없는 상태</translation>
<translation id="3573179567135747900">'<ph name="FROM_LOCALE"/>'(으)로 다시 변경(다시 시작해야 함)</translation>
<translation id="8103386449138765447">SMS 메시지: <ph name="MESSAGE_COUNT"/>개</translation>
<translation id="5045002648206642691">Google 문서함 설정...</translation>
-<translation id="1510238584712386396">실행기</translation>
<translation id="7209101170223508707">CAPS LOCK이 켜져 있습니다.
취소하려면 Alt+검색 또는 Shift 키를 누릅니다.</translation>
<translation id="8940956008527784070">배터리 부족(<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">수락</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> 남음</translation>
<translation id="520760366042891468">행아웃을 통해 화면 제어 권한 공유 중</translation>
<translation id="8000066093800657092">네트워크 없음</translation>
<translation id="4015692727874266537">다른 계정에 로그인...</translation>
<translation id="5941711191222866238">최소화</translation>
<translation id="6911468394164995108">다른 네트워크에 연결</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">충전 완료까지 <ph name="HOUR"/>시간 <ph name="MINUTE"/>분 남음</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/>에서 전송된 SMS</translation>
<translation id="1244147615850840081">네트워크 사업자</translation>
diff --git a/chromium/ash/strings/ash_strings_lt.xtb b/chromium/ash/strings/ash_strings_lt.xtb
index 611b1ea5ed3..0bb860e6630 100644
--- a/chromium/ash/strings/ash_strings_lt.xtb
+++ b/chromium/ash/strings/ash_strings_lt.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="lt">
<translation id="3595596368722241419">Akumuliatorius įkrautas</translation>
-<translation id="5250713215130379958">Automatiškai slėpti paleidimo priemonę</translation>
<translation id="7814236020522506259"><ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portalo būsena</translation>
<translation id="30155388420722288">Perpildymo mygtukas</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">„Bluetooth“ įgalinta</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> pakeista į <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">„Bluetooth“ neleidžiama</translation>
+<translation id="7165320105431587207">Nepavyko sukonfigūruoti tinklo</translation>
<translation id="3775358506042162758">Naudodami kelių paskyrų funkciją, galite turėti iki trijų paskyrų.</translation>
<translation id="370649949373421643">Įgalinti „Wi-Fi“</translation>
<translation id="3626281679859535460">Skaistis</translation>
+<translation id="595202126637698455">Įgalintas našumo stebėjimas</translation>
<translation id="8054466585765276473">Apskaičiuojamas laikas, likęs iki akumuliatoriaus išsikrovimo.</translation>
<translation id="7982789257301363584">Tinklas</translation>
<translation id="5565793151875479467">Įgaliotasis serveris...</translation>
<translation id="938582441709398163">Klaviatūros perdanga</translation>
<translation id="4387004326333427325">Autentifikavimo sertifikatas atmestas nuotoliniu būdu</translation>
<translation id="6979158407327259162">„Google“ diskas</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> skyra pakeista į <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Įvyko HTTP klaida</translation>
<translation id="2297568595583585744">Būsenos dėklas</translation>
<translation id="1661867754829461514">Trūksta PIN kodo</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Mažos galios įkroviklis</translation>
<translation id="3846575436967432996">Nėra tinklo informacijos</translation>
<translation id="3026237328237090306">Nustatyti duomenis mobiliesiems</translation>
+<translation id="5871632337994001636">Tvarkyti įrenginius...</translation>
<translation id="785750925697875037">Žiūrėti paskyrą mobiliesiems</translation>
<translation id="153454903766751181">Inicijuojamas korinio ryšio modemas...</translation>
<translation id="4628814525959230255">Jūsų ekrano valdymas bendrinamas su <ph name="HELPER_NAME"/> per „Hangout“.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> pasuktas</translation>
<translation id="7864539943188674973">Neleisti „Bluetooth“</translation>
<translation id="939252827960237676">Išsaugant ekrano kopiją įvyko klaida</translation>
<translation id="3126069444801937830">Paleisti iš naujo, kad būtų atnaujinta</translation>
<translation id="2268813581635650749">Atjungti visus</translation>
<translation id="735745346212279324">VPN atjungtas</translation>
<translation id="7320906967354320621">Neveikia</translation>
-<translation id="6303423059719347535">Likusi akumuliatoriaus įkrova: <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Didelis pelės žymeklis</translation>
-<translation id="2778346081696727092">Nepavyko autentifikuoti naudojant pateiktą naudotojo vardą ar slaptažodį</translation>
<translation id="3294437725009624529">Svečias</translation>
<translation id="8190698733819146287">Tinkinti kalbas ir įvestį...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Lentynos pozicija</translation>
<translation id="2903907270192926896">ĮVESTIS</translation>
<translation id="8676770494376880701">Prijungtas mažos galios įkroviklis</translation>
<translation id="7170041865419449892">Nepasiekiama</translation>
<translation id="4804818685124855865">Atsijungti</translation>
<translation id="2544853746127077729">Autentifikavimo sertifikatą atmetė tinklas</translation>
<translation id="5222676887888702881">Atsijungti</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigūracija</translation>
<translation id="1272079795634619415">Sustabdyti</translation>
<translation id="4957722034734105353">Sužinokite daugiau...</translation>
<translation id="2964193600955408481">Neleisti „Wi-Fi“</translation>
-<translation id="811680302244032017">Pridėti įrenginį...</translation>
<translation id="4279490309300973883">Dubliuojama</translation>
+<translation id="7973962044839454485">Nepavyko autentifikuoti PGP dėl netinkamo naudotojo vardo ar slaptažodžio</translation>
<translation id="2509468283778169019">DIDŽIŲJŲ RAIDŽIŲ RAŠYMAS įjungtas</translation>
<translation id="3892641579809465218">Vidinė pateiktis</translation>
<translation id="7823564328645135659">Po nustatymų sinchronizavimo kalba pakeista iš <ph name="FROM_LOCALE"/> į <ph name="TO_LOCALE"/>.</translation>
<translation id="3368922792935385530">Prijungta</translation>
<translation id="8340999562596018839">Žodiniai atsiliepimai</translation>
<translation id="8654520615680304441">Įjungti „Wi-Fi“...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Įvesties metodas pakeistas į <ph name="INPUT_METHOD_ID"/>.
Jei norite perjungti, paspauskite „Shift“ + „Alt“.</translation>
<translation id="2562916301614567480">Privatus tinklas</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Liko <ph name="PERCENTAGE"/> proc.</translation>
<translation id="9089416786594320554">Įvesties metodai</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Lentyna</translation>
<translation id="2614835198358683673">„Chromebook“ gali nebūti įkraunamas, kai jis įjungtas. Apsvarstykite galimybę naudoti originalų įkroviklį.</translation>
<translation id="1895658205118569222">Išjungimas</translation>
<translation id="4430019312045809116">Apimtis</translation>
+<translation id="8681498213689260554">Kad atnaujintumėte, paleiskite iš naujo ir naudokite „Powerwash“</translation>
<translation id="4442424173763614572">Įvyko DNS paieškos klaida</translation>
-<translation id="6356500677799115505">Akumuliatorius įkrautas ir vis įkraunamas.</translation>
<translation id="7874779702599364982">Ieškoma korinio ryšio tinklų...</translation>
<translation id="583281660410589416">Nežinoma</translation>
<translation id="1383876407941801731">Ieškoti</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Tinklo informacija</translation>
<translation id="1621499497873603021">Laikas, likęs iki akumuliatoriaus išsikrovimo: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Išeiti iš svečio režimo</translation>
-<translation id="4471417012762451363">Likusi akumuliatoriaus įkrova: <ph name="PERCENTAGE"/> %. Jis įkraunamas.</translation>
<translation id="8308637677604853869">Ankstesnis meniu</translation>
<translation id="4666297444214622512">Negalima prisijungti prie kitos paskyros.</translation>
<translation id="1346748346194534595">Dešinė</translation>
@@ -114,6 +120,7 @@ Jei norite neleisti, paspauskite „Ctrl“ + „Alt“ + Z.</translation>
<translation id="6312403991423642364">Nežinoma tinklo klaida</translation>
<translation id="1467432559032391204">Kairė</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktyvinamas „<ph name="NAME"/>“</translation>
<translation id="8814190375133053267">WI-Fi</translation>
<translation id="1398853756734560583">Išskleisti</translation>
@@ -123,7 +130,6 @@ Jei norite neleisti, paspauskite „Ctrl“ + „Alt“ + Z.</translation>
<translation id="2727977024730340865">Prijungtas mažos galios įkroviklis. Akumuliatoriaus įkrovimas gali būti nepatikimas.</translation>
<translation id="3784455785234192852">Užrakinti</translation>
<translation id="2805756323405976993">Programos</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> dydis pakeistas į <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktyvinimo triktis</translation>
<translation id="5097002363526479830">Nepavyko prisijungti prie tinklo „<ph name="NAME"/>“: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">„Wi-Fi“ ryšys išjungtas.</translation>
@@ -131,6 +137,7 @@ Jei norite neleisti, paspauskite „Ctrl“ + „Alt“ + Z.</translation>
<translation id="7052914147756339792">Nustatyti darbalaukio foną...</translation>
<translation id="8678698760965522072">Būsena „Prisijungus“</translation>
<translation id="2532589005999780174">Didelio kontrasto režimas</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Vidinė klaida</translation>
<translation id="3019353588588144572">Laikas, likęs iki akumuliatoriaus įkrovimo: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Ekrano didintuvas</translation>
@@ -153,20 +160,24 @@ Serverio pranešimas: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Išeiti iš sesijos</translation>
<translation id="8454013096329229812">„Wi-Fi“ ryšys įjungtas.</translation>
<translation id="4872237917498892622">„Alt“ + paieškos arba antrojo lygio klavišas</translation>
+<translation id="9201131092683066720">Likusi akumuliatoriaus įkrova: <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Nustatymai...</translation>
+<translation id="1195412055398077112">sritis aplink vaizdo kraštus</translation>
<translation id="1717216362413677834">Doko režimas</translation>
+<translation id="112308213915226829">Automatiškai slėpti lentyną</translation>
<translation id="8927026611342028580">Pateikta prisijungimo užklausa</translation>
<translation id="8300849813060516376">OTASP nepavyko</translation>
<translation id="2792498699870441125">„Alt“ + paieškos klavišas</translation>
<translation id="8660803626959853127">Sinchronizuojamas (-i) <ph name="COUNT"/> failas (-ai)</translation>
+<translation id="5958529069007801266">Prižiūrimas naudotojas</translation>
<translation id="3709443003275901162">Daugiau nei 9</translation>
<translation id="639644700271529076">DIDŽIŲJŲ RAIDŽIŲ RAŠYMAS išjungtas</translation>
<translation id="6248847161401822652">Jei norite išeiti, du kartus paspauskite „Control“ + „Shift“ + Q.</translation>
+<translation id="6785414152754474415">Likusi akumuliatoriaus įkrova: <ph name="PERCENTAGE"/> %. Jis įkraunamas.</translation>
<translation id="6267036997247669271">„<ph name="NAME"/>“: aktyvinama...</translation>
+<translation id="4895488851634969361">Akumuliatorius visiškai įkrautas.</translation>
<translation id="1391854757121130358">Galbūt išnaudojote savo mobiliojo ryšio duomenų normą.</translation>
-<translation id="5413208160176941586">Vietoje tvarkoma naudotojo paskyra</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Paleidiklio pozicija</translation>
+<translation id="5947494881799873997">Grąžinti</translation>
<translation id="7593891976182323525">Paieškos arba antrojo lygio klavišas</translation>
<translation id="7649070708921625228">Žinynas</translation>
<translation id="3050422059534974565">DIDŽIŲJŲ RAIDŽIŲ RAŠYMAS įjungtas.
@@ -179,22 +190,24 @@ Jei norite atšaukti, paspauskite paieškos arba antrojo lygio klavišą.</trans
<translation id="6692173217867674490">Netinkama slaptafrazė</translation>
<translation id="6165508094623778733">Sužinokite daugiau</translation>
<translation id="9046895021617826162">Nepavyko prisijungti</translation>
+<translation id="7168224885072002358">Po <ph name="TIMEOUT_SECONDS"/> bus grąžinta sena skyra</translation>
<translation id="973896785707726617">Ši sesija baigsis po <ph name="SESSION_TIME_REMAINING"/>. Būsite automatiškai atjungti.</translation>
<translation id="8372369524088641025">Netinkamas WEP raktas</translation>
<translation id="6636709850131805001">Neatpažinta būsena</translation>
<translation id="3573179567135747900">Pakeisti atgal į „<ph name="FROM_LOCALE"/>“ (reikia paleisti iš naujo)</translation>
<translation id="8103386449138765447">SMS pranešimų: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">„Google“ disko nustatymai...</translation>
-<translation id="1510238584712386396">Paleidimo priemonė</translation>
<translation id="7209101170223508707">DIDŽIŲJŲ RAIDŽIŲ RAŠYMAS įjungtas.
Jei norite atšaukti, paspauskite „Alt“ + paieškos klavišas arba „Alt“ + antrojo lygio klavišas.</translation>
<translation id="8940956008527784070">Akumuliatorius senka (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Priimti</translation>
<translation id="5102001756192215136">Liko <ph name="HOUR"/>.<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Jūsų ekrano valdymas bendrinamas per „Hangout“.</translation>
<translation id="8000066093800657092">Tinklo nėra</translation>
<translation id="4015692727874266537">Prisijungti prie kitos paskyros...</translation>
<translation id="5941711191222866238">Sumažinti</translation>
<translation id="6911468394164995108">Prisijungti prie kito...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> val. <ph name="MINUTE"/> min. iki visiško įkrovimo</translation>
<translation id="6359806961507272919">SMS iš <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operatorius</translation>
diff --git a/chromium/ash/strings/ash_strings_lv.xtb b/chromium/ash/strings/ash_strings_lv.xtb
index 5d8f38c5087..71e8d06b6e6 100644
--- a/chromium/ash/strings/ash_strings_lv.xtb
+++ b/chromium/ash/strings/ash_strings_lv.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="lv">
<translation id="3595596368722241419">Akumulators pilns</translation>
-<translation id="5250713215130379958">Automātiski paslēpt palaišanas lapu</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> un <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portāla statuss</translation>
<translation id="30155388420722288">Pārpildes poga</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth iespējots</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> tika pagriezts šādi: <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth atspējots</translation>
+<translation id="7165320105431587207">Neizdevās konfigurēt tīklu</translation>
<translation id="3775358506042162758">Vairākkārtējas pierakstīšanās laikā var izmantot ne vairāk kā trīs kontus.</translation>
<translation id="370649949373421643">Iespējot Wi-Fi</translation>
<translation id="3626281679859535460">Spilgtums</translation>
+<translation id="595202126637698455">Veiktspējas izsekošana ir iespējota</translation>
<translation id="8054466585765276473">Notiek akumulatora darbības ilguma aprēķināšana.</translation>
<translation id="7982789257301363584">Tīkls</translation>
<translation id="5565793151875479467">Starpniekserveris...</translation>
<translation id="938582441709398163">Tastatūras pārklājums</translation>
<translation id="4387004326333427325">Autentifikācijas sertifikāts tika attāli noraidīts.</translation>
<translation id="6979158407327259162">Google disks</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> izšķirtspēja tika mainīta uz <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Neizdevās iegūt HTTP</translation>
<translation id="2297568595583585744">Statusa tekne</translation>
<translation id="1661867754829461514">Trūkst PIN koda</translation>
@@ -34,39 +38,41 @@ Lai to pārslēgtu, nospiediet taustiņu kombināciju Shift+Alt.</translation>
<translation id="2127372758936585790">Lādētājs ar mazu strāvas padevi</translation>
<translation id="3846575436967432996">Tīkla informācija nav pieejama.</translation>
<translation id="3026237328237090306">Iestatīt mobilo datu pārraidi</translation>
+<translation id="5871632337994001636">Pārvaldīt ierīces...</translation>
<translation id="785750925697875037">Skatīt mobilo kontu</translation>
<translation id="153454903766751181">Notiek mobilā modema inicializēšana...</translation>
<translation id="4628814525959230255">Ekrāna vadības kopīgošana ar lietotāju <ph name="HELPER_NAME"/>, izmantojot funkciju Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ir pagriezts.</translation>
<translation id="7864539943188674973">Atspējot Bluetooth</translation>
<translation id="939252827960237676">Neizdevās saglabāt ekrānuzņēmumu.</translation>
<translation id="3126069444801937830">Restartēt, lai atjauninātu</translation>
<translation id="2268813581635650749">Izrakstīt visus</translation>
<translation id="735745346212279324">VPN ir atvienots</translation>
<translation id="7320906967354320621">Dīkstāve</translation>
-<translation id="6303423059719347535">Akumulatora uzlādes līmenis: <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Liels peles kursors</translation>
-<translation id="2778346081696727092">Neizdevās autentificēt ievadīto lietotājvārdu un paroli</translation>
<translation id="3294437725009624529">Viesis</translation>
<translation id="8190698733819146287">Pielāgot valodas un ievadi...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Plaukta pozīcija</translation>
<translation id="2903907270192926896">IEEJA</translation>
<translation id="8676770494376880701">Pievienots lādētājs ar mazu strāvas padevi</translation>
<translation id="7170041865419449892">Ārpus diapazona</translation>
<translation id="4804818685124855865">Atvienot</translation>
<translation id="2544853746127077729">Tīkls noraidīja autentifikācijas sertifikātu.</translation>
<translation id="5222676887888702881">Izrakstīties</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigurācija</translation>
<translation id="1272079795634619415">Apturēt</translation>
<translation id="4957722034734105353">Uzzināt vairāk...</translation>
<translation id="2964193600955408481">Atspējot Wi-Fi</translation>
-<translation id="811680302244032017">Pievienot ierīci...</translation>
<translation id="4279490309300973883">Spoguļošana</translation>
+<translation id="7973962044839454485">PSP autentifikācija neizdevās nepareiza lietotājvārda un paroles dēļ.</translation>
<translation id="2509468283778169019">Funkcija Caps Lock ir ieslēgta</translation>
<translation id="3892641579809465218">Iekšējais displejs</translation>
<translation id="7823564328645135659">Pēc jūsu iestatījumu sinhronizēšanas valoda ir mainīta no <ph name="FROM_LOCALE"/> uz <ph name="TO_LOCALE"/>.</translation>
<translation id="3368922792935385530">pievienots</translation>
<translation id="8340999562596018839">Balss komentāri</translation>
<translation id="8654520615680304441">Ieslēgt Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Ievades metode ir mainīta uz <ph name="INPUT_METHOD_ID"/>.
Lai to pārslēgtu, nospiediet taustiņu kombināciju Shift+Alt.</translation>
<translation id="2562916301614567480">Privāts tīkls</translation>
@@ -83,11 +89,12 @@ Lai to pārslēgtu, nospiediet taustiņu kombināciju Shift+Alt.</translation>
<translation id="3626637461649818317">Atlikums: <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Ievades metodes</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Plaukts</translation>
<translation id="2614835198358683673">Jūsu Chromebook dators, iespējams, netiks uzlādēts, kamēr tas ir ieslēgts. Ieteicams izmantot oriģinālo lādētāju.</translation>
<translation id="1895658205118569222">Izslēgšana</translation>
<translation id="4430019312045809116">Skaļums</translation>
+<translation id="8681498213689260554">Lai atjauninātu, restartējiet un veiciet Powerwash</translation>
<translation id="4442424173763614572">DNS uzmeklēšana neizdevās</translation>
-<translation id="6356500677799115505">Akumulators ir pilnībā uzlādēts, un tiek turpināta tā uzlāde.</translation>
<translation id="7874779702599364982">Notiek mobilo sakaru tīklu meklēšana...</translation>
<translation id="583281660410589416">Nezināms</translation>
<translation id="1383876407941801731">Meklēšana</translation>
@@ -96,7 +103,6 @@ Lai to pārslēgtu, nospiediet taustiņu kombināciju Shift+Alt.</translation>
<translation id="2204305834655267233">Tīkla informācija</translation>
<translation id="1621499497873603021">Atlikušais akumulatora darbības laiks: <ph name="TIME_LEFT"/>.</translation>
<translation id="5980301590375426705">Aizvērt viesa sesiju</translation>
-<translation id="4471417012762451363">Akumulatora uzlādes līmenis: <ph name="PERCENTAGE"/>%; tiek turpināta tā uzlāde.</translation>
<translation id="8308637677604853869">Iepriekšējā izvēlne</translation>
<translation id="4666297444214622512">Nevar pierakstīties citā kontā.</translation>
<translation id="1346748346194534595">Pa labi</translation>
@@ -114,6 +120,7 @@ Nospiediet Ctrl+Alt+Z, lai tos atspējotu.</translation>
<translation id="6312403991423642364">Nezināma tīkla kļūda</translation>
<translation id="1467432559032391204">Pa kreisi</translation>
<translation id="5543001071567407895">Īsziņa</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Notiek <ph name="NAME"/> aktivizēšana.</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maksimizēt</translation>
@@ -123,7 +130,6 @@ Nospiediet Ctrl+Alt+Z, lai tos atspējotu.</translation>
<translation id="2727977024730340865">Pievienots lādētājs ar mazu strāvas padevi. Akumulatora uzlāde var nebūt uzticama.</translation>
<translation id="3784455785234192852">Bloķēt</translation>
<translation id="2805756323405976993">Lietotnes</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> lielums ir mainīts uz <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktivizācijas kļūme</translation>
<translation id="5097002363526479830">Neizdevās izveidot savienojumu ar tīklu <ph name="NAME"/>: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi tīkls ir izslēgts.</translation>
@@ -131,6 +137,7 @@ Nospiediet Ctrl+Alt+Z, lai tos atspējotu.</translation>
<translation id="7052914147756339792">Iestatīt fona tapeti...</translation>
<translation id="8678698760965522072">Tiešsaistes statuss</translation>
<translation id="2532589005999780174">Augsta kontrasta režīms</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Iekšēja kļūda</translation>
<translation id="3019353588588144572">Pilnīgais uzlādei nepieciešamais laiks: <ph name="TIME_REMAINING"/>.</translation>
<translation id="3473479545200714844">Ekrāna lupa</translation>
@@ -153,20 +160,24 @@ Servera ziņojums: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Iziet no sesijas</translation>
<translation id="8454013096329229812">Wi-Fi tīkls ir ieslēgts.</translation>
<translation id="4872237917498892622">Alt+Meklēt vai Shift</translation>
+<translation id="9201131092683066720">Akumulatora uzlādes līmenis: <ph name="PERCENTAGE"/>%</translation>
<translation id="2983818520079887040">Iestatījumi...</translation>
+<translation id="1195412055398077112">attēla izvērse</translation>
<translation id="1717216362413677834">Dokošanas režīms</translation>
+<translation id="112308213915226829">Automātiski slēpt plauktu</translation>
<translation id="8927026611342028580">Ir pieprasīta savienojuma izveide.</translation>
<translation id="8300849813060516376">OTASP neizdevās</translation>
<translation id="2792498699870441125">Alt+Meklēt</translation>
<translation id="8660803626959853127">Notiek <ph name="COUNT"/> faila(-u) sinhronizēšana</translation>
+<translation id="5958529069007801266">Uzraudzīts lietotājs</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">Funkcija CAPS LOCK ir izslēgta.</translation>
<translation id="6248847161401822652">Lai izietu, divas reizes nospiediet taustiņu kombināciju Ctrl+Shift+Q.</translation>
+<translation id="6785414152754474415">Akumulatora uzlādes līmenis: <ph name="PERCENTAGE"/>%; uzlāde tiek turpināta.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: notiek aktivizēšana...</translation>
+<translation id="4895488851634969361">Akumulators ir pilnībā uzlādēts.</translation>
<translation id="1391854757121130358">Iespējams, esat jau izmantojis savu mobilo datu atļauju.</translation>
-<translation id="5413208160176941586">Vietēji pārvaldīts lietotājs</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Palaidēja novietojums</translation>
+<translation id="5947494881799873997">Atgriezt</translation>
<translation id="7593891976182323525">Meklēt vai Shift</translation>
<translation id="7649070708921625228">Palīdzība</translation>
<translation id="3050422059534974565">Ir ieslēgts BURTSLĒGS.
@@ -179,22 +190,24 @@ Lai atceltu tā funkcionalitāti, nospiediet Meklēt vai Shift.</translation>
<translation id="6692173217867674490">Neatbilstoša ieejas frāze</translation>
<translation id="6165508094623778733">Uzziniet vairāk</translation>
<translation id="9046895021617826162">Savienojums neizdevās</translation>
+<translation id="7168224885072002358">Iepriekšējā izšķirtspēja tiks atgriezta pēc <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Atlikušais laiks līdz šīs sesijas beigām: <ph name="SESSION_TIME_REMAINING"/>. Jūs tiksiet automātiski izrakstīts.</translation>
<translation id="8372369524088641025">Neatbilstoša WEP atslēga</translation>
<translation id="6636709850131805001">Neatpazīts stāvoklis</translation>
<translation id="3573179567135747900">Mainīt atpakaļ uz <ph name="FROM_LOCALE"/> (nepieciešama restartēšana)</translation>
<translation id="8103386449138765447">Īsziņas: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google diska iestatījumi...</translation>
-<translation id="1510238584712386396">Lietojumprogrammu palaidējs</translation>
<translation id="7209101170223508707">Ir ieslēgts BURTSLĒGS.
Lai atceltu tā funkcionalitāti, nospiediet Alt+Meklēt vai Shift.</translation>
<translation id="8940956008527784070">Akumulators gandrīz tukšs (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Pieņemt</translation>
<translation id="5102001756192215136">Atlicis: <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Ekrāna vadības kopīgošana, izmantojot funkciju Hangouts.</translation>
<translation id="8000066093800657092">Nav tīkla</translation>
<translation id="4015692727874266537">Pierakstīties citā kontā...</translation>
<translation id="5941711191222866238">Minimizēt</translation>
<translation id="6911468394164995108">Pievienoties citam...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">Līdz pilnīgai uzlādei atlikušais laiks: <ph name="HOUR"/> h <ph name="MINUTE"/> min</translation>
<translation id="6359806961507272919">SMS no <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Mobilo sakaru operators</translation>
diff --git a/chromium/ash/strings/ash_strings_ml.xtb b/chromium/ash/strings/ash_strings_ml.xtb
index df9b8e869c0..a258cc7a98a 100644
--- a/chromium/ash/strings/ash_strings_ml.xtb
+++ b/chromium/ash/strings/ash_strings_ml.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ml">
<translation id="3595596368722241419">ബാറ്ററി നിറഞ്ഞു</translation>
-<translation id="5250713215130379958">ലോഞ്ചർ യാന്ത്രികമായി മറയ്‌ക്കുക</translation>
<translation id="7814236020522506259"><ph name="HOUR"/>, <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">പോര്‍ട്ടല്‍ അവസ്ഥ</translation>
<translation id="30155388420722288">ഓവർഫ്ലോ ബട്ടൺ</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth പ്രാപ്‌തമാക്കി</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> എന്നതിനെ <ph name="ROTATION"/> എന്നതിലേയ്‌ക്ക് തിരിച്ചു</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth അപ്രാപ്‌തമാക്കി</translation>
+<translation id="7165320105431587207">നെറ്റ്‌വർക്ക് കോൺഫിഗർ ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു</translation>
<translation id="3775358506042162758">ഒന്നിലധികം സൈൻ ഇന്നുകളിൽ നിങ്ങൾക്ക് മൂന്ന് അക്കൗണ്ടുകൾ വരെ മാത്രമേ ഉണ്ടായിരിക്കാൻ പാടുള്ളൂ.</translation>
<translation id="370649949373421643">Wi-fi പ്രാപ്‌തമാക്കുക</translation>
<translation id="3626281679859535460">മിഴിവ്</translation>
+<translation id="595202126637698455">പ്രകടനം പിന്തുടരൽ പ്രവർത്തനക്ഷമമാക്കി</translation>
<translation id="8054466585765276473">ബാറ്ററി സമയം കണക്കാക്കുന്നു.</translation>
<translation id="7982789257301363584">നെറ്റ്വര്‍ക്ക്</translation>
<translation id="5565793151875479467">പ്രോക്‌സി...</translation>
<translation id="938582441709398163">കീബോര്‍ഡ് ഓവര്‍ലേ</translation>
<translation id="4387004326333427325">പ്രാമാണീകരണ സർട്ടിഫിക്കറ്റ് വിദൂരമായി നിരസിച്ചു</translation>
<translation id="6979158407327259162">Google ഡ്രൈവ്</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> മിഴിവ് <ph name="RESOLUTION"/> എന്നതിലേയ്‌ക്ക് മാറ്റി</translation>
<translation id="6943836128787782965">HTTP പരാജയപ്പെട്ടു</translation>
<translation id="2297568595583585744">സ്റ്റാറ്റസ് ട്രേ</translation>
<translation id="1661867754829461514">PIN കാണാനില്ല</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">കുറഞ്ഞ തോതിൽ വൈദ്യുതി പ്രവഹിക്കുന്ന ചാർജർ</translation>
<translation id="3846575436967432996">നെറ്റ്‌വർക്ക് വിവരങ്ങളൊന്നും ലഭ്യമല്ല</translation>
<translation id="3026237328237090306">മൊബൈൽ ഡാറ്റ സജ്ജമാക്കുക</translation>
+<translation id="5871632337994001636">ഉപകരണങ്ങൾ നിയന്ത്രിക്കുക...</translation>
<translation id="785750925697875037">മൊബൈൽ അക്കൗണ്ട് കാണുക</translation>
<translation id="153454903766751181">സെല്ലുലാർ മോഡം സമാരംഭിക്കുന്നു...</translation>
<translation id="4628814525959230255">നിങ്ങളുടെ സ്‌ക്രീനിന്റെ നിയന്ത്രണം Hangouts വഴി <ph name="HELPER_NAME"/> എന്നതുമായി പങ്കിടുന്നു.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> തിരിച്ചു</translation>
<translation id="7864539943188674973">Bluetooth അപ്രാപ്‌തമാക്കുക</translation>
<translation id="939252827960237676">സ്‌ക്രീൻഷോട്ട് സംരക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു</translation>
<translation id="3126069444801937830">അപ്‌ഡേറ്റുചെയ്യുന്നതിന് പുനരാരംഭിക്കുക</translation>
<translation id="2268813581635650749">എല്ലാം സൈൻ ഔട്ട് ചെയ്യുക</translation>
<translation id="735745346212279324">VPN വിച്ഛേദിച്ചു</translation>
<translation id="7320906967354320621">നിഷ്ക്രിയം</translation>
-<translation id="6303423059719347535">ബാറ്ററി <ph name="PERCENTAGE"/>% പൂർണ്ണമാണ്</translation>
<translation id="15373452373711364">വലിയ മൗസ് കഴ്‌സർ</translation>
-<translation id="2778346081696727092">നൽകിയ ഉപയോക്തൃനാമം അല്ലെങ്കിൽ പാസ്‌വേഡ് ഉപയോഗിച്ച് പ്രാമാണീകരിക്കുന്നത് പരാജയപ്പെട്ടു</translation>
<translation id="3294437725009624529">അതിഥി</translation>
<translation id="8190698733819146287">ഭാഷകള്‍‌ ഇച്ഛാനുസൃതമാക്കി നല്‍‌കുക...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">ഷെൽഫ് സ്ഥാനം</translation>
<translation id="2903907270192926896">ഇൻപുട്ട്</translation>
<translation id="8676770494376880701">കുറഞ്ഞ തോതിൽ വൈദ്യുതി പ്രവഹിക്കുന്ന ചാർജർ കണക്റ്റുചെയ്‌തു</translation>
<translation id="7170041865419449892">പരിധിയ്ക്ക് പുറത്താണ്</translation>
<translation id="4804818685124855865">വിച്ഛേദിക്കുക</translation>
<translation id="2544853746127077729">നെറ്റ്‌വർക്ക്, പ്രാമാണീകരണ സർട്ടിഫിക്കറ്റ് നിരസിച്ചു</translation>
<translation id="5222676887888702881">പുറത്തുകടക്കുക</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">ക്രമീകരണം</translation>
<translation id="1272079795634619415">നിര്‍ത്തുക</translation>
<translation id="4957722034734105353">കൂടുതലറിയുക...</translation>
<translation id="2964193600955408481">Wi-Fi അപ്രാപ്‌തമാക്കുക</translation>
-<translation id="811680302244032017">ഉപകരണം ചേർക്കുക...</translation>
<translation id="4279490309300973883">മിററിംഗ്</translation>
+<translation id="7973962044839454485">തെറ്റായ ഉപയോക്തൃനാമമോ പാസ്‌വേഡോ കാരണം PPP പ്രാമാണീകരണം പരാജയപ്പെട്ടു</translation>
<translation id="2509468283778169019">CAPS LOCK ഓൺ ആണ്</translation>
<translation id="3892641579809465218">ആന്തരിക പ്രദർശനം</translation>
<translation id="7823564328645135659">നിങ്ങളുടെ ക്രമീകരണങ്ങള്‍ സമന്വയിപ്പിച്ചതിന് ശേഷം ഭാഷ &quot;<ph name="FROM_LOCALE"/>&quot; എന്നതില്‍ നിന്ന് &quot;<ph name="TO_LOCALE"/>&quot; എന്നതിലേക്ക് മാറി.</translation>
<translation id="3368922792935385530">ബന്ധിപ്പിച്ചു</translation>
<translation id="8340999562596018839">സംഭാഷണ ഫീഡ്‌ബാക്ക്</translation>
<translation id="8654520615680304441">Wi-Fi ഓണാക്കുക...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">നിങ്ങളുടെ ഇൻപുട്ട് രീതി <ph name="INPUT_METHOD_ID"/> എന്നതിലേയ്‌ക്ക് മാറ്റി. സ്വിച്ചുചെയ്യുന്നതിന് Shift + Alt അമർത്തുക.</translation>
<translation id="2562916301614567480">സ്വകാര്യ നെറ്റ്‌വർക്ക്</translation>
<translation id="6549021752953852991">സെല്ലുലാർ നെറ്റ്‌വർക്കൊന്നും ലഭ്യമല്ല</translation>
@@ -82,11 +88,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% ശേഷിക്കുന്നു</translation>
<translation id="9089416786594320554">ഇൻപുട്ട് രീതികൾ</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">ഷെൽഫ്</translation>
<translation id="2614835198358683673">ഓണായിരിക്കുമ്പോൾ നിങ്ങളുടെ Chromebook ചാർജ് ചെയ്യാനിടയില്ല. ഔദ്യോഗിക ചാർജ്ജർ ഉപയോഗിക്കുന്നത് പരിഗണിക്കുക.</translation>
<translation id="1895658205118569222">ഷട്ട്‌ഡൗൺ ചെയ്യുക</translation>
<translation id="4430019312045809116">അളവ്</translation>
+<translation id="8681498213689260554">പുനരാരംഭിക്കുക, തുടർന്ന് അപ്‌ഡേറ്റുചെയ്യാൻ പവർവാഷുചെയ്യുക</translation>
<translation id="4442424173763614572">DNS തിരയല്‍ പരാജയപ്പെട്ടു</translation>
-<translation id="6356500677799115505">ബാറ്ററി പൂർണ്ണവും ചാർജ്ജ് ചെയ്യുകയുമാണ്.</translation>
<translation id="7874779702599364982">സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾക്കായി തിരയുന്നു...</translation>
<translation id="583281660410589416">അജ്ഞാതം</translation>
<translation id="1383876407941801731">തിരയൂ</translation>
@@ -95,7 +102,6 @@
<translation id="2204305834655267233">നെറ്റ്‌വർക്ക് വിവരം</translation>
<translation id="1621499497873603021">ബാറ്ററി ശൂന്യമാകുന്നതിന് ശേഷിക്കുന്ന സമയം, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">അതിഥി സെഷനിൽ നിന്നും പുറത്തുകടക്കുക</translation>
-<translation id="4471417012762451363">ബാറ്ററി <ph name="PERCENTAGE"/>% പൂർണ്ണവും ചാർജ്ജ് ചെയ്യുകയുമാണ്</translation>
<translation id="8308637677604853869">മുൻ മെനു</translation>
<translation id="4666297444214622512">മറ്റൊരു അക്കൗണ്ടിൽ സൈൻ ഇൻ ചെയ്യാനാകില്ല.</translation>
<translation id="1346748346194534595">ശരി</translation>
@@ -113,6 +119,7 @@
<translation id="6312403991423642364">അറിയാത്ത നെറ്റ്‌വര്‍ക്ക് പിശക്</translation>
<translation id="1467432559032391204">ഇടത്</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> സജീവമാക്കുന്നു</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">വലുതാക്കുക</translation>
@@ -122,7 +129,6 @@
<translation id="2727977024730340865">കുറഞ്ഞ തോതിൽ വൈദ്യുതി പ്രവഹിക്കുന്ന ചാർജ്ജറിലേക്ക് പ്ലഗ് ചെയ്‌തിരിക്കുന്നു. ബാറ്ററി ചാർജുചെയ്യൽ വിശ്വസനീയമാകണമെന്നില്ല.</translation>
<translation id="3784455785234192852">ലോക്കുചെയ്യുക</translation>
<translation id="2805756323405976993">അപ്ലിക്കേഷനുകള്‍</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/>, <ph name="RESOLUTION"/> എന്നതിലേക്ക് വലുപ്പം മാറ്റി</translation>
<translation id="1512064327686280138">സജീവമാക്കല്‍ പരാജയപ്പെട്ടു</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>' നെറ്റ്‌വര്‍‌ക്കിലേക്ക് ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi ഓഫുചെയ്‌തു.</translation>
@@ -130,6 +136,7 @@
<translation id="7052914147756339792">വാൾപേപ്പർ സജ്ജമാക്കുക...</translation>
<translation id="8678698760965522072">ഓണ്‍ലൈന്‍ അവസ്ഥ</translation>
<translation id="2532589005999780174">ഉയർന്ന ദൃശ്യതീവ്രത മോഡ്</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">ആന്തരിക പിശക്</translation>
<translation id="3019353588588144572">ബാറ്ററി പൂർണ്ണമായി ചാർജ്ജാകുന്നതിന് ശേഷിക്കുന്ന സമയം, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">സ്‌ക്രീൻ മാഗ്‌നിഫയർ</translation>
@@ -152,20 +159,24 @@
<translation id="7029814467594812963">സെഷനിൽ നിന്ന് പുറത്തുകടക്കുക</translation>
<translation id="8454013096329229812">Wi-Fi ഓൺ ചെയ്‌തു.</translation>
<translation id="4872237917498892622">Alt+തിരയൽ അല്ലെങ്കിൽ Shift</translation>
+<translation id="9201131092683066720">ബാറ്ററി <ph name="PERCENTAGE"/>% നിറഞ്ഞു.</translation>
<translation id="2983818520079887040">ക്രമീകരണങ്ങള്‍...</translation>
+<translation id="1195412055398077112">ഓവർസ്‌കാൻ</translation>
<translation id="1717216362413677834">ഡോക്ക് മോഡ്</translation>
+<translation id="112308213915226829">ഷെൽഫ് യാന്ത്രികമായി മറയ്‌ക്കുക</translation>
<translation id="8927026611342028580">കണക്റ്റുചെയ്യാൻ അഭ്യർത്ഥിച്ചു</translation>
<translation id="8300849813060516376">OTASP പരാജയപ്പെട്ടു</translation>
<translation id="2792498699870441125">Alt+തിരയൽ</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> ഫയൽ(കൾ) സമന്വയിപ്പിക്കുന്നു</translation>
+<translation id="5958529069007801266">സൂപ്പർവൈസുചെയ്‌ത ഉപയോക്താവ്</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK ഓഫാണ്</translation>
<translation id="6248847161401822652">പുറത്തുപോകുന്നതിന് രണ്ടുതവണ Control Shift Q അമർത്തുക.</translation>
+<translation id="6785414152754474415">ബാറ്ററി <ph name="PERCENTAGE"/>% നിറഞ്ഞിരിക്കുന്നു, ചാർജുചെയ്യൽ തുടരുന്നു.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: സജീവമാക്കുന്നു...</translation>
+<translation id="4895488851634969361">ബാറ്ററി ചാർജുചെയ്യൽ പൂർണ്ണമായി.</translation>
<translation id="1391854757121130358">നിങ്ങൾ മൊബൈൽ ഡാറ്റ അലവൻസ് ഉപയോഗിച്ചിരിക്കാനിടയുണ്ട്.</translation>
-<translation id="5413208160176941586">പ്രാദേശികമായി നിയന്ത്രിക്കപ്പെടുന്ന ഉപയോക്താവ്</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">ലോഞ്ചറിന്റെ സ്ഥാനം</translation>
+<translation id="5947494881799873997">പഴയപടിയാക്കുക</translation>
<translation id="7593891976182323525">തിരയൽ അല്ലെങ്കിൽ Shift</translation>
<translation id="7649070708921625228">സഹായം</translation>
<translation id="3050422059534974565">CAPS LOCK ഓൺ ആണ്.
@@ -178,22 +189,24 @@
<translation id="6692173217867674490">മോശം പാസ്ഫ്രെയ്സ്</translation>
<translation id="6165508094623778733">കൂടുതല്‍ മനസിലാക്കുക</translation>
<translation id="9046895021617826162">ബന്ധിപ്പിക്കല്‍ പരാജയപ്പെട്ടു</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/>-ൽ പഴയ മിഴിവിലേക്ക് പഴയപടിയാക്കുന്നു</translation>
<translation id="973896785707726617"><ph name="SESSION_TIME_REMAINING"/> ആകുമ്പോൾ ഈ സെഷൻ അവസാനിക്കും. നിങ്ങൾ യാന്ത്രികമായി സൈൻ ഔട്ടാകും.</translation>
<translation id="8372369524088641025">മോശം WEP കീ</translation>
<translation id="6636709850131805001">തിരിച്ചറിയാത്ത അവസ്ഥ</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; എന്നതിലേക്ക് തിരികെ മാറുക (റീസ്റ്റാര്‍ട്ട് ആവശ്യമാണ്)</translation>
<translation id="8103386449138765447">SMS സന്ദേശങ്ങൾ: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google ഡ്രൈവ് ക്രമീകരണങ്ങൾ...</translation>
-<translation id="1510238584712386396">ലോഞ്ചർ</translation>
<translation id="7209101170223508707">CAPS LOCK ഓണാണ്.
റദ്ദാക്കുന്നതിന് Alt+തിരയൽ അല്ലെങ്കിൽ Shift അമർത്തുക.</translation>
<translation id="8940956008527784070">ബാറ്ററി കുറവാണ് (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">സ്വീകരിക്കുക</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> ശേഷിക്കുന്നു</translation>
<translation id="520760366042891468">നിങ്ങളുടെ സ്‌ക്രീനിന്റെ നിയന്ത്രണം Hangouts വഴി പങ്കിടുന്നു.</translation>
<translation id="8000066093800657092">നെറ്റ്‍വര്‍ക്ക് ഇല്ല</translation>
<translation id="4015692727874266537">മറ്റൊരു അക്കൗണ്ടിൽ സൈൻ ഇൻ ചെയ്യുക...</translation>
<translation id="5941711191222866238">ചെറുതാക്കുക‍</translation>
<translation id="6911468394164995108">മറ്റുള്ളവ ചേർക്കുക...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">പൂർണ്ണമായും ചാർജാകുന്നതിന് <ph name="HOUR"/>മ <ph name="MINUTE"/>മി</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> എന്നതില്‍ നിന്നുള്ള SMS</translation>
<translation id="1244147615850840081">കാരിയര്‍</translation>
diff --git a/chromium/ash/strings/ash_strings_mr.xtb b/chromium/ash/strings/ash_strings_mr.xtb
index 4705f008a35..6d80de1f818 100644
--- a/chromium/ash/strings/ash_strings_mr.xtb
+++ b/chromium/ash/strings/ash_strings_mr.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="mr">
<translation id="3595596368722241419">बॅटरी पूर्ण चार्ज</translation>
-<translation id="5250713215130379958">लाँचर स्वयं लपवा</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> आणि <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">पोर्टल राज्य</translation>
<translation id="30155388420722288">ओव्हरफ्लो बटण</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth सक्षम</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> <ph name="ROTATION"/> वर फिरविले होते</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth अक्षम</translation>
+<translation id="7165320105431587207">नेटवर्क कॉन्फिगर करण्यात अयशस्वी</translation>
<translation id="3775358506042162758">आपल्याकडे एकाधिक साइन इनमध्ये फक्त तीन पर्यंत खाती असू शकतात.</translation>
<translation id="370649949373421643">Wi-fi सक्षम करा</translation>
<translation id="3626281679859535460">ब्राइटनेस</translation>
+<translation id="595202126637698455">कार्यप्रदर्शन ट्रेसिंग सक्षम केले</translation>
<translation id="8054466585765276473">बॅटरी वेळ गणना करत आहे.</translation>
<translation id="7982789257301363584">नेटवर्क</translation>
<translation id="5565793151875479467">प्रॉक्सी...</translation>
<translation id="938582441709398163">कीबोर्ड आच्छादन</translation>
<translation id="4387004326333427325">प्रमाणीकरण प्रमाणपत्र दूरस्थपणे नाकारले</translation>
<translation id="6979158407327259162">Google ड्राइव्ह</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> रिजोल्यूशन <ph name="RESOLUTION"/> वर बदलले होते</translation>
<translation id="6943836128787782965">HTTP अयशस्वी झाले</translation>
<translation id="2297568595583585744">स्थिती ट्रे</translation>
<translation id="1661867754829461514">PIN गहाळ आहे </translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">निम्न-उर्जेचे चार्जर</translation>
<translation id="3846575436967432996">कोणतीही नेटवर्क माहिती उपलब्ध नाही</translation>
<translation id="3026237328237090306">मोबाइल डेटा सेटअप करा</translation>
+<translation id="5871632337994001636">डिव्हाइस व्यवस्थापित करा...</translation>
<translation id="785750925697875037">मोबाइल खाते पहा</translation>
<translation id="153454903766751181">सेल्युलर मोडेम आरंभ करत आहे...</translation>
<translation id="4628814525959230255">Hangouts द्वारे <ph name="HELPER_NAME"/> सह आपल्या स्क्रीनचे सामायिकरण नियंत्रण.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> फिरवले गेले आ</translation>
<translation id="7864539943188674973">Bluetooth अक्षम करा</translation>
<translation id="939252827960237676">स्क्रीनशॉट जतन करण्यात अयशस्वी</translation>
<translation id="3126069444801937830">अद्यतनासाठी पुनर्प्रारंभ करा</translation>
<translation id="2268813581635650749">सर्व साइन आउट करा</translation>
<translation id="735745346212279324">VPN डिस्कनेक्ट केले</translation>
<translation id="7320906967354320621">निष्क्रिय</translation>
-<translation id="6303423059719347535">बॅटरी <ph name="PERCENTAGE"/>% भरली आहे</translation>
<translation id="15373452373711364">मोठा माउस कर्सर</translation>
-<translation id="2778346081696727092">प्रदान केलेल्या वापरकर्तानाव किंवा संकेतशब्दासह प्रमाणिकरण करण्‍यात अयशस्वी झाले</translation>
<translation id="3294437725009624529">अतिथी</translation>
<translation id="8190698733819146287">भाषा आणि इनपुट सानुकूलित करा...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">शेल्फ स्थिती</translation>
<translation id="2903907270192926896">इनपुट</translation>
<translation id="8676770494376880701">निम्न-उर्जेचे चार्जर कनेक्ट केले</translation>
<translation id="7170041865419449892">परिक्षेत्राबाहेर</translation>
<translation id="4804818685124855865">‍डिस्कनेक्ट</translation>
<translation id="2544853746127077729">प्रमाणीकरण प्रमाणपत्र नेटवर्कद्वारे नाकारले</translation>
<translation id="5222676887888702881">साइन आउट करा</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">कॉन्फिगरेशन</translation>
<translation id="1272079795634619415">थांबा</translation>
<translation id="4957722034734105353">अधिक जाणून घ्या...</translation>
<translation id="2964193600955408481">Wi-Fi अक्षम करा</translation>
-<translation id="811680302244032017">डिव्हाइस जोडा...</translation>
<translation id="4279490309300973883">मिररिंग</translation>
+<translation id="7973962044839454485">अयोग्य वापरकर्तानावामुळे किंवा संकेतशब्दामुळे PPP प्रमाणीकरण अयशस्वी झाले</translation>
<translation id="2509468283778169019">CAPS LOCK सुरु आहे</translation>
<translation id="3892641579809465218">अंतर्गत डिस्प्ले</translation>
<translation id="7823564328645135659">आपली सेटिंग्ज समक्रमित केल्यानंतर भाषा &quot;<ph name="FROM_LOCALE"/>&quot; मधून &quot;<ph name="TO_LOCALE"/>&quot; मध्ये बदलली आहे.</translation>
<translation id="3368922792935385530">कनेक्ट केले</translation>
<translation id="8340999562596018839">संभाषण अभिप्राय</translation>
<translation id="8654520615680304441">Wi-Fi चालू करा...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">आपली इनपुट पद्धत <ph name="INPUT_METHOD_ID"/> मध्ये बदलली आहे.
स्विच करण्यासाठी Shift + Alt दाबा.</translation>
<translation id="2562916301614567480">खाजगी नेटवर्क</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% उर्वरित</translation>
<translation id="9089416786594320554">इनपुट पद्धती</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">शेल्फ</translation>
<translation id="2614835198358683673">आपले Chromebook चालू असताना ते चार्ज होऊ शकत नाही. अधिकृत चार्जर वापरण्याचा विचार करा.</translation>
<translation id="1895658205118569222">बंद करा</translation>
<translation id="4430019312045809116">व्हॉल्यूम</translation>
+<translation id="8681498213689260554">अद्यतनासाठी रीस्टार्ट करा आणि पॉवरवॉश करा</translation>
<translation id="4442424173763614572">DNS लुकअप अयश्सवी</translation>
-<translation id="6356500677799115505">बॅटरी भरली आहे आणि चार्ज होत आहे</translation>
<translation id="7874779702599364982">सेल्यूलर नेटवर्कसाठी शोधत आहे...</translation>
<translation id="583281660410589416">अज्ञात</translation>
<translation id="1383876407941801731">शोध</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">नेटवर्क माहिती</translation>
<translation id="1621499497873603021">बॅटरी रिक्त होईपर्यंत शिल्लक वेळ, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">अतिथी निर्गमन करा</translation>
-<translation id="4471417012762451363">बॅटरी <ph name="PERCENTAGE"/>% भरली आहे आणि चार्ज होत आहे</translation>
<translation id="8308637677604853869">मागील मेनू</translation>
<translation id="4666297444214622512">दुसर्‍या खात्यामध्ये साइन इन करू शकत नाही.</translation>
<translation id="1346748346194534595">उजवे</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">अज्ञात नेटवर्क त्रुटी</translation>
<translation id="1467432559032391204">डावे</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> सक्रिय करत आहे</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">वाढवा</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">एका निम्न-उर्जेच्या चार्जरवर प्लग इन केले. बॅटरी चार्जिंग विश्वसनीय असू शकत नाही.</translation>
<translation id="3784455785234192852">लॉक करा</translation>
<translation id="2805756323405976993">अनुप्रयोग</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> चा आकार <ph name="RESOLUTION"/> मध्ये बदलण्यात आला</translation>
<translation id="1512064327686280138">सक्रियन अयशस्वी</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>': नेटवर्कशी कनेक्ट करण्यात अयशस्वी. <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi बंद आहे.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">वॉलपेपर सेट करा...</translation>
<translation id="8678698760965522072">ऑनलाइन राज्य</translation>
<translation id="2532589005999780174">उच्च तीव्रता मोड</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">अंतर्गत त्रुटी</translation>
<translation id="3019353588588144572">बॅटरी पूर्णपणे चार्ज होईपर्यंत उर्वरित वेळ, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">स्क्रीन भिंग</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">सत्र निर्गमन करा</translation>
<translation id="8454013096329229812">Wi-Fi चालू आहे.</translation>
<translation id="4872237917498892622">Alt+Search किंवा Shift</translation>
+<translation id="9201131092683066720">बॅटरी <ph name="PERCENTAGE"/>% भरली आहे.</translation>
<translation id="2983818520079887040">सेटिंग्ज...</translation>
+<translation id="1195412055398077112">ओव्हरस्कॅन</translation>
<translation id="1717216362413677834">डॉक मोड</translation>
+<translation id="112308213915226829">शेल्फ स्वयं लपवा</translation>
<translation id="8927026611342028580">विनंती केलेले कनेक्ट करा</translation>
<translation id="8300849813060516376">OTASP बिघडले</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> फाईल(ली) समक्रमित करीत आहे</translation>
+<translation id="5958529069007801266">पर्यवेक्षी वापरकर्ता</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK बंद आहे</translation>
<translation id="6248847161401822652">बाहेर पडण्यासाठी Control Shift Q दोनदा दाबा.</translation>
+<translation id="6785414152754474415">बॅटरी <ph name="PERCENTAGE"/>% भरली आहे आणि चार्ज होत आहे.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: सक्रिय करत आहे...</translation>
+<translation id="4895488851634969361">बॅटरी भरली आहे.</translation>
<translation id="1391854757121130358">आपण आपल्या मोबाईल डेटा भत्त्याचा वापर केला असेल.</translation>
-<translation id="5413208160176941586">स्थानिकरित्या व्यवस्थापित वापरकर्ता</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">लाँचर स्थिती</translation>
+<translation id="5947494881799873997">परत करा</translation>
<translation id="7593891976182323525">Search किंवा Shift</translation>
<translation id="7649070708921625228">मदत</translation>
<translation id="3050422059534974565">CAPS LOCK चालू आहे.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">चुकीचा सांकेतिक वाक्यांश</translation>
<translation id="6165508094623778733">अधिक जाणून घ्या</translation>
<translation id="9046895021617826162">कनेक्ट करण्यात अयशस्वी</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> मध्ये जुन्या रिजोल्यूशनवर परत करत आहे</translation>
<translation id="973896785707726617">हे सत्र <ph name="SESSION_TIME_REMAINING"/> मध्ये समाप्त होईल. आपल्याला स्वयंचलितपणे साइन आउट केले जाईल.</translation>
<translation id="8372369524088641025">खराब WEP की</translation>
<translation id="6636709850131805001">अपरिचित राज्य</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; मध्ये परत बदला (रीस्टार्ट करणे आवश्यक)</translation>
<translation id="8103386449138765447">SMS संदेश: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google ड्राइव्ह सेटिंग्ज...</translation>
-<translation id="1510238584712386396">लाँचर</translation>
<translation id="7209101170223508707">CAPS LOCK चालू आहे.
रद्द करण्यासाठी Alt+Search किंवा Shift दाबा.</translation>
<translation id="8940956008527784070">बॅटरी कमी झाली (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">स्वीकारा</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> शिल्‍लक</translation>
<translation id="520760366042891468">Hangouts द्वारे आपल्या स्क्रीनचे नियंत्रण सामायिक करत आहे.</translation>
<translation id="8000066093800657092">कोणतेही नेटवर्क नाही</translation>
<translation id="4015692727874266537">दुसऱ्या खात्यात साइन इन करा...</translation>
<translation id="5941711191222866238">लहान करा</translation>
<translation id="6911468394164995108">दुसरीकडे सामील व्हा...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">पूर्ण होईपर्यंत <ph name="HOUR"/>ता <ph name="MINUTE"/>मि</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> कडून SMS</translation>
<translation id="1244147615850840081">कॅरियर</translation>
diff --git a/chromium/ash/strings/ash_strings_ms.xtb b/chromium/ash/strings/ash_strings_ms.xtb
index e701bf92582..7006c53b69b 100644
--- a/chromium/ash/strings/ash_strings_ms.xtb
+++ b/chromium/ash/strings/ash_strings_ms.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ms">
<translation id="3595596368722241419">Bateri penuh</translation>
-<translation id="5250713215130379958">Autosembunyi pelancar</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> dan <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Keadaan portal</translation>
<translation id="30155388420722288">Butang Limpahan</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth didayakan</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> telah diputarkan ke <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth dilumpuhkan</translation>
+<translation id="7165320105431587207">Gagal mengkonfigurasi rangkaian</translation>
<translation id="3775358506042162758">Anda hanya boleh mempunyai sehingga tiga akaun dalam log masuk berbilang.</translation>
<translation id="370649949373421643">Dayakan Wi-Fi</translation>
<translation id="3626281679859535460">Kecerahan</translation>
+<translation id="595202126637698455">Penjejakan prestasi didayakan</translation>
<translation id="8054466585765276473">Mengira tempoh bateri.</translation>
<translation id="7982789257301363584">Rangkaian</translation>
<translation id="5565793151875479467">Proksi...</translation>
<translation id="938582441709398163">Tindihan Papan Kekunci</translation>
<translation id="4387004326333427325">Sijil pengesahan ditolak dari jauh</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Peleraian <ph name="DISPLAY_NAME"/> telah diubah kepada <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP gagal</translation>
<translation id="2297568595583585744">Dulang status</translation>
<translation id="1661867754829461514">PIN tiada</translation>
@@ -34,39 +38,41 @@ Tekan Shift + Alt untuk menukar.</translation>
<translation id="2127372758936585790">Pengecas berkuasa rendah</translation>
<translation id="3846575436967432996">Tiada maklumat rangkaian tersedia</translation>
<translation id="3026237328237090306">Sediakan data mudah alih</translation>
+<translation id="5871632337994001636">Uruskan peranti...</translation>
<translation id="785750925697875037">Lihat akaun mudah alih</translation>
<translation id="153454903766751181">Memulakan modem selular...</translation>
<translation id="4628814525959230255">Berkongsi kawalan skrin anda dengan <ph name="HELPER_NAME"/> melalui Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> telah diputar</translation>
<translation id="7864539943188674973">Lumpuhkan Bluetooth</translation>
<translation id="939252827960237676">Gagal menyimpan tangkapan skrin</translation>
<translation id="3126069444801937830">Mulakan semula untuk mengemas kini</translation>
<translation id="2268813581635650749">Log keluar semua</translation>
<translation id="735745346212279324">VPN diputuskan sambungan</translation>
<translation id="7320906967354320621">Melahu</translation>
-<translation id="6303423059719347535">Bateri <ph name="PERCENTAGE"/>% penuh</translation>
<translation id="15373452373711364">Kursor tetikus besar</translation>
-<translation id="2778346081696727092">Gagal untuk mengesahkan dengan nama pengguna atau kata laluan yang disediakan</translation>
<translation id="3294437725009624529">Tetamu</translation>
<translation id="8190698733819146287">Sesuaikan bahasa dan input...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Kedudukan rak</translation>
<translation id="2903907270192926896">INPUT</translation>
<translation id="8676770494376880701">Pengecas berkuasa rendah disambungkan</translation>
<translation id="7170041865419449892">Di luar lingkungan</translation>
<translation id="4804818685124855865">Putuskan sambungan</translation>
<translation id="2544853746127077729">Sijil pengesahan ditolak oleh rangkaian</translation>
<translation id="5222676887888702881">Log keluar</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigurasi</translation>
<translation id="1272079795634619415">Berhenti</translation>
<translation id="4957722034734105353">Ketahui lebih lanjut...</translation>
<translation id="2964193600955408481">Lumpuhkan Wi-Fi</translation>
-<translation id="811680302244032017">Tambah peranti...</translation>
<translation id="4279490309300973883">Pencerminan</translation>
+<translation id="7973962044839454485">Pengesahan PPP gagal disebabkan oleh nama pengguna atau kata laluan yang salah</translation>
<translation id="2509468283778169019">Kekunci CAPS LOCK dihidupkan</translation>
<translation id="3892641579809465218">Paparan Dalaman</translation>
<translation id="7823564328645135659">Bahasa telah ditukar daripada &quot;<ph name="FROM_LOCALE"/>&quot; kepada &quot;<ph name="TO_LOCALE"/>&quot; selepas menyegerakkan tetapan anda.</translation>
<translation id="3368922792935385530">Disambungkan</translation>
<translation id="8340999562596018839">Maklum balas dituturkan</translation>
<translation id="8654520615680304441">Hidupkan Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Kaedah masukan anda telah ditukar kepada <ph name="INPUT_METHOD_ID"/>.
Tekan Shift + Alt untuk menukar.</translation>
<translation id="2562916301614567480">Rangkaian Persendirian</translation>
@@ -83,11 +89,12 @@ Tekan Shift + Alt untuk menukar.</translation>
<translation id="3626637461649818317">Tinggal <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Kaedah input</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Rak</translation>
<translation id="2614835198358683673">Chromebook anda tidak boleh dicas semasa dihidupkan. Pertimbangkan untuk menggunakan pengecas rasmi.</translation>
<translation id="1895658205118569222">Tutup</translation>
<translation id="4430019312045809116">Kelantangan</translation>
+<translation id="8681498213689260554">Mulakan semula dan Hapus Bersih untuk mengemas kini</translation>
<translation id="4442424173763614572">Carian DNS gagal</translation>
-<translation id="6356500677799115505">Bateri penuh dan sedang dicas.</translation>
<translation id="7874779702599364982">Mencari rangkaian selular...</translation>
<translation id="583281660410589416">Tidak diketahui</translation>
<translation id="1383876407941801731">Cari</translation>
@@ -96,7 +103,6 @@ Tekan Shift + Alt untuk menukar.</translation>
<translation id="2204305834655267233">Maklumat Rangkaian</translation>
<translation id="1621499497873603021">Masa yang tinggal sehingga bateri kosong, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Keluar dari tetamu</translation>
-<translation id="4471417012762451363">Bateri <ph name="PERCENTAGE"/>% penuh dan sedang dicas</translation>
<translation id="8308637677604853869">Menu sebelumnya</translation>
<translation id="4666297444214622512">Tidak boleh log masuk ke akaun lain.</translation>
<translation id="1346748346194534595">Kanan</translation>
@@ -114,6 +120,7 @@ Tekan Ctrl+Alt+Z untuk melumpuhkan.</translation>
<translation id="6312403991423642364">Ralat rangkaian tidak diketahui</translation>
<translation id="1467432559032391204">Kiri</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Mengaktifkan <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maksimumkan</translation>
@@ -123,7 +130,6 @@ Tekan Ctrl+Alt+Z untuk melumpuhkan.</translation>
<translation id="2727977024730340865">Dipalamkan pada pengecas berkuasa rendah. Pengecasan bateri mungkin tidak boleh diharapkan.</translation>
<translation id="3784455785234192852">Kunci</translation>
<translation id="2805756323405976993">Apl</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> telah diubah saiz kepada <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Gagal pengaktifan</translation>
<translation id="5097002363526479830">Gagal untuk bersambung ke rangkaian '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi dimatikan.</translation>
@@ -131,6 +137,7 @@ Tekan Ctrl+Alt+Z untuk melumpuhkan.</translation>
<translation id="7052914147756339792">Tetapkan kertas dinding...</translation>
<translation id="8678698760965522072">Keadaan dalam talian</translation>
<translation id="2532589005999780174">Mod kontras tinggi</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Ralat dalaman</translation>
<translation id="3019353588588144572">Masa yang tinggal sehingga bateri dicas sepenuhnya, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Penggadang skrin</translation>
@@ -153,20 +160,24 @@ Mesej pelayan: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Keluar dari sesi</translation>
<translation id="8454013096329229812">Wi-Fi dihidupkan.</translation>
<translation id="4872237917498892622">Alt+Search atau Shift</translation>
+<translation id="9201131092683066720">Bateri <ph name="PERCENTAGE"/>% penuh.</translation>
<translation id="2983818520079887040">Tetapan...</translation>
+<translation id="1195412055398077112">imbas lampau</translation>
<translation id="1717216362413677834">Mod dok</translation>
+<translation id="112308213915226829">Autosembunyi rak</translation>
<translation id="8927026611342028580">Sambungan Diminta</translation>
<translation id="8300849813060516376">OTASP gagal</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127">Menyegerakkan <ph name="COUNT"/> fail</translation>
+<translation id="5958529069007801266">Pengguna diselia</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">Kekunci CAPS LOCK dimatikan</translation>
<translation id="6248847161401822652">Tekan Control Shift Q dua kali untuk keluar.</translation>
+<translation id="6785414152754474415">Bateri <ph name="PERCENTAGE"/>% penuh dan sedang dicas.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Mengaktifkan...</translation>
+<translation id="4895488851634969361">Bateri penuh.</translation>
<translation id="1391854757121130358">Anda mungkin telah menghabiskan peruntukan data mudah alih anda.</translation>
-<translation id="5413208160176941586">Pengguna terurus setempat</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Kedudukan pelancar</translation>
+<translation id="5947494881799873997">Berbalik</translation>
<translation id="7593891976182323525">Search atau Shift</translation>
<translation id="7649070708921625228">Bantuan</translation>
<translation id="3050422059534974565">CAPS LOCK dihidupkan. Tekan Search atau Shift untuk membatalkan.</translation>
@@ -178,22 +189,24 @@ Mesej pelayan: <ph name="SERVER_MSG"/></translation>
<translation id="6692173217867674490">Frasa laluan teruk</translation>
<translation id="6165508094623778733">Ketahui lebih lanjut</translation>
<translation id="9046895021617826162">Gagal disambungkan</translation>
+<translation id="7168224885072002358">Kembali kepada peleraian lama dalam <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Sesi ini akan berakhir dalam <ph name="SESSION_TIME_REMAINING"/>. Anda akan dilog keluar secara automatik.</translation>
<translation id="8372369524088641025">Kekunci WEP teruk</translation>
<translation id="6636709850131805001">Keadaan tidak dikenali</translation>
<translation id="3573179567135747900">Tukar kembali kepada &quot;<ph name="FROM_LOCALE"/>&quot; (perlu dimulakan semula)</translation>
<translation id="8103386449138765447">Mesej SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Tetapan Google Drive</translation>
-<translation id="1510238584712386396">Pelancar</translation>
<translation id="7209101170223508707">CAPS LOCK dihidupkan.
Tekan Alt+Search atau Shift untuk membatalkan.</translation>
<translation id="8940956008527784070">Bateri lemah (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Terima</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> tinggal</translation>
<translation id="520760366042891468">Berkongsi kawalan skrin anda melalui Hangouts.</translation>
<translation id="8000066093800657092">Tiada rangkaian</translation>
<translation id="4015692727874266537">Log masuk akaun lain...</translation>
<translation id="5941711191222866238">Minimumkan</translation>
<translation id="6911468394164995108">Sertai yang lain...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>j <ph name="MINUTE"/>m sehingga penuh</translation>
<translation id="6359806961507272919">SMS daripada <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Pembawa</translation>
diff --git a/chromium/ash/strings/ash_strings_nl.xtb b/chromium/ash/strings/ash_strings_nl.xtb
index e92a4a594e3..ccb89626970 100644
--- a/chromium/ash/strings/ash_strings_nl.xtb
+++ b/chromium/ash/strings/ash_strings_nl.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="nl">
<translation id="3595596368722241419">Accu is vol</translation>
-<translation id="5250713215130379958">Opstartprogramma automatisch verbergen</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> en <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Status van portal</translation>
<translation id="30155388420722288">Overloopknop</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth ingeschakeld</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> is gedraaid naar <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth uitgeschakeld</translation>
-<translation id="3775358506042162758">U kunt maximaal drie accounts hebben in Toegang tot meerdere accounts</translation>
+<translation id="7165320105431587207">Kan netwerk niet configureren</translation>
+<translation id="3775358506042162758">Je kunt maximaal drie accounts hebben in Toegang tot meerdere accounts</translation>
<translation id="370649949373421643">Wifi inschakelen</translation>
<translation id="3626281679859535460">Helderheid</translation>
+<translation id="595202126637698455">Bijhouden van prestaties ingeschakeld</translation>
<translation id="8054466585765276473">Accuduur berekenen.</translation>
<translation id="7982789257301363584">Netwerk</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Overlay voor toetsenbord</translation>
<translation id="4387004326333427325">Verificatiecertificaat afgewezen op afstand</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">De resolutie van <ph name="DISPLAY_NAME"/> is gewijzigd in <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Ophalen van HTTP mislukt</translation>
<translation id="2297568595583585744">Statussysteemvak</translation>
<translation id="1661867754829461514">Pincode ontbreekt</translation>
@@ -29,45 +33,47 @@
<translation id="6596816719288285829">IP-adres</translation>
<translation id="4508265954913339219">Activering mislukt</translation>
<translation id="3621712662352432595">Audio-instellingen</translation>
-<translation id="1812696562331527143">Uw invoermethode is gewijzigd in <ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>derden<ph name="END_LINK"/>).
+<translation id="1812696562331527143">Je invoermethode is gewijzigd in <ph name="INPUT_METHOD_ID"/>*(<ph name="BEGIN_LINK"/>derden<ph name="END_LINK"/>).
Druk op Shift + Alt om te schakelen.j</translation>
<translation id="2127372758936585790">Laag-vermogen-lader</translation>
<translation id="3846575436967432996">Geen netwerkinformatie beschikbaar</translation>
<translation id="3026237328237090306">Mobiele gegevens instellen</translation>
+<translation id="5871632337994001636">Apparaten beheren...</translation>
<translation id="785750925697875037">Mobiel account weergeven</translation>
<translation id="153454903766751181">Mobiele modem initialiseren...</translation>
-<translation id="4628814525959230255">Controle over uw scherm delen met <ph name="HELPER_NAME"/> via Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> is gedraaid</translation>
+<translation id="4628814525959230255">Controle over je scherm delen met <ph name="HELPER_NAME"/> via Hangouts.</translation>
<translation id="7864539943188674973">Bluetooth uitschakelen</translation>
<translation id="939252827960237676">Kan screenshot niet opslaan</translation>
<translation id="3126069444801937830">Opnieuw starten voor bijwerken</translation>
<translation id="2268813581635650749">Alle gebruikers uitloggen</translation>
<translation id="735745346212279324">Verbinding met VPN verbroken</translation>
<translation id="7320906967354320621">Inactief</translation>
-<translation id="6303423059719347535">De accu is <ph name="PERCENTAGE"/>% vol</translation>
<translation id="15373452373711364">Grote muisaanwijzer</translation>
-<translation id="2778346081696727092">Kan niet verifiëren met deze gebruikersnaam of dit wachtwoord</translation>
<translation id="3294437725009624529">Gast</translation>
<translation id="8190698733819146287">Talen en invoer aanpassen...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Positie van plank</translation>
<translation id="2903907270192926896">INVOER</translation>
<translation id="8676770494376880701">Laag-vermogen-lader aangesloten</translation>
<translation id="7170041865419449892">Geen bereik</translation>
<translation id="4804818685124855865">Verbinding verbreken</translation>
<translation id="2544853746127077729">Verificatiecertificaat geweigerd door netwerk</translation>
<translation id="5222676887888702881">Uitloggen</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuratie</translation>
<translation id="1272079795634619415">Stop</translation>
<translation id="4957722034734105353">Meer informatie...</translation>
<translation id="2964193600955408481">Wifi uitschakelen</translation>
-<translation id="811680302244032017">Apparaat toevoegen...</translation>
<translation id="4279490309300973883">Mirroring</translation>
+<translation id="7973962044839454485">PPP-verificatie mislukt wegens een onjuiste gebruikersnaam of wachtwoord</translation>
<translation id="2509468283778169019">CAPS LOCK is ingeschakeld</translation>
<translation id="3892641579809465218">Interne display</translation>
-<translation id="7823564328645135659">Na het synchroniseren met uw instellingen, is de taal gewijzigd van '<ph name="FROM_LOCALE"/>' in '<ph name="TO_LOCALE"/>'.</translation>
+<translation id="7823564328645135659">Na het synchroniseren met je instellingen, is de taal gewijzigd van '<ph name="FROM_LOCALE"/>' in '<ph name="TO_LOCALE"/>'.</translation>
<translation id="3368922792935385530">Verbonden</translation>
<translation id="8340999562596018839">Gesproken feedback</translation>
<translation id="8654520615680304441">Wifi inschakelen...</translation>
-<translation id="5825747213122829519">Uw invoermethode is gewijzigd in <ph name="INPUT_METHOD_ID"/>.
+<translation id="8828714802988429505">90°</translation>
+<translation id="5825747213122829519">Je invoermethode is gewijzigd in <ph name="INPUT_METHOD_ID"/>.
Druk op Shift + Alt om te schakelen.</translation>
<translation id="2562916301614567480">Privénetwerk</translation>
<translation id="6549021752953852991">Geen mobiel netwerk beschikbaar</translation>
@@ -83,11 +89,12 @@ Druk op Shift + Alt om te schakelen.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% resterend</translation>
<translation id="9089416786594320554">Invoermethoden</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
-<translation id="2614835198358683673">Uw Chromebook wordt mogelijk niet opgeladen wanneer deze is ingeschakeld. Overweeg het gebruik van een officiële lader.</translation>
+<translation id="2825619548187458965">Plank</translation>
+<translation id="2614835198358683673">Je Chromebook wordt mogelijk niet opgeladen wanneer deze is ingeschakeld. Overweeg het gebruik van een officiële lader.</translation>
<translation id="1895658205118569222">Uitschakeling</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">Start opnieuw op en voer Powerwash uit om bij te werken</translation>
<translation id="4442424173763614572">DNS-lookup mislukt</translation>
-<translation id="6356500677799115505">De accu is vol en wordt opgeladen.</translation>
<translation id="7874779702599364982">Zoeken naar mobiele netwerken...</translation>
<translation id="583281660410589416">Onbekend</translation>
<translation id="1383876407941801731">Zoeken</translation>
@@ -96,7 +103,6 @@ Druk op Shift + Alt om te schakelen.</translation>
<translation id="2204305834655267233">Netwerkinfo</translation>
<translation id="1621499497873603021">Resterende tijd totdat de accu leeg is: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Gastsessie sluiten</translation>
-<translation id="4471417012762451363">De accu is <ph name="PERCENTAGE"/>% vol en wordt opgeladen</translation>
<translation id="8308637677604853869">Vorig menu</translation>
<translation id="4666297444214622512">Kan niet inloggen op een ander account.</translation>
<translation id="1346748346194534595">Rechts</translation>
@@ -114,6 +120,7 @@ Druk op Ctrl+Alt+Z om uit te schakelen.</translation>
<translation id="6312403991423642364">Onbekende netwerkfout</translation>
<translation id="1467432559032391204">Links</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> activeren</translation>
<translation id="8814190375133053267">Wifi</translation>
<translation id="1398853756734560583">Maximaliseren</translation>
@@ -123,7 +130,6 @@ Druk op Ctrl+Alt+Z om uit te schakelen.</translation>
<translation id="2727977024730340865">Aangesloten op een laag-vermogen-lader. Opladen van de batterij mogelijk niet betrouwbaar.</translation>
<translation id="3784455785234192852">Vergrendelen</translation>
<translation id="2805756323405976993">Applicaties</translation>
-<translation id="8871072142849158571">Het formaat van <ph name="DISPLAY_NAME"/> is aangepast naar <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Activering mislukt</translation>
<translation id="5097002363526479830">Kan geen verbinding maken met het netwerk '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wifi is uitgeschakeld.</translation>
@@ -131,6 +137,7 @@ Druk op Ctrl+Alt+Z om uit te schakelen.</translation>
<translation id="7052914147756339792">Achtergrond instellen...</translation>
<translation id="8678698760965522072">Online status</translation>
<translation id="2532589005999780174">Modus voor hoog contrast</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Interne fout</translation>
<translation id="3019353588588144572">Resterende tijd totdat de accu volledig is opgeladen: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Vergrootglas</translation>
@@ -153,20 +160,24 @@ Melding van de server: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Sessie sluiten</translation>
<translation id="8454013096329229812">Wifi is ingeschakeld.</translation>
<translation id="4872237917498892622">Alt+Zoeken of Shift</translation>
+<translation id="9201131092683066720">De accu is <ph name="PERCENTAGE"/>% vol.</translation>
<translation id="2983818520079887040">Instellingen...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Dockmodus</translation>
+<translation id="112308213915226829">Plank automatisch verbergen</translation>
<translation id="8927026611342028580">Verbinding aangevraagd</translation>
<translation id="8300849813060516376">OTASP mislukt</translation>
<translation id="2792498699870441125">Alt+Zoeken</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> bestand(en) synchroniseren</translation>
+<translation id="5958529069007801266">Bewaakte gebruiker</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK is uitgeschakeld</translation>
<translation id="6248847161401822652">Druk twee keer op Control+Shift+Q om te stoppen.</translation>
+<translation id="6785414152754474415">De accu is <ph name="PERCENTAGE"/>% vol en wordt opgeladen.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: activeren...</translation>
-<translation id="1391854757121130358">U heeft mogelijk uw quotum voor mobiele gegevens verbruikt.</translation>
-<translation id="5413208160176941586">Lokaal beheerde gebruiker</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Positie van launcher</translation>
+<translation id="4895488851634969361">De accu is vol.</translation>
+<translation id="1391854757121130358">Je hebt mogelijk je quotum voor mobiele gegevens verbruikt.</translation>
+<translation id="5947494881799873997">Terugzetten</translation>
<translation id="7593891976182323525">Zoeken of Shift</translation>
<translation id="7649070708921625228">Help</translation>
<translation id="3050422059534974565">CAPS LOCK is ingeschakeld.
@@ -179,22 +190,24 @@ Druk op Zoeken of Shift om te annuleren.</translation>
<translation id="6692173217867674490">Slechte wachtwoordzin</translation>
<translation id="6165508094623778733">Meer informatie</translation>
<translation id="9046895021617826162">Verbinding mislukt</translation>
-<translation id="973896785707726617">Deze sessie loopt af over <ph name="SESSION_TIME_REMAINING"/>. U wordt automatisch uitgelogd.</translation>
+<translation id="7168224885072002358">Terugzetten naar oude resolutie over <ph name="TIMEOUT_SECONDS"/></translation>
+<translation id="973896785707726617">Deze sessie loopt af over <ph name="SESSION_TIME_REMAINING"/>. Je wordt automatisch uitgelogd.</translation>
<translation id="8372369524088641025">Slechte WEP-sleutel</translation>
<translation id="6636709850131805001">Niet-herkende staat</translation>
<translation id="3573179567135747900">Teruggaan naar '<ph name="FROM_LOCALE"/>' (opnieuw starten vereist)</translation>
<translation id="8103386449138765447">SMS-berichten: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Instellingen voor Google Drive...</translation>
-<translation id="1510238584712386396">Opstartprogramma</translation>
<translation id="7209101170223508707">CAPS LOCK is ingeschakeld.
Druk op Alt+Zoeken of Shift om te annuleren.</translation>
<translation id="8940956008527784070">Accu is bijna leeg (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Accepteren</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> resterend</translation>
-<translation id="520760366042891468">Controle over uw scherm delen via Hangouts.</translation>
+<translation id="520760366042891468">Controle over je scherm delen via Hangouts.</translation>
<translation id="8000066093800657092">Geen netwerk</translation>
<translation id="4015692727874266537">Inloggen op ander account...</translation>
<translation id="5941711191222866238">Minimaliseren</translation>
<translation id="6911468394164995108">Verbinding met ander netwerk maken...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>u <ph name="MINUTE"/>m tot volledig opgeladen</translation>
<translation id="6359806961507272919">Sms van <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Provider</translation>
diff --git a/chromium/ash/strings/ash_strings_no.xtb b/chromium/ash/strings/ash_strings_no.xtb
index 06b5745a658..5c3a4876143 100644
--- a/chromium/ash/strings/ash_strings_no.xtb
+++ b/chromium/ash/strings/ash_strings_no.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="no">
<translation id="3595596368722241419">Batteriet er fullt</translation>
-<translation id="5250713215130379958">Skjul programlisten automatisk</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> og <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portaltilstand</translation>
<translation id="30155388420722288">Overflyt-knappen</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth er aktivert</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> ble rotert til <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth er deaktivert</translation>
+<translation id="7165320105431587207">Kunne ikke konfigurere nettverket</translation>
<translation id="3775358506042162758">Du kan bare ha opptil tre kontoer i flerpålogging.</translation>
<translation id="370649949373421643">Aktivér Wi-Fi</translation>
<translation id="3626281679859535460">Lysstyrke</translation>
+<translation id="595202126637698455">Ytelsessporing er aktivert</translation>
<translation id="8054466585765276473">Beregner batteritid.</translation>
<translation id="7982789257301363584">Nettverk</translation>
<translation id="5565793151875479467">Mellomtjener</translation>
<translation id="938582441709398163">Tastaturbelegg</translation>
<translation id="4387004326333427325">Autentiseringssertifikatet ble avvist eksternt</translation>
<translation id="6979158407327259162">Google Disk</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/>-oppløsningen ble endret til <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Henting av HTTP mislyktes</translation>
<translation id="2297568595583585744">Status-felt</translation>
<translation id="1661867754829461514">Personlig kode mangler</translation>
@@ -34,39 +38,41 @@ Trykk på Shift + Alt for å bytte.</translation>
<translation id="2127372758936585790">Lading med lav effekt</translation>
<translation id="3846575436967432996">Ingen nettverksinformasjon tilgjengelig</translation>
<translation id="3026237328237090306">Konfigurer mobildata</translation>
+<translation id="5871632337994001636">Administrer enheter</translation>
<translation id="785750925697875037">Se mobilkontoen</translation>
<translation id="153454903766751181">Starter mobilmodemet ...</translation>
<translation id="4628814525959230255">Deling av skjermkontrollen din med <ph name="HELPER_NAME"/> via Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> er rotert</translation>
<translation id="7864539943188674973">Deaktiver Bluetooth</translation>
<translation id="939252827960237676">Lagringen av skjermdumpen mislyktes</translation>
<translation id="3126069444801937830">Start på nytt for å oppdatere</translation>
<translation id="2268813581635650749">Logg alle av</translation>
<translation id="735745346212279324">VPN frakoblet</translation>
<translation id="7320906967354320621">Ikke aktiv</translation>
-<translation id="6303423059719347535">Batteriet er <ph name="PERCENTAGE"/> % fullt</translation>
<translation id="15373452373711364">Stor markør</translation>
-<translation id="2778346081696727092">Kunne ikke autentisere med oppgitt brukernavn eller passord</translation>
<translation id="3294437725009624529">Gjest</translation>
<translation id="8190698733819146287">Tilpass språk og inndata</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Hylleposisjon</translation>
<translation id="2903907270192926896">INNDATA</translation>
<translation id="8676770494376880701">Laveffektslader er tilkoblet</translation>
<translation id="7170041865419449892">Utenfor rekkevidde</translation>
<translation id="4804818685124855865">Koble fra</translation>
<translation id="2544853746127077729">Autentiseringssertifikatet ble avvist av nettverket</translation>
<translation id="5222676887888702881">Logg av</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfigurasjon</translation>
<translation id="1272079795634619415">Stopp</translation>
<translation id="4957722034734105353">Finn ut mer</translation>
<translation id="2964193600955408481">Deaktiver Wi-Fi</translation>
-<translation id="811680302244032017">Legg til enhet</translation>
<translation id="4279490309300973883">Speiling</translation>
+<translation id="7973962044839454485">PPP-autentiseringen mislyktes på grunn av feil brukernavn eller passord</translation>
<translation id="2509468283778169019">Caps Lock er på</translation>
<translation id="3892641579809465218">Innebygd skjerm</translation>
<translation id="7823564328645135659">Språket er endret fra <ph name="FROM_LOCALE"/> til <ph name="TO_LOCALE"/> etter synkronisering av innstillingene dine.</translation>
<translation id="3368922792935385530">Tilkoblet</translation>
<translation id="8340999562596018839">Talerespons</translation>
<translation id="8654520615680304441">Slå på Wi-Fi</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Inndatametoden din er endret til <ph name="INPUT_METHOD_ID"/>.
Trykk på Shift + Alt for å bytte.</translation>
<translation id="2562916301614567480">Privat nettverk</translation>
@@ -83,11 +89,12 @@ Trykk på Shift + Alt for å bytte.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% igjen</translation>
<translation id="9089416786594320554">Inndatametoder</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Hylle</translation>
<translation id="2614835198358683673">Chromebook kan ikke lades mens den er slått på. Vurder å bruke den offisielle laderen.</translation>
<translation id="1895658205118569222">Avslutning</translation>
<translation id="4430019312045809116">Volum</translation>
+<translation id="8681498213689260554">Start på nytt og kjør Powerwash for å oppdatere</translation>
<translation id="4442424173763614572">DNS-søk mislyktes</translation>
-<translation id="6356500677799115505">Batteriet er fullt og til lading.</translation>
<translation id="7874779702599364982">Søker etter mobilnettverk ...</translation>
<translation id="583281660410589416">Ukjent</translation>
<translation id="1383876407941801731">Søk</translation>
@@ -96,7 +103,6 @@ Trykk på Shift + Alt for å bytte.</translation>
<translation id="2204305834655267233">Nettverksinformasjon</translation>
<translation id="1621499497873603021">Gjenværende tid til batteriet er tomt – <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Avslutt gjesteøkten</translation>
-<translation id="4471417012762451363">Batteriet er <ph name="PERCENTAGE"/> % fullt og til lading</translation>
<translation id="8308637677604853869">Forrige meny</translation>
<translation id="4666297444214622512">Kan ikke logge på en annen konto.</translation>
<translation id="1346748346194534595">Høyre</translation>
@@ -114,6 +120,7 @@ Trykk på Ctrl+Alt+Z for å deaktivere.</translation>
<translation id="6312403991423642364">Ukjent nettverksfeil</translation>
<translation id="1467432559032391204">Venstre</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktiverer <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maksimer</translation>
@@ -123,7 +130,6 @@ Trykk på Ctrl+Alt+Z for å deaktivere.</translation>
<translation id="2727977024730340865">Tilkoblet laveffektslader. Batteriladingen kan være upålitelig.</translation>
<translation id="3784455785234192852">Lås</translation>
<translation id="2805756323405976993">Programmer</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> har endret oppløsning til <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktiveringen mislyktes</translation>
<translation id="5097002363526479830">Kunne ikke koble til nettverket «<ph name="NAME"/>»: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi er slått av.</translation>
@@ -131,6 +137,7 @@ Trykk på Ctrl+Alt+Z for å deaktivere.</translation>
<translation id="7052914147756339792">Angi bakgrunnsbilde</translation>
<translation id="8678698760965522072">Tilkoblet tilstand</translation>
<translation id="2532589005999780174">Høykontrastmodus</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Intern feil</translation>
<translation id="3019353588588144572">Tid som gjenstår til batteriet er fulladet – <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Skjermforstørrer</translation>
@@ -153,20 +160,24 @@ Tjenermelding: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Avslutt økten</translation>
<translation id="8454013096329229812">Wi-Fi er slått på.</translation>
<translation id="4872237917498892622">Alt + Søk eller Shift</translation>
+<translation id="9201131092683066720">Batteriet er <ph name="PERCENTAGE"/> % fullt</translation>
<translation id="2983818520079887040">Innstillinger</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Dokkmodus</translation>
+<translation id="112308213915226829">Skjul hylle automatisk</translation>
<translation id="8927026611342028580">Tilkobling har blitt forespurt</translation>
<translation id="8300849813060516376">OTASP mislyktes</translation>
<translation id="2792498699870441125">Alt + Søk</translation>
<translation id="8660803626959853127">Synkroniserer <ph name="COUNT"/> fil(er)</translation>
+<translation id="5958529069007801266">Overvåket bruker</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK er av</translation>
<translation id="6248847161401822652">Trykk Control+Shift+Q to ganger for å avslutte.</translation>
+<translation id="6785414152754474415">Batteriet er <ph name="PERCENTAGE"/> % fullt og til lading.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: aktiveres …</translation>
+<translation id="4895488851634969361">Batteriet er fullt.</translation>
<translation id="1391854757121130358">Du kan ha brukt opp mobildatakvoten din.</translation>
-<translation id="5413208160176941586">Lokalt administrert bruker</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Programlisteplassering</translation>
+<translation id="5947494881799873997">Tilbakestill</translation>
<translation id="7593891976182323525">Søk eller Shift</translation>
<translation id="7649070708921625228">Hjelp</translation>
<translation id="3050422059534974565">Caps Lock er på.
@@ -179,22 +190,24 @@ Trykk på Søk eller Shift for å avbryte.</translation>
<translation id="6692173217867674490">Feil passordfrase</translation>
<translation id="6165508094623778733">Les mer</translation>
<translation id="9046895021617826162">Tilkoblingen mislyktes</translation>
+<translation id="7168224885072002358">Går tilbake til den gamle oppløsningen om <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Denne økten slutter om <ph name="SESSION_TIME_REMAINING"/>. Du logges ut automatisk.</translation>
<translation id="8372369524088641025">Feil WEP-nøkkel</translation>
<translation id="6636709850131805001">Ikke gjenkjent tilstand</translation>
<translation id="3573179567135747900">Endre tilbake til <ph name="FROM_LOCALE"/> (krever omstart)</translation>
<translation id="8103386449138765447">SMS-meldinger: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Innstillinger for Google Disk</translation>
-<translation id="1510238584712386396">Appvelger</translation>
<translation id="7209101170223508707">Caps Lock er på.
Trykk på Alt + Søk eller Shift for å avbryte.</translation>
<translation id="8940956008527784070">Lavt batterinivå (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Godta</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>.<ph name="MINUTE"/> gjenstår</translation>
<translation id="520760366042891468">Deler skjermkontrollen din via Hangouts.</translation>
<translation id="8000066093800657092">Ingen nettverk</translation>
<translation id="4015692727874266537">Logg på en annen konto</translation>
<translation id="5941711191222866238">Minimer</translation>
<translation id="6911468394164995108">Koble til annet</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> t og <ph name="MINUTE"/> m til batteriet er ferdigladet</translation>
<translation id="6359806961507272919">Tekstmelding fra <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operatør</translation>
diff --git a/chromium/ash/strings/ash_strings_pl.xtb b/chromium/ash/strings/ash_strings_pl.xtb
index 2258bf53677..b0b124da7f4 100644
--- a/chromium/ash/strings/ash_strings_pl.xtb
+++ b/chromium/ash/strings/ash_strings_pl.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="pl">
<translation id="3595596368722241419">Bateria naładowana</translation>
-<translation id="5250713215130379958">Automatycznie ukrywaj program uruchamiający</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> i <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stan portalu</translation>
<translation id="30155388420722288">Przycisk akcji</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth włączony</translation>
+<translation id="6310121235600822547">Wyświetlacz <ph name="DISPLAY_NAME"/> został obrócony na <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth wyłączony</translation>
+<translation id="7165320105431587207">Nie można skonfigurować sieci</translation>
<translation id="3775358506042162758">W wielokrotnym logowaniu możesz mieć najwyżej trzy konta.</translation>
<translation id="370649949373421643">Włącz Wi-Fi</translation>
<translation id="3626281679859535460">Jasność</translation>
+<translation id="595202126637698455">Śledzenie wydajności jest włączone</translation>
<translation id="8054466585765276473">Obliczanie czasu pracy na baterii.</translation>
<translation id="7982789257301363584">Sieć</translation>
<translation id="5565793151875479467">Serwer proxy...</translation>
<translation id="938582441709398163">Nakładka klawiatury</translation>
<translation id="4387004326333427325">Certyfikat uwierzytelniania został odrzucony zdalnie</translation>
<translation id="6979158407327259162">Dysk Google</translation>
+<translation id="3683428399328702079">Rozdzielczość wyświetlacza <ph name="DISPLAY_NAME"/> została zmieniona na <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Wykonanie metody GET protokołu HTTP nie powiodło się.</translation>
<translation id="2297568595583585744">Zasobnik stanu</translation>
<translation id="1661867754829461514">Brak kodu PIN</translation>
@@ -34,39 +38,41 @@ Naciśnij Shift + Alt, by ją przełączyć.</translation>
<translation id="2127372758936585790">Ładowarka o małej mocy</translation>
<translation id="3846575436967432996">Brak informacji o sieciach</translation>
<translation id="3026237328237090306">Skonfiguruj komórkową transmisję danych</translation>
+<translation id="5871632337994001636">Zarządzaj urządzeniami...</translation>
<translation id="785750925697875037">Wyświetl konto dla telefonów komórkowych</translation>
<translation id="153454903766751181">Inicjuję modem komórkowy...</translation>
<translation id="4628814525959230255">Udostępniasz ekran w Hangouts – <ph name="HELPER_NAME"/> kontroluje Twój komputer.</translation>
-<translation id="8343941333792395995">Ekran <ph name="DISPLAY_NAME"/> został obrócony</translation>
<translation id="7864539943188674973">Wyłącz Bluetooth</translation>
<translation id="939252827960237676">Nie można zapisać zrzutu ekranu</translation>
<translation id="3126069444801937830">Uruchom ponownie i zaktualizuj</translation>
<translation id="2268813581635650749">Wyloguj wszystkich</translation>
<translation id="735745346212279324">VPN odłączona</translation>
<translation id="7320906967354320621">Bezczynna</translation>
-<translation id="6303423059719347535">Naładowanie baterii: <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Duży kursor myszy</translation>
-<translation id="2778346081696727092">Nie powiodło się uwierzytelnienie przy użyciu podanej nazwy użytkownika i hasła.</translation>
<translation id="3294437725009624529">Gość</translation>
<translation id="8190698733819146287">Dostosuj języki i metody wprowadzania</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Pozycja półki</translation>
<translation id="2903907270192926896">WEJŚCIE</translation>
<translation id="8676770494376880701">Podłączono ładowarkę o małej mocy</translation>
<translation id="7170041865419449892">Poza zasięgiem</translation>
<translation id="4804818685124855865">Rozłącz</translation>
<translation id="2544853746127077729">Certyfikat uwierzytelniania został odrzucony przez sieć</translation>
<translation id="5222676887888702881">Wyloguj się</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguracja</translation>
<translation id="1272079795634619415">Zatrzymaj</translation>
<translation id="4957722034734105353">Więcej informacji...</translation>
<translation id="2964193600955408481">Wyłącz Wi-Fi</translation>
-<translation id="811680302244032017">Dodaj urządzenie...</translation>
<translation id="4279490309300973883">Odbicie lustrzane</translation>
+<translation id="7973962044839454485">Uwierzytelnianie PPP nie powiodło się z powodu nieprawidłowej nazwy użytkownika lub hasła</translation>
<translation id="2509468283778169019">CAPS LOCK jest włączony.</translation>
<translation id="3892641579809465218">Wyświetlacz wewnętrzny</translation>
<translation id="7823564328645135659">Po zsynchronizowaniu ustawień zmieniono język z „<ph name="FROM_LOCALE"/>” na „<ph name="TO_LOCALE"/>”.</translation>
<translation id="3368922792935385530">Połączone</translation>
<translation id="8340999562596018839">Potwierdzenia głosowe</translation>
<translation id="8654520615680304441">Włącz Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Metoda wprowadzania została zmieniona na <ph name="INPUT_METHOD_ID"/>.
Naciśnij Shift + Alt, by ją przełączyć.</translation>
<translation id="2562916301614567480">Sieć prywatna</translation>
@@ -83,11 +89,12 @@ Naciśnij Shift + Alt, by ją przełączyć.</translation>
<translation id="3626637461649818317">Pozostało <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Wprowadzanie tekstu</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Półka</translation>
<translation id="2614835198358683673">Włączony Chromebook może nie być ładowany. Zalecamy użycie oryginalnej ładowarki.</translation>
<translation id="1895658205118569222">Wyłączenie</translation>
<translation id="4430019312045809116">Głośność</translation>
+<translation id="8681498213689260554">Uruchom ponownie i użyj funkcji Powerwash, by zaktualizować</translation>
<translation id="4442424173763614572">Wyszukiwanie DNS nie powiodło się.</translation>
-<translation id="6356500677799115505">Bateria jest pełna i trwa ładowanie.</translation>
<translation id="7874779702599364982">Szukam sieci komórkowych...</translation>
<translation id="583281660410589416">Nieznany</translation>
<translation id="1383876407941801731">Wyszukiwanie</translation>
@@ -96,7 +103,6 @@ Naciśnij Shift + Alt, by ją przełączyć.</translation>
<translation id="2204305834655267233">Informacje o sieci</translation>
<translation id="1621499497873603021">Czas pozostały do wyczerpania baterii: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Zakończ sesję gościa</translation>
-<translation id="4471417012762451363">Naładowanie baterii: <ph name="PERCENTAGE"/>%. Trwa ładowanie</translation>
<translation id="8308637677604853869">Poprzednie menu</translation>
<translation id="4666297444214622512">Nie można zalogować się na kolejne konto.</translation>
<translation id="1346748346194534595">W prawo</translation>
@@ -114,6 +120,7 @@ Aby wyłączyć, naciśnij Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Nieznany błąd sieci</translation>
<translation id="1467432559032391204">W lewo</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktywuję <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maksymalizuj</translation>
@@ -123,7 +130,6 @@ Aby wyłączyć, naciśnij Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Podłączono ładowarkę o małej mocy. Ładowanie baterii może być nieprawidłowe.</translation>
<translation id="3784455785234192852">Zablokuj</translation>
<translation id="2805756323405976993">Aplikacje</translation>
-<translation id="8871072142849158571">Rozdzielczość ekranu <ph name="DISPLAY_NAME"/> została zmieniona na <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Niepowodzenie aktywacji</translation>
<translation id="5097002363526479830">Nie udało się połączyć z siecią „<ph name="NAME"/>”: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi wyłączone.</translation>
@@ -131,6 +137,7 @@ Aby wyłączyć, naciśnij Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Ustaw tapetę...</translation>
<translation id="8678698760965522072">Online</translation>
<translation id="2532589005999780174">Tryb wysokiego kontrastu</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Błąd wewnętrzny</translation>
<translation id="3019353588588144572">Czas pozostały do pełnego naładowania baterii: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Komunikat serwera: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Zakończ sesję</translation>
<translation id="8454013096329229812">Wi-Fi włączone.</translation>
<translation id="4872237917498892622">Alt+Szukaj lub Shift</translation>
+<translation id="9201131092683066720">Naładowanie baterii: <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Ustawienia</translation>
+<translation id="1195412055398077112">nadmiarowość obrazu</translation>
<translation id="1717216362413677834">Tryb doku</translation>
+<translation id="112308213915226829">Autoukrywanie półki</translation>
<translation id="8927026611342028580">Poproszono o połączenie</translation>
<translation id="8300849813060516376">Dostarczanie OTASP nie powiodło się</translation>
<translation id="2792498699870441125">Alt+Szukaj</translation>
<translation id="8660803626959853127">Synchronizacja: <ph name="COUNT"/> pliki(ów)</translation>
+<translation id="5958529069007801266">Użytkownik nadzorowany</translation>
<translation id="3709443003275901162">Ponad 9</translation>
<translation id="639644700271529076">CAPS LOCK jest wyłączony</translation>
<translation id="6248847161401822652">Naciśnij dwukrotnie Control Shift Q, by zakończyć.</translation>
+<translation id="6785414152754474415">Naładowanie baterii: <ph name="PERCENTAGE"/>%. Trwa ładowanie.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: aktywuję...</translation>
+<translation id="4895488851634969361">Bateria jest pełna.</translation>
<translation id="1391854757121130358">Być może został wyczerpany limit komórkowej transmisji danych.</translation>
-<translation id="5413208160176941586">Użytkownik zarządzany lokalnie</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Pozycja programu uruchamiającego</translation>
+<translation id="5947494881799873997">Przywróć</translation>
<translation id="7593891976182323525">Szukaj lub Shift</translation>
<translation id="7649070708921625228">Pomoc</translation>
<translation id="3050422059534974565">CAPS LOCK jest włączony.
@@ -179,22 +190,24 @@ Naciśnij Szukaj lub Shift, by anulować.</translation>
<translation id="6692173217867674490">Błędne hasło</translation>
<translation id="6165508094623778733">Więcej informacji</translation>
<translation id="9046895021617826162">Łączenie nie powiodło się</translation>
+<translation id="7168224885072002358">Powrót do wcześniejszej rozdzielczości za <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Ta sesja zakończy się za <ph name="SESSION_TIME_REMAINING"/>. Nastąpi automatyczne wylogowanie.</translation>
<translation id="8372369524088641025">Błędny klucz WEP</translation>
<translation id="6636709850131805001">Nierozpoznany stan</translation>
<translation id="3573179567135747900">Zmień z powrotem na „<ph name="FROM_LOCALE"/>” (wymaga ponownego uruchomienia)</translation>
<translation id="8103386449138765447">SMS-y: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Ustawienia Dysku Google...</translation>
-<translation id="1510238584712386396">Program uruchamiający</translation>
<translation id="7209101170223508707">CAPS LOCK jest włączony.
Naciśnij Alt+Szukaj lub Shift, by anulować.</translation>
<translation id="8940956008527784070">Niski stan baterii (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Akceptuj</translation>
<translation id="5102001756192215136">Pozostało <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Udostępniasz ekran i kontrolę nad komputerem w Hangouts.</translation>
<translation id="8000066093800657092">Brak sieci</translation>
<translation id="4015692727874266537">Zaloguj się na kolejne konto...</translation>
<translation id="5941711191222866238">Minimalizuj</translation>
<translation id="6911468394164995108">Połącz z inną...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> godz. <ph name="MINUTE"/> min do pełnego naładowania</translation>
<translation id="6359806961507272919">Wiadomość SMS z numeru <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operator</translation>
diff --git a/chromium/ash/strings/ash_strings_pt-BR.xtb b/chromium/ash/strings/ash_strings_pt-BR.xtb
index b351f45c0cd..d2f1d0e53a0 100644
--- a/chromium/ash/strings/ash_strings_pt-BR.xtb
+++ b/chromium/ash/strings/ash_strings_pt-BR.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="pt-BR">
<translation id="3595596368722241419">Bateria carregada</translation>
-<translation id="5250713215130379958">Ocultar automaticamente o iniciador</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> e <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Estado do portal</translation>
<translation id="30155388420722288">Botão de estouro</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth ativado</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> foi substituída por <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth desativado</translation>
+<translation id="7165320105431587207">Falha ao configurar rede</translation>
<translation id="3775358506042162758">É possível ter até três contas em login múltiplo.</translation>
<translation id="370649949373421643">Ativar Wi-Fi</translation>
<translation id="3626281679859535460">Brilho</translation>
+<translation id="595202126637698455">Rastreamento de desempenho ativado</translation>
<translation id="8054466585765276473">Calculando duração da bateria.</translation>
<translation id="7982789257301363584">Rede</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Sobreposição do teclado</translation>
<translation id="4387004326333427325">Certificado de autenticação rejeitado remotamente</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">A resolução de <ph name="DISPLAY_NAME"/> foi alterada para <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP falhou</translation>
<translation id="2297568595583585744">Bandeja de status</translation>
<translation id="1661867754829461514">PIN ausente</translation>
@@ -34,39 +38,41 @@ Pressione Shift + Alt para alternar.</translation>
<translation id="2127372758936585790">Carregador de baixa potência</translation>
<translation id="3846575436967432996">Não há informações de rede disponíveis</translation>
<translation id="3026237328237090306">Configurar dados móveis</translation>
+<translation id="5871632337994001636">Gerenciar dispositivos...</translation>
<translation id="785750925697875037">Exibir conta de celular</translation>
<translation id="153454903766751181">Inicializando modem celular...</translation>
<translation id="4628814525959230255">Compartilhando o controle de sua tela com <ph name="HELPER_NAME"/> por meio do Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> foi girada</translation>
<translation id="7864539943188674973">Desativar bluetooth</translation>
<translation id="939252827960237676">Falha ao salvar a captura de tela</translation>
<translation id="3126069444801937830">Reiniciar para atualizar</translation>
<translation id="2268813581635650749">Desconectar todos</translation>
<translation id="735745346212279324">VPN desconectada</translation>
<translation id="7320906967354320621">Inativo</translation>
-<translation id="6303423059719347535">A bateria está <ph name="PERCENTAGE"/>% cheia</translation>
<translation id="15373452373711364">Cursor grande do mouse</translation>
-<translation id="2778346081696727092">Falha na autenticação com nome de usuário ou senha fornecidos</translation>
<translation id="3294437725009624529">Visitante</translation>
<translation id="8190698733819146287">Personalizar idiomas e entrada...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posição da estante</translation>
<translation id="2903907270192926896">ENTRADA</translation>
<translation id="8676770494376880701">Carregador de baixa potência conectado</translation>
<translation id="7170041865419449892">Fora de alcance</translation>
<translation id="4804818685124855865">Desconectar</translation>
<translation id="2544853746127077729">Certificado de autenticação rejeitado pela rede</translation>
<translation id="5222676887888702881">Sair</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuração</translation>
<translation id="1272079795634619415">Parar</translation>
<translation id="4957722034734105353">Saiba mais...</translation>
<translation id="2964193600955408481">Desativar Wi-Fi</translation>
-<translation id="811680302244032017">Adicionar dispositivo...</translation>
<translation id="4279490309300973883">Espelhamento</translation>
+<translation id="7973962044839454485">Falha da autenticação PPC devido a senha ou nome de usuário incorreto</translation>
<translation id="2509468283778169019">CAPS LOCK está ativado</translation>
<translation id="3892641579809465218">Display interno</translation>
<translation id="7823564328645135659">O idioma foi alterado de &quot;<ph name="FROM_LOCALE"/>&quot; para &quot;<ph name="TO_LOCALE"/>&quot; após a sincronização de suas configurações.</translation>
<translation id="3368922792935385530">Conectado</translation>
<translation id="8340999562596018839">Feedback falado</translation>
<translation id="8654520615680304441">Ativar Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Seu método de entrada mudou para <ph name="INPUT_METHOD_ID"/>.
Pressione Shift + Alt para alternar.</translation>
<translation id="2562916301614567480">Rede privada</translation>
@@ -83,11 +89,12 @@ Pressione Shift + Alt para alternar.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% restante</translation>
<translation id="9089416786594320554">Métodos de entrada</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Estante</translation>
<translation id="2614835198358683673">Seu Chromebook pode não carregar enquanto estiver ligado. Considere usar o carregador oficial.</translation>
<translation id="1895658205118569222">Encerramento</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">Reiniciar e executar Powerwash para atualizar</translation>
<translation id="4442424173763614572">A busca de DNS falhou</translation>
-<translation id="6356500677799115505">A bateria está cheia e carregando.</translation>
<translation id="7874779702599364982">Procurando redes de celular...</translation>
<translation id="583281660410589416">Desconhecido</translation>
<translation id="1383876407941801731">Pesquisa</translation>
@@ -96,7 +103,6 @@ Pressione Shift + Alt para alternar.</translation>
<translation id="2204305834655267233">Informações de rede</translation>
<translation id="1621499497873603021">O tempo restante até que a bateria se esgote é de <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Sair da sessão de visitante</translation>
-<translation id="4471417012762451363">A bateria está <ph name="PERCENTAGE"/>% cheia e carregando</translation>
<translation id="8308637677604853869">Menu anterior</translation>
<translation id="4666297444214622512">Não é possível fazer login em outra conta.</translation>
<translation id="1346748346194534595">Para a direita</translation>
@@ -114,6 +120,7 @@ Pressione Ctrl+Alt+Z para desativá-lo.</translation>
<translation id="6312403991423642364">Erro de rede desconhecido</translation>
<translation id="1467432559032391204">Para a esquerda</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Ativando <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximizar</translation>
@@ -123,7 +130,6 @@ Pressione Ctrl+Alt+Z para desativá-lo.</translation>
<translation id="2727977024730340865">Conectado a um carregador de baixa potência. O carregamento da bateria pode não ser confiável.</translation>
<translation id="3784455785234192852">Bloquear</translation>
<translation id="2805756323405976993">Aplicativos</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> foi redimensionada para <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Falha na ativação</translation>
<translation id="5097002363526479830">Falha na conexão à rede &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">O Wi-Fi está desligado.</translation>
@@ -131,6 +137,7 @@ Pressione Ctrl+Alt+Z para desativá-lo.</translation>
<translation id="7052914147756339792">Definir plano de fundo...</translation>
<translation id="8678698760965522072">Estado on-line</translation>
<translation id="2532589005999780174">Modo de alto contraste</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Erro interno</translation>
<translation id="3019353588588144572">O tempo restante até que a bateria esteja totalmente carregada é de <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Mensagem do servidor: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Sair da sessão</translation>
<translation id="8454013096329229812">O Wi-Fi está ligado.</translation>
<translation id="4872237917498892622">Alt + Pesquisar ou Shift</translation>
+<translation id="9201131092683066720">A bateria está <ph name="PERCENTAGE"/>% carregada.</translation>
<translation id="2983818520079887040">Configurações...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Modo dock</translation>
+<translation id="112308213915226829">Ocultar estante automaticamente</translation>
<translation id="8927026611342028580">Conexão solicitada</translation>
<translation id="8300849813060516376">Falha no OTASP</translation>
<translation id="2792498699870441125">Alt + Pesquisar</translation>
<translation id="8660803626959853127">Sincronizando <ph name="COUNT"/> arquivos</translation>
+<translation id="5958529069007801266">Usuário supervisionado</translation>
<translation id="3709443003275901162">Mais de 9</translation>
<translation id="639644700271529076">CAPS LOCK está desativado</translation>
<translation id="6248847161401822652">Pressione Control+Shift+Q duas vezes para sair.</translation>
+<translation id="6785414152754474415">A bateria está <ph name="PERCENTAGE"/>% cheia e carregando.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Ativando...</translation>
+<translation id="4895488851634969361">A bateria está carregada.</translation>
<translation id="1391854757121130358">Você pode ter esgotado sua permissão de dados móveis.</translation>
-<translation id="5413208160176941586">Usuário gerenciado localmente</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posição do iniciador</translation>
+<translation id="5947494881799873997">Reverter</translation>
<translation id="7593891976182323525">Pesquisar ou Shift</translation>
<translation id="7649070708921625228">Ajuda</translation>
<translation id="3050422059534974565">A tecla CAPS LOCK está ativada. Pressione Pesquisar ou Shift para cancelar.</translation>
@@ -178,21 +189,23 @@ Mensagem do servidor: <ph name="SERVER_MSG"/></translation>
<translation id="6692173217867674490">Senha incorreta</translation>
<translation id="6165508094623778733">Saiba mais</translation>
<translation id="9046895021617826162">Falha na conexão</translation>
+<translation id="7168224885072002358">Revertendo para resolução anterior em <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Esta sessão terminará em <ph name="SESSION_TIME_REMAINING"/>. Você será automaticamente desconectado.</translation>
<translation id="8372369524088641025">Chave WEP incorreta</translation>
<translation id="6636709850131805001">Estado não reconhecido</translation>
<translation id="3573179567135747900">Voltar a &quot;<ph name="FROM_LOCALE"/>&quot; (exige reinicialização)</translation>
<translation id="8103386449138765447">Mensagens SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Configurações do Google Drive...</translation>
-<translation id="1510238584712386396">Iniciador</translation>
<translation id="7209101170223508707">A tecla CAPS LOCK está ativada. Pressione Alt + Pesquisar ou Shift para cancelar.</translation>
<translation id="8940956008527784070">Nível de bateria baixo (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Aceitar</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> restantes</translation>
<translation id="520760366042891468">Compartilhando o controle de sua tela por meio do Hangouts.</translation>
<translation id="8000066093800657092">Sem rede</translation>
<translation id="4015692727874266537">Fazer login em outra conta...</translation>
<translation id="5941711191222866238">Minimizar</translation>
<translation id="6911468394164995108">Conectar-se a outra...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>h<ph name="MINUTE"/>m até a carga total</translation>
<translation id="6359806961507272919">SMS de <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operadora</translation>
diff --git a/chromium/ash/strings/ash_strings_pt-PT.xtb b/chromium/ash/strings/ash_strings_pt-PT.xtb
index cf5df2d6704..5cb04a1b4e2 100644
--- a/chromium/ash/strings/ash_strings_pt-PT.xtb
+++ b/chromium/ash/strings/ash_strings_pt-PT.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="pt-PT">
<translation id="3595596368722241419">Bateria carregada</translation>
-<translation id="5250713215130379958">Ocultar automaticamente iniciador</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> e <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Estado do portal</translation>
<translation id="30155388420722288">Botão de Sobrecarga</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth ativado</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> foi rodado para <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth desativado</translation>
+<translation id="7165320105431587207">Não foi possível configurar a rede</translation>
<translation id="3775358506042162758">Só pode ter três contas no máximo no início de sessão integrado.</translation>
<translation id="370649949373421643">Ativar Wi-Fi</translation>
<translation id="3626281679859535460">Brilho</translation>
+<translation id="595202126637698455">Rastreio do desempenho ativado</translation>
<translation id="8054466585765276473">A calcular tempo da bateria.</translation>
<translation id="7982789257301363584">Rede</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Sobreposição do teclado</translation>
<translation id="4387004326333427325">Certificado de autenticação rejeitado remotamente</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">A resolução de <ph name="DISPLAY_NAME"/> foi alterada para <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">A obtenção de HTTP falhou</translation>
<translation id="2297568595583585744">Tabuleiro de estado</translation>
<translation id="1661867754829461514">Falta o PIN</translation>
@@ -34,39 +38,41 @@ Prima Shift + Alt para mudar.</translation>
<translation id="2127372758936585790">Carregador de baixo consumo</translation>
<translation id="3846575436967432996">Não existem informações de rede disponíveis</translation>
<translation id="3026237328237090306">Configurar dados móveis</translation>
+<translation id="5871632337994001636">Gerir dispositivos...</translation>
<translation id="785750925697875037">Ver conta do telemóvel</translation>
<translation id="153454903766751181">A inicializar o modem celular...</translation>
<translation id="4628814525959230255">Partilhar o controlo do seu ecrã com <ph name="HELPER_NAME"/> através do Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> foi rodado</translation>
<translation id="7864539943188674973">Desativar Bluetooth</translation>
<translation id="939252827960237676">Não foi possível guardar a captura de ecrã</translation>
<translation id="3126069444801937830">Reiniciar para atualizar</translation>
<translation id="2268813581635650749">Terminar sessão de todos</translation>
<translation id="735745346212279324">VPN desligado</translation>
<translation id="7320906967354320621">Inactiva</translation>
-<translation id="6303423059719347535">A bateria está <ph name="PERCENTAGE"/>% cheia</translation>
<translation id="15373452373711364">Cursor do rato grande</translation>
-<translation id="2778346081696727092">Falha ao autenticar com o nome de utilizador ou palavra-passe fornecidos</translation>
<translation id="3294437725009624529">Convidado</translation>
<translation id="8190698733819146287">Personalizar idiomas e introdução...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Posição da prateleira</translation>
<translation id="2903907270192926896">ENTRADA</translation>
<translation id="8676770494376880701">Carregador de baixo consumo ligado</translation>
<translation id="7170041865419449892">Fora de alcance</translation>
<translation id="4804818685124855865">Desligar</translation>
<translation id="2544853746127077729">Certificado de autenticação rejeitado pela rede</translation>
<translation id="5222676887888702881">Terminar sessão</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configuração</translation>
<translation id="1272079795634619415">Parar</translation>
<translation id="4957722034734105353">Saiba mais...</translation>
<translation id="2964193600955408481">Desativar Wi-Fi</translation>
-<translation id="811680302244032017">Adicionar aparelho...</translation>
<translation id="4279490309300973883">Espelhamento</translation>
+<translation id="7973962044839454485">Falha na autenticação PPP devido a um nome de utilizador ou palavra-passe incorretos</translation>
<translation id="2509468283778169019">CAPS LOCK está ativado</translation>
<translation id="3892641579809465218">Apresentação Interna</translation>
<translation id="7823564328645135659">O idioma foi alterado de <ph name="FROM_LOCALE"/> para <ph name="TO_LOCALE"/> depois de sincronizar as suas definições.</translation>
<translation id="3368922792935385530">Ligado</translation>
<translation id="8340999562596018839">Respostas faladas</translation>
<translation id="8654520615680304441">Ligar Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">O seu método de introdução foi alterado para <ph name="INPUT_METHOD_ID"/>.
Prima Shift + Alt para mudar.</translation>
<translation id="2562916301614567480">Rede Privada</translation>
@@ -83,11 +89,12 @@ Prima Shift + Alt para mudar.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/> % restante</translation>
<translation id="9089416786594320554">Métodos de introdução</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Prateleira</translation>
<translation id="2614835198358683673">É possível que não consiga carregar o seu Chromebook enquanto este se encontrar ligado. Considere utilizar o carregador oficial.</translation>
<translation id="1895658205118569222">Encerrar</translation>
<translation id="4430019312045809116">Volume</translation>
+<translation id="8681498213689260554">Reiniciar e Powerwash para atualizar</translation>
<translation id="4442424173763614572">A procura de DNS falhou</translation>
-<translation id="6356500677799115505">A bateria está cheia e a carregar.</translation>
<translation id="7874779702599364982">A procurar redes celulares...</translation>
<translation id="583281660410589416">Desconhecido</translation>
<translation id="1383876407941801731">Pesquisa</translation>
@@ -96,7 +103,6 @@ Prima Shift + Alt para mudar.</translation>
<translation id="2204305834655267233">Informações da Rede</translation>
<translation id="1621499497873603021">Tempo restante até a bateria terminar, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Sair da sessão de convidado</translation>
-<translation id="4471417012762451363">A bateria está <ph name="PERCENTAGE"/>% cheia e a carregar</translation>
<translation id="8308637677604853869">Menu anterior</translation>
<translation id="4666297444214622512">Não é possível iniciar sessão noutra conta.</translation>
<translation id="1346748346194534595">Direita</translation>
@@ -114,6 +120,7 @@ Prima Ctrl+Alt+Z para desativar.</translation>
<translation id="6312403991423642364">Erro de rede desconhecido</translation>
<translation id="1467432559032391204">Esquerda</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">A ativar <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximizar</translation>
@@ -123,7 +130,6 @@ Prima Ctrl+Alt+Z para desativar.</translation>
<translation id="2727977024730340865">Ligado a um carregador de baixo consumo. O carregamento da bateria pode não ser fiável.</translation>
<translation id="3784455785234192852">Bloquear</translation>
<translation id="2805756323405976993">Aplicações</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> foi redimensionado para <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Falha na activação</translation>
<translation id="5097002363526479830">Falha ao ligar à rede &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">A ligação Wi-Fi está desativada.</translation>
@@ -131,6 +137,7 @@ Prima Ctrl+Alt+Z para desativar.</translation>
<translation id="7052914147756339792">Definir imagem de fundo...</translation>
<translation id="8678698760965522072">Estado on-line</translation>
<translation id="2532589005999780174">Modo de alto contraste</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Erro interno</translation>
<translation id="3019353588588144572">Tempo restante até a bateria estar totalmente carregada: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Mensagem do servidor: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Sair da sessão</translation>
<translation id="8454013096329229812">A ligação Wi-Fi está ativada.</translation>
<translation id="4872237917498892622">Alt + Pesquisar ou Shift</translation>
+<translation id="9201131092683066720">A bateria está <ph name="PERCENTAGE"/>% cheia.</translation>
<translation id="2983818520079887040">Definições...</translation>
+<translation id="1195412055398077112">overscan</translation>
<translation id="1717216362413677834">Modo da estação de ancoragem</translation>
+<translation id="112308213915226829">Ocultar automaticamente a prateleira</translation>
<translation id="8927026611342028580">Ligação Solicitada</translation>
<translation id="8300849813060516376">O OTASP falhou</translation>
<translation id="2792498699870441125">Alt + Pesquisar</translation>
<translation id="8660803626959853127">A sincronizar <ph name="COUNT"/> ficheiro(s)</translation>
+<translation id="5958529069007801266">Utilizador supervisionado</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK está desativado</translation>
<translation id="6248847161401822652">Prima Ctrl+Shift+Q duas vezes para sair.</translation>
+<translation id="6785414152754474415">A bateria está <ph name="PERCENTAGE"/>% cheia e a carregar.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: a ativar...</translation>
+<translation id="4895488851634969361">A bateria está carregada.</translation>
<translation id="1391854757121130358">Poderá ter utilizado toda a sua bonificação de dados móveis.</translation>
-<translation id="5413208160176941586">Utilizador gerido localmente</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Posição do iniciador</translation>
+<translation id="5947494881799873997">Reverter</translation>
<translation id="7593891976182323525">Pesquisar ou Shift</translation>
<translation id="7649070708921625228">Ajuda</translation>
<translation id="3050422059534974565">CAPS LOCK ativado.
@@ -179,22 +190,24 @@ Prima Pesquisar ou Shift para cancelar.</translation>
<translation id="6692173217867674490">Frase de acesso incorrecta</translation>
<translation id="6165508094623778733">Saiba mais</translation>
<translation id="9046895021617826162">A ligação falhou</translation>
+<translation id="7168224885072002358">A reverter para a resolução antiga dentro de <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Esta sessão irá terminar em <ph name="SESSION_TIME_REMAINING"/>. A sua sessão será automaticamente terminada.</translation>
<translation id="8372369524088641025">Chave WEP incorrecta</translation>
<translation id="6636709850131805001">Estado não reconhecido</translation>
<translation id="3573179567135747900">Reverter alteração para <ph name="FROM_LOCALE"/> (requer reinicio)</translation>
<translation id="8103386449138765447">Mensagens SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Definições do Google Drive...</translation>
-<translation id="1510238584712386396">Iniciador</translation>
<translation id="7209101170223508707">CAPS LOCK ativado.
Prima Alt + Pesquisar ou Shift para cancelar.</translation>
<translation id="8940956008527784070">Bateria fraca (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Aceitar</translation>
<translation id="5102001756192215136">Restam <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Partilhar o controlo do seu ecrã através dos Hangouts.</translation>
<translation id="8000066093800657092">Sem rede</translation>
<translation id="4015692727874266537">Iniciar sessão numa conta adicional...</translation>
<translation id="5941711191222866238">Minimizar</translation>
<translation id="6911468394164995108">Aderir a outra...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>h <ph name="MINUTE"/>m até ficar completa</translation>
<translation id="6359806961507272919">SMS de <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operador</translation>
diff --git a/chromium/ash/strings/ash_strings_ro.xtb b/chromium/ash/strings/ash_strings_ro.xtb
index 2412434089a..ace43009830 100644
--- a/chromium/ash/strings/ash_strings_ro.xtb
+++ b/chromium/ash/strings/ash_strings_ro.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ro">
<translation id="3595596368722241419">Baterie încărcată</translation>
-<translation id="5250713215130379958">Ascundeți automat lansatorul</translation>
<translation id="7814236020522506259"><ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stare portal</translation>
<translation id="30155388420722288">Butonul Overflow</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth activat</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> a fost rotit la <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth dezactivat</translation>
+<translation id="7165320105431587207">Rețeaua nu a putut fi configurată</translation>
<translation id="3775358506042162758">Conectarea multiplă acceptă maximum trei conturi.</translation>
<translation id="370649949373421643">Activați Wi-Fi</translation>
<translation id="3626281679859535460">Luminozitate</translation>
+<translation id="595202126637698455">Urmărirea performanței este activată</translation>
<translation id="8054466585765276473">Se calculează durata bateriei.</translation>
<translation id="7982789257301363584">Rețea</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Suprapunere a tastaturii</translation>
<translation id="4387004326333427325">Certificatul de autentificare a fost respins de la distanță</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Rezoluția <ph name="DISPLAY_NAME"/> a fost modificată la <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Metoda GET a protocolului HTTP a eșuat</translation>
<translation id="2297568595583585744">Bara de stare</translation>
<translation id="1661867754829461514">Codul PIN lipsește</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Încărcător de putere joasă</translation>
<translation id="3846575436967432996">Nu sunt disponibile informații despre rețele</translation>
<translation id="3026237328237090306">Configurați datele mobile</translation>
+<translation id="5871632337994001636">Gestionați dispozitivele...</translation>
<translation id="785750925697875037">Afișați contul mobil</translation>
<translation id="153454903766751181">Se inițializează modemul mobil...</translation>
<translation id="4628814525959230255">În prezent, <ph name="HELPER_NAME"/> vă poate controla ecranul prin intermediul Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> a fost rotit</translation>
<translation id="7864539943188674973">Dezactivați Bluetooth</translation>
<translation id="939252827960237676">Captura de ecran nu a putut fi salvată.</translation>
<translation id="3126069444801937830">Reporniți pentru a actualiza</translation>
<translation id="2268813581635650749">Deconectați toți utilizatorii</translation>
<translation id="735745346212279324">Rețea VPN deconectată</translation>
<translation id="7320906967354320621">Inactivă</translation>
-<translation id="6303423059719347535">Nivelul bateriei este de <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Cursor de mouse mare</translation>
-<translation id="2778346081696727092">Autentificarea cu numele de utilizator sau parola furnizate a eșuat</translation>
<translation id="3294437725009624529">Invitat</translation>
<translation id="8190698733819146287">Personalizați limbile și modul de introducere...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Poziție raft</translation>
<translation id="2903907270192926896">INTRARE</translation>
<translation id="8676770494376880701">A fost conectat un încărcător de putere joasă</translation>
<translation id="7170041865419449892">Fără acoperire</translation>
<translation id="4804818685124855865">Deconectați-vă</translation>
<translation id="2544853746127077729">Certificatul de autentificare a fost respins de rețea</translation>
<translation id="5222676887888702881">Deconectați-vă</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Configurare</translation>
<translation id="1272079795634619415">Opriți</translation>
<translation id="4957722034734105353">Aflați mai multe...</translation>
<translation id="2964193600955408481">Dezactivați Wi-Fi</translation>
-<translation id="811680302244032017">Adăugați un dispozitiv...</translation>
<translation id="4279490309300973883">Oglindire</translation>
+<translation id="7973962044839454485">Autentificarea PPP nu a reușit, din cauza unui nume de utilizator sau a unei parole greșite</translation>
<translation id="2509468283778169019">Tasta CAPS LOCK este activată</translation>
<translation id="3892641579809465218">Afișaj intern</translation>
<translation id="7823564328645135659">După sincronizarea setărilor, limba a fost modificată de la „<ph name="FROM_LOCALE"/>” la „<ph name="TO_LOCALE"/>”.</translation>
<translation id="3368922792935385530">Conectat</translation>
<translation id="8340999562596018839">Feedback vocal</translation>
<translation id="8654520615680304441">Activați Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Metoda de introducere s-a schimbat la <ph name="INPUT_METHOD_ID"/>.
Apăsați pe Shift + Alt pentru a comuta.</translation>
<translation id="2562916301614567480">Rețea privată</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Nivel disponibil: <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Metode de introducere</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Raft</translation>
<translation id="2614835198358683673">Este posibil ca laptopul Chromebook să nu se încarce în timp ce este pornit. Se recomandă să utilizați încărcătorul original.</translation>
<translation id="1895658205118569222">Închideți</translation>
<translation id="4430019312045809116">Volum</translation>
+<translation id="8681498213689260554">Pentru a actualiza, reporniți și efectuați Powerwash</translation>
<translation id="4442424173763614572">Căutarea DNS a eșuat</translation>
-<translation id="6356500677799115505">Bateria este plină și se încarcă.</translation>
<translation id="7874779702599364982">Se caută rețele mobile...</translation>
<translation id="583281660410589416">Necunoscut</translation>
<translation id="1383876407941801731">Căutare</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Informații despre rețea</translation>
<translation id="1621499497873603021">Timp rămas până la descărcarea bateriei: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Ieșiți din sesiunea pentru invitați</translation>
-<translation id="4471417012762451363">Nivelul bateriei este de <ph name="PERCENTAGE"/> % și se încarcă</translation>
<translation id="8308637677604853869">Meniul anterior</translation>
<translation id="4666297444214622512">Nu vă mai puteți conecta la alt cont.</translation>
<translation id="1346748346194534595">Dreapta</translation>
@@ -114,6 +120,7 @@ Apăsați Ctrl+Alt+Z pentru a-l dezactiva.</translation>
<translation id="6312403991423642364">Eroare de rețea necunoscută</translation>
<translation id="1467432559032391204">Stânga</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Se activează <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximizați</translation>
@@ -123,7 +130,6 @@ Apăsați Ctrl+Alt+Z pentru a-l dezactiva.</translation>
<translation id="2727977024730340865">V-ați conectat la un încărcător de putere joasă. Încărcarea bateriei poate fi nesigură.</translation>
<translation id="3784455785234192852">Blocați</translation>
<translation id="2805756323405976993">Google Apps</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> a fost redimensionat la <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Activare nereușită</translation>
<translation id="5097002363526479830">A eșuat conectarea la rețeaua „<ph name="NAME"/>”: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Conexiunea Wi-Fi este dezactivată.</translation>
@@ -131,6 +137,7 @@ Apăsați Ctrl+Alt+Z pentru a-l dezactiva.</translation>
<translation id="7052914147756339792">Setați o imagine de fundal...</translation>
<translation id="8678698760965522072">Stare online</translation>
<translation id="2532589005999780174">Mod de contrast ridicat</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Eroare internă</translation>
<translation id="3019353588588144572">Timp rămas până la încărcarea completă a bateriei: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupă de ecran</translation>
@@ -153,20 +160,24 @@ Mesaj server: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Ieșiți din sesiune</translation>
<translation id="8454013096329229812">Conexiunea Wi-Fi este activată.</translation>
<translation id="4872237917498892622">Alt+Căutare sau Shift</translation>
+<translation id="9201131092683066720">Nivelul bateriei este de <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Setări...</translation>
+<translation id="1195412055398077112">suprascanare</translation>
<translation id="1717216362413677834">Mod de andocare</translation>
+<translation id="112308213915226829">Ascundeți automat raftul</translation>
<translation id="8927026611342028580">Conectare solicitată</translation>
<translation id="8300849813060516376">OTASP a eșuat</translation>
<translation id="2792498699870441125">Alt+Căutare</translation>
<translation id="8660803626959853127">Se sincronizează <ph name="COUNT"/> (de) fișiere</translation>
+<translation id="5958529069007801266">Utilizator monitorizat</translation>
<translation id="3709443003275901162">Peste 9</translation>
<translation id="639644700271529076">Tasta CAPS LOCK este dezactivată</translation>
<translation id="6248847161401822652">Apăsați de două ori Control Shift Q pentru a ieși.</translation>
+<translation id="6785414152754474415">Nivelul bateriei este de <ph name="PERCENTAGE"/>% și se încarcă.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: se activează...</translation>
+<translation id="4895488851634969361">Bateria este încărcată complet.</translation>
<translation id="1391854757121130358">Este posibil să fi consumat complet alocarea datelor mobile.</translation>
-<translation id="5413208160176941586">Utilizator gestionat local</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Poziția lansatorului</translation>
+<translation id="5947494881799873997">Reveniți</translation>
<translation id="7593891976182323525">Căutare sau Shift</translation>
<translation id="7649070708921625228">Ajutor</translation>
<translation id="3050422059534974565">Tasta CAPS LOCK este activată.
@@ -179,22 +190,24 @@ Apăsați Căutare sau Shift pentru a anula.</translation>
<translation id="6692173217867674490">Expresie de acces greșită</translation>
<translation id="6165508094623778733">Aflați mai multe</translation>
<translation id="9046895021617826162">Conectarea a eșuat</translation>
+<translation id="7168224885072002358">Se revine la rezoluția anterioară în <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Această sesiune se va încheia în <ph name="SESSION_TIME_REMAINING"/>. Veți fi deconectat(ă) automat.</translation>
<translation id="8372369524088641025">Cheie WEP greșită</translation>
<translation id="6636709850131805001">Stare nerecunoscută</translation>
<translation id="3573179567135747900">Modificați înapoi la „<ph name="FROM_LOCALE"/>” (este necesară repornirea)</translation>
<translation id="8103386449138765447">Mesaje SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Setări Disc Google...</translation>
-<translation id="1510238584712386396">Lansator</translation>
<translation id="7209101170223508707">Tasta CAPS LOCK este activată.
Apăsați Alt+Căutare sau Shift pentru a anula.</translation>
<translation id="8940956008527784070">Baterie slabă (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Accept</translation>
<translation id="5102001756192215136">Timp rămas: <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">În prezent, permiteți controlul la ecran prin intermediul Hangouts.</translation>
<translation id="8000066093800657092">Nicio rețea</translation>
<translation id="4015692727874266537">Conectați-vă la alt cont...</translation>
<translation id="5941711191222866238">Minimizați</translation>
<translation id="6911468394164995108">Conectați-vă la altă rețea...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h. <ph name="MINUTE"/> min. până la încărcare completă</translation>
<translation id="6359806961507272919">SMS de la <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operator</translation>
diff --git a/chromium/ash/strings/ash_strings_ru.xtb b/chromium/ash/strings/ash_strings_ru.xtb
index c248abcaa21..e99e8b8418a 100644
--- a/chromium/ash/strings/ash_strings_ru.xtb
+++ b/chromium/ash/strings/ash_strings_ru.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ru">
<translation id="3595596368722241419">Аккумулятор заряжен</translation>
-<translation id="5250713215130379958">Автоматически скрывать панель запуска</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Состояние портала</translation>
<translation id="30155388420722288">Кнопка переполнения</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth включен</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/>: положение изменено на <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth отключен</translation>
+<translation id="7165320105431587207">Не удалось настроить сеть</translation>
<translation id="3775358506042162758">Множественный вход поддерживает не более трех аккаунтов.</translation>
<translation id="370649949373421643">Включить Wi-Fi</translation>
<translation id="3626281679859535460">Яркость</translation>
+<translation id="595202126637698455">Включено отслеживание эффективности</translation>
<translation id="8054466585765276473">Подсчет оставшегося времени работы от батареи…</translation>
<translation id="7982789257301363584">Сеть</translation>
<translation id="5565793151875479467">Прокси-сервер…</translation>
<translation id="938582441709398163">Накладка на клавиатуру</translation>
<translation id="4387004326333427325">Сертификат аутентификации отклонен удаленно</translation>
<translation id="6979158407327259162">Google Диск</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/>: установлено разрешение <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Произошла ошибка запроса HTTP GET</translation>
<translation id="2297568595583585744">Строка состояния</translation>
<translation id="1661867754829461514">PIN-код отсутствует</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Маломощное зарядное устройство</translation>
<translation id="3846575436967432996">Информация о сетях недоступна</translation>
<translation id="3026237328237090306">Настроить мобильную передачу данных</translation>
+<translation id="5871632337994001636">Управление устройствами...</translation>
<translation id="785750925697875037">Просмотр мобильного аккаунта</translation>
<translation id="153454903766751181">Инициализация сотового модема…</translation>
<translation id="4628814525959230255">Доступ к экрану для <ph name="HELPER_NAME"/> в Hangouts.</translation>
-<translation id="8343941333792395995">Экран <ph name="DISPLAY_NAME"/> перевернут</translation>
<translation id="7864539943188674973">Отключить Bluetooth</translation>
<translation id="939252827960237676">Не удалось сохранить скриншот</translation>
<translation id="3126069444801937830">Перезагрузите, чтобы обновить</translation>
<translation id="2268813581635650749">Выйти из всех аккаунтов</translation>
<translation id="735745346212279324">VPN-соединение прервано</translation>
<translation id="7320906967354320621">Не активно</translation>
-<translation id="6303423059719347535">Батарея заряжена на <ph name="PERCENTAGE"/>%.</translation>
<translation id="15373452373711364">Большой курсор мыши</translation>
-<translation id="2778346081696727092">Не удалось выполнить аутентификацию</translation>
<translation id="3294437725009624529">Гость</translation>
<translation id="8190698733819146287">Настройка языков и ввода...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Положение полки</translation>
<translation id="2903907270192926896">ВХОД</translation>
<translation id="8676770494376880701">Подключено маломощное зарядное устройство</translation>
<translation id="7170041865419449892">Выход за рамки диапазона</translation>
<translation id="4804818685124855865">Отключиться</translation>
<translation id="2544853746127077729">Сертификат аутентификации отклонен сетью</translation>
<translation id="5222676887888702881">Выйти</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Конфигурация</translation>
<translation id="1272079795634619415">Остановить</translation>
<translation id="4957722034734105353">Подробнее…</translation>
<translation id="2964193600955408481">Отключить Wi-Fi</translation>
-<translation id="811680302244032017">Добавить устройство</translation>
<translation id="4279490309300973883">Отражение</translation>
+<translation id="7973962044839454485">Не удалось выполнить аутентификацию PPP: неверное имя пользователя или пароль</translation>
<translation id="2509468283778169019">Включен режим CAPS LOCK</translation>
<translation id="3892641579809465218">Встроенный дисплей</translation>
<translation id="7823564328645135659">В результате синхронизации настроек язык изменен. Теперь используется <ph name="TO_LOCALE"/>, а не <ph name="FROM_LOCALE"/>.</translation>
<translation id="3368922792935385530">Подключено</translation>
<translation id="8340999562596018839">Голосовое сопровождение</translation>
<translation id="8654520615680304441">Включение Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Способ ввода изменен на <ph name="INPUT_METHOD_ID"/>.
Для переключения нажмите Shift + Alt.</translation>
<translation id="2562916301614567480">Частная сеть</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Осталось <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Методы ввода</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Полка</translation>
<translation id="2614835198358683673">Возможны проблемы при зарядке Chromebook. Рекомендуем использовать комплектное зарядное устройство.</translation>
<translation id="1895658205118569222">Завершение работы</translation>
<translation id="4430019312045809116">Объем</translation>
+<translation id="8681498213689260554">Чтобы обновить систему, перезапустите ее и выполните Powerwash</translation>
<translation id="4442424173763614572">Произошла ошибка при поиске сервера DNS</translation>
-<translation id="6356500677799115505">Батарея заряжена и подключена к источнику питания.</translation>
<translation id="7874779702599364982">Поиск сетей мобильной связи...</translation>
<translation id="583281660410589416">неизвестно</translation>
<translation id="1383876407941801731">Поиск</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Информация о сети</translation>
<translation id="1621499497873603021">Оставшееся время работы от батареи: <ph name="TIME_LEFT"/>.</translation>
<translation id="5980301590375426705">Выйти из гостевого режима</translation>
-<translation id="4471417012762451363">Батарея заряжена на <ph name="PERCENTAGE"/>% и подключена к источнику питания.</translation>
<translation id="8308637677604853869">Предыдущее меню</translation>
<translation id="4666297444214622512">Не удается войти ещё в один аккаунт.</translation>
<translation id="1346748346194534595">Вправо</translation>
@@ -113,6 +119,7 @@
<translation id="6312403991423642364">Неизвестная ошибка сети</translation>
<translation id="1467432559032391204">Влево</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Активация <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Развернуть</translation>
@@ -122,7 +129,6 @@
<translation id="2727977024730340865">Подключено маломощное зарядное устройство. Возможны проблемы при зарядке.</translation>
<translation id="3784455785234192852">Заблокировать</translation>
<translation id="2805756323405976993">Приложения</translation>
-<translation id="8871072142849158571">Установлено новое разрешение экрана <ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Сбой активации</translation>
<translation id="5097002363526479830">Не удалось подключиться к сети <ph name="NAME"/>: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi отключен</translation>
@@ -130,6 +136,7 @@
<translation id="7052914147756339792">Выбрать обои</translation>
<translation id="8678698760965522072">Состояние &quot;В сети&quot;</translation>
<translation id="2532589005999780174">Режим высокой контрастности</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Внутренняя ошибка</translation>
<translation id="3019353588588144572">Оставшееся время до полной зарядки батареи: <ph name="TIME_REMAINING"/>.</translation>
<translation id="3473479545200714844">Лупа</translation>
@@ -152,20 +159,24 @@
<translation id="7029814467594812963">Завершить сеанс</translation>
<translation id="8454013096329229812">Wi-Fi включен</translation>
<translation id="4872237917498892622">Alt + Search или Shift</translation>
+<translation id="9201131092683066720">Батарея заряжена на <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Настройки...</translation>
+<translation id="1195412055398077112">Каемка экрана</translation>
<translation id="1717216362413677834">Закрепленный режим</translation>
+<translation id="112308213915226829">Автоматически скрывать полку</translation>
<translation id="8927026611342028580">Запрос на подключение отправлен</translation>
<translation id="8300849813060516376">Сбой OTASP</translation>
<translation id="2792498699870441125">Alt + Search</translation>
<translation id="8660803626959853127">Синхронизация файлов (<ph name="COUNT"/>)</translation>
+<translation id="5958529069007801266">Контролируемый профиль</translation>
<translation id="3709443003275901162">более 9</translation>
<translation id="639644700271529076">CAPS LOCK отключен</translation>
<translation id="6248847161401822652">Чтобы выйти, дважды нажмите Control + Shift + Q.</translation>
+<translation id="6785414152754474415">Батарея заряжена на <ph name="PERCENTAGE"/>% и подключена к источнику питания.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: выполняется активация...</translation>
+<translation id="4895488851634969361">Батарея полностью заряжена.</translation>
<translation id="1391854757121130358">Вероятно, вы использовали весь объем данных, предусмотренный тарифным планом.</translation>
-<translation id="5413208160176941586">Локально управляемый профиль</translation>
-<translation id="1059194134494239015">Разрешение экрана <ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Положение панели запуска</translation>
+<translation id="5947494881799873997">Отменить</translation>
<translation id="7593891976182323525">Search или Shift</translation>
<translation id="7649070708921625228">Справка</translation>
<translation id="3050422059534974565">Включен режим CAPS LOCK.
@@ -178,22 +189,24 @@
<translation id="6692173217867674490">Неправильная кодовая фраза</translation>
<translation id="6165508094623778733">Подробнее...</translation>
<translation id="9046895021617826162">Сбой подключения</translation>
+<translation id="7168224885072002358">Возврат к предыдущему разрешению через <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Сеанс будет завершен через <ph name="SESSION_TIME_REMAINING"/>. Произойдет автоматический выход из системы.</translation>
<translation id="8372369524088641025">Недопустимый ключ WEP</translation>
<translation id="6636709850131805001">Нераспознанное состояние</translation>
<translation id="3573179567135747900">Вернуться к языку: &quot;<ph name="FROM_LOCALE"/>&quot; (потребуется перезагрузка)</translation>
<translation id="8103386449138765447">SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Настройки Диска Google…</translation>
-<translation id="1510238584712386396">Панель запуска</translation>
<translation id="7209101170223508707">Включен режим CAPS LOCK.
Чтобы отключить его, нажмите Alt + Search или Shift.</translation>
<translation id="8940956008527784070">Низкий заряд батареи (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Принять</translation>
<translation id="5102001756192215136">Осталось <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Доступ к экрану в Hangouts.</translation>
<translation id="8000066093800657092">Нет сети</translation>
<translation id="4015692727874266537">Войти ещё в один аккаунт...</translation>
<translation id="5941711191222866238">Свернуть</translation>
<translation id="6911468394164995108">Подключиться к другой сети...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">До полной зарядки: <ph name="HOUR"/> ч <ph name="MINUTE"/> мин</translation>
<translation id="6359806961507272919">SMS от <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Оператор связи</translation>
diff --git a/chromium/ash/strings/ash_strings_sk.xtb b/chromium/ash/strings/ash_strings_sk.xtb
index 02ba009f4e1..c313ac11200 100644
--- a/chromium/ash/strings/ash_strings_sk.xtb
+++ b/chromium/ash/strings/ash_strings_sk.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="sk">
<translation id="3595596368722241419">Batéria je nabitá</translation>
-<translation id="5250713215130379958">Automaticky skryť spúšťač</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> a <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stav portálu</translation>
<translation id="30155388420722288">Tlačidlo pretečenia</translation>
+<translation id="8673028979667498656">270 °</translation>
<translation id="5571066253365925590">Rozhranie Bluetooth je povolené</translation>
+<translation id="6310121235600822547">Obrazovka <ph name="DISPLAY_NAME"/> bola otočená o <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Rozhranie Bluetooth je zakázané</translation>
+<translation id="7165320105431587207">Sieť sa nepodarilo nakonfigurovať</translation>
<translation id="3775358506042162758">V rámci viacnásobného prihlásenia môžete mať maximálne tri účty.</translation>
<translation id="370649949373421643">Povoliť Wi-Fi</translation>
<translation id="3626281679859535460">Jas</translation>
+<translation id="595202126637698455">Sledovanie výkonnosti je povolené</translation>
<translation id="8054466585765276473">Výpočet času výdrže batérie.</translation>
<translation id="7982789257301363584">Sieť</translation>
<translation id="5565793151875479467">Server proxy...</translation>
<translation id="938582441709398163">Prekryvná vrstva klávesnice</translation>
<translation id="4387004326333427325">Certifikát na overenie totožnosti bol zamietnutý na diaľku</translation>
<translation id="6979158407327259162">Disk Google</translation>
+<translation id="3683428399328702079">Rozlíšenie obrazovky <ph name="DISPLAY_NAME"/> bolo zmenené na <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Príkaz get protokolu HTTP zlyhal</translation>
<translation id="2297568595583585744">Stavový panel</translation>
<translation id="1661867754829461514">Chýba kód PIN</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Nabíjačka s nízkym výkonom</translation>
<translation id="3846575436967432996">Informácie o sieti nie sú k dispozícii</translation>
<translation id="3026237328237090306">Nastavenie mobilného dátového pripojenia</translation>
+<translation id="5871632337994001636">Spravovať zariadenia...</translation>
<translation id="785750925697875037">Zobraziť mobilný účet</translation>
<translation id="153454903766751181">Inicializácia mobilného modemu...</translation>
<translation id="4628814525959230255">Zdieľanie ovládania obrazovky s používateľom <ph name="HELPER_NAME"/> prostredníctvom služby Hangouts.</translation>
-<translation id="8343941333792395995">Obrazovka <ph name="DISPLAY_NAME"/> sa otočila</translation>
<translation id="7864539943188674973">Zakázať rozhranie Bluetooth</translation>
<translation id="939252827960237676">Uloženie snímky obrazovky zlyhalo.</translation>
<translation id="3126069444801937830">Reštartovaním vykonáte aktualizáciu</translation>
<translation id="2268813581635650749">Odhlásiť všetkých</translation>
<translation id="735745346212279324">Sieť VPN je odpojená</translation>
<translation id="7320906967354320621">Nečinná</translation>
-<translation id="6303423059719347535">Batéria je nabitá na <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Veľký kurzor myši</translation>
-<translation id="2778346081696727092">Overenie totožnosti pomocou zadaného používateľského mena a hesla zlyhalo</translation>
<translation id="3294437725009624529">Hosť</translation>
<translation id="8190698733819146287">Prebieha prispôsobenie jazykov a vstupu...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Pozícia poličky</translation>
<translation id="2903907270192926896">VSTUP</translation>
<translation id="8676770494376880701">Pripojila sa nabíjačka s nízkym výkonom</translation>
<translation id="7170041865419449892">Mimo rozsah</translation>
<translation id="4804818685124855865">Odpojiť</translation>
<translation id="2544853746127077729">Certifikát na overenie totožnosti bol zamietnutý sieťou</translation>
<translation id="5222676887888702881">Odhlásiť sa</translation>
+<translation id="2391579633712104609">180 °</translation>
<translation id="2688477613306174402">Konfigurácia</translation>
<translation id="1272079795634619415">Zastaviť</translation>
<translation id="4957722034734105353">Viac informácií...</translation>
<translation id="2964193600955408481">Zakázať sieť Wi-Fi</translation>
-<translation id="811680302244032017">Pridať zariadenie ...</translation>
<translation id="4279490309300973883">Zrkadlenie</translation>
+<translation id="7973962044839454485">Overenie PKS zlyhalo z dôvodu nesprávneho používateľského mena alebo hesla</translation>
<translation id="2509468283778169019">Kláves CAPS LOCK je zapnutý</translation>
<translation id="3892641579809465218">Interný displej</translation>
<translation id="7823564328645135659">Po synchronizácii vašich nastavení bol zmenený jazyk „<ph name="FROM_LOCALE"/>“ na jazyk „<ph name="TO_LOCALE"/>“.</translation>
<translation id="3368922792935385530">Pripojené</translation>
<translation id="8340999562596018839">Hlasová odozva</translation>
<translation id="8654520615680304441">Zapnúť sieť Wi-Fi...</translation>
+<translation id="8828714802988429505">90 °</translation>
<translation id="5825747213122829519">Metóda vstupu sa zmenila na <ph name="INPUT_METHOD_ID"/>.
Prepnete ju stlačením klávesov Shift + Alt.</translation>
<translation id="2562916301614567480">Súkromná sieť</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Zostáva <ph name="PERCENTAGE"/> %</translation>
<translation id="9089416786594320554">Metódy vstupu</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Polička</translation>
<translation id="2614835198358683673">Chromebook sa nesmie dobíjať v čase, keď je zapnutý. Zvážte použitie oficiálnej nabíjačky.</translation>
<translation id="1895658205118569222">Vypnúť</translation>
<translation id="4430019312045809116">Hlasitosť</translation>
+<translation id="8681498213689260554">Aktualizáciu uskutočníte reštartovaním a použitím funkcie Powerwash</translation>
<translation id="4442424173763614572">Vyhľadanie DNS zlyhalo</translation>
-<translation id="6356500677799115505">Batéria je úplne nabitá a nabíja sa.</translation>
<translation id="7874779702599364982">Prebieha vyhľadávanie mobilných sietí...</translation>
<translation id="583281660410589416">Neznámy</translation>
<translation id="1383876407941801731">Vyhľadávanie</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Informácie o sieti</translation>
<translation id="1621499497873603021">Čas zostávajúci do vybitia batérie: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Ukončiť reláciu hosťa</translation>
-<translation id="4471417012762451363">Batéria je nabitá na <ph name="PERCENTAGE"/> % a nabíja sa</translation>
<translation id="8308637677604853869">Predchádzajúca ponuka</translation>
<translation id="4666297444214622512">Nepodarilo sa prihlásiť do iného účtu.</translation>
<translation id="1346748346194534595">Doprava</translation>
@@ -114,6 +120,7 @@ Zakážete ju stlačením klávesov Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Neznáma chyba siete</translation>
<translation id="1467432559032391204">Doľava</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktivujte sa sieť <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximalizovať</translation>
@@ -123,7 +130,6 @@ Zakážete ju stlačením klávesov Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Batéria je zapojená do nabíjačky s nízkym výkonom. Nabíjanie batérie nemusí byť spoľahlivé.</translation>
<translation id="3784455785234192852">Uzamknúť</translation>
<translation id="2805756323405976993">Aplikácie</translation>
-<translation id="8871072142849158571">Veľkosť obrazovky <ph name="DISPLAY_NAME"/> sa zmenila na veľkosť <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Zlyhanie aktivácie</translation>
<translation id="5097002363526479830">K sieti „<ph name="NAME"/>“ sa nepodarilo pripojiť: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Pripojenie Wi-Fi je vypnuté.</translation>
@@ -131,6 +137,7 @@ Zakážete ju stlačením klávesov Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Nastavenie tapety...</translation>
<translation id="8678698760965522072">Stav online</translation>
<translation id="2532589005999780174">Režim s vysokým kontrastom</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Interná chyba</translation>
<translation id="3019353588588144572">Čas zostávajúci do úplného nabitia batérie: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Správa zo servera: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Ukončiť reláciu</translation>
<translation id="8454013096329229812">Pripojenie Wi-Fi je zapnuté.</translation>
<translation id="4872237917498892622">Alt + Hľadať alebo Shift</translation>
+<translation id="9201131092683066720">Batéria je nabitá na <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Nastavenia...</translation>
+<translation id="1195412055398077112">presah obsahu</translation>
<translation id="1717216362413677834">Režim doku</translation>
+<translation id="112308213915226829">Automatické skrývanie poličky</translation>
<translation id="8927026611342028580">Vyžaduje sa pripojenie</translation>
<translation id="8300849813060516376">Zlyhanie služby OTASP</translation>
<translation id="2792498699870441125">Alt + Hľadať</translation>
<translation id="8660803626959853127">Synchronizácia súborov (<ph name="COUNT"/>)</translation>
+<translation id="5958529069007801266">Kontrolovaný používateľ</translation>
<translation id="3709443003275901162">viac ako 9</translation>
<translation id="639644700271529076">CAPS LOCK je vypnutý</translation>
<translation id="6248847161401822652">Ak chcete skončiť, stlačte dvakrát kombináciu kláves Ctrl+Shift+Q.</translation>
+<translation id="6785414152754474415">Batéria je nabitá na <ph name="PERCENTAGE"/> % a nabíja sa.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Aktivuje sa...</translation>
+<translation id="4895488851634969361">Batéria je úplne nabitá.</translation>
<translation id="1391854757121130358">Možno ste dosiahli limit povolených mobilných dát.</translation>
-<translation id="5413208160176941586">Miestne spravovaný používateľ</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Pozícia spúťača</translation>
+<translation id="5947494881799873997">Vrátiť</translation>
<translation id="7593891976182323525">Hľadať alebo Shift</translation>
<translation id="7649070708921625228">Pomocník</translation>
<translation id="3050422059534974565">Kláves CAPS LOCK je zapnutý.
@@ -179,22 +190,24 @@ Ak ho chcete zrušiť, stlačte klávesy Hľadať alebo Shift.</translation>
<translation id="6692173217867674490">Zlá prístupová fráza</translation>
<translation id="6165508094623778733">Viac informácií</translation>
<translation id="9046895021617826162">Zlyhanie pripojenia</translation>
+<translation id="7168224885072002358">Vrátenie starého rozlíšenia prebehne o <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Relácia sa ukončí o <ph name="SESSION_TIME_REMAINING"/>. Automaticky dôjde k odhláseniu.</translation>
<translation id="8372369524088641025">Zlý kľúč WEP</translation>
<translation id="6636709850131805001">Nerozpoznaný stav</translation>
<translation id="3573179567135747900">Zmeniť späť na miestne nastavenie „<ph name="FROM_LOCALE"/>“ (vyžaduje sa reštart)</translation>
<translation id="8103386449138765447">Správy SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Nastavenia služby Disk Google...</translation>
-<translation id="1510238584712386396">Spúšťač</translation>
<translation id="7209101170223508707">Kláves CAPS LOCK je zapnutý.
Ak ho chcete zrušiť, stlačte klávesy Alt + Hľadať alebo Shift.</translation>
<translation id="8940956008527784070">Kapacita batérie je nízka (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Prijať</translation>
<translation id="5102001756192215136">zostáva <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Zdieľanie ovládania obrazovky prostredníctvom služby Hangouts.</translation>
<translation id="8000066093800657092">Žiadna sieť</translation>
<translation id="4015692727874266537">Prihláste sa do iného účtu...</translation>
<translation id="5941711191222866238">Minimalizovať</translation>
<translation id="6911468394164995108">Pripojiť k ďalšej...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>h <ph name="MINUTE"/>min do nabitia</translation>
<translation id="6359806961507272919">SMS z č. <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operátor</translation>
diff --git a/chromium/ash/strings/ash_strings_sl.xtb b/chromium/ash/strings/ash_strings_sl.xtb
index 3ac1f59d5b2..e9d5d1ec8cc 100644
--- a/chromium/ash/strings/ash_strings_sl.xtb
+++ b/chromium/ash/strings/ash_strings_sl.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="sl">
<translation id="3595596368722241419">Baterija je polna</translation>
-<translation id="5250713215130379958">Samodejno skrij zaganjalnik</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> in <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Stanje portala</translation>
<translation id="30155388420722288">Gumb za presežek</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth omogočen</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> – zasuk na <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth onemogočen</translation>
+<translation id="7165320105431587207">Omrežja ni bilo mogoče konfigurirati</translation>
<translation id="3775358506042162758">S prijavo z več računi lahko uporabljate samo tri račune.</translation>
<translation id="370649949373421643">Omogoči Wi-Fi</translation>
<translation id="3626281679859535460">Svetlost</translation>
+<translation id="595202126637698455">Sledenje učinkovitosti delovanja je omogočeno</translation>
<translation id="8054466585765276473">Izračunavanje časa trajanja akumulatorja.</translation>
<translation id="7982789257301363584">Omrežje</translation>
<translation id="5565793151875479467">Proxy ...</translation>
<translation id="938582441709398163">Prekrivna tipkovnica</translation>
<translation id="4387004326333427325">Potrdilo za preverjanje pristnosti je bilo zavrnjeno na oddaljeni lokaciji</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> – ločljivost je bila spremenjena na: <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Ukaz HTTP get ni uspel</translation>
<translation id="2297568595583585744">Pladenj stanja</translation>
<translation id="1661867754829461514">Manjka PIN</translation>
@@ -34,39 +38,41 @@ Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="2127372758936585790">Nizkoenergijski polnilnik</translation>
<translation id="3846575436967432996">Ni podatkov o omrežju</translation>
<translation id="3026237328237090306">Nastavitev mobilne podatkovne povezave</translation>
+<translation id="5871632337994001636">Upravljanje naprav ...</translation>
<translation id="785750925697875037">Prikaz mobilnega računa</translation>
<translation id="153454903766751181">Inicializacija modema za mobilno omrežje ...</translation>
<translation id="4628814525959230255">Skupni nadzor zaslona z osebo <ph name="HELPER_NAME"/> prek klepetalnic Hangouts.</translation>
-<translation id="8343941333792395995">Zaslon <ph name="DISPLAY_NAME"/> je zasukan</translation>
<translation id="7864539943188674973">Onemogoči Bluetooth</translation>
<translation id="939252827960237676">Posnetka zaslona ni bilo mogoče shraniti</translation>
<translation id="3126069444801937830">Znova zaženite za posodobitev</translation>
<translation id="2268813581635650749">Odjava vseh</translation>
<translation id="735745346212279324">Povezava z navideznim zasebnim omrežjem je prekinjena</translation>
<translation id="7320906967354320621">Nedejavno</translation>
-<translation id="6303423059719347535">Napolnjenost akumulatorja: <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Velik miškin kazalec</translation>
-<translation id="2778346081696727092">Preverjanje pristnosti vnesenega uporabniškega imena ali gesla ni uspelo</translation>
<translation id="3294437725009624529">Gost</translation>
<translation id="8190698733819146287">Prilagajanje jezikov in vnosa ...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Položaj police</translation>
<translation id="2903907270192926896">VHOD</translation>
<translation id="8676770494376880701">Priključen je nizkoenergijski polnilnik</translation>
<translation id="7170041865419449892">Zunaj dosega</translation>
<translation id="4804818685124855865">Prekini povezavo</translation>
<translation id="2544853746127077729">Omrežje je zavrnilo potrdilo za preverjanje pristnosti</translation>
<translation id="5222676887888702881">Odjava</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguracija</translation>
<translation id="1272079795634619415">Ustavi</translation>
<translation id="4957722034734105353">Več o tem ...</translation>
<translation id="2964193600955408481">Onemogoči Wi-Fi</translation>
-<translation id="811680302244032017">Dodaj napravo ...</translation>
<translation id="4279490309300973883">Zrcaljenje</translation>
+<translation id="7973962044839454485">Preverjanje pristnosti PPP ni uspelo zaradi napačnega uporabniškega imena ali gesla</translation>
<translation id="2509468283778169019">Tipka CAPS LOCK je vklopljena</translation>
<translation id="3892641579809465218">Notranji zaslon</translation>
<translation id="7823564328645135659">Po sinhronizaciji nastavitev se je jezik spremenil iz jezika »<ph name="FROM_LOCALE"/>« v jezik »<ph name="TO_LOCALE"/>«.</translation>
<translation id="3368922792935385530">Povezano</translation>
<translation id="8340999562596018839">Glasovni odziv</translation>
<translation id="8654520615680304441">Vklop omrežja Wi-Fi ...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Način vnosa se je spremenil v <ph name="INPUT_METHOD_ID"/>.
Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="2562916301614567480">Zasebno omrežje</translation>
@@ -83,11 +89,12 @@ Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="3626637461649818317">Preostane še <ph name="PERCENTAGE"/> %</translation>
<translation id="9089416786594320554">Načini vnosa</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Polica</translation>
<translation id="2614835198358683673">Vaš Chromebook se ne more polniti, ko je vklopljen. Priporočamo uporabo uradnega polnilnika.</translation>
<translation id="1895658205118569222">Zaprt</translation>
<translation id="4430019312045809116">Glasnost</translation>
+<translation id="8681498213689260554">Če želite posodobiti, znova zaženite in uporabite funkcijo Powerwash</translation>
<translation id="4442424173763614572">Iskanje DNS ni uspelo</translation>
-<translation id="6356500677799115505">Akumulator je poln in se polni.</translation>
<translation id="7874779702599364982">Iskanje mobilnih omrežij ...</translation>
<translation id="583281660410589416">Neznano</translation>
<translation id="1383876407941801731">Iskanje</translation>
@@ -96,7 +103,6 @@ Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="2204305834655267233">Podatki o omrežju</translation>
<translation id="1621499497873603021">Preostali čas do izpraznitve akumulatorja, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Zapusti sejo gosta</translation>
-<translation id="4471417012762451363">Napolnjenost akumulatorja: <ph name="PERCENTAGE"/> % in se polni</translation>
<translation id="8308637677604853869">Prejšnji meni</translation>
<translation id="4666297444214622512">V drug račun se ni mogoče prijaviti.</translation>
<translation id="1346748346194534595">V desno</translation>
@@ -114,6 +120,7 @@ Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="6312403991423642364">Neznana napaka v omrežju</translation>
<translation id="1467432559032391204">V levo</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktiviranje omrežja <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Povečaj</translation>
@@ -123,7 +130,6 @@ Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="2727977024730340865">Priključen je nizkoenergijski polnilnik. Polnjenje akumulatorja morda ne bo zanesljivo.</translation>
<translation id="3784455785234192852">Zakleni</translation>
<translation id="2805756323405976993">Google Apps</translation>
-<translation id="8871072142849158571">Ločljivost zaslona <ph name="DISPLAY_NAME"/> je spremenjena na <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Napaka pri aktiviranju</translation>
<translation id="5097002363526479830">Povezava z omrežjem »<ph name="NAME"/>« ni uspela: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi je izklopljen.</translation>
@@ -131,6 +137,7 @@ Pritisnite Shift + Alt, da ga preklopite.</translation>
<translation id="7052914147756339792">Nastavi sliko za ozadje ...</translation>
<translation id="8678698760965522072">Stanje s povezavo</translation>
<translation id="2532589005999780174">Visokokontrastni način</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Notranja napaka</translation>
<translation id="3019353588588144572">Preostali čas do napolnitve akumulatorja, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Lupa</translation>
@@ -153,20 +160,24 @@ Sporočilo strežnika: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Zapusti sejo</translation>
<translation id="8454013096329229812">Wi-Fi je vklopljen.</translation>
<translation id="4872237917498892622">Alt + iskanje ali Shift</translation>
+<translation id="9201131092683066720">Napolnjenost akumulatorja: <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Nastavitve ...</translation>
+<translation id="1195412055398077112">upodabljanje čez rob zaslona</translation>
<translation id="1717216362413677834">Zasidrani način</translation>
+<translation id="112308213915226829">Samodejno skrivanje police</translation>
<translation id="8927026611342028580">Povezava zahtevana</translation>
<translation id="8300849813060516376">Storitev OTASP ni uspela</translation>
<translation id="2792498699870441125">Alt + iskanje</translation>
<translation id="8660803626959853127">Sinhroniziranje toliko datotek: <ph name="COUNT"/> ...</translation>
+<translation id="5958529069007801266">Nadzorovan uporabnik</translation>
<translation id="3709443003275901162">Več kot 9</translation>
<translation id="639644700271529076">Tipka CAPS LOCK je izklopljena</translation>
<translation id="6248847161401822652">Dvakrat pritisnite Ctrl + Shift + Q, če želite končati.</translation>
+<translation id="6785414152754474415">Napolnjenost akumulatorja: <ph name="PERCENTAGE"/> % – polnjenje še poteka.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Aktiviranje ...</translation>
+<translation id="4895488851634969361">Akumulator je poln.</translation>
<translation id="1391854757121130358">Morda ste porabili dovoljeno količino mobilnih podatkov.</translation>
-<translation id="5413208160176941586">Lokalno upravljani uporabnik</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Položaj zaganjalnika</translation>
+<translation id="5947494881799873997">Razveljavi</translation>
<translation id="7593891976182323525">Iskanje ali Shift</translation>
<translation id="7649070708921625228">Pomoč</translation>
<translation id="3050422059534974565">Tipka CAPS LOCK je vklopljena.
@@ -179,22 +190,24 @@ Pritisnite tipko za iskanje ali Shift, da jo prekličete.</translation>
<translation id="6692173217867674490">Napačno geslo</translation>
<translation id="6165508094623778733">Več o tem</translation>
<translation id="9046895021617826162">Vzpostavljanje povezave ni uspelo</translation>
+<translation id="7168224885072002358">Ponastavitev na prejšnjo ločljivost čez <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Ta seja se bo končala čez <ph name="SESSION_TIME_REMAINING"/>. Samodejno boste odjavljeni.</translation>
<translation id="8372369524088641025">Napačen ključ WEP</translation>
<translation id="6636709850131805001">Neprepoznano stanje</translation>
<translation id="3573179567135747900">Spremeni nazaj v jezik »<ph name="FROM_LOCALE"/>« (potreben vnovični zagon)</translation>
<translation id="8103386449138765447">Sporočila SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Nastavitve za Google Drive ...</translation>
-<translation id="1510238584712386396">Zaganjalnik</translation>
<translation id="7209101170223508707">Tipka CAPS LOCK je vklopljena.
Pritisnite Alt in tipko za iskanje ali Shift, da jo prekličete.</translation>
<translation id="8940956008527784070">Akumulator je skoraj prazen (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Sprejmi</translation>
<translation id="5102001756192215136">Še <ph name="HOUR"/>.<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Skupni nadzor zaslona prek klepetalnic Hangouts.</translation>
<translation id="8000066093800657092">Ni omrežja</translation>
<translation id="4015692727874266537">Prijava z drugim računom ...</translation>
<translation id="5941711191222866238">Pomanjšaj</translation>
<translation id="6911468394164995108">Pridružite se drugemu ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h <ph name="MINUTE"/> min do napolnjenosti</translation>
<translation id="6359806961507272919">SMS od <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operater</translation>
diff --git a/chromium/ash/strings/ash_strings_sr.xtb b/chromium/ash/strings/ash_strings_sr.xtb
index dba64929d63..df00c69eecb 100644
--- a/chromium/ash/strings/ash_strings_sr.xtb
+++ b/chromium/ash/strings/ash_strings_sr.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="sr">
<translation id="3595596368722241419">Батерија је пуна</translation>
-<translation id="5250713215130379958">Аутоматски сакриј покретач</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> и <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Стање Портал</translation>
<translation id="30155388420722288">Дугме за додатне опције</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth је омогућен</translation>
+<translation id="6310121235600822547">Екран <ph name="DISPLAY_NAME"/> је промењен у <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth је онемогућен</translation>
+<translation id="7165320105431587207">Конфигурација мреже није успела</translation>
<translation id="3775358506042162758">Можете да имате највише три налога за вишеструко пријављивање.</translation>
<translation id="370649949373421643">Омогући Wi-Fi</translation>
<translation id="3626281679859535460">Осветљеност</translation>
+<translation id="595202126637698455">Праћење учинка је омогућено</translation>
<translation id="8054466585765276473">Израчунавање времена трајања батерије.</translation>
<translation id="7982789257301363584">Мрежа</translation>
<translation id="5565793151875479467">Прокси...</translation>
<translation id="938582441709398163">Постављени елемент тастатуре</translation>
<translation id="4387004326333427325">Сертификат за потврду аутентичности је одбијен даљински</translation>
<translation id="6979158407327259162">Google диск</translation>
+<translation id="3683428399328702079">Резолуција <ph name="DISPLAY_NAME"/> је промењена у <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP get није успео</translation>
<translation id="2297568595583585744">Палета статуса</translation>
<translation id="1661867754829461514">Недостаје PIN</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Пуњач мале снаге</translation>
<translation id="3846575436967432996">Нису доступне информације о мрежи</translation>
<translation id="3026237328237090306">Подеси податке за мобилне уређаје</translation>
+<translation id="5871632337994001636">Управљај уређајима...</translation>
<translation id="785750925697875037">Прикажи налог за мобилне уређаје</translation>
<translation id="153454903766751181">Покретање модема за мобилну мрежу...</translation>
<translation id="4628814525959230255">Контрола над екраном се дели са корисником <ph name="HELPER_NAME"/> преко Hangouts-а.</translation>
-<translation id="8343941333792395995">Екран <ph name="DISPLAY_NAME"/> је ротиран</translation>
<translation id="7864539943188674973">Онемогући Bluetooth</translation>
<translation id="939252827960237676">Чување снимка екрана није успело</translation>
<translation id="3126069444801937830">Покрените поново да бисте ажурирали</translation>
<translation id="2268813581635650749">Одјави све</translation>
<translation id="735745346212279324">Веза са VPN-ом је прекинута</translation>
<translation id="7320906967354320621">Неактивно</translation>
-<translation id="6303423059719347535">Батерија је <ph name="PERCENTAGE"/>% пуна</translation>
<translation id="15373452373711364">Велики показивач миша</translation>
-<translation id="2778346081696727092">Потврда аутентичности помоћу наведеног корисничког имена или лозинке није успела</translation>
<translation id="3294437725009624529">Гост</translation>
<translation id="8190698733819146287">Прилагоди језике и унос...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Положај полице</translation>
<translation id="2903907270192926896">УЛАЗ</translation>
<translation id="8676770494376880701">Повезан је пуњач мале снаге</translation>
<translation id="7170041865419449892">Изван опсега</translation>
<translation id="4804818685124855865">Прекини везу</translation>
<translation id="2544853746127077729">Мрежа је одбила сертификат за потврду аутентичности</translation>
<translation id="5222676887888702881">Одјави ме</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Конфигурација</translation>
<translation id="1272079795634619415">Заустави</translation>
<translation id="4957722034734105353">Сазнајте више...</translation>
<translation id="2964193600955408481">Онемогући Wi-Fi</translation>
-<translation id="811680302244032017">Додај уређај...</translation>
<translation id="4279490309300973883">Пресликавање</translation>
+<translation id="7973962044839454485">Провера аутентичности преко протокола PPP није успела због нетачног корисничког имена или лозинке</translation>
<translation id="2509468283778169019">CAPS LOCK је укључен</translation>
<translation id="3892641579809465218">Интерни екран</translation>
<translation id="7823564328645135659">Језик је промењен са језика „<ph name="FROM_LOCALE"/>“ на „<ph name="TO_LOCALE"/>“ након синхронизације подешавања.</translation>
<translation id="3368922792935385530">Повезан</translation>
<translation id="8340999562596018839">Говорне повратне информације</translation>
<translation id="8654520615680304441">Укључи Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Метод уноса је промењен у <ph name="INPUT_METHOD_ID"/>.
Притисните Shift + Alt да бисте пребацили.</translation>
<translation id="2562916301614567480">Приватна мрежа</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Преостало је <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Методи уноса</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Полица</translation>
<translation id="2614835198358683673">Chromebook се можда неће пунити док је укључен. Размислите о коришћењу оригиналног пуњача.</translation>
<translation id="1895658205118569222">Затварање</translation>
<translation id="4430019312045809116">Јачина звука</translation>
+<translation id="8681498213689260554">Поново покрените и обавите Powerwash да бисте ажурирали</translation>
<translation id="4442424173763614572">DNS претрага није успела</translation>
-<translation id="6356500677799115505">Батерија је пуна и још увек се пуни.</translation>
<translation id="7874779702599364982">Претраживање мобилних мрежа...</translation>
<translation id="583281660410589416">Непознато</translation>
<translation id="1383876407941801731">Претрага</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Информације о мрежи</translation>
<translation id="1621499497873603021">Време које је преостало док се батерија не испразни, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Изађи из сесије госта</translation>
-<translation id="4471417012762451363">Батерија је <ph name="PERCENTAGE"/>% пуна и још увек се пуни</translation>
<translation id="8308637677604853869">Претходни мени</translation>
<translation id="4666297444214622512">Не можете да се пријавите на други налог.</translation>
<translation id="1346748346194534595">Удесно</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">Непозната грешка на мрежи</translation>
<translation id="1467432559032391204">Улево</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Активирање мреже <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Увећај</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">Уређај је укључен у пуњач мале снаге. Пуњење батерије можда неће бити поуздано.</translation>
<translation id="3784455785234192852">Закључај</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571">Величина екрана <ph name="DISPLAY_NAME"/> је промењена у <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Активација није успела</translation>
<translation id="5097002363526479830">Повезивање са мрежом „<ph name="NAME"/>“ није успело: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi је искључен.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">Подеси позадину...</translation>
<translation id="8678698760965522072">Стање На мрежи</translation>
<translation id="2532589005999780174">Режим високог контраста</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Интерна грешка</translation>
<translation id="3019353588588144572">Време које је преостало док се батерија у потпуности не напуни, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Лупа екрана</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">Изађи из сесије</translation>
<translation id="8454013096329229812">Wi-Fi је укључен.</translation>
<translation id="4872237917498892622">Alt + тастер за претрагу или Shift</translation>
+<translation id="9201131092683066720">Батерија је <ph name="PERCENTAGE"/>% пуна.</translation>
<translation id="2983818520079887040">Подешавања...</translation>
+<translation id="1195412055398077112">ивично подручје екрана</translation>
<translation id="1717216362413677834">Режим базне станице</translation>
+<translation id="112308213915226829">Аутоматски сакриј полицу</translation>
<translation id="8927026611342028580">Захтева се повезивање</translation>
<translation id="8300849813060516376">OTASP није успео</translation>
<translation id="2792498699870441125">Alt + тастер за претрагу</translation>
<translation id="8660803626959853127">Синхронизовање <ph name="COUNT"/> датотеке(а)</translation>
+<translation id="5958529069007801266">Корисник под надзором</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK је искључен</translation>
<translation id="6248847161401822652">Притисните Control Shift Q двапут да бисте изашли.</translation>
+<translation id="6785414152754474415">Батерија је <ph name="PERCENTAGE"/>% пуна и још увек се пуни.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Активирање...</translation>
+<translation id="4895488851634969361">Батерија је пуна.</translation>
<translation id="1391854757121130358">Можда сте искористили додељени пакет података за мобилне уређаје.</translation>
-<translation id="5413208160176941586">Корисник којим се локално управља</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Положај покретача</translation>
+<translation id="5947494881799873997">Врати</translation>
<translation id="7593891976182323525">Тастер за претрагу или Shift</translation>
<translation id="7649070708921625228">Помоћ</translation>
<translation id="3050422059534974565">CAPS LOCK је укључен.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">Неисправна приступна фраза</translation>
<translation id="6165508094623778733">Сазнајте више</translation>
<translation id="9046895021617826162">Повезивање није успело</translation>
+<translation id="7168224885072002358">Враћање на стару резолуцију за <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Ова сесија ће се завршити за <ph name="SESSION_TIME_REMAINING"/>. Бићете аутоматски одјављени.</translation>
<translation id="8372369524088641025">Неисправна WEP шифра</translation>
<translation id="6636709850131805001">Непознато стање</translation>
<translation id="3573179567135747900">Врати на „<ph name="FROM_LOCALE"/>“ (потребно је поновно покретање)</translation>
<translation id="8103386449138765447">SMS поруке: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Подешавања Google диска...</translation>
-<translation id="1510238584712386396">Покретач</translation>
<translation id="7209101170223508707">CAPS LOCK је укључен.
Притисните Alt + тастер за претрагу или Shift да бисте га отказали.</translation>
<translation id="8940956008527784070">Батерија је скоро празна (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Прихвати</translation>
<translation id="5102001756192215136">Преостало је <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Контрола над екраном се дели преко Hangouts-а.</translation>
<translation id="8000066093800657092">Нема мреже</translation>
<translation id="4015692727874266537">Пријави ме на други налог...</translation>
<translation id="5941711191222866238">Смањи</translation>
<translation id="6911468394164995108">Придружи ме другој...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> с <ph name="MINUTE"/> м до краја пуњења</translation>
<translation id="6359806961507272919">SMS са броја <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Мобилни оператер</translation>
diff --git a/chromium/ash/strings/ash_strings_sv.xtb b/chromium/ash/strings/ash_strings_sv.xtb
index 7418d0e765a..b07c6b93e7a 100644
--- a/chromium/ash/strings/ash_strings_sv.xtb
+++ b/chromium/ash/strings/ash_strings_sv.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="sv">
<translation id="3595596368722241419">Batteriet är fulladdat</translation>
-<translation id="5250713215130379958">Dölj startfältet automatiskt</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> och <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portalläge</translation>
<translation id="30155388420722288">Överflödsknapp</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth aktiverad</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> byttes till <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth inaktiverad</translation>
+<translation id="7165320105431587207">Det gick inte att konfigurera nätverket</translation>
<translation id="3775358506042162758">Du kan högst använda tre konton för multiinloggning.</translation>
<translation id="370649949373421643">Aktivera Wi-Fi</translation>
<translation id="3626281679859535460">Ljusstyrka</translation>
+<translation id="595202126637698455">Resultatspårning aktiverat</translation>
<translation id="8054466585765276473">Batteritiden beräknas.</translation>
<translation id="7982789257301363584">Nätverk</translation>
<translation id="5565793151875479467">Proxy ...</translation>
<translation id="938582441709398163">Tangentbordsöverlägg</translation>
<translation id="4387004326333427325">Autentiseringscertifikatet godkändes inte av fjärrvärden</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Upplösningen för <ph name="DISPLAY_NAME"/> ändrades till <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP GET misslyckades</translation>
<translation id="2297568595583585744">Statusfält</translation>
<translation id="1661867754829461514">PIN saknas</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Laddning med låg effekt</translation>
<translation id="3846575436967432996">Det finns ingen nätverksinformation</translation>
<translation id="3026237328237090306">Konfigurera mobildata</translation>
+<translation id="5871632337994001636">Hantera enheter ...</translation>
<translation id="785750925697875037">Visa mobilkonto</translation>
<translation id="153454903766751181">Mobilt modem initieras ...</translation>
<translation id="4628814525959230255">Delar kontrollen över din skärm med <ph name="HELPER_NAME"/> via Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> har roterats</translation>
<translation id="7864539943188674973">Inaktivera Bluetooth</translation>
<translation id="939252827960237676">Det gick inte att spara skärmdumpen</translation>
<translation id="3126069444801937830">Starta om för att uppdatera</translation>
<translation id="2268813581635650749">Logga ut alla</translation>
<translation id="735745346212279324">VPN frånkopplat</translation>
<translation id="7320906967354320621">Inaktiv</translation>
-<translation id="6303423059719347535">Batteriet är fullt till <ph name="PERCENTAGE"/> %</translation>
<translation id="15373452373711364">Stor muspekare</translation>
-<translation id="2778346081696727092">Det gick inte att autentisera med användarnamnet eller lösenordet som angavs</translation>
<translation id="3294437725009624529">Gäst</translation>
<translation id="8190698733819146287">Anpassa språk och inmatning...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Hyllposition</translation>
<translation id="2903907270192926896">INDATA</translation>
<translation id="8676770494376880701">Laddare med låg effekt ansluten</translation>
<translation id="7170041865419449892">Utanför intervallet</translation>
<translation id="4804818685124855865">Koppla från</translation>
<translation id="2544853746127077729">Autentiseringscertifikatet godkändes inte av nätverket</translation>
<translation id="5222676887888702881">Logga ut</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Konfiguration</translation>
<translation id="1272079795634619415">Stopp</translation>
<translation id="4957722034734105353">Läs mer ...</translation>
<translation id="2964193600955408481">Inaktivera Wi-Fi</translation>
-<translation id="811680302244032017">Lägg till enhet ...</translation>
<translation id="4279490309300973883">Spegling</translation>
+<translation id="7973962044839454485">PPP-autentisering misslyckades på grund av felaktigt användarnamn eller lösenord</translation>
<translation id="2509468283778169019">CAPS LOCK är på</translation>
<translation id="3892641579809465218">Intern bildskärm</translation>
<translation id="7823564328645135659">Chromes språk har ändrats från <ph name="FROM_LOCALE"/> till <ph name="TO_LOCALE"/> efter synkronisering av dina inställningar.</translation>
<translation id="3368922792935385530">Ansluten</translation>
<translation id="8340999562596018839">Talad feedback</translation>
<translation id="8654520615680304441">Aktivera Wi-Fi ...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Inmatningsmetoden har ändrats till <ph name="INPUT_METHOD_ID"/>.
Tryck på Skift + Alt om du vill byta.</translation>
<translation id="2562916301614567480">Privat nätverk</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/> % återstår</translation>
<translation id="9089416786594320554">Inmatningsmetoder</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/> %</translation>
+<translation id="2825619548187458965">Hylla</translation>
<translation id="2614835198358683673">Din Chromebook kanske inte laddas medan den är på. Överväg att använda den officiella laddaren.</translation>
<translation id="1895658205118569222">Stängning</translation>
<translation id="4430019312045809116">Volym</translation>
+<translation id="8681498213689260554">Starta om och utför en powerwash för att uppdatera</translation>
<translation id="4442424173763614572">DNS-sökning misslyckades</translation>
-<translation id="6356500677799115505">Batteriet är fullt och laddas.</translation>
<translation id="7874779702599364982">Söker efter mobilnätverk ...</translation>
<translation id="583281660410589416">Okänt</translation>
<translation id="1383876407941801731">Sökning</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Nätverksinformation</translation>
<translation id="1621499497873603021">Tid som återstår tills batteriet är tomt: <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Avsluta gästsession</translation>
-<translation id="4471417012762451363">Batteriet är fullt till <ph name="PERCENTAGE"/> % och laddas</translation>
<translation id="8308637677604853869">Föregående meny</translation>
<translation id="4666297444214622512">Det går inte att logga in på ett annat konto.</translation>
<translation id="1346748346194534595">Höger</translation>
@@ -114,6 +120,7 @@ Inaktivera genom att trycka Ctrl+Alt+Z.</translation>
<translation id="6312403991423642364">Okänt nätverksfel</translation>
<translation id="1467432559032391204">Vänster</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Aktiverar <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Maximera</translation>
@@ -123,7 +130,6 @@ Inaktivera genom att trycka Ctrl+Alt+Z.</translation>
<translation id="2727977024730340865">Ansluten till en laddare med låg effekt. Batteriet kanske inte laddas ordentligt.</translation>
<translation id="3784455785234192852">Lås</translation>
<translation id="2805756323405976993">Appar</translation>
-<translation id="8871072142849158571">Storleken på <ph name="DISPLAY_NAME"/> har ändrats till <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Aktiveringsfel</translation>
<translation id="5097002363526479830">Det gick inte att ansluta till nätverket <ph name="NAME"/>: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi är inaktiverat.</translation>
@@ -131,6 +137,7 @@ Inaktivera genom att trycka Ctrl+Alt+Z.</translation>
<translation id="7052914147756339792">Ange bakgrund ...</translation>
<translation id="8678698760965522072">Onlineläge</translation>
<translation id="2532589005999780174">Högkontrastläge</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Internt fel</translation>
<translation id="3019353588588144572">Tid som återstår tills batteriet är fulladdat: <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Skärmförstorare</translation>
@@ -153,20 +160,24 @@ Meddelande från servern: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Avsluta session</translation>
<translation id="8454013096329229812">Wi-Fi är aktiverat.</translation>
<translation id="4872237917498892622">Alt + Sök eller Skift</translation>
+<translation id="9201131092683066720">Batteriet är fullt till <ph name="PERCENTAGE"/> %.</translation>
<translation id="2983818520079887040">Inställningar...</translation>
+<translation id="1195412055398077112">överskanning</translation>
<translation id="1717216362413677834">Dockningsläge</translation>
+<translation id="112308213915226829">Dölj hylla automatiskt</translation>
<translation id="8927026611342028580">Anslutning begärd</translation>
<translation id="8300849813060516376">Det gick inte att etablera tjänsten over-the-air.</translation>
<translation id="2792498699870441125">Alt + Sök</translation>
<translation id="8660803626959853127">Synkroniserar <ph name="COUNT"/> filer</translation>
+<translation id="5958529069007801266">Övervakad användare</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK är av</translation>
<translation id="6248847161401822652">Avsluta genom att trycka på Ctrl + Skift + Q två gånger.</translation>
+<translation id="6785414152754474415">Batteriet är fullt till <ph name="PERCENTAGE"/> % och laddas.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Aktiverar ...</translation>
+<translation id="4895488851634969361">Batteriet är fullt.</translation>
<translation id="1391854757121130358">Du kanske har slut på mobildata.</translation>
-<translation id="5413208160176941586">Lokalt hanterad användare</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Startfältets position</translation>
+<translation id="5947494881799873997">Återgå</translation>
<translation id="7593891976182323525">Sök eller Skift</translation>
<translation id="7649070708921625228">Hjälp</translation>
<translation id="3050422059534974565">CAPS LOCK är på. Avbryt genom att trycka på Sök eller Shift.</translation>
@@ -178,21 +189,23 @@ Meddelande från servern: <ph name="SERVER_MSG"/></translation>
<translation id="6692173217867674490">Ogiltig lösenfras</translation>
<translation id="6165508094623778733">Läs mer</translation>
<translation id="9046895021617826162">Kunde inte ansluta</translation>
+<translation id="7168224885072002358">Återgår till den gamla upplösningen om <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Sessionen avslutas om <ph name="SESSION_TIME_REMAINING"/>. Du kommer att loggas ut automatiskt.</translation>
<translation id="8372369524088641025">Felaktig WEP-nyckel</translation>
<translation id="6636709850131805001">Okänt tillstånd</translation>
<translation id="3573179567135747900">Byt tillbaka till &quot;<ph name="FROM_LOCALE"/>&quot; (kräver omstart)</translation>
<translation id="8103386449138765447">SMS-meddelanden: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Inställningar för Google Drive ...</translation>
-<translation id="1510238584712386396">Startprogram</translation>
<translation id="7209101170223508707">CAPS LOCK är på. Avbryt genom att trycka på Alt + Sök eller Skift.</translation>
<translation id="8940956008527784070">Låg batterinivå (<ph name="PERCENTAGE"/> %)</translation>
+<translation id="4918086044614829423">Acceptera</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> kvar</translation>
<translation id="520760366042891468">Delar kontrollen över din skärm via Hangouts.</translation>
<translation id="8000066093800657092">Inget nätverk</translation>
<translation id="4015692727874266537">Logga in på ett annat konto …</translation>
<translation id="5941711191222866238">Minimera</translation>
<translation id="6911468394164995108">Anslut till andra ...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> h <ph name="MINUTE"/> m till fulladdat</translation>
<translation id="6359806961507272919">SMS från <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Operatör</translation>
diff --git a/chromium/ash/strings/ash_strings_sw.xtb b/chromium/ash/strings/ash_strings_sw.xtb
index 8ee3b5f47f3..ab296ff9543 100644
--- a/chromium/ash/strings/ash_strings_sw.xtb
+++ b/chromium/ash/strings/ash_strings_sw.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="sw">
<translation id="3595596368722241419">Betri imejaa</translation>
-<translation id="5250713215130379958">Kizinduzi cha Kuficha otomatiki</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> na <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Hali ya lango</translation>
<translation id="30155388420722288">Kitufe Jalizi</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth imewezeshwa</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> ilizungushwa hadi <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth imelemazwa</translation>
+<translation id="7165320105431587207">Ilishindwa kusanidi mtandao</translation>
<translation id="3775358506042162758">Unaweza tu kuwa na hadi akaunti tatu zilizoingiwa kwa wakati mmoja</translation>
<translation id="370649949373421643">Wezesha Wi-Fi</translation>
<translation id="3626281679859535460">Ung'aavu</translation>
+<translation id="595202126637698455">Ufuatiliaji wa utendaji umewashwa</translation>
<translation id="8054466585765276473">Inakokotoa muda wa betri.</translation>
<translation id="7982789257301363584">Mtandao</translation>
<translation id="5565793151875479467">Proksi...</translation>
<translation id="938582441709398163">Mtandazo wa Kibodi</translation>
<translation id="4387004326333427325">Cheti cha uthibitishaji kimekataliwa kwa mbali</translation>
<translation id="6979158407327259162">Hifadhi ya Google</translation>
+<translation id="3683428399328702079">Ubora wa <ph name="DISPLAY_NAME"/> ulibadilishwa hadi <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP imeshindikana</translation>
<translation id="2297568595583585744">Treya ya hali</translation>
<translation id="1661867754829461514">PIN inakosekana</translation>
@@ -34,39 +38,41 @@ Bonyeza Shift + Alt ili kubadilisha.</translation>
<translation id="2127372758936585790">Chaja ya nguvu ya chini</translation>
<translation id="3846575436967432996">Hakuna maelezo ya mtandao yanayopatikana</translation>
<translation id="3026237328237090306">Sanidi data ya simu</translation>
+<translation id="5871632337994001636">Simamia vifaa...</translation>
<translation id="785750925697875037">Ona akaunti ya simu ya mkononi</translation>
<translation id="153454903766751181">Inaanzisha modemu ya simu za mkononi...</translation>
<translation id="4628814525959230255">Inashiriki udhibiti wa skrini yako na <ph name="HELPER_NAME"/> kupitia Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> limezungushwa</translation>
<translation id="7864539943188674973">Lemaza Bluetooth</translation>
<translation id="939252827960237676">Imeshindwa kuhifadhi picha ya skrini</translation>
<translation id="3126069444801937830">Anzisha upya ili kusasisha</translation>
<translation id="2268813581635650749">Ondoa wote</translation>
<translation id="735745346212279324">VPN imekatwa muunganisho</translation>
<translation id="7320906967354320621">Tulivu</translation>
-<translation id="6303423059719347535">Betri imejaa <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Kishale kikubwa cha kipanya</translation>
-<translation id="2778346081696727092">Imeshindwa kuthibitisha kwa jina la mtumiaji au nenosiri lililotolewa</translation>
<translation id="3294437725009624529">Mgeni</translation>
<translation id="8190698733819146287">Geuza lugha na uingizaji kukufaa...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Nafasi ya rafu</translation>
<translation id="2903907270192926896">INGIZO</translation>
<translation id="8676770494376880701">Chaja ya nguvu ya chini imeunganishwa</translation>
<translation id="7170041865419449892">Nje ya eneo</translation>
<translation id="4804818685124855865">Tenganisha</translation>
<translation id="2544853746127077729">Cheti cha uthibitishaji kimekataliwa na mtandao</translation>
<translation id="5222676887888702881">Ondoka</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Usanidi</translation>
<translation id="1272079795634619415">Simamisha</translation>
<translation id="4957722034734105353">Pata maelezo zaidi...</translation>
<translation id="2964193600955408481">Lemaza Wi-Fi</translation>
-<translation id="811680302244032017">Ongeza kifaa...</translation>
<translation id="4279490309300973883">Kuakisi</translation>
+<translation id="7973962044839454485">Uthibitishaji wa PPP ulishindwa kutokana na jina la mtumiaji na nenosiri lisilo sahihi</translation>
<translation id="2509468283778169019">Caps Lock imewashwa.</translation>
<translation id="3892641579809465218">Onyesho la Ndani</translation>
<translation id="7823564328645135659">Lugha imebadilika kutoka &quot;<ph name="FROM_LOCALE"/> &quot;na kuwa&quot; <ph name="TO_LOCALE"/>&quot; baada ya kulinganisha mipangilio yako.</translation>
<translation id="3368922792935385530">Umeunganishwa</translation>
<translation id="8340999562596018839">Maoni ya yaliyotamkwa</translation>
<translation id="8654520615680304441">Washa Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Mbinu ingizo yako imebadilika hadi <ph name="INPUT_METHOD_ID"/>.
Bonyeza Shift + Alt ili kubadili.</translation>
<translation id="2562916301614567480">Mtandao Binafsi</translation>
@@ -83,11 +89,12 @@ Bonyeza Shift + Alt ili kubadili.</translation>
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% inayobaki</translation>
<translation id="9089416786594320554">Mbinu Ingizo</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Rafu</translation>
<translation id="2614835198358683673">Chromebook yako huenda isichaji ikiwa imewashwa. Fikiria kutumia chaja rasmi.</translation>
<translation id="1895658205118569222">Funga</translation>
<translation id="4430019312045809116">Kiwango</translation>
+<translation id="8681498213689260554">Zima na uwashe na Powerwash ili kusasisha</translation>
<translation id="4442424173763614572">Mwonekano wa DNS umeshindikana</translation>
-<translation id="6356500677799115505">Betri imejaa na inachajiwa.</translation>
<translation id="7874779702599364982">Inatafuta mitandao ya simu za mkononi...</translation>
<translation id="583281660410589416">Siojulikana</translation>
<translation id="1383876407941801731">Tafuta</translation>
@@ -96,7 +103,6 @@ Bonyeza Shift + Alt ili kubadili.</translation>
<translation id="2204305834655267233">Maelezo ya Mtandao</translation>
<translation id="1621499497873603021">Muda unaosalia mpaka betri inapoisha, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Maliza Ugeni</translation>
-<translation id="4471417012762451363">Betri imejaa <ph name="PERCENTAGE"/>% na inachaji</translation>
<translation id="8308637677604853869">Menyu ya awali</translation>
<translation id="4666297444214622512">Huwezi kuingia katika akaunti nyingine.</translation>
<translation id="1346748346194534595">Kulia</translation>
@@ -114,6 +120,7 @@ Bonyeza Ctrl+Alt+Z ili ufunge.</translation>
<translation id="6312403991423642364">Hitilafu isiyojulikana ya mtandao</translation>
<translation id="1467432559032391204">Kushoto</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Inaanza kutumia <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Tanua</translation>
@@ -123,7 +130,6 @@ Bonyeza Ctrl+Alt+Z ili ufunge.</translation>
<translation id="2727977024730340865">Imechomekwa katika chaja ya kawi ya chini. Huenda kuchaji kwa betri hakutakuwa kuzuri.</translation>
<translation id="3784455785234192852">Funga</translation>
<translation id="2805756323405976993">Programu</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> imebadilishwa ukubwa kuwa <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Kushindwa kwa uamilishaji</translation>
<translation id="5097002363526479830">Imeshindwa kuunganisha kwenye mtandao '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi imezimwa.</translation>
@@ -131,6 +137,7 @@ Bonyeza Ctrl+Alt+Z ili ufunge.</translation>
<translation id="7052914147756339792">Weka Mandhari...</translation>
<translation id="8678698760965522072">Hali ya mtandaoni</translation>
<translation id="2532589005999780174">Hali ya juu ya utofautishaji</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Hitilafu ya ndani</translation>
<translation id="3019353588588144572">Muda unaosalia hadi betri itakapochajiwa kikamilifu, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Kikuza skrini</translation>
@@ -153,20 +160,24 @@ Ujumbe wa seza: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Toka kwenye kipindi</translation>
<translation id="8454013096329229812">Wi-Fi imewashwa.</translation>
<translation id="4872237917498892622">Alt + Utafutaji au Hama</translation>
+<translation id="9201131092683066720">Betri imejaa <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Mipangilio...</translation>
+<translation id="1195412055398077112">angalia kwa ujumla:</translation>
<translation id="1717216362413677834">Hali ya kufungwa</translation>
+<translation id="112308213915226829">Ficha rafu kiotomatiki</translation>
<translation id="8927026611342028580">Muunganisho Umeombwa</translation>
<translation id="8300849813060516376">OTASP imeshindikana</translation>
<translation id="2792498699870441125">Alt + Utafutaji</translation>
<translation id="8660803626959853127">Inalinganisha faili <ph name="COUNT"/></translation>
+<translation id="5958529069007801266">Mtumiaji anayesimamiwa</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK imezimwa</translation>
<translation id="6248847161401822652">Bofya &quot;Control&quot; na &quot;Shift&quot; na Q kwa pamoja mara mbili ili kuacha.</translation>
+<translation id="6785414152754474415">Betri imejaa <ph name="PERCENTAGE"/>% na inachaji.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Inaanza kutumia...</translation>
+<translation id="4895488851634969361">Betri imejaa.</translation>
<translation id="1391854757121130358">Inawezekana umemaliza mgawo wako wa data ya simu ya mkononi.</translation>
-<translation id="5413208160176941586">Mtumiaji anayedhibitiwa karibu</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Sehemu ya kizinduzi</translation>
+<translation id="5947494881799873997">Rejesha</translation>
<translation id="7593891976182323525">Utafutaji au Hama</translation>
<translation id="7649070708921625228">Usaidizi</translation>
<translation id="3050422059534974565">CAPS LOCK imeamilishwa.
@@ -179,22 +190,24 @@ Bonyeza Alt + Utafutaji au Hama ili kughairi.</translation>
<translation id="6692173217867674490">Kaulisiri mbovu</translation>
<translation id="6165508094623778733">Pata maelezo zaidi</translation>
<translation id="9046895021617826162">Muunganisho umeshindikana</translation>
+<translation id="7168224885072002358">Inarejesha katika ubora wa zamani baada ya <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Kipindi hiki kitaisha katika <ph name="SESSION_TIME_REMAINING"/>. Utaondolewa kiotomatiki.</translation>
<translation id="8372369524088641025">Kitufe kibovu cha WEP</translation>
<translation id="6636709850131805001">Hali isiyotambulika</translation>
<translation id="3573179567135747900">Badilisha hadi &quot;<ph name="FROM_LOCALE"/>&quot; (inahitaji uzime na uwashe)</translation>
<translation id="8103386449138765447">Ujumbe wa SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Mipangilio ya Hifadhi ya Google...</translation>
-<translation id="1510238584712386396">Kizindua</translation>
<translation id="7209101170223508707">CAPS LOCK imeamilishwa.
Bonyeza Alt + Utafutaji au Hama ili kughairi.</translation>
<translation id="8940956008527784070">Betri inaisha (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Kubali</translation>
<translation id="5102001756192215136">Imesalia <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Kushiriki udhibiti wa skrini yako kupitia Hangouts.</translation>
<translation id="8000066093800657092">Hakuna mtandao</translation>
<translation id="4015692727874266537">Ingia katika akaunti nyingine...</translation>
<translation id="5941711191222866238">Punguza</translation>
<translation id="6911468394164995108">Jiunge na mwingine...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">Saa<ph name="HOUR"/> dakika<ph name="MINUTE"/> ili ijae</translation>
<translation id="6359806961507272919">SMS kutoka <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Mtoa huduma</translation>
diff --git a/chromium/ash/strings/ash_strings_ta.xtb b/chromium/ash/strings/ash_strings_ta.xtb
index dce0b3ef07c..097fe33a02c 100644
--- a/chromium/ash/strings/ash_strings_ta.xtb
+++ b/chromium/ash/strings/ash_strings_ta.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ta">
<translation id="3595596368722241419">பேட்டரி நிரம்பியது</translation>
-<translation id="5250713215130379958">தொடக்கத்தை தானாக மறை</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> மற்றும் <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">போர்ட்டல் நிலை</translation>
<translation id="30155388420722288">மிகைப்படுத்தி பொத்தான்</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth இயக்கப்பட்டது</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> <ph name="ROTATION"/> ஆகச் சுழற்றப்பட்டது</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth முடக்கப்பட்டது</translation>
+<translation id="7165320105431587207">பிணையத்தை உள்ளமைப்பது தோல்வியடைந்தது</translation>
<translation id="3775358506042162758">பல உள்நுழைவில் மூன்று கணக்குகள் வரை மட்டுமே வைத்திருக்கலாம்.</translation>
<translation id="370649949373421643">Wi-fi ஐ இயக்கு</translation>
<translation id="3626281679859535460">ஒளிர்வு</translation>
+<translation id="595202126637698455">செயல்திறனைத் தடமறிதல் இயக்கப்பட்டுள்ளது</translation>
<translation id="8054466585765276473">பேட்டரி நேரத்தைக் கணக்கிடுகிறது.</translation>
<translation id="7982789257301363584">நெட்வொர்க்</translation>
<translation id="5565793151875479467">ப்ராக்ஸி...</translation>
<translation id="938582441709398163">விசைப்பலகை மேல்தோற்றம்</translation>
<translation id="4387004326333427325">அங்கீகரிப்புச் சான்றிதழ் தொலைநிலையில் நிராகரிக்கப்பட்டது</translation>
<translation id="6979158407327259162">Google இயக்ககம்</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> தெளிவுத்திறன் <ph name="RESOLUTION"/> க்கு மாற்றப்பட்டது</translation>
<translation id="6943836128787782965">HTTP தோல்வியடைந்தது</translation>
<translation id="2297568595583585744">நிலைத் தட்டு</translation>
<translation id="1661867754829461514">PIN இல்லை</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">குறைந்த சக்திகொண்ட சார்ஜர்</translation>
<translation id="3846575436967432996">நெட்வொர்க் தகவல் எதுவும் இல்லை</translation>
<translation id="3026237328237090306">மொபைல் தரவை அமை</translation>
+<translation id="5871632337994001636">சாதனங்களை நிர்வகி...</translation>
<translation id="785750925697875037">மொபைல் கணக்கைப் பார்க்கவும்</translation>
<translation id="153454903766751181">செல்லுலார் பயன்முறையைத் துவக்குகிறது...</translation>
<translation id="4628814525959230255">Hangouts வழியாக <ph name="HELPER_NAME"/> உடன் உங்கள் திரையின் கட்டுப்பாட்டைப் பகிர்கிறது.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> சுழற்றப்பட்டது</translation>
<translation id="7864539943188674973">Bluetooth ஐ முடக்கு</translation>
<translation id="939252827960237676">ஸ்கிரீன் ஷாட்டை சேமிப்பதில் தோல்வி</translation>
<translation id="3126069444801937830">புதுப்பிக்க மீண்டும் தொடங்குக</translation>
<translation id="2268813581635650749">அனைவரையும் வெளியேற்று</translation>
<translation id="735745346212279324">VPN துண்டிக்கப்பட்டது</translation>
<translation id="7320906967354320621">செயலின்றி</translation>
-<translation id="6303423059719347535"><ph name="PERCENTAGE"/>% பேட்டரி நிரம்பியது</translation>
<translation id="15373452373711364">பெரிய மவுஸ் இடஞ்சுட்டி</translation>
-<translation id="2778346081696727092">வழங்கப்பட்ட பயனர் பெயர் அல்லது கடவுச்சொல்லை அங்கீகரிப்பதில் தோல்வி</translation>
<translation id="3294437725009624529">விருந்தினர்</translation>
<translation id="8190698733819146287">மொழிகள் மற்றும் உள்ளீடைத் தனிப்பயனாக்கு...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">அடுக்கின் நிலை</translation>
<translation id="2903907270192926896">உள்ளீடு</translation>
<translation id="8676770494376880701">குறைந்த சக்தியிலான சார்ஜர் இணைக்கப்பட்டுள்ளது</translation>
<translation id="7170041865419449892">வரம்புக்கு வெளியே</translation>
<translation id="4804818685124855865">தொடர்பைத் துண்டி</translation>
<translation id="2544853746127077729">அங்கீகரிப்புச் சான்றிதழ் பிணையத்தால் நிராகரிக்கப்பட்டது</translation>
<translation id="5222676887888702881">வெளியேறு</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">உள்ளமைவு</translation>
<translation id="1272079795634619415">நிறுத்து</translation>
<translation id="4957722034734105353">மேலும் அறிக...</translation>
<translation id="2964193600955408481">Wi-Fi ஐ முடக்கு</translation>
-<translation id="811680302244032017">சாதனத்தைச் சேர்க்கவும்...</translation>
<translation id="4279490309300973883">பிரதிபலிக்கிறது</translation>
+<translation id="7973962044839454485">தவறான பயனர்பெயர் அல்லது கடவுச்சொல் காரணமாக PPP அங்கீகாரம் தோல்வியடைந்தது</translation>
<translation id="2509468283778169019">CAPS LOCK இயக்கத்தில்</translation>
<translation id="3892641579809465218">இணையக் காட்சி</translation>
<translation id="7823564328645135659">உங்கள் அமைப்புகளை ஒத்திசைத்த பிறகு, மொழியானது &quot;<ph name="FROM_LOCALE"/>&quot; இலிருந்து &quot;<ph name="TO_LOCALE"/>&quot; க்கு மாற்றப்பட்டுள்ளது.</translation>
<translation id="3368922792935385530">இணைக்கப்பட்டது</translation>
<translation id="8340999562596018839">பேச்சுவடிவ கருத்து</translation>
<translation id="8654520615680304441">Wi-Fi ஐ இயக்கு...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">உங்கள் உள்ளீட்டு முறையானது <ph name="INPUT_METHOD_ID"/> க்கு மாற்றப்பட்டது.
மாற்ற Shift + Alt ஐ அழுத்தவும்.</translation>
<translation id="2562916301614567480">தனிப்பட்ட நெட்வொர்க்</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% மீதமுள்ளது</translation>
<translation id="9089416786594320554">உள்ளீட்டு முறைகள்</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">அடுக்கு</translation>
<translation id="2614835198358683673">உங்கள் Chromebook இயக்கத்தில் இருக்கும்போது சார்ஜ் செய்ய முடியாது. அதிகாரப்பூர்வ சார்ஜரைப் பயன்படுத்தவும்.</translation>
<translation id="1895658205118569222">நிறுத்தம்</translation>
<translation id="4430019312045809116">அளவு</translation>
+<translation id="8681498213689260554">புதுப்பிப்பதற்கு மீண்டும் தொடங்கி, பவர்வாஷ் செய்க</translation>
<translation id="4442424173763614572">DNS தேடுதல் தோல்வி</translation>
-<translation id="6356500677799115505">பேட்டரி நிரம்பியது மேலும் சார்ஜ் ஆகிறது.</translation>
<translation id="7874779702599364982">செல்லுலார் நெட்வொர்க்குகளைத் தேடுகிறது...</translation>
<translation id="583281660410589416">அறியப்படாத</translation>
<translation id="1383876407941801731">தேடு</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">பிணைய தகவல்</translation>
<translation id="1621499497873603021">இன்னும் <ph name="TIME_LEFT"/> இல் பேட்டரி காலியாகிவிடும்</translation>
<translation id="5980301590375426705">விருந்தினரிலிருந்து வெளியேறவும்</translation>
-<translation id="4471417012762451363"><ph name="PERCENTAGE"/>% பேட்டரி நிரம்பியது மேலும் சார்ஜ் ஆகிறது</translation>
<translation id="8308637677604853869">முந்தைய மெனு</translation>
<translation id="4666297444214622512">இன்னொரு கணக்கில் உள்நுழைய முடியாது.</translation>
<translation id="1346748346194534595">வலது</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">அறியப்படாத பிணையப் பிழை</translation>
<translation id="1467432559032391204">இடது</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> ஐச் செயல்படுத்துகிறது</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">பெரிதாக்கு</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">குறைந்த சக்தியிலான சார்ஜர் செருகப்பட்டுள்ளது. பேட்டரி சார்ஜிங் நம்பகமானதாக இல்லாமல் இருக்கலாம்.</translation>
<translation id="3784455785234192852">பூட்டு</translation>
<translation id="2805756323405976993">ஆப்ஸ்</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> ஆனது <ph name="RESOLUTION"/> க்கு மாற்றியமைக்கப்பட்டது</translation>
<translation id="1512064327686280138">செயலாக்கம் தோல்வி</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>' நெட்வொர்க்குடன் இணைப்பதில் தோல்வி: <ph name="DETAILS"/> </translation>
<translation id="1850504506766569011">Wi-Fi முடக்கத்தில் உள்ளது.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">வால்பேப்பரை அமை...</translation>
<translation id="8678698760965522072">ஆன்லைன் நிலை</translation>
<translation id="2532589005999780174">அதிக ஒளி மாறுபாட்டுப் பயன்முறை</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">அகப் பிழை</translation>
<translation id="3019353588588144572"><ph name="TIME_REMAINING"/> இல் பேட்டரி முழுவதும் சார்ஜ் ஆகிவிடும்</translation>
<translation id="3473479545200714844">திரை உருப்பெருக்கி</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">அமர்விலிருந்து வெளியேறவும்</translation>
<translation id="8454013096329229812">Wi-Fi இயக்கத்தில் உள்ளது.</translation>
<translation id="4872237917498892622">Alt+Search அல்லது Shift</translation>
+<translation id="9201131092683066720">பேட்டரி <ph name="PERCENTAGE"/>% நிரம்பியது.</translation>
<translation id="2983818520079887040">அமைப்புகள்...</translation>
+<translation id="1195412055398077112">ஓவர்ஸ்கேன்</translation>
<translation id="1717216362413677834">டாக் பயன்முறை</translation>
+<translation id="112308213915226829">அடுக்கைத் தானாக மறை</translation>
<translation id="8927026611342028580">இணைக்க கோரப்பட்டது</translation>
<translation id="8300849813060516376">OTASP தோல்வியுற்றது</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> கோப்பு(களை) ஒத்திசைக்கிறது</translation>
+<translation id="5958529069007801266">கண்காணிக்கப்படும் பயனர்</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK முடக்கப்பட்டுள்ளது</translation>
<translation id="6248847161401822652">வெளியேற Control Shift Q ஐ இருமுறை அழுத்தவும்.</translation>
+<translation id="6785414152754474415">பேட்டரி <ph name="PERCENTAGE"/>% நிரம்பியது, மேலும் சார்ஜ் ஆகிறது.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: செயல்படுத்துகிறது...</translation>
+<translation id="4895488851634969361">பேட்டரி நிரம்பியது.</translation>
<translation id="1391854757121130358">உங்களின் அனுமதிக்கப்பட்ட மொபைல் தரவை நீங்கள் பயன்படுத்தி இருக்கலாம்.</translation>
-<translation id="5413208160176941586">உட்புறமாக நிர்வகிக்கப்படும் பயனர்</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">துவக்கி நிலை</translation>
+<translation id="5947494881799873997">மாற்றியமை</translation>
<translation id="7593891976182323525">Search அல்லது Shift</translation>
<translation id="7649070708921625228">உதவி</translation>
<translation id="3050422059534974565">CAPS LOCK இயக்கத்தில் உள்ளது.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">மோசமான கடவுச்சொற்றொடர்</translation>
<translation id="6165508094623778733">மேலும் அறிக</translation>
<translation id="9046895021617826162">இணைப்பு தோல்வியடைந்தது</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> வினாடிகளில் பழைய தெளிவுதிறனுக்கு மாற்றியமைக்கப்படும்</translation>
<translation id="973896785707726617">இந்த அமர்வு <ph name="SESSION_TIME_REMAINING"/> நிமிடங்களில் முடியும். நீங்கள் தானாகவே வெளியேற்றப்படுவீர்கள்.</translation>
<translation id="8372369524088641025">மோசமான WEP விசை</translation>
<translation id="6636709850131805001">அறியப்படாத நிலை</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot; க்கு மீண்டும் மாற்று (மறுதொடக்கம் தேவை)</translation>
<translation id="8103386449138765447">SMS செய்திகள்: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google இயக்கக அமைப்புகள்...</translation>
-<translation id="1510238584712386396">துவக்கி</translation>
<translation id="7209101170223508707">CAPS LOCK இயக்கத்தில் உள்ளது.
ரத்துசெய்ய Alt+Search அல்லது Shift ஐ அழுத்தவும்.</translation>
<translation id="8940956008527784070">பேட்டரி குறைவு (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">ஏற்கிறேன்</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> உள்ளது</translation>
<translation id="520760366042891468">Hangouts மூலமாக உங்கள் திரையின் கட்டுப்பாட்டைப் பகிர்கிறது.</translation>
<translation id="8000066093800657092">நெட்வொர்க் இல்லை</translation>
<translation id="4015692727874266537">இன்னொரு கணக்கில் உள்நுழைக...</translation>
<translation id="5941711191222866238">சிறிதாக்கு</translation>
<translation id="6911468394164995108">மற்றொன்றில் சேர்...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">முழுவதும் சார்ஜ் ஆகும் நேரம் - <ph name="HOUR"/>ம <ph name="MINUTE"/>நி</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> என்ற எண்ணிலிருந்து வந்த SMS</translation>
<translation id="1244147615850840081">சேவை வழங்குநர்</translation>
diff --git a/chromium/ash/strings/ash_strings_te.xtb b/chromium/ash/strings/ash_strings_te.xtb
index 9e37d6251b1..5bac372bd69 100644
--- a/chromium/ash/strings/ash_strings_te.xtb
+++ b/chromium/ash/strings/ash_strings_te.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="te">
<translation id="3595596368722241419">బ్యాటరీ నిండింది</translation>
-<translation id="5250713215130379958">లాంచర్‌ను స్వయంచాలకంగా దాచు</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> మరియు <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">పోర్టల్ స్థితి</translation>
<translation id="30155388420722288">అతివ్యాప్తి బటన్</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth ప్రారంభించబడింది</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> <ph name="ROTATION"/>కి తిప్పబడింది</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth నిలిపివేయబడింది</translation>
+<translation id="7165320105431587207">నెట్‌వర్క్‌ని కాన్ఫిగర్ చేయడంలో విఫలమైంది</translation>
<translation id="3775358506042162758">మీరు బహుళ సైన్-ఇన్‌లో గరిష్టంగా మూడు ఖాతాలను మాత్రమే కలిగి ఉండవచ్చు.</translation>
<translation id="370649949373421643">Wi-fiని ప్రారంభించు</translation>
<translation id="3626281679859535460">ప్రకాశం</translation>
+<translation id="595202126637698455">పనితీరుని గుర్తించడం ప్రారంభించబడింది</translation>
<translation id="8054466585765276473">బ్యాటరీ సమయాన్ని లెక్కిస్తోంది.</translation>
<translation id="7982789257301363584">నెట్‌వర్క్</translation>
<translation id="5565793151875479467">ప్రాక్సీ...</translation>
<translation id="938582441709398163">కీబోర్డ్ అవలోకనం</translation>
<translation id="4387004326333427325">ప్రామాణీకరణ ప్రమాణపత్రం రిమోట్‌లో తిరస్కరించబడింది</translation>
<translation id="6979158407327259162">Google డిస్క్</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> రిజల్యూషన్ <ph name="RESOLUTION"/>కి మార్చబడింది</translation>
<translation id="6943836128787782965">HTTP పొందడంలో విఫలమైంది</translation>
<translation id="2297568595583585744">స్థితి ట్రే</translation>
<translation id="1661867754829461514">PIN లేదు</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">తక్కువ-పవర్ గల ఛార్జర్</translation>
<translation id="3846575436967432996">నెట్‌వర్క్ సమాచారం అందుబాటులో లేదు</translation>
<translation id="3026237328237090306">మొబైల్ డేటాను సెటప్ చేయి</translation>
+<translation id="5871632337994001636">పరికరాలను నిర్వహించండి...</translation>
<translation id="785750925697875037">మొబైల్ ఖాతాని వీక్షించండి</translation>
<translation id="153454903766751181">సెల్యులార్ మోడెమ్‌ను ప్రారంభిస్తోంది...</translation>
<translation id="4628814525959230255">మీ స్క్రీన్ యొక్క నియంత్రణ Hangouts ద్వారా <ph name="HELPER_NAME"/>తో భాగస్వామ్యం చేయబడుతోంది.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> తిప్పబడింది</translation>
<translation id="7864539943188674973">Bluetoothని నిలిపివేయి</translation>
<translation id="939252827960237676">స్క్రీన్‌షాట్‌ను సేవ్ చేయడంలో విఫలమైంది</translation>
<translation id="3126069444801937830">నవీకరించడానికి పునఃప్రారంభించండి</translation>
<translation id="2268813581635650749">అందరినీ సైన్ అవుట్ చేయి</translation>
<translation id="735745346212279324">VPN డిస్‌కనెక్ట్ చేయబడింది</translation>
<translation id="7320906967354320621">ఖాళీగా ఉంది</translation>
-<translation id="6303423059719347535">బ్యాటరీ <ph name="PERCENTAGE"/>% నిండింది</translation>
<translation id="15373452373711364">పెద్ద మౌస్ కర్సర్</translation>
-<translation id="2778346081696727092">అందించిన వినియోగదారు పేరుతో లేదా పాస్‌వర్డ్‌తో ప్రామాణీకరించడం విఫలమైంది</translation>
<translation id="3294437725009624529">అతిథి</translation>
<translation id="8190698733819146287">భాషలను అనుకూలీకరించి, ఇన్‌పుట్ చెయ్యి...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">అర స్థానం</translation>
<translation id="2903907270192926896">ఇన్‌పుట్</translation>
<translation id="8676770494376880701">తక్కువ-పవర్ గల ఛార్జర్ కనెక్ట్ చేయబడింది</translation>
<translation id="7170041865419449892">పరిధిని దాటింది</translation>
<translation id="4804818685124855865">డిస్‌కనెక్ట్ చెయ్యి</translation>
<translation id="2544853746127077729">ప్రామాణీకరణ ప్రమాణపత్రం నెట్‌వర్క్ ద్వారా తిరస్కరించబడింది</translation>
<translation id="5222676887888702881">సైన్ ఔట్</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">కాన్ఫిగరేషన్</translation>
<translation id="1272079795634619415">ఆపు</translation>
<translation id="4957722034734105353">మరింత తెలుసుకోండి...</translation>
<translation id="2964193600955408481">Wi-Fiని నిలిపివేయి</translation>
-<translation id="811680302244032017">పరికరాన్ని జోడించు...</translation>
<translation id="4279490309300973883">ప్రతిబింబిస్తుంది</translation>
+<translation id="7973962044839454485">వినియోగదారు పేరు లేదా పాస్‌వర్డ్ తప్పు అయినందున PPP ప్రామాణీకరణ విఫలమైంది</translation>
<translation id="2509468283778169019">CAPS LOCK ఆన్‌లో ఉంది</translation>
<translation id="3892641579809465218">అంతర్గత ప్రదర్శన</translation>
<translation id="7823564328645135659">మీ సెట్టింగ్‌లను సమకాలీకరించిన తర్వాత Chrome యొక్క భాష &quot;<ph name="FROM_LOCALE"/>&quot; నుండి &quot;<ph name="TO_LOCALE"/>&quot;కి మార్చబడింది.</translation>
<translation id="3368922792935385530">కనెక్ట్ అయింది</translation>
<translation id="8340999562596018839">చదవబడే అభిప్రాయం</translation>
<translation id="8654520615680304441">Wi-Fiని ప్రారంభించు...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">మీ ఇన్‌పుట్ పద్ధతి <ph name="INPUT_METHOD_ID"/>కు మార్చబడింది.
మారడానికి Shift + Altను నొక్కండి.</translation>
<translation id="2562916301614567480">ప్రైవేట్ నెట్‌వర్క్</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317"><ph name="PERCENTAGE"/>% మిగిలి ఉంది</translation>
<translation id="9089416786594320554">ఇన్‌పుట్ పద్ధతులు</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">అర</translation>
<translation id="2614835198358683673">మీ Chromebook ప్రారంభించబడినప్పుడు ఛార్జ్ కాకపోవచ్చు. అధికారిక ఛార్జర్‌ను ఉపయోగించడానికి ప్రయత్నించండి.</translation>
<translation id="1895658205118569222">షట్‌డౌన్</translation>
<translation id="4430019312045809116">వాల్యూమ్</translation>
+<translation id="8681498213689260554">నవీకరించడానికి పునఃప్రారంభించి పవర్‌వాష్ చేయండి</translation>
<translation id="4442424173763614572">DNS శోధన విఫలమైంది</translation>
-<translation id="6356500677799115505">బ్యాటరీ నిండింది మరియు చార్జ్ అవుతోంది.</translation>
<translation id="7874779702599364982">సెల్యులార్ నెట్‌వర్క్‌ల కోసం శోధిస్తోంది...</translation>
<translation id="583281660410589416">తెలియనిది</translation>
<translation id="1383876407941801731">శోధన</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">నెట్‌వర్క్ సమాచారం</translation>
<translation id="1621499497873603021">బ్యాటరీ ఖాళీ కావడానికి మిగిలి ఉన్న సమయం, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">అతిథిగా నిష్క్రమించు</translation>
-<translation id="4471417012762451363">బ్యాటరీ <ph name="PERCENTAGE"/>% నిండింది మరియు చార్జ్ అవుతోంది</translation>
<translation id="8308637677604853869">మునుపటి మెను</translation>
<translation id="4666297444214622512">మరో ఖాతాకు సైన్ ఇన్ చేయలేరు.</translation>
<translation id="1346748346194534595">కుడి</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">తెలియని నెట్‌వర్క్ లోపం</translation>
<translation id="1467432559032391204">ఎడమ</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/>ని సక్రియం చేస్తోంది</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">గరిష్ఠీకరించు</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">తక్కువ-పవర్ గల ఛార్జర్‌కు ప్లగిన్ చేయబడింది. బ్యాటరీ ఛార్జింగ్ విశ్వసనీయంగా ఉండకపోవచ్చు.</translation>
<translation id="3784455785234192852">లాక్ చేయి</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> పరిమాణం <ph name="RESOLUTION"/>కి మార్చబడింది</translation>
<translation id="1512064327686280138">సక్రియా విఫలం</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>'కు నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి విఫలమైంది: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi నిలిపివేయబడింది.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">వాల్‌పేపర్‌ను సెట్ చేయి...</translation>
<translation id="8678698760965522072">ఆన్‌లైన్ స్థితి</translation>
<translation id="2532589005999780174">అధిక కాంట్రాస్ట్ మోడ్</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">అంతర్గత లోపం</translation>
<translation id="3019353588588144572">బ్యాటరీ నిండటానికి పట్టే సమయం, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">స్క్రీన్ మాగ్నిఫైయర్</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">సెషన్‌ని నిష్క్రమించు</translation>
<translation id="8454013096329229812">Wi-Fi ప్రారంభించబడింది.</translation>
<translation id="4872237917498892622">Alt+Search లేదా Shift</translation>
+<translation id="9201131092683066720">బ్యాటరీ <ph name="PERCENTAGE"/>% నిండింది.</translation>
<translation id="2983818520079887040">సెట్టింగ్‌లు...</translation>
+<translation id="1195412055398077112">ఓవర్‌స్కాన్</translation>
<translation id="1717216362413677834">డాక్ మోడ్</translation>
+<translation id="112308213915226829">అరను స్వయంచాలకంగా దాచు</translation>
<translation id="8927026611342028580">కనెక్ట్ చేయడం అభ్యర్థించబడింది</translation>
<translation id="8300849813060516376">OTASP విఫలమైంది</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> ఫైల్(ల)ను సమకాలీకరిస్తోంది</translation>
+<translation id="5958529069007801266">పర్యవేక్షించబడే వినియోగదారు</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK ఆపివేయబడింది</translation>
<translation id="6248847161401822652">నిష్క్రమించడానికి రెండుసార్లు Control Shift Q నొక్కండి.</translation>
+<translation id="6785414152754474415">బ్యాటరీ <ph name="PERCENTAGE"/>% నిండింది మరియు ఛార్జ్ అవుతోంది.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: సక్రియం చేస్తోంది...</translation>
+<translation id="4895488851634969361">బ్యాటరీ నిండింది.</translation>
<translation id="1391854757121130358">మీరు మీ మొబైల్ డేటా కేటాయింపును ఉపయోగించి ఉండవచ్చు.</translation>
-<translation id="5413208160176941586">స్థానికంగా నిర్వహించబడే వినియోగదారు</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">లాంచర్ స్థానం</translation>
+<translation id="5947494881799873997">తిరిగి పూర్వ స్థితికి మార్చు</translation>
<translation id="7593891976182323525">Search లేదా Shift</translation>
<translation id="7649070708921625228">సహాయం</translation>
<translation id="3050422059534974565">CAPS LOCK ఆన్‌లో ఉంది.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">తప్పుడు పాస్‌ఫ్రేజ్</translation>
<translation id="6165508094623778733">మరింత తెలుసుకోండి</translation>
<translation id="9046895021617826162">కనెక్ట్ విఫలమైంది</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/>లో తిరిగి పాత రిజల్యూషన్‌కి మార్చబడుతోంది</translation>
<translation id="973896785707726617">ఈ సెషన్ <ph name="SESSION_TIME_REMAINING"/> తర్వాత ముగుస్తుంది. మీరు స్వయంచాలకంగా సైన్ అవుట్ చేయబడతారు.</translation>
<translation id="8372369524088641025">తప్పుడు WEP కీ</translation>
<translation id="6636709850131805001">గుర్తించబడని రాష్ట్రం</translation>
<translation id="3573179567135747900">&quot;<ph name="FROM_LOCALE"/>&quot;కు వెనుకకి మార్చండి (పునఃప్రారంభం అవసరం)</translation>
<translation id="8103386449138765447">SMS సందేశాలు: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google డిస్క్ సెట్టింగ్‌లు...</translation>
-<translation id="1510238584712386396">లాంచర్</translation>
<translation id="7209101170223508707">CAPS LOCK ఆన్‌లో ఉంది.
రద్దు చేయడానికి Alt+Search లేదా Shiftని నొక్కండి.</translation>
<translation id="8940956008527784070">బ్యాటరీ తక్కువగా ఉంది (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">ఆమోదించు</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> మిగిలి ఉంది</translation>
<translation id="520760366042891468">మీ స్క్రీన్ యొక్క నియంత్రణ Hangouts ద్వారా భాగస్వామ్యం చేయబడుతోంది.</translation>
<translation id="8000066093800657092">ఏ నెట్‌వర్క్ లేదు</translation>
<translation id="4015692727874266537">మరో ఖాతాతో సైన్ ఇన్ చేయి...</translation>
<translation id="5941711191222866238">కనిష్టీకరించు</translation>
<translation id="6911468394164995108">మరొక దానిలో చేరండి...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">నిండే వరకు <ph name="HOUR"/>h <ph name="MINUTE"/>m అవుతుంది</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> నుండి SMS</translation>
<translation id="1244147615850840081">కారియర్</translation>
diff --git a/chromium/ash/strings/ash_strings_th.xtb b/chromium/ash/strings/ash_strings_th.xtb
index a749f023b66..c0d786c12c0 100644
--- a/chromium/ash/strings/ash_strings_th.xtb
+++ b/chromium/ash/strings/ash_strings_th.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="th">
<translation id="3595596368722241419">แบตเตอรี่เต็ม</translation>
-<translation id="5250713215130379958">ตัวเรียกใช้งานแบบซ่อนอัตโนมัติ</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> กับ <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">สถานะพอร์ทัล</translation>
<translation id="30155388420722288">ปุ่มแบบโอเวอร์โฟลว์</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">เปิดใช้งานบลูทูธแล้ว</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> หมุนเวียนเป็น <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">บลูทูธ</translation>
<translation id="2268130516524549846">ปิดใช้งานบลูทูธแล้ว</translation>
+<translation id="7165320105431587207">ล้มเหลวในการกำหนดค่าเครือข่าย</translation>
<translation id="3775358506042162758">คุณสามารถมีได้มากสุดสามบัญชีเท่านั้นในการลงชื่อเข้าสู่ระบบพร้อมกันหลายบัญชี</translation>
<translation id="370649949373421643">เปิดใช้งาน Wi-Fi</translation>
<translation id="3626281679859535460">ความสว่าง</translation>
+<translation id="595202126637698455">เปิดใช้งานการติดตามการปฏิบัติงานแล้ว</translation>
<translation id="8054466585765276473">กำลังคำนวณเวลาใช้งานแบตเตอรี่</translation>
<translation id="7982789257301363584">เครือข่าย</translation>
<translation id="5565793151875479467">พร็อกซี...</translation>
<translation id="938582441709398163">การวางซ้อนแป้นพิมพ์</translation>
<translation id="4387004326333427325">ใบรับรองการตรวจสอบสิทธิ์ได้รับการปฏิเสธจากระยะไกล</translation>
<translation id="6979158407327259162">Google ไดรฟ์</translation>
+<translation id="3683428399328702079">ความละเอียดของ <ph name="DISPLAY_NAME"/> เปลี่ยนเป็น <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">การรับ HTTP ล้มเหลว</translation>
<translation id="2297568595583585744">ถาดสถานะ</translation>
<translation id="1661867754829461514">ไม่พบ PIN</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">ที่ชาร์จพลังงานต่ำ</translation>
<translation id="3846575436967432996">ไม่มีข้อมูลเครือข่ายที่สามารถใช้งานได้</translation>
<translation id="3026237328237090306">ตั้งค่าข้อมูลมือถือ</translation>
+<translation id="5871632337994001636">จัดการอุปกรณ์...</translation>
<translation id="785750925697875037">ดูบัญชีมือถือ</translation>
<translation id="153454903766751181">กำลังเริ่มต้นโมเด็มมือถือ...</translation>
<translation id="4628814525959230255">กำลังแชร์การควบคุมหน้าจอของคุณด้วย <ph name="HELPER_NAME"/> ผ่านแฮงเอาท์</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> ถูกหมุนเวียน</translation>
<translation id="7864539943188674973">ปิดใช้งานบลูทูธ</translation>
<translation id="939252827960237676">ไม่สามารถบันทึกภาพหน้าจอ</translation>
<translation id="3126069444801937830">รีสตาร์ทเพื่ออัปเดต</translation>
<translation id="2268813581635650749">ออกจากระบบทั้งหมด</translation>
<translation id="735745346212279324">ยกเลิกการเชื่อมต่อ VPN แล้ว</translation>
<translation id="7320906967354320621">ไม่ทำงาน</translation>
-<translation id="6303423059719347535">มีแบตเตอรี่ <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">เคอร์เซอร์เมาส์ขนาดใหญ่</translation>
-<translation id="2778346081696727092">ไม่สามารถตรวจสอบสิทธิ์ชื่อผู้ใช้หรือรหัสผ่านที่ให้มาได้</translation>
<translation id="3294437725009624529">ผู้มาเยือน</translation>
<translation id="8190698733819146287">กำหนดค่าภาษาและการป้อนข้อมูล... </translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">ตำแหน่งของชั้นวาง</translation>
<translation id="2903907270192926896">อินพุต</translation>
<translation id="8676770494376880701">เชื่อมต่อกับที่ชาร์จพลังงานต่ำ</translation>
<translation id="7170041865419449892">อยู่นอกระยะสัญญาณ</translation>
<translation id="4804818685124855865">ตัดการเชื่อมต่อ</translation>
<translation id="2544853746127077729">ใบรับรองการตรวจสอบสิทธิ์ได้รับการปฏิเสธจากเครือข่าย</translation>
<translation id="5222676887888702881">ออกจากระบบ</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">การกำหนดค่า</translation>
<translation id="1272079795634619415">หยุด</translation>
<translation id="4957722034734105353">เรียนรู้เพิ่มเติม...</translation>
<translation id="2964193600955408481">ปิดใช้งาน WiFi</translation>
-<translation id="811680302244032017">เพิ่มอุปกรณ์...</translation>
<translation id="4279490309300973883">กำลังแสดงผล</translation>
+<translation id="7973962044839454485">การตรวจสอบสิทธิ์ PPP ล้มเหลวเนื่องจากชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง</translation>
<translation id="2509468283778169019">Caps Lock เปิดอยู่</translation>
<translation id="3892641579809465218">จอแสดงผลภายใน</translation>
<translation id="7823564328645135659">เปลี่ยนภาษาจาก &quot;<ph name="FROM_LOCALE"/>&quot; เป็น &quot;<ph name="TO_LOCALE"/>&quot; หลังจากซิงค์การตั้งค่าของคุณ</translation>
<translation id="3368922792935385530">เชื่อมต่อแล้ว</translation>
<translation id="8340999562596018839">การตอบสนองด้วยเสียง</translation>
<translation id="8654520615680304441">เปิด WiFi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">วิธีการป้อนข้อมูลของคุณเปลี่ยนแปลงเป็น <ph name="INPUT_METHOD_ID"/> แล้ว
กด Shift + Alt เพื่อสลับ</translation>
<translation id="2562916301614567480">เครือข่ายส่วนบุคคล</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">เหลืออีก <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">วิธีการป้อนข้อมูล</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">ชั้นวาง</translation>
<translation id="2614835198358683673">Chromebook ของคุณอาจไม่ได้ชาร์จในขณะที่เปิดอยู่ ลองใช้ที่ชาร์จมาตรฐาน</translation>
<translation id="1895658205118569222">ปิด</translation>
<translation id="4430019312045809116">ระดับเสียง</translation>
+<translation id="8681498213689260554">รีสตาร์ทและ Powerwash เพื่ออัปเดต</translation>
<translation id="4442424173763614572">การค้นหา DNS ล้มเหลว</translation>
-<translation id="6356500677799115505">แบตเตอรี่เต็มและกำลังชาร์จ</translation>
<translation id="7874779702599364982">กำลังค้นหาเครือข่ายโทรศัพท์มือถือ...</translation>
<translation id="583281660410589416">ไม่รู้จัก</translation>
<translation id="1383876407941801731">เครื่องมือค้นหา</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">ข้อมูลเครือข่าย</translation>
<translation id="1621499497873603021">เวลาที่เหลือกว่าแบตเตอรี่จะหมด, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">ออกจากเซสชันผู้มาเยือน</translation>
-<translation id="4471417012762451363">มีแบตเตอรี่ <ph name="PERCENTAGE"/>% และกำลังชาร์จ</translation>
<translation id="8308637677604853869">เมนูก่อนหน้า</translation>
<translation id="4666297444214622512">ไม่สามารถลงชื่อเข้าใช้บัญชีอื่น</translation>
<translation id="1346748346194534595">ขวา</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">ข้อผิดพลาดเครือข่ายที่ไม่รู้จัก</translation>
<translation id="1467432559032391204">ซ้าย</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">กำลังเปิดใช้งาน <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">ย่อ</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">เสียบอยู่กับที่ชาร์จพลังงานต่ำ การชาร์จแบตเตอรี่อาจไม่น่าเชื่อถือ</translation>
<translation id="3784455785234192852">ล็อก</translation>
<translation id="2805756323405976993">Apps</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> ถูกปรับขนาดเป็น <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">การเปิดใช้งานล้มเหลว</translation>
<translation id="5097002363526479830">ไม่สามารถเชื่อมต่อเครือข่าย &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">WiFi ปิดอยู่</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">ตั้งค่าวอลเปเปอร์...</translation>
<translation id="8678698760965522072">สถานะออนไลน์</translation>
<translation id="2532589005999780174">โหมดคอนทราสต์สูง</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">ข้อผิดพลาดภายใน</translation>
<translation id="3019353588588144572">เวลาที่เหลือกว่าจะชาร์จแบตเตอรี่เต็ม, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">แว่นขยายหน้าจอ</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">ออกจากเซสชัน</translation>
<translation id="8454013096329229812">WiFi เปิดอยู่</translation>
<translation id="4872237917498892622">Alt+ค้นหา หรือ Shift</translation>
+<translation id="9201131092683066720">มีแบตเตอรี่ <ph name="PERCENTAGE"/>%</translation>
<translation id="2983818520079887040">การตั้งค่า...</translation>
+<translation id="1195412055398077112">โอเวอร์สแกน</translation>
<translation id="1717216362413677834">โหมดแท่นชาร์จ</translation>
+<translation id="112308213915226829">ซ่อนชั้นวางโดยอัตโนมัติ</translation>
<translation id="8927026611342028580">ขอเชื่อมต่อ</translation>
<translation id="8300849813060516376">OTASP ล้มเหลว</translation>
<translation id="2792498699870441125">Alt+ค้นหา</translation>
<translation id="8660803626959853127">กำลังซิงค์ <ph name="COUNT"/> ไฟล์</translation>
+<translation id="5958529069007801266">ผู้ใช้ภายใต้การดูแล</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK ปิดอยู่</translation>
<translation id="6248847161401822652">กด Control Shift Q สองครั้งเพื่อออก</translation>
+<translation id="6785414152754474415">มีแบตเตอรี่ <ph name="PERCENTAGE"/>% และกำลังชาร์จ</translation>
<translation id="6267036997247669271"><ph name="NAME"/> กำลังเปิดใช้งาน...</translation>
+<translation id="4895488851634969361">แบตเตอรี่เต็ม</translation>
<translation id="1391854757121130358">คุณอาจใช้ข้อมูลมือถือถึงขีดจำกัดแล้ว</translation>
-<translation id="5413208160176941586">ผู้ใช้ที่ได้รับการจัดการในเครื่อง</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">ตำแหน่งของตัวเรียกใช้งาน</translation>
+<translation id="5947494881799873997">ย้อนกลับ</translation>
<translation id="7593891976182323525">ค้นหาหรือ Shift</translation>
<translation id="7649070708921625228">ช่วยเหลือ</translation>
<translation id="3050422059534974565">CAPS LOCK เปิดอยู่
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">ข้อความรหัสผ่านไม่ถูกต้อง</translation>
<translation id="6165508094623778733">เรียนรู้เพิ่มเติม</translation>
<translation id="9046895021617826162">การเชื่อมต่อล้มเหลว</translation>
+<translation id="7168224885072002358">เปลี่ยนกลับไปเป็นความละเอียดเดิมภายใน <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">เซสชันนี้จะสิ้นสุดใน <ph name="SESSION_TIME_REMAINING"/> ระบบจะลงชื่อออกให้คุณโดยอัตโนมัติ</translation>
<translation id="8372369524088641025">คีย์ WEP ไม่ถูกต้อง</translation>
<translation id="6636709850131805001">สถานะที่ไม่รู้จัก</translation>
<translation id="3573179567135747900">เปลี่ยนกลับเป็น &quot;<ph name="FROM_LOCALE"/>&quot; (จำเป็นต้องรีสตาร์ต)</translation>
<translation id="8103386449138765447">ข้อความ SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">การตั้งค่า Google ไดรฟ์...</translation>
-<translation id="1510238584712386396">ตัวเรียกใช้งาน</translation>
<translation id="7209101170223508707">CAPS LOCK เปิดอยู่
กด Alt+ค้นหา หรือ Shift เพื่อยกเลิก</translation>
<translation id="8940956008527784070">แบตเตอรี่ต่ำ (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">ยอมรับ</translation>
<translation id="5102001756192215136">เหลืออีก <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">กำลังแชร์การควบคุมหน้าจอผ่านแฮงเอาท์</translation>
<translation id="8000066093800657092">ไม่มีเครือข่าย</translation>
<translation id="4015692727874266537">ลงชื่อเข้าใช้บัญชีอื่น...</translation>
<translation id="5941711191222866238">ย่อ</translation>
<translation id="6911468394164995108">เชื่อมต่อเครือข่ายอื่น...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">อีก <ph name="HOUR"/>ชม. <ph name="MINUTE"/>นาทีจึงจะเต็ม</translation>
<translation id="6359806961507272919">SMS จาก <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">ผู้ให้บริการ</translation>
diff --git a/chromium/ash/strings/ash_strings_tr.xtb b/chromium/ash/strings/ash_strings_tr.xtb
index b6580301792..afc2efc3574 100644
--- a/chromium/ash/strings/ash_strings_tr.xtb
+++ b/chromium/ash/strings/ash_strings_tr.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="tr">
<translation id="3595596368722241419">Pil tam dolu</translation>
-<translation id="5250713215130379958">Başlatıcıyı otomatik gizle</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> ve <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Portal durumu</translation>
<translation id="30155388420722288">Taşma Düğmesi</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth etkin</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> dönme ayarı <ph name="ROTATION"/> olarak değiştirildi</translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth devre dışı</translation>
+<translation id="7165320105431587207">Ağ yapılandırılamadı</translation>
<translation id="3775358506042162758">Çoklu oturum açmada en fazla üç hesabınız olabilir.</translation>
<translation id="370649949373421643">Kablosuzu Etkinleştir</translation>
<translation id="3626281679859535460">Parlaklık</translation>
+<translation id="595202126637698455">Performans izleme etkin</translation>
<translation id="8054466585765276473">Pilin süresi hesaplanıyor.</translation>
<translation id="7982789257301363584">Ağ</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Klavye Yer Paylaşımı</translation>
<translation id="4387004326333427325">Kimlik doğrulama sertifikası uzaktan reddedildi</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> çözünürlüğü <ph name="RESOLUTION"/> olarak değiştirildi</translation>
<translation id="6943836128787782965">HTTP get işlevi başarısız oldu</translation>
<translation id="2297568595583585744">Durum tepsisi</translation>
<translation id="1661867754829461514">PIN eksik</translation>
@@ -34,39 +38,41 @@ Geçiş yapmak için ÜstKrktr + Alt tuşlarına basın.</translation>
<translation id="2127372758936585790">Düşük güçlü şarj cihazı</translation>
<translation id="3846575436967432996">Hiçbir ağ bilgisi yok</translation>
<translation id="3026237328237090306">Mobil verileri ayarla</translation>
+<translation id="5871632337994001636">Cihazları yönet...</translation>
<translation id="785750925697875037">Mobil hesabı görüntüle</translation>
<translation id="153454903766751181">Hücresel modem başlatılıyor...</translation>
<translation id="4628814525959230255">Ekranınızın denetimi Hangouts üzerinden <ph name="HELPER_NAME"/> ile paylaşılıyor.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> döndürüldü</translation>
<translation id="7864539943188674973">Bluetooth'u devre dışı bırak</translation>
<translation id="939252827960237676">Ekran görüntüsü kaydedilemedi</translation>
<translation id="3126069444801937830">Güncellemek için yeniden başlat</translation>
<translation id="2268813581635650749">Tüm kullanıcıların oturumunu kapat</translation>
<translation id="735745346212279324">VPN bağlantısı kesildi</translation>
<translation id="7320906967354320621">Boşta</translation>
-<translation id="6303423059719347535">Pil %<ph name="PERCENTAGE"/> dolu</translation>
<translation id="15373452373711364">Büyük fare imleci</translation>
-<translation id="2778346081696727092">Sağlanan kullanıcı adı ve şifreyle kimlik doğrulanamadı</translation>
<translation id="3294437725009624529">Misafir</translation>
<translation id="8190698733819146287">Dilleri ve girişi özelleştir...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Raf konumu</translation>
<translation id="2903907270192926896">GİRİŞ</translation>
<translation id="8676770494376880701">Düşük güçlü şarj cihazı bağlandı</translation>
<translation id="7170041865419449892">Aralık dışında</translation>
<translation id="4804818685124855865">Bağlantıyı kes</translation>
<translation id="2544853746127077729">Kimlik doğrulama sertifikası ağ tarafından reddedildi</translation>
<translation id="5222676887888702881">Çıkış</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Yapılandırma</translation>
<translation id="1272079795634619415">Durdur</translation>
<translation id="4957722034734105353">Daha fazla bilgi edinin...</translation>
<translation id="2964193600955408481">Kablosuz bağlantıyı devre dışı bırak</translation>
-<translation id="811680302244032017">Cihaz ekle...</translation>
<translation id="4279490309300973883">Yansıtılıyor</translation>
+<translation id="7973962044839454485">Yanlış kullanıcı adı veya şifreden dolayı PPP kimlik doğrulaması başarısız oldu</translation>
<translation id="2509468283778169019">CAPS LOCK açık</translation>
<translation id="3892641579809465218">Dahili Ekran</translation>
<translation id="7823564328645135659">Ayarlarınız senkronize edildikten sonra &quot;<ph name="FROM_LOCALE"/>&quot; olan dil &quot;<ph name="TO_LOCALE"/>&quot; olarak değiştirildi.</translation>
<translation id="3368922792935385530">Bağlı</translation>
<translation id="8340999562596018839">Sesli geri bildirim</translation>
<translation id="8654520615680304441">Kablosuz'u aç...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Giriş yönteminiz <ph name="INPUT_METHOD_ID"/> olarak değiştirildi.
Geçiş yapmak için ÜstKrktr + Alt tuşlarına basın.</translation>
<translation id="2562916301614567480">Özel Ağ</translation>
@@ -83,11 +89,12 @@ Geçiş yapmak için ÜstKrktr + Alt tuşlarına basın.</translation>
<translation id="3626637461649818317">%<ph name="PERCENTAGE"/> kaldı</translation>
<translation id="9089416786594320554">Giriş yöntemleri</translation>
<translation id="6247708409970142803">%<ph name="PERCENTAGE"/></translation>
+<translation id="2825619548187458965">Raf</translation>
<translation id="2614835198358683673">Chromebook'unuz açıkken şarj edilemeyebilir. Orijinal şarj cihazını kullanmayı düşünün.</translation>
<translation id="1895658205118569222">Kapat</translation>
<translation id="4430019312045809116">Ses</translation>
+<translation id="8681498213689260554">Güncellemek için yeniden başlatın ve Powerwash yapın</translation>
<translation id="4442424173763614572">DNS arama başarısız oldu</translation>
-<translation id="6356500677799115505">Pil dolu ve şarj oluyor.</translation>
<translation id="7874779702599364982">Hücresel ağlar aranıyor...</translation>
<translation id="583281660410589416">Bilinmiyor</translation>
<translation id="1383876407941801731">Arama</translation>
@@ -96,7 +103,6 @@ Geçiş yapmak için ÜstKrktr + Alt tuşlarına basın.</translation>
<translation id="2204305834655267233">Ağ Bilgisi</translation>
<translation id="1621499497873603021">Pilin boşalması için kalan süre, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Misafir oturumundan çık</translation>
-<translation id="4471417012762451363">Pil %<ph name="PERCENTAGE"/> dolu ve şarj oluyor</translation>
<translation id="8308637677604853869">Önceki menü</translation>
<translation id="4666297444214622512">Başka bir hesapta oturum açılamıyor.</translation>
<translation id="1346748346194534595">Sağa</translation>
@@ -114,6 +120,7 @@ Devre dışı bırakmak için Ctrl+Alt+Z tuşlarına basın.</translation>
<translation id="6312403991423642364">Bilinmeyen ağ hatası</translation>
<translation id="1467432559032391204">Sola</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830"><ph name="NAME"/> etkinleştiriliyor</translation>
<translation id="8814190375133053267">Kablosuz</translation>
<translation id="1398853756734560583">Büyüt</translation>
@@ -123,7 +130,6 @@ Devre dışı bırakmak için Ctrl+Alt+Z tuşlarına basın.</translation>
<translation id="2727977024730340865">Düşük güçlü bir şarj cihazına takıldı. Şarj durumu güvenilir olmayabilir.</translation>
<translation id="3784455785234192852">Kilitle</translation>
<translation id="2805756323405976993">Uygulamalar</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> ekranı <ph name="RESOLUTION"/> olarak yeniden boyutlandırıldı</translation>
<translation id="1512064327686280138">Etkinleştirme hatası</translation>
<translation id="5097002363526479830">'<ph name="NAME"/>' ağına bağlanamadı: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Kablosuz kapalı.</translation>
@@ -131,6 +137,7 @@ Devre dışı bırakmak için Ctrl+Alt+Z tuşlarına basın.</translation>
<translation id="7052914147756339792">Duvar kağıdını ayarla...</translation>
<translation id="8678698760965522072">Çevrimiçi durumu</translation>
<translation id="2532589005999780174">Yüksek kontrast modu</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Dahili hata</translation>
<translation id="3019353588588144572">Pilin tam olarak şarj olması için kalan süre, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Ekran büyüteci</translation>
@@ -153,20 +160,24 @@ Sunucu mesajı: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Oturumdan çık</translation>
<translation id="8454013096329229812">Kablosuz açık.</translation>
<translation id="4872237917498892622">Alt+Arama veya Üst Karakter</translation>
+<translation id="9201131092683066720">Pil %<ph name="PERCENTAGE"/> dolu.</translation>
<translation id="2983818520079887040">Ayarlar...</translation>
+<translation id="1195412055398077112">fazla tarama</translation>
<translation id="1717216362413677834">Yuva modu</translation>
+<translation id="112308213915226829">Rafı otomatik gizle</translation>
<translation id="8927026611342028580">Bağlantı İstendi</translation>
<translation id="8300849813060516376">OTASP başarısız oldu</translation>
<translation id="2792498699870441125">Alt+Arama</translation>
<translation id="8660803626959853127"><ph name="COUNT"/> dosya senkronize ediliyor</translation>
+<translation id="5958529069007801266">Denetlenen kullanıcı</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK kapalı</translation>
<translation id="6248847161401822652">Çıkmak için Ctrl+ÜstKrktr+Q tuşlarına iki kez basın.</translation>
+<translation id="6785414152754474415">Pil %<ph name="PERCENTAGE"/> dolu ve şarj oluyor.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Etkinleştiriliyor...</translation>
+<translation id="4895488851634969361">Pil dolu.</translation>
<translation id="1391854757121130358">Mobil veri hakkınızı bitirmiş olabilirsiniz.</translation>
-<translation id="5413208160176941586">Yerel olarak yönetilen kullanıcı</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Başlatıcı konumu</translation>
+<translation id="5947494881799873997">Geri döndür</translation>
<translation id="7593891976182323525">Arama veya Üst Karakter</translation>
<translation id="7649070708921625228">Yardım</translation>
<translation id="3050422059534974565">CAPS LOCK açık.
@@ -179,22 +190,24 @@ Sunucu mesajı: <ph name="SERVER_MSG"/></translation>
<translation id="6692173217867674490">Hatalı parola</translation>
<translation id="6165508094623778733">Daha fazla bilgi edinin</translation>
<translation id="9046895021617826162">Bağlantı başarısız oldu</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/> saniye içinde eski çözünürlüğe dönülüyor</translation>
<translation id="973896785707726617">Bu oturum <ph name="SESSION_TIME_REMAINING"/> içinde sona erecek. Oturumunuz otomatik olarak kapatılacaktır.</translation>
<translation id="8372369524088641025">Hatalı WEP anahtarı</translation>
<translation id="6636709850131805001">Tanınmayan durum</translation>
<translation id="3573179567135747900">Tekrar &quot;<ph name="FROM_LOCALE"/>&quot; ayarına dön (yeniden başlatmak gerekir)</translation>
<translation id="8103386449138765447">SMS mesajları: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google Drive ayarları...</translation>
-<translation id="1510238584712386396">Başlatıcı</translation>
<translation id="7209101170223508707">CAPS LOCK açık.
İptal için Alt+Arama veya Üst Karakter tuşlarına basın.</translation>
<translation id="8940956008527784070">Pil gücü az (%<ph name="PERCENTAGE"/>)</translation>
+<translation id="4918086044614829423">Kabul et</translation>
<translation id="5102001756192215136"><ph name="HOUR"/>:<ph name="MINUTE"/> kaldı</translation>
<translation id="520760366042891468">Ekranınızın denetimi Hangouts üzerinden paylaşılıyor.</translation>
<translation id="8000066093800657092">Ağ yok</translation>
<translation id="4015692727874266537">Başka bir hesapta oturum açın...</translation>
<translation id="5941711191222866238">Simge durumuna küçült</translation>
<translation id="6911468394164995108">Başka ağa katıl...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">Tam dolana kadar <ph name="HOUR"/> sa <ph name="MINUTE"/> dk var</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> numaradan SMS alındı</translation>
<translation id="1244147615850840081">Operatör</translation>
diff --git a/chromium/ash/strings/ash_strings_uk.xtb b/chromium/ash/strings/ash_strings_uk.xtb
index 711cb63da8f..298cd93d92c 100644
--- a/chromium/ash/strings/ash_strings_uk.xtb
+++ b/chromium/ash/strings/ash_strings_uk.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="uk">
<translation id="3595596368722241419">Акумулятор заряджено</translation>
-<translation id="5250713215130379958">Автоматично ховати панель запуску</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> і <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Стан порталу</translation>
<translation id="30155388420722288">Кнопка переповнення</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Bluetooth увімкнено</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> обернено на <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Bluetooth вимкнено</translation>
+<translation id="7165320105431587207">Помилка налаштування мережі</translation>
<translation id="3775358506042162758">Паралельно можна входити не більше ніж у три облікові записи.</translation>
<translation id="370649949373421643">Увімкнути Wi-Fi</translation>
<translation id="3626281679859535460">Яскравість</translation>
+<translation id="595202126637698455">Відстеження ефективності ввімкнено</translation>
<translation id="8054466585765276473">Обчислення часу роботи акумулятора.</translation>
<translation id="7982789257301363584">Мережа</translation>
<translation id="5565793151875479467">Проксі-сервер...</translation>
<translation id="938582441709398163">Розкладка клавіатури</translation>
<translation id="4387004326333427325">Сертифікат автентифікації відхилений дистанційно</translation>
<translation id="6979158407327259162">Диск Google</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/>: установлено роздільну здатність <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">Помилка HTTP</translation>
<translation id="2297568595583585744">Контейтер стану</translation>
<translation id="1661867754829461514">Відсутній PIN-код</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">Зарядний пристрій низької потужності</translation>
<translation id="3846575436967432996">Інформація про мережу не доступна</translation>
<translation id="3026237328237090306">Налаштувати передавання мобільних даних</translation>
+<translation id="5871632337994001636">Керування пристроями…</translation>
<translation id="785750925697875037">Переглянути обліковий запис для мобільних пристроїв</translation>
<translation id="153454903766751181">Ініціалізація мобільного модема…</translation>
<translation id="4628814525959230255">Спільний доступ до екрана для користувача <ph name="HELPER_NAME"/> через Hangouts.</translation>
-<translation id="8343941333792395995">Екран <ph name="DISPLAY_NAME"/> обернено</translation>
<translation id="7864539943188674973">Вимкнути Bluetooth</translation>
<translation id="939252827960237676">Не вдалося зберегти знімок екрана</translation>
<translation id="3126069444801937830">Перезапустіть, щоб оновити</translation>
<translation id="2268813581635650749">Вийти з усіх облікових записів</translation>
<translation id="735745346212279324">VPN від’єднано</translation>
<translation id="7320906967354320621">Простій</translation>
-<translation id="6303423059719347535">Акумулятор заряджений на <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">Великий курсор миші</translation>
-<translation id="2778346081696727092">Помилка автентифікації за допомогою введеного імені користувача чи пароля</translation>
<translation id="3294437725009624529">Гість</translation>
<translation id="8190698733819146287">Налаштувати мови та введення тексту...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Розташування полиці</translation>
<translation id="2903907270192926896">ВХІД</translation>
<translation id="8676770494376880701">Зарядний пристрій низької потужності підключено</translation>
<translation id="7170041865419449892">За межами досяжності</translation>
<translation id="4804818685124855865">Від'єднатися</translation>
<translation id="2544853746127077729">Сертифікат автентифікації відхилений мережею</translation>
<translation id="5222676887888702881">Вийти</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Конфігурація</translation>
<translation id="1272079795634619415">Зупинити</translation>
<translation id="4957722034734105353">Докладніше...</translation>
<translation id="2964193600955408481">Вимкнути Wi-Fi</translation>
-<translation id="811680302244032017">Додати пристрій...</translation>
<translation id="4279490309300973883">Дзеркальне відображення</translation>
+<translation id="7973962044839454485">Помилка автентифікації PPP через неправильне ім’я користувача або пароль</translation>
<translation id="2509468283778169019">Режим CAPS LOCK увімкнено</translation>
<translation id="3892641579809465218">Внутрішній екран</translation>
<translation id="7823564328645135659">Після синхронізації налаштувань мову змінено. Попередня: <ph name="FROM_LOCALE"/>, нова: <ph name="TO_LOCALE"/>.</translation>
<translation id="3368922792935385530">Підключено</translation>
<translation id="8340999562596018839">Голосові підказки</translation>
<translation id="8654520615680304441">Увімкнення Wi-Fi…</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Метод введення змінено на <ph name="INPUT_METHOD_ID"/>.
Щоб переключитися, натисніть Shift + Alt.</translation>
<translation id="2562916301614567480">Приватна мережа</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">Залишилося <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Методи введення</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Полиця</translation>
<translation id="2614835198358683673">Ваш Chromebook може не заряджатися, якщо ввімкнений. Спробуйте скористатися офіційним зарядним пристроєм.</translation>
<translation id="1895658205118569222">Завершення роботи</translation>
<translation id="4430019312045809116">Гучність</translation>
+<translation id="8681498213689260554">Щоб оновити, перезапустіть і скористайтеся функцією Powerwash</translation>
<translation id="4442424173763614572">Помилка пошуку DNS</translation>
-<translation id="6356500677799115505">Акумулятор заряджений і продовжує заряджатися.</translation>
<translation id="7874779702599364982">Пошук мобільних мереж…</translation>
<translation id="583281660410589416">Невідомо</translation>
<translation id="1383876407941801731">Пошук</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">Інформація про мережу</translation>
<translation id="1621499497873603021">До розрядження акумулятора залишилося <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Завершити сеанс у режимі гостя</translation>
-<translation id="4471417012762451363">Акумулятор заряджений на <ph name="PERCENTAGE"/>% і продовжує заряджатися</translation>
<translation id="8308637677604853869">Попереднє меню</translation>
<translation id="4666297444214622512">Неможливо ввійти в інший обліковий запис.</translation>
<translation id="1346748346194534595">Праворуч</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">Невідома помилка мережі</translation>
<translation id="1467432559032391204">Ліворуч</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Активація <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Збільшити</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">Підключено до зарядного пристрою низької потужності. Акумулятор може заряджатися неналежним чином.</translation>
<translation id="3784455785234192852">Заблокувати</translation>
<translation id="2805756323405976993">Програми</translation>
-<translation id="8871072142849158571">Роздільну здатність екрана <ph name="DISPLAY_NAME"/> змінено на <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Помилка активації</translation>
<translation id="5097002363526479830">Не вдалося під’єднатися до мережі &quot;<ph name="NAME"/>&quot;: <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi вимкнено.</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">Установити фоновий малюнок...</translation>
<translation id="8678698760965522072">Статус онлайн</translation>
<translation id="2532589005999780174">Режим високого контрасту</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Внутрішня помилка</translation>
<translation id="3019353588588144572">До повного зарядження акумулятора залишилося <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Лупа</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">Завершити сеанс</translation>
<translation id="8454013096329229812">Wi-Fi увімкнено.</translation>
<translation id="4872237917498892622">Alt+клавіша пошуку або Shift</translation>
+<translation id="9201131092683066720">Акумулятор заряджений на <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Налаштування...</translation>
+<translation id="1195412055398077112">облямівка екрана</translation>
<translation id="1717216362413677834">Режим док-станції</translation>
+<translation id="112308213915226829">Автоматично ховати полицю</translation>
<translation id="8927026611342028580">Подано запит на під’єднання</translation>
<translation id="8300849813060516376">Помилка OTASP</translation>
<translation id="2792498699870441125">Alt+клавіша пошуку</translation>
<translation id="8660803626959853127">Синхронізація файлів (<ph name="COUNT"/>)</translation>
+<translation id="5958529069007801266">Контрольований користувач</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">Режим CAPS LOCK вимкнено</translation>
<translation id="6248847161401822652">Двічі натисніть комбінацію клавіш Control Shift Q, щоб вийти.</translation>
+<translation id="6785414152754474415">Акумулятор заряджений на <ph name="PERCENTAGE"/>% і заряджається.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: активація…</translation>
+<translation id="4895488851634969361">Акумулятор заряджений.</translation>
<translation id="1391854757121130358">Можливо, ви використали свій ліміт мобільного передавання даних.</translation>
-<translation id="5413208160176941586">Локально керований користувач</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Положення панелі запуску</translation>
+<translation id="5947494881799873997">Повернути</translation>
<translation id="7593891976182323525">Клавіша пошуку або Shift</translation>
<translation id="7649070708921625228">Довідка</translation>
<translation id="3050422059534974565">Клавішу CAPS LOCK увімкнено.
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">Погана парольна фраза</translation>
<translation id="6165508094623778733">Докладніше</translation>
<translation id="9046895021617826162">Помилка з'єднання</translation>
+<translation id="7168224885072002358">Попередня роздільна здатність повернеться через <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Сеанс закінчиться за <ph name="SESSION_TIME_REMAINING"/>. Ви вийдете автоматично.</translation>
<translation id="8372369524088641025">Поганий WEP-ключ</translation>
<translation id="6636709850131805001">Нерозпізнаний стан</translation>
<translation id="3573179567135747900">Повернутися до мови &quot;<ph name="FROM_LOCALE"/>&quot; (потрібно перезавантажитися)</translation>
<translation id="8103386449138765447">SMS повідомлень: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Налаштування Диска Google...</translation>
-<translation id="1510238584712386396">Панель запуску</translation>
<translation id="7209101170223508707">Клавішу CAPS LOCK увімкнено.
Натисніть Alt+клавішу пошуку або Shift, щоб скасувати.</translation>
<translation id="8940956008527784070">Низький заряд акумулятора (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Прийняти</translation>
<translation id="5102001756192215136">Залишилося <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Спільний доступ до екрана через Hangouts.</translation>
<translation id="8000066093800657092">Немає мережі</translation>
<translation id="4015692727874266537">Увійти в інший обліковий запис…</translation>
<translation id="5941711191222866238">Зменшити</translation>
<translation id="6911468394164995108">Під’єднатися до іншої...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/> год. <ph name="MINUTE"/> хв. до повного зарядження</translation>
<translation id="6359806961507272919">SMS-повідомлення від <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Постачальник</translation>
diff --git a/chromium/ash/strings/ash_strings_vi.xtb b/chromium/ash/strings/ash_strings_vi.xtb
index b0affdb44ce..52855111fed 100644
--- a/chromium/ash/strings/ash_strings_vi.xtb
+++ b/chromium/ash/strings/ash_strings_vi.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="vi">
<translation id="3595596368722241419">Pin đầy</translation>
-<translation id="5250713215130379958">Tự động ẩn trình khởi chạy</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> và <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">Trạng thái cổng</translation>
<translation id="30155388420722288">Nút tràn</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">Đã bật bluetooth</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> đã được xoay vòng sang <ph name="ROTATION"/></translation>
<translation id="9074739597929991885">Bluetooth</translation>
<translation id="2268130516524549846">Đã tắt bluetooth</translation>
+<translation id="7165320105431587207">Không định cấu hình mạng được</translation>
<translation id="3775358506042162758">Bạn chỉ có thể có tối đa ba tài khoản khi đăng nhập nhiều tài khoản.</translation>
<translation id="370649949373421643">Bật Wi-Fi</translation>
<translation id="3626281679859535460">Độ sáng</translation>
+<translation id="595202126637698455">Đã bật theo dõi hoạt động</translation>
<translation id="8054466585765276473">Đang tính toán thời lượng pin.</translation>
<translation id="7982789257301363584">Mạng</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">Lớp phủ bàn phím</translation>
<translation id="4387004326333427325">Chứng chỉ xác thực bị từ chối từ xa</translation>
<translation id="6979158407327259162">Google Drive</translation>
+<translation id="3683428399328702079">Độ phân giải <ph name="DISPLAY_NAME"/> đã được chuyển thành <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP gặp lỗi</translation>
<translation id="2297568595583585744">Khay trạng thái</translation>
<translation id="1661867754829461514">Thiếu PIN</translation>
@@ -34,39 +38,41 @@ Nhấn Shift + Alt để chuyển đổi.</translation>
<translation id="2127372758936585790">Bộ sạc công suất thấp</translation>
<translation id="3846575436967432996">Không có thông tin mạng</translation>
<translation id="3026237328237090306">Thiết lập dữ liệu di động</translation>
+<translation id="5871632337994001636">Quản lý thiết bị...</translation>
<translation id="785750925697875037">Xem tài khoản di động</translation>
<translation id="153454903766751181">Đang khởi chạy modem di động...</translation>
<translation id="4628814525959230255">Chia sẻ quyền kiểm soát màn hình của bạn với <ph name="HELPER_NAME"/> qua Hangouts.</translation>
-<translation id="8343941333792395995"><ph name="DISPLAY_NAME"/> đã được xoay</translation>
<translation id="7864539943188674973">Tắt bluetooth</translation>
<translation id="939252827960237676">Không lưu được ảnh chụp màn hình</translation>
<translation id="3126069444801937830">Khởi động lại để cập nhật</translation>
<translation id="2268813581635650749">Đăng xuất tất cả</translation>
<translation id="735745346212279324">Đã ngắt kết nối VPN</translation>
<translation id="7320906967354320621">Rảnh</translation>
-<translation id="6303423059719347535">Pin <ph name="PERCENTAGE"/>% đầy</translation>
<translation id="15373452373711364">Con trỏ chuột lớn</translation>
-<translation id="2778346081696727092">Không thể xác thực với tên người dùng và mật khẩu đã cung cấp</translation>
<translation id="3294437725009624529">Khách</translation>
<translation id="8190698733819146287">Tùy chỉnh ngôn ngữ và dữ liệu nhập...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">Vị trí giá</translation>
<translation id="2903907270192926896">ĐẦU VÀO</translation>
<translation id="8676770494376880701">Đã kết nối bộ sạc công suất thấp</translation>
<translation id="7170041865419449892">Ngoài vùng phủ sóng</translation>
<translation id="4804818685124855865">Ngắt kết nối</translation>
<translation id="2544853746127077729">Chứng chỉ xác thực bị mạng từ chối</translation>
<translation id="5222676887888702881">Đăng xuất</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">Cấu hình</translation>
<translation id="1272079795634619415">Dừng</translation>
<translation id="4957722034734105353">Tìm hiểu thêm...</translation>
<translation id="2964193600955408481">Tắt Wi-Fi</translation>
-<translation id="811680302244032017">Thêm thiết bị...</translation>
<translation id="4279490309300973883">Đang phản chiếu</translation>
+<translation id="7973962044839454485">Xác thực PPP không thành công do tên người dùng hoặc mật khẩu không đúng</translation>
<translation id="2509468283778169019">Đang bật CAPS LOCK</translation>
<translation id="3892641579809465218">Màn hình nội bộ</translation>
<translation id="7823564328645135659">Ngôn ngữ đã chuyển từ &quot;<ph name="FROM_LOCALE"/>&quot; thành &quot;<ph name="TO_LOCALE"/>&quot; sau khi đồng bộ hóa cài đặt của bạn.</translation>
<translation id="3368922792935385530">Đã kết nối</translation>
<translation id="8340999562596018839">Phản hồi nói</translation>
<translation id="8654520615680304441">Bật Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">Phương thức nhập của bạn đã thay đổi thành <ph name="INPUT_METHOD_ID"/>.
Nhấn Shift + Alt để chuyển đổi.</translation>
<translation id="2562916301614567480">Mạng riêng</translation>
@@ -83,11 +89,12 @@ Nhấn Shift + Alt để chuyển đổi.</translation>
<translation id="3626637461649818317">Còn lại <ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">Phương thức nhập</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">Giá</translation>
<translation id="2614835198358683673">Chromebook của bạn có thể không sạc khi đang bật. Hãy xem xét sử dụng bộ sạc chính thức.</translation>
<translation id="1895658205118569222">Tắt</translation>
<translation id="4430019312045809116">Âm lượng</translation>
+<translation id="8681498213689260554">Khởi động lại và powerwash để cập nhật</translation>
<translation id="4442424173763614572">Tìm kiếm DNS không thành công</translation>
-<translation id="6356500677799115505">Pin đầy và đang sạc.</translation>
<translation id="7874779702599364982">Đang tìm kiếm mạng di động...</translation>
<translation id="583281660410589416">Không biết</translation>
<translation id="1383876407941801731">Tìm kiếm</translation>
@@ -96,7 +103,6 @@ Nhấn Shift + Alt để chuyển đổi.</translation>
<translation id="2204305834655267233">Thông tin mạng</translation>
<translation id="1621499497873603021">Thời gian còn lại cho đến khi pin hết, <ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">Thoát khỏi phiên khách</translation>
-<translation id="4471417012762451363">Pin <ph name="PERCENTAGE"/>% đầy và đang sạc</translation>
<translation id="8308637677604853869">Trình đơn trước</translation>
<translation id="4666297444214622512">Không thể đăng nhập tài khoản khác.</translation>
<translation id="1346748346194534595">Phải</translation>
@@ -114,6 +120,7 @@ Nhấn Ctrl+Alt+Z để tắt.</translation>
<translation id="6312403991423642364">Lỗi mạng không xác định</translation>
<translation id="1467432559032391204">Trái</translation>
<translation id="5543001071567407895">SMS</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">Kích hoạt <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">Phóng to</translation>
@@ -123,7 +130,6 @@ Nhấn Ctrl+Alt+Z để tắt.</translation>
<translation id="2727977024730340865">Được cắm vào bộ sạc công suất thấp. Việc sạc pin có thể không được đảm bảo.</translation>
<translation id="3784455785234192852">Khóa</translation>
<translation id="2805756323405976993">Ứng dụng</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/> đã được đổi kích thước thành <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">Lỗi kích hoạt</translation>
<translation id="5097002363526479830">Không thể kết nối với mạng '<ph name="NAME"/>': <ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi đang tắt.</translation>
@@ -131,6 +137,7 @@ Nhấn Ctrl+Alt+Z để tắt.</translation>
<translation id="7052914147756339792">Đặt hình nền...</translation>
<translation id="8678698760965522072">Trạng thái trực tuyến</translation>
<translation id="2532589005999780174">Chế độ tương phản cao</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>, <ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">Lỗi nội bộ</translation>
<translation id="3019353588588144572">Thời gian còn lại cho đến khi pin được sạc đầy, <ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">Phóng to màn hình</translation>
@@ -153,20 +160,24 @@ Thông báo máy chủ: <ph name="SERVER_MSG"/></translation>
<translation id="7029814467594812963">Thoát khỏi phiên</translation>
<translation id="8454013096329229812">Wi-Fi đang bật.</translation>
<translation id="4872237917498892622">Alt+Search hoặc Shift</translation>
+<translation id="9201131092683066720">Pin đầy <ph name="PERCENTAGE"/>%.</translation>
<translation id="2983818520079887040">Cài đặt...</translation>
+<translation id="1195412055398077112">quét quá mức</translation>
<translation id="1717216362413677834">Chế độ gắn đế</translation>
+<translation id="112308213915226829">Tự động ẩn giá</translation>
<translation id="8927026611342028580">Yêu cầu kết nối</translation>
<translation id="8300849813060516376">OTASP không thành công</translation>
<translation id="2792498699870441125">Alt+Search</translation>
<translation id="8660803626959853127">Đang đồng bộ hóa <ph name="COUNT"/> tệp</translation>
+<translation id="5958529069007801266">Người dùng được giám sát</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK tắt</translation>
<translation id="6248847161401822652">Nhấn Control Shift Q hai lần để thoát.</translation>
+<translation id="6785414152754474415">Pin đầy <ph name="PERCENTAGE"/>% và đang sạc.</translation>
<translation id="6267036997247669271"><ph name="NAME"/>: Đang kích hoạt...</translation>
+<translation id="4895488851634969361">Pin đầy.</translation>
<translation id="1391854757121130358">Có thể bạn đã sử dụng hết dữ liệu di động được phép.</translation>
-<translation id="5413208160176941586">Người dùng được quản lý cục bộ</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>: <ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">Vị trí trình khởi chạy</translation>
+<translation id="5947494881799873997">Hoàn nguyên</translation>
<translation id="7593891976182323525">Search hoặc Shift</translation>
<translation id="7649070708921625228">Trợ giúp</translation>
<translation id="3050422059534974565">CAPS LOCK đang bật.
@@ -179,22 +190,24 @@ Nhấn Search hoặc Shift để hủy.</translation>
<translation id="6692173217867674490">Cụm mật khẩu sai</translation>
<translation id="6165508094623778733">Tìm hiểu thêm</translation>
<translation id="9046895021617826162">Kết nối không thành công</translation>
+<translation id="7168224885072002358">Sẽ hoàn nguyên về độ phân giải cũ sau <ph name="TIMEOUT_SECONDS"/></translation>
<translation id="973896785707726617">Phiên này sẽ kết thúc sau <ph name="SESSION_TIME_REMAINING"/>. Bạn sẽ tự động bị đăng xuất.</translation>
<translation id="8372369524088641025">Khóa WEP sai</translation>
<translation id="6636709850131805001">Trạng thái không xác định</translation>
<translation id="3573179567135747900">Thay đổi lại thành &quot;<ph name="FROM_LOCALE"/>&quot; (yêu cầu khởi động lại)</translation>
<translation id="8103386449138765447">Tin nhắn SMS: <ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Cài đặt Google Drive...</translation>
-<translation id="1510238584712386396">Trình khởi chạy</translation>
<translation id="7209101170223508707">CAPS LOCK đang bật.
Nhấn Alt+Search hoặc Shift để hủy.</translation>
<translation id="8940956008527784070">Pin yếu (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">Chấp nhận</translation>
<translation id="5102001756192215136">Còn lại <ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">Chia sẻ quyền kiểm soát màn hình của bạn qua Hangouts.</translation>
<translation id="8000066093800657092">Không có mạng nào</translation>
<translation id="4015692727874266537">Đăng nhập tài khoản khác...</translation>
<translation id="5941711191222866238">Thu nhỏ</translation>
<translation id="6911468394164995108">Tham gia mạng khác...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>: <ph name="ANNOTATION"/></translation>
<translation id="412065659894267608"><ph name="HOUR"/>g <ph name="MINUTE"/>p cho đến khi đầy</translation>
<translation id="6359806961507272919">SMS từ <ph name="PHONE_NUMBER"/></translation>
<translation id="1244147615850840081">Nhà cung cấp</translation>
diff --git a/chromium/ash/strings/ash_strings_zh-CN.xtb b/chromium/ash/strings/ash_strings_zh-CN.xtb
index 97af7e7a548..18ab6705034 100644
--- a/chromium/ash/strings/ash_strings_zh-CN.xtb
+++ b/chromium/ash/strings/ash_strings_zh-CN.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="zh-CN">
<translation id="3595596368722241419">电池已充满</translation>
-<translation id="5250713215130379958">自动隐藏启动程序</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> <ph name="MINUTE"/></translation>
<translation id="7880025619322806991">“门户网站”状态</translation>
<translation id="30155388420722288">溢出按钮</translation>
+<translation id="8673028979667498656">270°</translation>
<translation id="5571066253365925590">蓝牙已启用</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/>已旋转为<ph name="ROTATION"/></translation>
<translation id="9074739597929991885">蓝牙</translation>
<translation id="2268130516524549846">蓝牙已停用</translation>
+<translation id="7165320105431587207">无法配置网络</translation>
<translation id="3775358506042162758">使用多帐户登录时,最多只能有 3 个帐户。</translation>
<translation id="370649949373421643">启用 Wi-Fi</translation>
<translation id="3626281679859535460">亮度</translation>
+<translation id="595202126637698455">已启用性能跟踪</translation>
<translation id="8054466585765276473">正在计算续航时间。</translation>
<translation id="7982789257301363584">网络</translation>
<translation id="5565793151875479467">代理...</translation>
<translation id="938582441709398163">Overlay 键盘</translation>
<translation id="4387004326333427325">身份验证证书遭到远程拒绝</translation>
<translation id="6979158407327259162">Google 云端硬盘</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/>的分辨率已改为<ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP 获取请求失败</translation>
<translation id="2297568595583585744">状态栏</translation>
<translation id="1661867754829461514">缺少 PIN</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">低功率充电器</translation>
<translation id="3846575436967432996">没有可用的网络信息</translation>
<translation id="3026237328237090306">设置移动数据</translation>
+<translation id="5871632337994001636">管理设备…</translation>
<translation id="785750925697875037">查看移动帐户</translation>
<translation id="153454903766751181">正在初始化蜂窝调制解调器...</translation>
<translation id="4628814525959230255">通过环聊与<ph name="HELPER_NAME"/>共享您屏幕的控制权。</translation>
-<translation id="8343941333792395995">已旋转<ph name="DISPLAY_NAME"/></translation>
<translation id="7864539943188674973">停用蓝牙</translation>
<translation id="939252827960237676">无法保存屏幕截图</translation>
<translation id="3126069444801937830">重新启动以进行更新</translation>
<translation id="2268813581635650749">全部退出</translation>
<translation id="735745346212279324">VPN 连接已断开</translation>
<translation id="7320906967354320621">空闲</translation>
-<translation id="6303423059719347535">电池电量为 <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">大号鼠标光标</translation>
-<translation id="2778346081696727092">无法使用提供的用户名或密码进行身份验证</translation>
<translation id="3294437725009624529">访客</translation>
<translation id="8190698733819146287">自定义语言和输入法...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/>(<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">底栏的放置</translation>
<translation id="2903907270192926896">输入</translation>
<translation id="8676770494376880701">已连接低功率充电器</translation>
<translation id="7170041865419449892">超出范围</translation>
<translation id="4804818685124855865">断开连接</translation>
<translation id="2544853746127077729">身份验证证书遭到网络拒绝</translation>
<translation id="5222676887888702881">退出</translation>
+<translation id="2391579633712104609">180°</translation>
<translation id="2688477613306174402">配置</translation>
<translation id="1272079795634619415">停止</translation>
<translation id="4957722034734105353">了解详情...</translation>
<translation id="2964193600955408481">停用 Wi-Fi</translation>
-<translation id="811680302244032017">添加设备...</translation>
<translation id="4279490309300973883">正在镜像</translation>
+<translation id="7973962044839454485">用户名或密码不正确,导致 PPP 身份验证失败</translation>
<translation id="2509468283778169019">CAPS LOCK 已打开</translation>
<translation id="3892641579809465218">内部显示</translation>
<translation id="7823564328645135659">同步了您的设置后,该语言已由“<ph name="FROM_LOCALE"/>”更改为“<ph name="TO_LOCALE"/>”。</translation>
<translation id="3368922792935385530">已连接</translation>
<translation id="8340999562596018839">语音反馈</translation>
<translation id="8654520615680304441">启用 Wi-Fi...</translation>
+<translation id="8828714802988429505">90°</translation>
<translation id="5825747213122829519">您的输入法已更改为“<ph name="INPUT_METHOD_ID"/>”。
按 Shift + Alt 键可进行切换。</translation>
<translation id="2562916301614567480">专用网</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">剩余电量:<ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">输入法</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">底栏</translation>
<translation id="2614835198358683673">您的 Chromebook 在开启期间可能无法充电。建议您使用产品原装的充电器。</translation>
<translation id="1895658205118569222">关闭</translation>
<translation id="4430019312045809116">音量</translation>
+<translation id="8681498213689260554">重新启动并通过 Powerwash 来更新系统</translation>
<translation id="4442424173763614572">DNS 查找失败</translation>
-<translation id="6356500677799115505">电池电量已满并处于充电状态。</translation>
<translation id="7874779702599364982">正在搜索蜂窝网络...</translation>
<translation id="583281660410589416">未知</translation>
<translation id="1383876407941801731">搜索</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">网络信息</translation>
<translation id="1621499497873603021">电池电量将在 <ph name="TIME_LEFT"/>后耗尽</translation>
<translation id="5980301590375426705">退出访客模式</translation>
-<translation id="4471417012762451363">电池电量为 <ph name="PERCENTAGE"/>% 并处于充电状态</translation>
<translation id="8308637677604853869">上一菜单</translation>
<translation id="4666297444214622512">无法登录到其他帐户。</translation>
<translation id="1346748346194534595">向右</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">未知网络错误</translation>
<translation id="1467432559032391204">向左</translation>
<translation id="5543001071567407895">短信</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">正在激活“<ph name="NAME"/>”</translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">最大化</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">已插入低功率充电器;可能无法保证充电成功。</translation>
<translation id="3784455785234192852">锁定</translation>
<translation id="2805756323405976993">应用</translation>
-<translation id="8871072142849158571"><ph name="DISPLAY_NAME"/>的分辨率已调整为 <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">激活失败</translation>
<translation id="5097002363526479830">无法连接到网络“<ph name="NAME"/>”:<ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi 已关闭。</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">设置壁纸...</translation>
<translation id="8678698760965522072">“在线”状态</translation>
<translation id="2532589005999780174">高反差模式</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>,<ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">内部错误</translation>
<translation id="3019353588588144572">电池电量将在 <ph name="TIME_REMAINING"/>后充满</translation>
<translation id="3473479545200714844">屏幕放大镜</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">退出会话</translation>
<translation id="8454013096329229812">Wi-Fi 已打开。</translation>
<translation id="4872237917498892622">Alt + 搜索键或 Shift</translation>
+<translation id="9201131092683066720">电池电量为<ph name="PERCENTAGE"/>%。</translation>
<translation id="2983818520079887040">设置...</translation>
+<translation id="1195412055398077112">过扫描</translation>
<translation id="1717216362413677834">基座模式</translation>
+<translation id="112308213915226829">自动隐藏底栏</translation>
<translation id="8927026611342028580">连接请求已发送</translation>
<translation id="8300849813060516376">OTASP 失败</translation>
<translation id="2792498699870441125">Alt + 搜索键</translation>
<translation id="8660803626959853127">正在同步 <ph name="COUNT"/> 个文件</translation>
+<translation id="5958529069007801266">受监管用户</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">CAPS LOCK 已关闭</translation>
<translation id="6248847161401822652">连按两次 Control+Shift+Q 即可退出。</translation>
+<translation id="6785414152754474415">电池电量为<ph name="PERCENTAGE"/>%(正在充电)。</translation>
<translation id="6267036997247669271"><ph name="NAME"/>:正在激活…</translation>
+<translation id="4895488851634969361">电池电量已满。</translation>
<translation id="1391854757121130358">您可能已用尽移动数据配额。</translation>
-<translation id="5413208160176941586">本地托管用户</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>:<ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">启动器位置</translation>
+<translation id="5947494881799873997">还原</translation>
<translation id="7593891976182323525">搜索键或 Shift</translation>
<translation id="7649070708921625228">帮助</translation>
<translation id="3050422059534974565">CAPS LOCK 已开启。
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">密码错误</translation>
<translation id="6165508094623778733">了解详情</translation>
<translation id="9046895021617826162">连接失败</translation>
+<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS"/>秒后恢复到原分辨率</translation>
<translation id="973896785707726617">该会话将在 <ph name="SESSION_TIME_REMAINING"/>后结束,到时您将自动退出。</translation>
<translation id="8372369524088641025">WEP 密钥错误</translation>
<translation id="6636709850131805001">未知状态</translation>
<translation id="3573179567135747900">重新更改为“<ph name="FROM_LOCALE"/>”(需要重启)</translation>
<translation id="8103386449138765447">短信数:<ph name="MESSAGE_COUNT"/> 条</translation>
<translation id="5045002648206642691">Google 云端硬盘设置...</translation>
-<translation id="1510238584712386396">启动器</translation>
<translation id="7209101170223508707">Caps Lock 已开启。
按 Alt + 搜索键或 Shift 可取消。</translation>
<translation id="8940956008527784070">电池电量不足 (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">接受</translation>
<translation id="5102001756192215136">可用时长:<ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">通过环聊共享您屏幕的控制权。</translation>
<translation id="8000066093800657092">未连接任何网络</translation>
<translation id="4015692727874266537">登录其他帐户…</translation>
<translation id="5941711191222866238">最小化</translation>
<translation id="6911468394164995108">连接其他...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>:<ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">还需要 <ph name="HOUR"/> 小时 <ph name="MINUTE"/> 分钟才能充满电</translation>
<translation id="6359806961507272919"><ph name="PHONE_NUMBER"/> 发来的短信</translation>
<translation id="1244147615850840081">运营商</translation>
diff --git a/chromium/ash/strings/ash_strings_zh-TW.xtb b/chromium/ash/strings/ash_strings_zh-TW.xtb
index 83261ecbf75..ac3d090bb42 100644
--- a/chromium/ash/strings/ash_strings_zh-TW.xtb
+++ b/chromium/ash/strings/ash_strings_zh-TW.xtb
@@ -2,22 +2,26 @@
<!DOCTYPE translationbundle>
<translationbundle lang="zh-TW">
<translation id="3595596368722241419">電池已充滿</translation>
-<translation id="5250713215130379958">自動隱藏啟動器</translation>
<translation id="7814236020522506259"><ph name="HOUR"/> 小時 <ph name="MINUTE"/> 分鐘</translation>
<translation id="7880025619322806991">入口網站狀態</translation>
<translation id="30155388420722288">溢位按鈕</translation>
+<translation id="8673028979667498656">270 度</translation>
<translation id="5571066253365925590">藍牙已啟用</translation>
+<translation id="6310121235600822547"><ph name="DISPLAY_NAME"/> 已旋轉到<ph name="ROTATION"/></translation>
<translation id="9074739597929991885">藍牙</translation>
<translation id="2268130516524549846">藍牙已停用</translation>
+<translation id="7165320105431587207">無法設定網路</translation>
<translation id="3775358506042162758">多帳戶登入功能一次只能登入最多 3 個帳戶。</translation>
<translation id="370649949373421643">啟用 Wi-Fi</translation>
<translation id="3626281679859535460">亮度</translation>
+<translation id="595202126637698455">效能追蹤已啟用</translation>
<translation id="8054466585765276473">正在計算電池使用時間。</translation>
<translation id="7982789257301363584">網路</translation>
<translation id="5565793151875479467">Proxy...</translation>
<translation id="938582441709398163">鍵盤自訂快速鍵</translation>
<translation id="4387004326333427325">遠端已拒絕驗證憑證</translation>
<translation id="6979158407327259162">Google 雲端硬碟</translation>
+<translation id="3683428399328702079"><ph name="DISPLAY_NAME"/> 的解析度已變更為 <ph name="RESOLUTION"/></translation>
<translation id="6943836128787782965">HTTP 擷取失敗</translation>
<translation id="2297568595583585744">狀態匣</translation>
<translation id="1661867754829461514">找不到 PIN</translation>
@@ -34,39 +38,41 @@
<translation id="2127372758936585790">低功率充電器</translation>
<translation id="3846575436967432996">沒有可用的網路資訊</translation>
<translation id="3026237328237090306">設定行動數據</translation>
+<translation id="5871632337994001636">管理裝置...</translation>
<translation id="785750925697875037">查看行動帳戶</translation>
<translation id="153454903766751181">正在初始化行動數據機...</translation>
<translation id="4628814525959230255">透過 Hangouts 與 <ph name="HELPER_NAME"/> 分享螢幕控制權。</translation>
-<translation id="8343941333792395995">已旋轉 <ph name="DISPLAY_NAME"/></translation>
<translation id="7864539943188674973">停用藍牙</translation>
<translation id="939252827960237676">無法儲存螢幕擷取畫面</translation>
<translation id="3126069444801937830">重新啟用即可更新</translation>
<translation id="2268813581635650749">登出所有使用者</translation>
<translation id="735745346212279324">已中斷 VPN 連線</translation>
<translation id="7320906967354320621">閒置</translation>
-<translation id="6303423059719347535">電池電量為 <ph name="PERCENTAGE"/>%</translation>
<translation id="15373452373711364">大型滑鼠游標</translation>
-<translation id="2778346081696727092">無法使用您所提供的使用者名稱或密碼進行驗證</translation>
<translation id="3294437725009624529">訪客</translation>
<translation id="8190698733819146287">自訂語言與輸入法...</translation>
+<translation id="1279938420744323401"><ph name="DISPLAY_NAME"/> (<ph name="ANNOTATION"/>)</translation>
+<translation id="2942516765047364088">檔案櫃位置</translation>
<translation id="2903907270192926896">輸入</translation>
<translation id="8676770494376880701">已連接低功率充電器</translation>
<translation id="7170041865419449892">超出範圍</translation>
<translation id="4804818685124855865">中斷連線</translation>
<translation id="2544853746127077729">網路已拒絕驗證憑證</translation>
<translation id="5222676887888702881">登出</translation>
+<translation id="2391579633712104609">180 度</translation>
<translation id="2688477613306174402">設定</translation>
<translation id="1272079795634619415">停止</translation>
<translation id="4957722034734105353">瞭解詳情...</translation>
<translation id="2964193600955408481">停用 WiFi</translation>
-<translation id="811680302244032017">新增裝置...</translation>
<translation id="4279490309300973883">鏡像</translation>
+<translation id="7973962044839454485">使用者名稱或密碼錯誤,導致 PPP 驗證失敗</translation>
<translation id="2509468283778169019">大寫鍵已啟用</translation>
<translation id="3892641579809465218">內部畫面</translation>
<translation id="7823564328645135659">同步處理您的設定後,系統已將語言從「<ph name="FROM_LOCALE"/>」變更為「<ph name="TO_LOCALE"/>」。</translation>
<translation id="3368922792935385530">已連線</translation>
<translation id="8340999562596018839">互動朗讀</translation>
<translation id="8654520615680304441">開啟 Wi-Fi...</translation>
+<translation id="8828714802988429505">90 度</translation>
<translation id="5825747213122829519">您的輸入法已變更為 <ph name="INPUT_METHOD_ID"/>。
按下 Shift + Alt 鍵即可切換。</translation>
<translation id="2562916301614567480">私人網路</translation>
@@ -83,11 +89,12 @@
<translation id="3626637461649818317">剩餘電量:<ph name="PERCENTAGE"/>%</translation>
<translation id="9089416786594320554">輸入法</translation>
<translation id="6247708409970142803"><ph name="PERCENTAGE"/>%</translation>
+<translation id="2825619548187458965">檔案櫃</translation>
<translation id="2614835198358683673">您的 Chromebook 可能無法在開機時充電。建議您使用官方提供的充電器。</translation>
<translation id="1895658205118569222">關閉</translation>
<translation id="4430019312045809116">音量</translation>
+<translation id="8681498213689260554">重新啟動並恢復原廠設定以進行更新</translation>
<translation id="4442424173763614572">DNS 查詢失敗</translation>
-<translation id="6356500677799115505">電池電量已滿 (充電中)。</translation>
<translation id="7874779702599364982">正在搜尋行動網路...</translation>
<translation id="583281660410589416">不明</translation>
<translation id="1383876407941801731">搜尋</translation>
@@ -96,7 +103,6 @@
<translation id="2204305834655267233">網路資訊</translation>
<translation id="1621499497873603021">電池剩餘使用時間:<ph name="TIME_LEFT"/></translation>
<translation id="5980301590375426705">結束訪客工作階段</translation>
-<translation id="4471417012762451363">電池電量為 <ph name="PERCENTAGE"/>% (充電中)</translation>
<translation id="8308637677604853869">前一個選單</translation>
<translation id="4666297444214622512">無法登入其他帳戶。</translation>
<translation id="1346748346194534595">向右</translation>
@@ -114,6 +120,7 @@
<translation id="6312403991423642364">不明的網路錯誤</translation>
<translation id="1467432559032391204">向左</translation>
<translation id="5543001071567407895">簡訊</translation>
+<translation id="1957803754585243749">0°</translation>
<translation id="2354174487190027830">正在啟用 <ph name="NAME"/></translation>
<translation id="8814190375133053267">Wi-Fi</translation>
<translation id="1398853756734560583">放到最大</translation>
@@ -123,7 +130,6 @@
<translation id="2727977024730340865">使用低功率充電器,可能導致充電狀態不穩定。</translation>
<translation id="3784455785234192852">鎖定</translation>
<translation id="2805756323405976993">應用程式</translation>
-<translation id="8871072142849158571">已將 <ph name="DISPLAY_NAME"/> 的大小重新調整為 <ph name="RESOLUTION"/></translation>
<translation id="1512064327686280138">啟用失敗</translation>
<translation id="5097002363526479830">無法連線至「<ph name="NAME"/>」:<ph name="DETAILS"/></translation>
<translation id="1850504506766569011">Wi-Fi 已關閉。</translation>
@@ -131,6 +137,7 @@
<translation id="7052914147756339792">設定桌布...</translation>
<translation id="8678698760965522072">線上狀態</translation>
<translation id="2532589005999780174">高反差模式</translation>
+<translation id="511445211639755999"><ph name="RESOLUTION"/>,<ph name="OVERSCAN"/></translation>
<translation id="1119447706177454957">內部錯誤</translation>
<translation id="3019353588588144572">電池剩餘充電時間:<ph name="TIME_REMAINING"/></translation>
<translation id="3473479545200714844">畫面放大鏡</translation>
@@ -153,20 +160,24 @@
<translation id="7029814467594812963">結束工作階段</translation>
<translation id="8454013096329229812">Wi-Fi 已開啟。</translation>
<translation id="4872237917498892622">Alt + 搜尋鍵或 Shift 鍵</translation>
+<translation id="9201131092683066720">電池電量為 <ph name="PERCENTAGE"/>%。</translation>
<translation id="2983818520079887040">設定...</translation>
+<translation id="1195412055398077112">遮視區域</translation>
<translation id="1717216362413677834">座架模式</translation>
+<translation id="112308213915226829">自動隱藏檔案櫃</translation>
<translation id="8927026611342028580">已要求連線</translation>
<translation id="8300849813060516376">OTASP 失敗</translation>
<translation id="2792498699870441125">Alt + 搜尋鍵</translation>
<translation id="8660803626959853127">正在同步處理 <ph name="COUNT"/> 個檔案</translation>
+<translation id="5958529069007801266">受監管的使用者</translation>
<translation id="3709443003275901162">9+</translation>
<translation id="639644700271529076">大寫鍵已關閉</translation>
<translation id="6248847161401822652">按兩下 Control、Shift 和 Q 鍵即可結束。</translation>
+<translation id="6785414152754474415">電池電量為 <ph name="PERCENTAGE"/>% (充電中)。</translation>
<translation id="6267036997247669271"><ph name="NAME"/>:正在啟用...</translation>
+<translation id="4895488851634969361">電池電量已滿。</translation>
<translation id="1391854757121130358">您可能已用盡行動數據配額。</translation>
-<translation id="5413208160176941586">本機管理化環境下的使用者</translation>
-<translation id="1059194134494239015"><ph name="DISPLAY_NAME"/>:<ph name="RESOLUTION"/></translation>
-<translation id="4864165860509564259">啟動器位置</translation>
+<translation id="5947494881799873997">還原</translation>
<translation id="7593891976182323525">搜尋鍵或 Shift 鍵</translation>
<translation id="7649070708921625228">說明</translation>
<translation id="3050422059534974565">大寫鍵已啟用。
@@ -179,22 +190,24 @@
<translation id="6692173217867674490">通關密語有誤</translation>
<translation id="6165508094623778733">瞭解詳情</translation>
<translation id="9046895021617826162">連線失敗</translation>
+<translation id="7168224885072002358">系統將在 <ph name="TIMEOUT_SECONDS"/> 秒後還原成原來的解析度</translation>
<translation id="973896785707726617">這個工作階段將在 <ph name="SESSION_TIME_REMAINING"/>後結束,系統會自動將您登出。</translation>
<translation id="8372369524088641025">WEP 金鑰有誤</translation>
<translation id="6636709850131805001">不明狀態</translation>
<translation id="3573179567135747900">改回「<ph name="FROM_LOCALE"/>」(需要重新啟動)</translation>
<translation id="8103386449138765447">簡訊數:<ph name="MESSAGE_COUNT"/></translation>
<translation id="5045002648206642691">Google 雲端硬碟設定...</translation>
-<translation id="1510238584712386396">啟動器</translation>
<translation id="7209101170223508707">大寫鍵已啟用。
按下 Alt + 搜尋鍵或 Shift 鍵即可取消。</translation>
<translation id="8940956008527784070">電池電量不足 (<ph name="PERCENTAGE"/>%)</translation>
+<translation id="4918086044614829423">接受</translation>
<translation id="5102001756192215136">電量剩餘時間:<ph name="HOUR"/>:<ph name="MINUTE"/></translation>
<translation id="520760366042891468">透過 Hangouts 分享螢幕控制權。</translation>
<translation id="8000066093800657092">沒有網路</translation>
<translation id="4015692727874266537">使用其他帳戶登入...</translation>
<translation id="5941711191222866238">縮到最小</translation>
<translation id="6911468394164995108">加入其他網路...</translation>
+<translation id="3678715477168044796"><ph name="DISPLAY_NAME"/>:<ph name="ANNOTATION"/></translation>
<translation id="412065659894267608">尚需 <ph name="HOUR"/> 小時 <ph name="MINUTE"/> 分鐘才能充滿電</translation>
<translation id="6359806961507272919">來自 <ph name="PHONE_NUMBER"/> 的簡訊</translation>
<translation id="1244147615850840081">通訊業者</translation>
diff --git a/chromium/ash/system/chromeos/network/network_connect.cc b/chromium/ash/system/chromeos/network/network_connect.cc
index 3aca1622223..d733a01fa64 100644
--- a/chromium/ash/system/chromeos/network/network_connect.cc
+++ b/chromium/ash/system/chromeos/network/network_connect.cc
@@ -66,7 +66,8 @@ void OnConnectFailed(const std::string& service_path,
if (error_name == NetworkConnectionHandler::kErrorConnectCanceled)
return;
- if (error_name == NetworkConnectionHandler::kErrorPassphraseRequired ||
+ if (error_name == flimflam::kErrorBadPassphrase ||
+ error_name == NetworkConnectionHandler::kErrorPassphraseRequired ||
error_name == NetworkConnectionHandler::kErrorConfigurationRequired ||
error_name == NetworkConnectionHandler::kErrorAuthenticationRequired) {
ash::Shell::GetInstance()->system_tray_delegate()->ConfigureNetwork(
@@ -96,7 +97,7 @@ void OnConnectFailed(const std::string& service_path,
ShowErrorNotification(error_name, service_path);
// Show a configure dialog for ConnectFailed errors.
- if (error_name != NetworkConnectionHandler::kErrorConnectFailed)
+ if (error_name != flimflam::kErrorConnectFailed)
return;
// If Shill reports an InProgress error, don't try to configure the network.
@@ -137,11 +138,10 @@ void CallConnectToNetwork(const std::string& service_path,
}
void OnActivateFailed(const std::string& service_path,
- const std::string& error_name,
+ const std::string& error_name,
scoped_ptr<base::DictionaryValue> error_data) {
NET_LOG_ERROR("Unable to activate network", service_path);
- ShowErrorNotification(
- NetworkConnectionHandler::kErrorActivateFailed, service_path);
+ ShowErrorNotification(network_connect::kErrorActivateFailed, service_path);
}
void OnActivateSucceeded(const std::string& service_path) {
@@ -246,6 +246,8 @@ void ConfigureSetProfileSucceeded(
namespace network_connect {
+const char kErrorActivateFailed[] = "activate-failed";
+
void ConnectToNetwork(const std::string& service_path,
gfx::NativeWindow owning_window) {
const bool check_error_state = true;
@@ -254,25 +256,27 @@ void ConnectToNetwork(const std::string& service_path,
void ActivateCellular(const std::string& service_path) {
NET_LOG_USER("ActivateCellular", service_path);
+ const NetworkState* cellular =
+ NetworkHandler::Get()->network_state_handler()->
+ GetNetworkState(service_path);
+ if (!cellular || cellular->type() != flimflam::kTypeCellular) {
+ NET_LOG_ERROR("ActivateCellular with no Service", service_path);
+ return;
+ }
const DeviceState* cellular_device =
NetworkHandler::Get()->network_state_handler()->
- GetDeviceStateByType(flimflam::kTypeCellular);
+ GetDeviceState(cellular->device_path());
if (!cellular_device) {
NET_LOG_ERROR("ActivateCellular with no Device", service_path);
return;
}
if (!IsDirectActivatedCarrier(cellular_device->carrier())) {
// For non direct activation, show the mobile setup dialog which can be
- // used to activate the network.
- ash::Shell::GetInstance()->system_tray_delegate()->ShowMobileSetup(
- service_path);
- return;
- }
- const NetworkState* cellular =
- NetworkHandler::Get()->network_state_handler()->
- GetNetworkState(service_path);
- if (!cellular || cellular->type() != flimflam::kTypeCellular) {
- NET_LOG_ERROR("ActivateCellular with no Service", service_path);
+ // used to activate the network. Only show the dialog, if an account
+ // management URL is available.
+ if (!cellular->payment_url().empty())
+ ash::Shell::GetInstance()->system_tray_delegate()->ShowMobileSetup(
+ service_path);
return;
}
if (cellular->activation_state() == flimflam::kActivationStateActivated) {
diff --git a/chromium/ash/system/chromeos/network/network_connect.h b/chromium/ash/system/chromeos/network/network_connect.h
index 65c430d073e..06656ce0548 100644
--- a/chromium/ash/system/chromeos/network/network_connect.h
+++ b/chromium/ash/system/chromeos/network/network_connect.h
@@ -18,6 +18,8 @@ class DictionaryValue;
namespace ash {
namespace network_connect {
+ASH_EXPORT extern const char kErrorActivateFailed[];
+
// Requests a network connection and handles any errors and notifications.
// |owning_window| is used to parent any UI on failure (e.g. for certificate
// enrollment). If NULL, the default window will be used.
diff --git a/chromium/ash/system/chromeos/network/network_icon.cc b/chromium/ash/system/chromeos/network/network_icon.cc
index efe7e07afc4..bd32a9f8b16 100644
--- a/chromium/ash/system/chromeos/network/network_icon.cc
+++ b/chromium/ash/system/chromeos/network/network_icon.cc
@@ -620,8 +620,9 @@ void NetworkIconImpl::GetBadges(const NetworkState* network, Badges* badges) {
// For networks that are always in roaming don't show roaming badge.
const DeviceState* device =
handler->GetDeviceState(network->device_path());
- DCHECK(device);
- if (!device->provider_requires_roaming()) {
+ LOG_IF(WARNING, !device) << "Could not find device state for "
+ << network->device_path();
+ if (!device || !device->provider_requires_roaming()) {
badges->bottom_right = rb.GetImageSkiaNamed(
IconTypeIsDark(icon_type_) ?
IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK :
diff --git a/chromium/ash/system/chromeos/network/network_state_notifier.cc b/chromium/ash/system/chromeos/network/network_state_notifier.cc
index 1c971a32a44..47940d5f746 100644
--- a/chromium/ash/system/chromeos/network/network_state_notifier.cc
+++ b/chromium/ash/system/chromeos/network/network_state_notifier.cc
@@ -35,7 +35,7 @@ string16 GetConnectErrorString(const std::string& error_name) {
if (error_name == NetworkConnectionHandler::kErrorConfigureFailed)
return l10n_util::GetStringUTF16(
IDS_CHROMEOS_NETWORK_ERROR_CONFIGURE_FAILED);
- if (error_name == NetworkConnectionHandler::kErrorActivateFailed)
+ if (error_name == ash::network_connect::kErrorActivateFailed)
return l10n_util::GetStringUTF16(
IDS_CHROMEOS_NETWORK_ERROR_ACTIVATION_FAILED);
return string16();
@@ -71,7 +71,7 @@ void NetworkStateNotifier::NetworkListChanged() {
// case a connect attempt fails because a network is no longer visible.
if (!connect_failed_network_.empty()) {
ShowNetworkConnectError(
- NetworkConnectionHandler::kErrorConnectFailed, connect_failed_network_);
+ flimflam::kErrorConnectFailed, connect_failed_network_);
}
}
@@ -92,7 +92,7 @@ void NetworkStateNotifier::NetworkPropertiesUpdated(
// property has been set.
if (network->path() == connect_failed_network_ && !network->error().empty()) {
ShowNetworkConnectError(
- NetworkConnectionHandler::kErrorConnectFailed, connect_failed_network_);
+ flimflam::kErrorConnectFailed, connect_failed_network_);
}
// Trigger "Out of credits" notification if the cellular network is the most
// recent default network (i.e. we have not switched to another network).
@@ -141,7 +141,7 @@ void NetworkStateNotifier::ShowNetworkConnectError(
const std::string& service_path) {
const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
GetNetworkState(service_path);
- if (error_name == NetworkConnectionHandler::kErrorConnectFailed &&
+ if (error_name == flimflam::kErrorConnectFailed &&
service_path != connect_failed_network_) {
// Shill may not have set the Error property yet. First request an update
// and wait for either the update to complete or the network list to be
diff --git a/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc b/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc
index d8d036ad653..6e2069deb65 100644
--- a/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc
+++ b/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc
@@ -14,6 +14,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_device_client.h"
#include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/network/network_connection_handler.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace {
@@ -26,6 +27,8 @@ ash::SystemTray* GetSystemTray() {
} // namespace
using chromeos::DBusThreadManager;
+using chromeos::NetworkHandler;
+using chromeos::NetworkConnectionHandler;
using chromeos::ShillDeviceClient;
using chromeos::ShillServiceClient;
@@ -40,12 +43,14 @@ class NetworkStateNotifierTest : public AshTestBase {
virtual void SetUp() OVERRIDE {
DBusThreadManager::InitializeWithStub();
SetupDefaultShillState();
+ NetworkHandler::Initialize();
RunAllPendingInMessageLoop();
AshTestBase::SetUp();
}
virtual void TearDown() OVERRIDE {
AshTestBase::TearDown();
+ NetworkHandler::Shutdown();
DBusThreadManager::Shutdown();
}
diff --git a/chromium/ash/system/chromeos/network/sms_observer.h b/chromium/ash/system/chromeos/network/sms_observer.h
new file mode 100644
index 00000000000..bc5496780d1
--- /dev/null
+++ b/chromium/ash/system/chromeos/network/sms_observer.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2012 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.
+
+#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_SMS_OBSERVER_H
+#define ASH_SYSTEM_CHROMEOS_NETWORK_SMS_OBSERVER_H
+
+namespace base {
+class DictionaryValue;
+}
+
+namespace ash {
+
+const char kSmsNumberKey[] = "number";
+const char kSmsTextKey[] = "text";
+
+class SmsObserver {
+ public:
+ virtual ~SmsObserver() {}
+
+ virtual void AddMessage(const base::DictionaryValue& message) = 0;
+};
+
+} // namespace ash
+
+#endif // ASH_SYSTEM_CHROMEOS_NETWORK_SMS_OBSERVER_H
diff --git a/chromium/ash/system/chromeos/network/tray_sms.cc b/chromium/ash/system/chromeos/network/tray_sms.cc
index 008129faa5f..982a5643181 100644
--- a/chromium/ash/system/chromeos/network/tray_sms.cc
+++ b/chromium/ash/system/chromeos/network/tray_sms.cc
@@ -16,8 +16,6 @@
#include "ash/system/tray/tray_notification_view.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "chromeos/network/network_event_log.h"
-#include "chromeos/network/network_handler.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -37,15 +35,12 @@ const int kMessageListMinHeight = 200;
// Top/bottom padding of the text items.
const int kPaddingVertical = 10;
-const char kSmsNumberKey[] = "number";
-const char kSmsTextKey[] = "text";
-
bool GetMessageFromDictionary(const base::DictionaryValue* message,
std::string* number,
std::string* text) {
- if (!message->GetStringWithoutPathExpansion(kSmsNumberKey, number))
+ if (!message->GetStringWithoutPathExpansion(ash::kSmsNumberKey, number))
return false;
- if (!message->GetStringWithoutPathExpansion(kSmsTextKey, text))
+ if (!message->GetStringWithoutPathExpansion(ash::kSmsTextKey, text))
return false;
return true;
}
@@ -286,14 +281,11 @@ TraySms::TraySms(SystemTray* system_tray)
default_(NULL),
detailed_(NULL),
notification_(NULL) {
- // TODO(armansito): SMS could be a special case for cellular that requires a
- // user (perhaps the owner) to be logged in. If that is the case, then an
- // additional check should be done before subscribing for SMS notifications.
- chromeos::NetworkHandler::Get()->network_sms_handler()->AddObserver(this);
+ Shell::GetInstance()->system_tray_notifier()->AddSmsObserver(this);
}
TraySms::~TraySms() {
- chromeos::NetworkHandler::Get()->network_sms_handler()->RemoveObserver(this);
+ Shell::GetInstance()->system_tray_notifier()->RemoveSmsObserver(this);
}
views::View* TraySms::CreateDefaultView(user::LoginStatus status) {
@@ -335,35 +327,8 @@ void TraySms::DestroyNotificationView() {
notification_ = NULL;
}
-void TraySms::MessageReceived(const base::DictionaryValue& message) {
-
- std::string message_text;
- if (!message.GetStringWithoutPathExpansion(
- chromeos::NetworkSmsHandler::kTextKey, &message_text)) {
- NET_LOG_ERROR("SMS message contains no content.", "");
- return;
- }
- // TODO(armansito): A message might be due to a special "Message Waiting"
- // state that the message is in. Once SMS handling moves to shill, such
- // messages should be filtered there so that this check becomes unnecessary.
- if (message_text.empty()) {
- NET_LOG_DEBUG("SMS has empty content text. Ignoring.", "");
- return;
- }
- std::string message_number;
- if (!message.GetStringWithoutPathExpansion(
- chromeos::NetworkSmsHandler::kNumberKey, &message_number)) {
- NET_LOG_DEBUG("SMS contains no number. Ignoring.", "");
- return;
- }
-
- NET_LOG_DEBUG("Received SMS from: " + message_number + " with text: " +
- message_text, "");
-
- base::DictionaryValue* dict = new base::DictionaryValue();
- dict->SetString(kSmsNumberKey, message_number);
- dict->SetString(kSmsTextKey, message_text);
- messages_.Append(dict);
+void TraySms::AddMessage(const base::DictionaryValue& message) {
+ messages_.Append(message.DeepCopy());
Update(true);
}
diff --git a/chromium/ash/system/chromeos/network/tray_sms.h b/chromium/ash/system/chromeos/network/tray_sms.h
index 5a79360052a..7fc334b7ebd 100644
--- a/chromium/ash/system/chromeos/network/tray_sms.h
+++ b/chromium/ash/system/chromeos/network/tray_sms.h
@@ -7,15 +7,15 @@
#include <string>
+#include "ash/system/chromeos/network/sms_observer.h"
#include "ash/system/tray/system_tray_item.h"
#include "base/values.h"
-#include "chromeos/network/network_sms_handler.h"
namespace ash {
namespace internal {
class TraySms : public SystemTrayItem,
- public chromeos::NetworkSmsHandler::Observer {
+ public SmsObserver {
public:
explicit TraySms(SystemTray* system_tray);
virtual ~TraySms();
@@ -29,8 +29,8 @@ class TraySms : public SystemTrayItem,
virtual void DestroyDetailedView() OVERRIDE;
virtual void DestroyNotificationView() OVERRIDE;
- // Overridden from chromeos::NetworkSmsHandler::Observer.
- virtual void MessageReceived(const base::DictionaryValue& message) OVERRIDE;
+ // Overridden from SmsObserver.
+ virtual void AddMessage(const base::DictionaryValue& message) OVERRIDE;
protected:
class SmsDefaultView;
@@ -45,8 +45,7 @@ class TraySms : public SystemTrayItem,
// Removes message at |index| from message list.
void RemoveMessage(size_t index);
- // Called when sms messages have changed (through
- // chromeos::NetworkSmsHandler::Observer).
+ // Called when sms messages have changed (by tray::SmsObserver).
void Update(bool notify);
base::ListValue& messages() { return messages_; }
diff --git a/chromium/ash/system/chromeos/settings/tray_settings.cc b/chromium/ash/system/chromeos/settings/tray_settings.cc
index 8153aeae81e..8868b7cf50d 100644
--- a/chromium/ash/system/chromeos/settings/tray_settings.cc
+++ b/chromium/ash/system/chromeos/settings/tray_settings.cc
@@ -142,6 +142,9 @@ views::View* TraySettings::CreateDefaultView(user::LoginStatus status) {
!PowerStatus::Get()->IsBatteryPresent())
return NULL;
+ if (!ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings())
+ return NULL;
+
CHECK(default_view_ == NULL);
default_view_ = new tray::SettingsDefaultView(status);
return default_view_;
diff --git a/chromium/ash/system/logout_button/logout_button_tray.cc b/chromium/ash/system/logout_button/logout_button_tray.cc
deleted file mode 100644
index f62921f1a08..00000000000
--- a/chromium/ash/system/logout_button/logout_button_tray.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2013 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/system/logout_button/logout_button_tray.h"
-
-#include "ash/shelf/shelf_types.h"
-#include "ash/shell.h"
-#include "ash/system/status_area_widget.h"
-#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_utils.h"
-#include "base/logging.h"
-#include "grit/ash_resources.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/events/event.h"
-#include "ui/gfx/font.h"
-#include "ui/gfx/insets.h"
-#include "ui/gfx/size.h"
-#include "ui/views/bubble/tray_bubble_view.h"
-#include "ui/views/controls/button/label_button.h"
-#include "ui/views/controls/button/label_button_border.h"
-#include "ui/views/painter.h"
-
-namespace ash {
-
-namespace internal {
-
-namespace {
-
-const int kLogoutButtonHorizontalExtraPadding = 7;
-
-const int kLogoutButtonNormalImages[] = {
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT
-};
-
-const int kLogoutButtonPushedImages[] = {
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM,
- IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT
-};
-
-class LogoutButton : public views::LabelButton {
- public:
- LogoutButton(views::ButtonListener* listener);
- virtual ~LogoutButton();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LogoutButton);
-};
-
-} // namespace
-
-LogoutButton::LogoutButton(views::ButtonListener* listener)
- : views::LabelButton(listener, base::string16()) {
- SetupLabelForTray(label());
- SetFont(GetFont().DeriveFont(0, gfx::Font::NORMAL));
- for (size_t state = 0; state < views::Button::STATE_COUNT; ++state)
- SetTextColor(static_cast<views::Button::ButtonState>(state), SK_ColorWHITE);
-
- views::LabelButtonBorder* border =
- new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON);
- border->SetPainter(false, views::Button::STATE_NORMAL,
- views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
- border->SetPainter(false, views::Button::STATE_HOVERED,
- views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
- border->SetPainter(false, views::Button::STATE_PRESSED,
- views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
- gfx::Insets insets = border->GetInsets();
- insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding,
- 0, kLogoutButtonHorizontalExtraPadding);
- border->set_insets(insets);
- set_border(border);
- set_animate_on_state_change(false);
-
- set_min_size(gfx::Size(0, GetShelfItemHeight()));
-}
-
-LogoutButton::~LogoutButton() {
-}
-
-LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget)
- : TrayBackgroundView(status_area_widget),
- button_(NULL),
- login_status_(user::LOGGED_IN_NONE),
- show_logout_button_in_tray_(false) {
- button_ = new LogoutButton(this);
- tray_container()->AddChildView(button_);
- tray_container()->set_border(NULL);
- Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this);
-}
-
-LogoutButtonTray::~LogoutButtonTray() {
- Shell::GetInstance()->system_tray_notifier()->
- RemoveLogoutButtonObserver(this);
-}
-
-void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
- TrayBackgroundView::SetShelfAlignment(alignment);
- tray_container()->set_border(NULL);
-}
-
-base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
- return button_->GetText();
-}
-
-void LogoutButtonTray::HideBubbleWithView(
- const views::TrayBubbleView* bubble_view) {
-}
-
-bool LogoutButtonTray::ClickedOutsideBubble() {
- return false;
-}
-
-void LogoutButtonTray::OnShowLogoutButtonInTrayChanged(bool show) {
- show_logout_button_in_tray_ = show;
- UpdateVisibility();
-}
-
-void LogoutButtonTray::ButtonPressed(views::Button* sender,
- const ui::Event& event) {
- DCHECK_EQ(sender, button_);
- Shell::GetInstance()->system_tray_delegate()->SignOut();
-}
-
-void LogoutButtonTray::UpdateAfterLoginStatusChange(
- user::LoginStatus login_status) {
- login_status_ = login_status;
- const base::string16 title =
- GetLocalizedSignOutStringForStatus(login_status, false);
- button_->SetText(title);
- button_->SetAccessibleName(title);
- UpdateVisibility();
-}
-
-void LogoutButtonTray::UpdateVisibility() {
- SetVisible(show_logout_button_in_tray_ &&
- login_status_ != user::LOGGED_IN_NONE &&
- login_status_ != user::LOGGED_IN_LOCKED);
-}
-
-} // namespace internal
-} // namespace ash
diff --git a/chromium/ash/system/logout_button/logout_button_tray.h b/chromium/ash/system/logout_button/logout_button_tray.h
deleted file mode 100644
index 5683e5e2654..00000000000
--- a/chromium/ash/system/logout_button/logout_button_tray.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_
-#define ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_
-
-#include "ash/system/logout_button/logout_button_observer.h"
-#include "ash/system/tray/tray_background_view.h"
-#include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "ui/views/controls/button/button.h"
-
-namespace views {
-class LabelButton;
-}
-
-namespace ash {
-namespace internal {
-
-class StatusAreaWidget;
-
-// Adds a logout button to the launcher's status area if enabled by the
-// kShowLogoutButtonInTray pref.
-class LogoutButtonTray : public TrayBackgroundView,
- public LogoutButtonObserver,
- public views::ButtonListener {
- public:
- explicit LogoutButtonTray(StatusAreaWidget* status_area_widget);
- virtual ~LogoutButtonTray();
-
- // TrayBackgroundView:
- virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
- virtual base::string16 GetAccessibleNameForTray() OVERRIDE;
- virtual void HideBubbleWithView(
- const views::TrayBubbleView* bubble_view) OVERRIDE;
- virtual bool ClickedOutsideBubble() OVERRIDE;
-
- // LogoutButtonObserver:
- virtual void OnShowLogoutButtonInTrayChanged(bool show) OVERRIDE;
-
- // views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE;
-
- void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
-
- private:
- void UpdateVisibility();
-
- views::LabelButton* button_; // Not owned.
- user::LoginStatus login_status_;
- bool show_logout_button_in_tray_;
-
- DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);
-};
-
-} // namespace internal
-} // namespace ash
-
-#endif // ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_
diff --git a/chromium/ash/system/logout_button/tray_logout_button.cc b/chromium/ash/system/logout_button/tray_logout_button.cc
new file mode 100644
index 00000000000..102329c9a22
--- /dev/null
+++ b/chromium/ash/system/logout_button/tray_logout_button.cc
@@ -0,0 +1,168 @@
+// Copyright (c) 2012 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/system/logout_button/tray_logout_button.h"
+
+#include <cstddef>
+
+#include "ash/shell.h"
+#include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/system/tray/tray_constants.h"
+#include "ash/system/user/login_status.h"
+#include "base/logging.h"
+#include "base/strings/string16.h"
+#include "grit/ash_resources.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/views/border.h"
+#include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/custom_button.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/label_button_border.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/view.h"
+
+namespace {
+
+const int kLogoutButtonNormalImages[] = {
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT
+};
+const int kLogoutButtonHotImages[] = {
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_TOP_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_TOP,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_TOP_RIGHT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_CENTER,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_RIGHT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_BOTTOM_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_BOTTOM,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_HOT_BOTTOM_RIGHT
+};
+const int kLogoutButtonPushedImages[] = {
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM,
+ IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT
+};
+
+} // namespace
+
+namespace ash {
+namespace internal {
+
+namespace tray {
+
+class LogoutButton : public views::View,
+ public views::ButtonListener {
+ public:
+ LogoutButton(user::LoginStatus status) : button_(NULL),
+ login_status_(user::LOGGED_IN_NONE),
+ show_logout_button_in_tray_(false) {
+ views::BoxLayout* layout = new views::BoxLayout(
+ views::BoxLayout::kHorizontal, 0, 0, 0);
+ layout->set_spread_blank_space(true);
+ SetLayoutManager(layout);
+ set_border(views::Border::CreateEmptyBorder(
+ 0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0, 0));
+
+ button_ = new views::LabelButton(this, base::string16());
+ for (size_t state = 0; state < views::Button::STATE_COUNT; ++state) {
+ button_->SetTextColor(
+ static_cast<views::Button::ButtonState>(state), SK_ColorWHITE);
+ }
+ button_->SetFont(button_->GetFont().DeriveFont(1));
+ views::LabelButtonBorder* border =
+ new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON);
+ border->SetPainter(false, views::Button::STATE_NORMAL,
+ views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
+ border->SetPainter(false, views::Button::STATE_HOVERED,
+ views::Painter::CreateImageGridPainter(kLogoutButtonHotImages));
+ border->SetPainter(false, views::Button::STATE_PRESSED,
+ views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
+ button_->set_border(border);
+ AddChildView(button_);
+ OnLoginStatusChanged(status);
+ }
+
+ void OnLoginStatusChanged(user::LoginStatus status) {
+ login_status_ = status;
+ const base::string16 title = GetLocalizedSignOutStringForStatus(
+ login_status_, false);
+ button_->SetText(title);
+ button_->SetAccessibleName(title);
+ UpdateVisibility();
+ }
+
+ void OnShowLogoutButtonInTrayChanged(bool show) {
+ show_logout_button_in_tray_ = show;
+ UpdateVisibility();
+ }
+
+ // Overridden from views::ButtonListener.
+ virtual void ButtonPressed(views::Button* sender,
+ const ui::Event& event) OVERRIDE {
+ DCHECK_EQ(sender, button_);
+ Shell::GetInstance()->system_tray_delegate()->SignOut();
+ }
+
+ private:
+ void UpdateVisibility() {
+ SetVisible(show_logout_button_in_tray_ &&
+ login_status_ != user::LOGGED_IN_NONE &&
+ login_status_ != user::LOGGED_IN_LOCKED);
+ }
+
+ views::LabelButton* button_;
+ user::LoginStatus login_status_;
+ bool show_logout_button_in_tray_;
+
+ DISALLOW_COPY_AND_ASSIGN(LogoutButton);
+};
+
+} // namespace tray
+
+TrayLogoutButton::TrayLogoutButton(SystemTray* system_tray)
+ : SystemTrayItem(system_tray),
+ logout_button_(NULL) {
+ Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this);
+}
+
+TrayLogoutButton::~TrayLogoutButton() {
+ Shell::GetInstance()->system_tray_notifier()->
+ RemoveLogoutButtonObserver(this);
+}
+
+views::View* TrayLogoutButton::CreateTrayView(user::LoginStatus status) {
+ CHECK(logout_button_ == NULL);
+ logout_button_ = new tray::LogoutButton(status);
+ return logout_button_;
+}
+
+void TrayLogoutButton::DestroyTrayView() {
+ logout_button_ = NULL;
+}
+
+void TrayLogoutButton::UpdateAfterLoginStatusChange(user::LoginStatus status) {
+ logout_button_->OnLoginStatusChanged(status);
+}
+
+void TrayLogoutButton::OnShowLogoutButtonInTrayChanged(bool show) {
+ logout_button_->OnShowLogoutButtonInTrayChanged(show);
+}
+
+} // namespace internal
+} // namespace ash
diff --git a/chromium/ash/system/logout_button/tray_logout_button.h b/chromium/ash/system/logout_button/tray_logout_button.h
new file mode 100644
index 00000000000..50ca9f9c2c1
--- /dev/null
+++ b/chromium/ash/system/logout_button/tray_logout_button.h
@@ -0,0 +1,44 @@
+// Copyright (c) 2012 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.
+
+#ifndef ASH_SYSTEM_LOGOUT_BUTTON_TRAY_LOGOUT_BUTTON_H_
+#define ASH_SYSTEM_LOGOUT_BUTTON_TRAY_LOGOUT_BUTTON_H_
+
+#include "ash/system/logout_button/logout_button_observer.h"
+#include "ash/system/tray/system_tray_item.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+
+namespace ash {
+namespace internal {
+
+namespace tray {
+class LogoutButton;
+}
+
+// Adds a logout button to the system tray if enabled by the
+// kShowLogoutButtonInTray pref.
+class TrayLogoutButton : public SystemTrayItem, public LogoutButtonObserver {
+ public:
+ explicit TrayLogoutButton(SystemTray* system_tray);
+ virtual ~TrayLogoutButton();
+
+ // Overridden from SystemTrayItem.
+ virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
+ virtual void DestroyTrayView() OVERRIDE;
+ virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
+
+ // Overridden from LogoutButtonObserver.
+ virtual void OnShowLogoutButtonInTrayChanged(bool show) OVERRIDE;
+
+ private:
+ tray::LogoutButton* logout_button_;
+
+ DISALLOW_COPY_AND_ASSIGN(TrayLogoutButton);
+};
+
+} // namespace internal
+} // namespace ash
+
+#endif // ASH_SYSTEM_LOGOUT_BUTTON_TRAY_LOGOUT_BUTTON_H_
diff --git a/chromium/ash/system/status_area_widget.cc b/chromium/ash/system/status_area_widget.cc
index ed31ba286fd..147251c6f52 100644
--- a/chromium/ash/system/status_area_widget.cc
+++ b/chromium/ash/system/status_area_widget.cc
@@ -11,7 +11,6 @@
#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
#include "ash/system/bluetooth/bluetooth_observer.h"
-#include "ash/system/logout_button/logout_button_tray.h"
#include "ash/system/status_area_widget_delegate.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -31,7 +30,6 @@ StatusAreaWidget::StatusAreaWidget(aura::Window* status_container)
: status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate),
system_tray_(NULL),
web_notification_tray_(NULL),
- logout_button_tray_(NULL),
login_status_(user::LOGGED_IN_NONE) {
views::Widget::InitParams params(
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
@@ -50,7 +48,6 @@ StatusAreaWidget::~StatusAreaWidget() {
void StatusAreaWidget::CreateTrayViews() {
AddSystemTray();
AddWebNotificationTray();
- AddLogoutButtonTray();
SystemTrayDelegate* delegate =
ash::Shell::GetInstance()->system_tray_delegate();
DCHECK(delegate);
@@ -59,8 +56,6 @@ void StatusAreaWidget::CreateTrayViews() {
system_tray_->InitializeTrayItems(delegate);
if (web_notification_tray_)
web_notification_tray_->Initialize();
- if (logout_button_tray_)
- logout_button_tray_->Initialize();
UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
}
@@ -68,8 +63,6 @@ void StatusAreaWidget::Shutdown() {
// Destroy the trays early, causing them to be removed from the view
// hierarchy. Do not used scoped pointers since we don't want to destroy them
// in the destructor if Shutdown() is not called (e.g. in tests).
- delete logout_button_tray_;
- logout_button_tray_ = NULL;
delete web_notification_tray_;
web_notification_tray_ = NULL;
delete system_tray_;
@@ -114,19 +107,12 @@ void StatusAreaWidget::AddWebNotificationTray() {
status_area_widget_delegate_->AddTray(web_notification_tray_);
}
-void StatusAreaWidget::AddLogoutButtonTray() {
- logout_button_tray_ = new LogoutButtonTray(this);
- status_area_widget_delegate_->AddTray(logout_button_tray_);
-}
-
void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
status_area_widget_delegate_->set_alignment(alignment);
if (system_tray_)
system_tray_->SetShelfAlignment(alignment);
if (web_notification_tray_)
web_notification_tray_->SetShelfAlignment(alignment);
- if (logout_button_tray_)
- logout_button_tray_->SetShelfAlignment(alignment);
status_area_widget_delegate_->UpdateLayout();
}
@@ -148,8 +134,6 @@ void StatusAreaWidget::UpdateAfterLoginStatusChange(
system_tray_->UpdateAfterLoginStatusChange(login_status);
if (web_notification_tray_)
web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
- if (logout_button_tray_)
- logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
}
} // namespace internal
diff --git a/chromium/ash/system/status_area_widget.h b/chromium/ash/system/status_area_widget.h
index 6a4cb2a40aa..5283535f5a0 100644
--- a/chromium/ash/system/status_area_widget.h
+++ b/chromium/ash/system/status_area_widget.h
@@ -18,7 +18,6 @@ class WebNotificationTray;
namespace internal {
-class LogoutButtonTray;
class StatusAreaWidgetDelegate;
class ASH_EXPORT StatusAreaWidget : public views::Widget {
@@ -28,7 +27,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
explicit StatusAreaWidget(aura::Window* status_container);
virtual ~StatusAreaWidget();
- // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
+ // Creates the SystemTray and the WebNotificationTray.
void CreateTrayViews();
// Destroys the system tray and web notification tray. Called before
@@ -73,13 +72,11 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
private:
void AddSystemTray();
void AddWebNotificationTray();
- void AddLogoutButtonTray();
// Weak pointers to View classes that are parented to StatusAreaWidget:
internal::StatusAreaWidgetDelegate* status_area_widget_delegate_;
SystemTray* system_tray_;
WebNotificationTray* web_notification_tray_;
- LogoutButtonTray* logout_button_tray_;
user::LoginStatus login_status_;
DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
diff --git a/chromium/ash/system/tray/system_tray.cc b/chromium/ash/system/tray/system_tray.cc
index 47157ea46ff..122253f9986 100644
--- a/chromium/ash/system/tray/system_tray.cc
+++ b/chromium/ash/system/tray/system_tray.cc
@@ -15,6 +15,7 @@
#include "ash/system/date/tray_date.h"
#include "ash/system/drive/tray_drive.h"
#include "ash/system/ime/tray_ime.h"
+#include "ash/system/logout_button/tray_logout_button.h"
#include "ash/system/monitor/tray_monitor.h"
#include "ash/system/session_length_limit/tray_session_length_limit.h"
#include "ash/system/status_area_widget.h"
@@ -146,6 +147,7 @@ void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate) {
void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
#if !defined(OS_WIN)
AddTrayItem(new internal::TraySessionLengthLimit(this));
+ AddTrayItem(new internal::TrayLogoutButton(this));
// In multi-profile user mode we can have multiple user tiles.
ash::Shell* shell = ash::Shell::GetInstance();
int maximum_user_profiles =
diff --git a/chromium/ash/system/tray/system_tray.h b/chromium/ash/system/tray/system_tray.h
index b37a643205a..ded64750026 100644
--- a/chromium/ash/system/tray/system_tray.h
+++ b/chromium/ash/system/tray/system_tray.h
@@ -36,6 +36,7 @@ class UpdateObserver;
class UserObserver;
#if defined(OS_CHROMEOS)
class NetworkObserver;
+class SmsObserver;
#endif
class SystemTrayItem;
diff --git a/chromium/ash/system/tray/system_tray_delegate.h b/chromium/ash/system/tray/system_tray_delegate.h
index a66726b8232..0742ad147ad 100644
--- a/chromium/ash/system/tray/system_tray_delegate.h
+++ b/chromium/ash/system/tray/system_tray_delegate.h
@@ -156,6 +156,9 @@ class SystemTrayDelegate {
// Shows settings.
virtual void ShowSettings() = 0;
+ // Returns true if settings menu item should appear.
+ virtual bool ShouldShowSettings() = 0;
+
// Shows the settings related to date, timezone etc.
virtual void ShowDateSettings() = 0;
@@ -288,6 +291,16 @@ class SystemTrayDelegate {
// Returns whether bluetooth is enabled.
virtual bool GetBluetoothEnabled() = 0;
+ // Retrieves information about the carrier and locale specific |setup_url|.
+ // If none of the carrier info/setup URL cannot be retrieved, returns false.
+ // Note: |setup_url| is returned when carrier is not defined (no SIM card).
+ virtual bool GetCellularCarrierInfo(std::string* carrier_id,
+ std::string* topup_url,
+ std::string* setup_url) = 0;
+
+ // Opens the cellular network specific URL.
+ virtual void ShowCellularURL(const std::string& url) = 0;
+
// Shows UI for changing proxy settings.
virtual void ChangeProxySettings() = 0;
diff --git a/chromium/ash/system/tray/system_tray_notifier.cc b/chromium/ash/system/tray/system_tray_notifier.cc
index fcdb2d6d5bc..73f619586fd 100644
--- a/chromium/ash/system/tray/system_tray_notifier.cc
+++ b/chromium/ash/system/tray/system_tray_notifier.cc
@@ -140,6 +140,14 @@ void SystemTrayNotifier::RemoveNetworkObserver(NetworkObserver* observer) {
network_observers_.RemoveObserver(observer);
}
+void SystemTrayNotifier::AddSmsObserver(SmsObserver* observer) {
+ sms_observers_.AddObserver(observer);
+}
+
+void SystemTrayNotifier::RemoveSmsObserver(SmsObserver* observer) {
+ sms_observers_.RemoveObserver(observer);
+}
+
void SystemTrayNotifier::AddEnterpriseDomainObserver(
EnterpriseDomainObserver* observer) {
enterprise_domain_observers_.AddObserver(observer);
@@ -318,6 +326,11 @@ void SystemTrayNotifier::NotifyRequestToggleWifi() {
RequestToggleWifi());
}
+void SystemTrayNotifier::NotifyAddSmsMessage(
+ const base::DictionaryValue& message) {
+ FOR_EACH_OBSERVER(SmsObserver, sms_observers_, AddMessage(message));
+}
+
void SystemTrayNotifier::NotifyEnterpriseDomainChanged() {
FOR_EACH_OBSERVER(EnterpriseDomainObserver, enterprise_domain_observers_,
OnEnterpriseDomainChanged());
diff --git a/chromium/ash/system/tray/system_tray_notifier.h b/chromium/ash/system/tray/system_tray_notifier.h
index 2ae739fe9e3..86210b4d343 100644
--- a/chromium/ash/system/tray/system_tray_notifier.h
+++ b/chromium/ash/system/tray/system_tray_notifier.h
@@ -13,6 +13,7 @@
#include "ash/system/brightness/brightness_observer.h"
#include "ash/system/chromeos/enterprise/enterprise_domain_observer.h"
#include "ash/system/chromeos/network/network_observer.h"
+#include "ash/system/chromeos/network/sms_observer.h"
#include "ash/system/chromeos/tray_tracing.h"
#include "ash/system/date/clock_observer.h"
#include "ash/system/drive/drive_observer.h"
@@ -28,6 +29,7 @@
#if defined(OS_CHROMEOS)
#include "ash/system/chromeos/network/network_observer.h"
+#include "ash/system/chromeos/network/sms_observer.h"
#include "ash/system/chromeos/screen_security/screen_capture_observer.h"
#include "ash/system/chromeos/screen_security/screen_share_observer.h"
#endif
@@ -86,6 +88,9 @@ public:
void AddNetworkObserver(NetworkObserver* observer);
void RemoveNetworkObserver(NetworkObserver* observer);
+ void AddSmsObserver(SmsObserver* observer);
+ void RemoveSmsObserver(SmsObserver* observer);
+
void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
@@ -126,6 +131,7 @@ public:
const std::vector<base::string16>& links);
void NotifyClearNetworkMessage(NetworkObserver::MessageType message_type);
void NotifyRequestToggleWifi();
+ void NotifyAddSmsMessage(const base::DictionaryValue& message);
void NotifyEnterpriseDomainChanged();
void NotifyScreenCaptureStart(const base::Closure& stop_callback,
const base::string16& sharing_app_name);
@@ -155,6 +161,7 @@ public:
ObserverList<UserObserver> user_observers_;
#if defined(OS_CHROMEOS)
ObserverList<NetworkObserver> network_observers_;
+ ObserverList<SmsObserver> sms_observers_;
ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
ObserverList<ScreenCaptureObserver> screen_capture_observers_;
ObserverList<ScreenShareObserver> screen_share_observers_;
diff --git a/chromium/ash/system/tray/test_system_tray_delegate.cc b/chromium/ash/system/tray/test_system_tray_delegate.cc
index 44b21fa8ff9..d7a3a551584 100644
--- a/chromium/ash/system/tray/test_system_tray_delegate.cc
+++ b/chromium/ash/system/tray/test_system_tray_delegate.cc
@@ -114,6 +114,10 @@ base::HourClockType TestSystemTrayDelegate::GetHourClockType() const {
void TestSystemTrayDelegate::ShowSettings() {
}
+bool TestSystemTrayDelegate::ShouldShowSettings() {
+ return true;
+}
+
void TestSystemTrayDelegate::ShowDateSettings() {
}
@@ -254,6 +258,15 @@ bool TestSystemTrayDelegate::GetBluetoothEnabled() {
return bluetooth_enabled_;
}
+bool TestSystemTrayDelegate::GetCellularCarrierInfo(std::string* carrier_id,
+ std::string* topup_url,
+ std::string* setup_url) {
+ return false;
+}
+
+void TestSystemTrayDelegate::ShowCellularURL(const std::string& url) {
+}
+
void TestSystemTrayDelegate::ChangeProxySettings() {
}
diff --git a/chromium/ash/system/tray/test_system_tray_delegate.h b/chromium/ash/system/tray/test_system_tray_delegate.h
index 9be9c8ac652..68bb593b843 100644
--- a/chromium/ash/system/tray/test_system_tray_delegate.h
+++ b/chromium/ash/system/tray/test_system_tray_delegate.h
@@ -38,6 +38,7 @@ class TestSystemTrayDelegate : public SystemTrayDelegate {
virtual bool SystemShouldUpgrade() const OVERRIDE;
virtual base::HourClockType GetHourClockType() const OVERRIDE;
virtual void ShowSettings() OVERRIDE;
+ virtual bool ShouldShowSettings() OVERRIDE;
virtual void ShowDateSettings() OVERRIDE;
virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;
virtual void ShowBluetoothSettings() OVERRIDE;
@@ -83,6 +84,10 @@ class TestSystemTrayDelegate : public SystemTrayDelegate {
virtual void ShowOtherCellular() OVERRIDE;
virtual bool GetBluetoothAvailable() OVERRIDE;
virtual bool GetBluetoothEnabled() OVERRIDE;
+ virtual bool GetCellularCarrierInfo(std::string* carrier_id,
+ std::string* topup_url,
+ std::string* setup_url) OVERRIDE;
+ virtual void ShowCellularURL(const std::string& url) OVERRIDE;
virtual void ChangeProxySettings() OVERRIDE;
virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE;
virtual void SetVolumeControlDelegate(
diff --git a/chromium/ash/system/tray/tray_background_view.h b/chromium/ash/system/tray/tray_background_view.h
index b0f28067f61..4d57d5bab22 100644
--- a/chromium/ash/system/tray/tray_background_view.h
+++ b/chromium/ash/system/tray/tray_background_view.h
@@ -19,8 +19,7 @@ class StatusAreaWidget;
class TrayEventFilter;
class TrayBackground;
-// Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray,
-// LogoutButtonTray.
+// Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray.
// This class handles setting and animating the background when the Launcher
// his shown/hidden. It also inherits from ActionableView so that the tray
// items can override PerformAction when clicked on.
diff --git a/chromium/ash/system/tray/tray_constants.cc b/chromium/ash/system/tray/tray_constants.cc
index 6d4b2e6b90d..6d108c8d029 100644
--- a/chromium/ash/system/tray/tray_constants.cc
+++ b/chromium/ash/system/tray/tray_constants.cc
@@ -67,17 +67,12 @@ const int kTrayNotificationContentsWidth = kTrayPopupMinWidth -
(kTrayPopupPaddingHorizontal / 2) * 3);
const int kTraySpacing = 8;
const int kAlternateTraySpacing = 4;
-const int kShelfItemHeight = 31;
-const int kAlternateShelfItemHeight = 38;
+// Returns kTraySpacing or kAlternateTraySpacing as applicable
+// (Determined by ash::switches::UseAlternateShelfLayout).
int GetTraySpacing() {
return ash::switches::UseAlternateShelfLayout() ?
kAlternateTraySpacing : kTraySpacing;
}
-int GetShelfItemHeight() {
- return ash::switches::UseAlternateShelfLayout() ?
- kAlternateShelfItemHeight : kShelfItemHeight;
-}
-
} // namespace ash
diff --git a/chromium/ash/system/tray/tray_constants.h b/chromium/ash/system/tray/tray_constants.h
index 50b2210bca0..480d5d54a35 100644
--- a/chromium/ash/system/tray/tray_constants.h
+++ b/chromium/ash/system/tray/tray_constants.h
@@ -66,10 +66,6 @@ extern const int kTrayNotificationContentsWidth;
// (Determined by ash::switches::UseAlternateShelfLayout).
int GetTraySpacing();
-// Returns kShelfItemHeight or kAlternateShelfItemHeight as applicable
-// (Determined by ash::switches::UseAlternateShelfLayout).
-int GetShelfItemHeight();
-
} // namespace ash
#endif // ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_
diff --git a/chromium/ash/system/tray/tray_image_item.cc b/chromium/ash/system/tray/tray_image_item.cc
index 7c5e216c942..d4ff9040ade 100644
--- a/chromium/ash/system/tray/tray_image_item.cc
+++ b/chromium/ash/system/tray/tray_image_item.cc
@@ -4,13 +4,12 @@
#include "ash/system/tray/tray_image_item.h"
-#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/tray_item_view.h"
#include "ash/system/tray/tray_utils.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/image_view.h"
-#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
namespace ash {
namespace internal {
@@ -42,7 +41,6 @@ views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().
GetImageNamed(resource_id_).ToImageSkia());
tray_view_->SetVisible(GetInitialVisibility());
- SetItemAlignment(system_tray()->shelf_alignment());
return tray_view_;
}
@@ -59,7 +57,6 @@ void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
SetTrayImageItemBorder(tray_view_, alignment);
- SetItemAlignment(alignment);
}
void TrayImageItem::DestroyTrayView() {
@@ -72,22 +69,5 @@ void TrayImageItem::DestroyDefaultView() {
void TrayImageItem::DestroyDetailedView() {
}
-void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) {
- // Center the item dependent on the orientation of the shelf.
- views::BoxLayout::Orientation layout = views::BoxLayout::kHorizontal;
- switch (alignment) {
- case ash::SHELF_ALIGNMENT_BOTTOM:
- case ash::SHELF_ALIGNMENT_TOP:
- layout = views::BoxLayout::kHorizontal;
- break;
- case ash::SHELF_ALIGNMENT_LEFT:
- case ash::SHELF_ALIGNMENT_RIGHT:
- layout = views::BoxLayout::kVertical;
- break;
- }
- tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
- tray_view_->Layout();
-}
-
} // namespace internal
} // namespace ash
diff --git a/chromium/ash/system/tray/tray_image_item.h b/chromium/ash/system/tray/tray_image_item.h
index 6dea5c8372f..ebaf30e14a0 100644
--- a/chromium/ash/system/tray/tray_image_item.h
+++ b/chromium/ash/system/tray/tray_image_item.h
@@ -41,9 +41,6 @@ class TrayImageItem : public SystemTrayItem {
ShelfAlignment alignment) OVERRIDE;
private:
- // Set the alignment of the image depending on the shelf alignment.
- void SetItemAlignment(ShelfAlignment alignment);
-
int resource_id_;
TrayItemView* tray_view_;
diff --git a/chromium/ash/system/user/tray_user.cc b/chromium/ash/system/user/tray_user.cc
index 94a85ea07a5..2ab24a8b8a4 100644
--- a/chromium/ash/system/user/tray_user.cc
+++ b/chromium/ash/system/user/tray_user.cc
@@ -10,9 +10,7 @@
#include "ash/ash_switches.h"
#include "ash/popup_message.h"
-#include "ash/root_window_controller.h"
#include "ash/session_state_delegate.h"
-#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/system/tray/system_tray.h"
@@ -1172,7 +1170,7 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
need_label = true;
break;
case user::LOGGED_IN_GUEST:
- need_label = true;
+ need_avatar = true;
break;
case user::LOGGED_IN_RETAIL_MODE:
case user::LOGGED_IN_KIOSK_APP:
@@ -1202,8 +1200,6 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
if (status == user::LOGGED_IN_LOCALLY_MANAGED) {
label_->SetText(
bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL));
- } else if (status == user::LOGGED_IN_GUEST) {
- label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
}
if (avatar_ && ash::switches::UseAlternateShelfLayout()) {
@@ -1214,12 +1210,6 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
avatar_->set_border(NULL);
}
UpdateAvatarImage(status);
-
- // Update layout after setting label_ and avatar_ with new login status.
- if (Shell::GetPrimaryRootWindowController()->shelf())
- UpdateAfterShelfAlignmentChange(
- Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
- GetAlignment());
}
void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
@@ -1286,10 +1276,19 @@ void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
int icon_size = ash::switches::UseAlternateShelfLayout() ?
kUserIconLargeSize : kUserIconSize;
- avatar_->SetImage(
- ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
- multiprofile_index_),
- gfx::Size(icon_size, icon_size));
+ if (status == user::LOGGED_IN_GUEST) {
+ int image_name = ash::switches::UseAlternateShelfLayout() ?
+ IDR_AURA_UBER_TRAY_GUEST_ICON_LARGE :
+ IDR_AURA_UBER_TRAY_GUEST_ICON;
+ avatar_->SetImage(*ui::ResourceBundle::GetSharedInstance().
+ GetImageNamed(image_name).ToImageSkia(),
+ gfx::Size(icon_size, icon_size));
+ } else {
+ avatar_->SetImage(
+ ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
+ multiprofile_index_),
+ gfx::Size(icon_size, icon_size));
+ }
}
} // namespace internal
diff --git a/chromium/ash/system/web_notification/web_notification_tray.cc b/chromium/ash/system/web_notification/web_notification_tray.cc
index e6bd4925e3e..2a6e2deadca 100644
--- a/chromium/ash/system/web_notification/web_notification_tray.cc
+++ b/chromium/ash/system/web_notification/web_notification_tray.cc
@@ -58,6 +58,10 @@ namespace ash {
namespace internal {
namespace {
+const int kWebNotificationIconSize = 31;
+// Height of the art assets used in alternate shelf layout,
+// see ash/ash_switches.h:UseAlternateShelfLayout.
+const int kWebNotificationAlternateSize = 38;
const SkColor kWebNotificationColorNoUnread = SkColorSetA(SK_ColorWHITE, 128);
const SkColor kWebNotificationColorWithUnread = SK_ColorWHITE;
@@ -106,15 +110,6 @@ WorkAreaObserver::~WorkAreaObserver() {
void WorkAreaObserver::SetSystemTrayHeight(int height) {
system_tray_height_ = height;
-
- // If the shelf is shown during auto-hide state, the distance from the edge
- // should be reduced by the height of shelf's shown height.
- if (shelf_->visibility_state() == SHELF_AUTO_HIDE &&
- shelf_->auto_hide_state() == SHELF_AUTO_HIDE_SHOWN) {
- system_tray_height_ -= ShelfLayoutManager::GetPreferredShelfSize() -
- ShelfLayoutManager::kAutoHideSize;
- }
-
if (system_tray_height_ > 0 && ash::switches::UseAlternateShelfLayout())
system_tray_height_ += message_center::kMarginBetweenItems;
@@ -132,23 +127,43 @@ void WorkAreaObserver::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
shelf_->shelf_widget()->GetNativeView());
gfx::Rect work_area = display.work_area();
int width = 0;
- if ((shelf_->visibility_state() == SHELF_AUTO_HIDE) &&
- new_state == SHELF_AUTO_HIDE_SHOWN) {
- // Since the work_area is already reduced by kAutoHideSize, the inset width
- // should be just the difference.
- width = ShelfLayoutManager::GetPreferredShelfSize() -
- ShelfLayoutManager::kAutoHideSize;
+ if (shelf_->auto_hide_behavior() != SHELF_AUTO_HIDE_BEHAVIOR_NEVER) {
+ width = (new_state == SHELF_AUTO_HIDE_HIDDEN) ?
+ ShelfLayoutManager::kAutoHideSize :
+ ShelfLayoutManager::GetPreferredShelfSize();
}
- work_area.Inset(shelf_->SelectValueForShelfAlignment(
- gfx::Insets(0, 0, width, 0),
- gfx::Insets(0, width, 0, 0),
- gfx::Insets(0, 0, 0, width),
- gfx::Insets(width, 0, 0, 0)));
- if (system_tray_height_ > 0) {
- work_area.set_height(
- std::max(0, work_area.height() - system_tray_height_));
- if (shelf_->GetAlignment() == SHELF_ALIGNMENT_TOP)
- work_area.set_y(work_area.y() + system_tray_height_);
+ switch (shelf_->GetAlignment()) {
+ case SHELF_ALIGNMENT_BOTTOM:
+ work_area.Inset(0, 0, 0, width);
+ if (system_tray_height_ > 0) {
+ work_area.set_height(
+ std::max(0, work_area.height() - system_tray_height_));
+ }
+ break;
+ case SHELF_ALIGNMENT_LEFT:
+ work_area.Inset(width, 0, 0, 0);
+ // Popups appear on the left bottom only when UI is RTL.
+ if (base::i18n::IsRTL() && system_tray_height_ > 0) {
+ work_area.set_height(
+ std::max(0, work_area.height() - system_tray_height_));
+ }
+ break;
+ case SHELF_ALIGNMENT_RIGHT:
+ work_area.Inset(0, 0, width, 0);
+ // Popups appear on the right bottom only when UI isn't RTL.
+ if (!base::i18n::IsRTL() && system_tray_height_ > 0) {
+ work_area.set_height(
+ std::max(0, work_area.height() - system_tray_height_));
+ }
+ break;
+ case SHELF_ALIGNMENT_TOP:
+ work_area.Inset(0, width, 0, 0);
+ if (system_tray_height_ > 0) {
+ work_area.set_y(work_area.y() + system_tray_height_);
+ work_area.set_height(
+ std::max(0, work_area.height() - system_tray_height_));
+ }
+ break;
}
collection_->SetDisplayInfo(work_area, display.bounds());
}
@@ -226,12 +241,10 @@ class WebNotificationButton : public views::CustomButton {
protected:
// Overridden from views::ImageButton:
virtual gfx::Size GetPreferredSize() OVERRIDE {
- const int notification_item_size = GetShelfItemHeight();
- return gfx::Size(notification_item_size, notification_item_size);
- }
-
- virtual int GetHeightForWidth(int width) OVERRIDE {
- return GetPreferredSize().height();
+ if (ash::switches::UseAlternateShelfLayout())
+ return gfx::Size(kWebNotificationAlternateSize,
+ kWebNotificationAlternateSize);
+ return gfx::Size(kWebNotificationIconSize, kWebNotificationIconSize);
}
private:
diff --git a/chromium/ash/system/web_notification/web_notification_tray.h b/chromium/ash/system/web_notification/web_notification_tray.h
index 1fb9c4d3fbc..d8b2fd3a02a 100644
--- a/chromium/ash/system/web_notification/web_notification_tray.h
+++ b/chromium/ash/system/web_notification/web_notification_tray.h
@@ -124,7 +124,6 @@ class ASH_EXPORT WebNotificationTray
FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications);
FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, PopupShownOnBothDisplays);
FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, PopupAndSystemTray);
- FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, PopupAndAutoHideShelf);
void UpdateTrayContent();
diff --git a/chromium/ash/system/web_notification/web_notification_tray_unittest.cc b/chromium/ash/system/web_notification/web_notification_tray_unittest.cc
index 5b67b7d72b4..026500f1798 100644
--- a/chromium/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/chromium/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -16,14 +16,8 @@
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/test_system_tray_delegate.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_properties.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
#include "ui/message_center/message_center_style.h"
#include "ui/message_center/message_center_tray.h"
#include "ui/message_center/message_center_util.h"
@@ -150,10 +144,6 @@ class WebNotificationTrayTest : public test::AshTestBase {
return tray->popup_collection_->work_area_;
}
- bool IsPopupVisible() {
- return GetTray()->IsPopupVisible();
- }
-
private:
DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayTest);
};
@@ -304,12 +294,8 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupShownOnBothDisplays) {
// RootWindow's bound can be bigger than gfx::Display's work area so that
// openingsystem tray doesn't affect at all the work area of popups.
#define MAYBE_PopupAndSystemTray PopupAndSystemTray
-#define MAYBE_PopupAndAutoHideShelf PopupAndAutoHideShelf
-#define MAYBE_PopupAndFullscreen PopupAndFullscreen
#else
#define MAYBE_PopupAndSystemTray DISABLED_PopupAndSystemTray
-#define MAYBE_PopupAndAutoHideShelf DISABLED_PopupAndAutoHideShelf
-#define MAYBE_PopupAndFullscreen DISABLED_PopupAndFullscreen
#endif
TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTray) {
@@ -346,115 +332,22 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTray) {
EXPECT_LT(work_area_with_tray_notificaiton.size().GetArea(),
work_area_with_notification.size().GetArea());
- // Close the system tray notifications.
+ // Close the notifications.
GetSystemTray()->HideNotificationView(test_item);
EXPECT_TRUE(GetTray()->IsPopupVisible());
EXPECT_EQ(work_area.ToString(), GetPopupWorkArea().ToString());
}
-TEST_F(WebNotificationTrayTest, MAYBE_PopupAndAutoHideShelf) {
+TEST_F(WebNotificationTrayTest, PopupAndSystemTrayAlignment) {
+ Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
+ SetAlignment(SHELF_ALIGNMENT_LEFT);
AddNotification("test_id");
- EXPECT_TRUE(GetTray()->IsPopupVisible());
gfx::Rect work_area = GetPopupWorkArea();
- // Shelf's auto-hide state won't be HIDDEN unless window exists.
- scoped_ptr<aura::Window> window(
- CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
- internal::ShelfLayoutManager* shelf =
- Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
- shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- gfx::Rect work_area_auto_hidden = GetPopupWorkArea();
- EXPECT_LT(work_area.size().GetArea(), work_area_auto_hidden.size().GetArea());
-
- // Close the window, which shows the shelf.
- window.reset();
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
- gfx::Rect work_area_auto_shown = GetPopupWorkArea();
- EXPECT_EQ(work_area.ToString(), work_area_auto_shown.ToString());
-
- // Create the system tray during auto-hide.
- window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
- TestItem* test_item = new TestItem;
- GetSystemTray()->AddTrayItem(test_item);
+ // System tray is created, but the work area is not affected since the tray
+ // appears at the left-bottom while the popups appear at the right bottom.
GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
-
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
- EXPECT_TRUE(GetTray()->IsPopupVisible());
- gfx::Rect work_area_with_tray = GetPopupWorkArea();
- EXPECT_GT(work_area_auto_shown.size().GetArea(),
- work_area_with_tray.size().GetArea());
-
- // Create tray notification.
- GetSystemTray()->ShowNotificationView(test_item);
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
- gfx::Rect work_area_with_tray_notification = GetPopupWorkArea();
- EXPECT_GT(work_area_with_tray.size().GetArea(),
- work_area_with_tray_notification.size().GetArea());
-
- // Close the system tray.
- GetSystemTray()->ClickedOutsideBubble();
- shelf->UpdateAutoHideState();
- RunAllPendingInMessageLoop();
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- gfx::Rect work_area_hidden_with_tray_notification = GetPopupWorkArea();
- EXPECT_LT(work_area_with_tray_notification.size().GetArea(),
- work_area_hidden_with_tray_notification.size().GetArea());
- EXPECT_GT(work_area_auto_hidden.size().GetArea(),
- work_area_hidden_with_tray_notification.size().GetArea());
-
- // Close the window again, which shows the shelf.
- window.reset();
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
- gfx::Rect work_area_shown_with_tray_notification = GetPopupWorkArea();
- EXPECT_GT(work_area_hidden_with_tray_notification.size().GetArea(),
- work_area_shown_with_tray_notification.size().GetArea());
- EXPECT_GT(work_area_auto_shown.size().GetArea(),
- work_area_shown_with_tray_notification.size().GetArea());
-}
-
-TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) {
- AddNotification("test_id");
- EXPECT_TRUE(IsPopupVisible());
- gfx::Rect work_area = GetPopupWorkArea();
-
- // Checks the work area for normal auto-hidden state.
- scoped_ptr<aura::Window> window(
- CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
- internal::ShelfLayoutManager* shelf =
- Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
- shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- gfx::Rect work_area_auto_hidden = GetPopupWorkArea();
- shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
-
- // Make the window to use immersive mode.
- window->SetProperty(internal::kFullscreenUsesMinimalChromeKey, true);
- window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
- RunAllPendingInMessageLoop();
-
- // The work area for auto-hidden status of fullscreen is a bit larger
- // since it doesn't even have the 3-pixel width.
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- gfx::Rect work_area_fullscreen_hidden = GetPopupWorkArea();
- EXPECT_EQ(work_area_auto_hidden.ToString(),
- work_area_fullscreen_hidden.ToString());
-
- // Move the mouse cursor at the bottom, which shows the shelf.
- aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
- gfx::Point bottom_right =
- Shell::GetScreen()->GetPrimaryDisplay().bounds().bottom_right();
- bottom_right.Offset(-1, -1);
- generator.MoveMouseTo(bottom_right);
- shelf->UpdateAutoHideStateNow();
- EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
EXPECT_EQ(work_area.ToString(), GetPopupWorkArea().ToString());
-
- generator.MoveMouseTo(work_area.CenterPoint());
- shelf->UpdateAutoHideStateNow();
- EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
- EXPECT_EQ(work_area_auto_hidden.ToString(), GetPopupWorkArea().ToString());
}
TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTrayMultiDisplay) {
diff --git a/chromium/ash/wm/boot_splash_screen_chromeos.cc b/chromium/ash/wm/boot_splash_screen.cc
index 00743409ae5..202ebe28eeb 100644
--- a/chromium/ash/wm/boot_splash_screen_chromeos.cc
+++ b/chromium/ash/wm/boot_splash_screen.cc
@@ -1,12 +1,11 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/wm/boot_splash_screen_chromeos.h"
+#include "ash/wm/boot_splash_screen.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/aura/root_window.h"
-#include "ui/base/x/x11_util.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_type.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
@@ -34,9 +33,9 @@ class BootSplashScreen::CopyHostContentLayerDelegate
// TODO(derat): Instead of copying the data, use GLX_EXT_texture_from_pixmap
// to create a zero-copy texture (when possible):
// https://codereview.chromium.org/10543125
- ui::CopyAreaToCanvas(root_window_->GetAcceleratedWidget(),
+ root_window_->CopyAreaToSkCanvas(
gfx::Rect(root_window_->GetHostOrigin(), root_window_->GetHostSize()),
- gfx::Point(), canvas);
+ gfx::Point(), canvas->sk_canvas());
}
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
diff --git a/chromium/ash/wm/boot_splash_screen_chromeos.h b/chromium/ash/wm/boot_splash_screen.h
index e844275ad5f..f56f49fe195 100644
--- a/chromium/ash/wm/boot_splash_screen_chromeos.h
+++ b/chromium/ash/wm/boot_splash_screen.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
-#ifndef ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_
-#define ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_
+#ifndef ASH_WM_BOOT_SPLASH_SCREEN_H_
+#define ASH_WM_BOOT_SPLASH_SCREEN_H_
#include <string>
@@ -50,4 +50,4 @@ class BootSplashScreen {
} // namespace internal
} // namespace ash
-#endif // ASH_WM_BOOT_SPLASH_SCREEN_CHROMEOS_H_
+#endif // ASH_WM_BOOT_SPLASH_SCREEN_H_
diff --git a/chromium/ash/wm/dock/docked_window_layout_manager.cc b/chromium/ash/wm/dock/docked_window_layout_manager.cc
index 1dacf5e9fbd..d73a0ccac7d 100644
--- a/chromium/ash/wm/dock/docked_window_layout_manager.cc
+++ b/chromium/ash/wm/dock/docked_window_layout_manager.cc
@@ -84,58 +84,10 @@ bool IsUsedByLayout(aura::Window* window) {
window->type() != aura::client::WINDOW_TYPE_POPUP);
}
-// A functor used to sort the windows in order of their center Y position.
-// |delta| is a pre-calculated distance from the bottom of one window to the top
-// of the next. Its value can be positive (gap) or negative (overlap).
-// Half of |delta| is used as a transition point at which windows could ideally
-// swap positions.
-struct CompareWindowPos {
- CompareWindowPos(aura::Window* dragged_window, float delta)
- : dragged_window_(dragged_window),
- delta_(delta / 2) {}
-
- bool operator()(const aura::Window* win1, const aura::Window* win2) {
- const gfx::Rect win1_bounds = win1->GetBoundsInScreen();
- const gfx::Rect win2_bounds = win2->GetBoundsInScreen();
- // If one of the windows is the |dragged_window_| attempt to make an
- // earlier swap between the windows than just based on their centers.
- // This is possible if the dragged window is at least as tall as the other
- // window.
- if (win1 == dragged_window_)
- return compare_two_windows(win1_bounds, win2_bounds);
- if (win2 == dragged_window_)
- return !compare_two_windows(win2_bounds, win1_bounds);
- // Otherwise just compare the centers.
- return win1_bounds.CenterPoint().y() < win2_bounds.CenterPoint().y();
- }
-
- // Based on center point tries to deduce where the drag is coming from.
- // When dragging from below up the transition point is lower.
- // When dragging from above down the transition point is higher.
- bool compare_bounds(const gfx::Rect dragged, const gfx::Rect other) {
- if (dragged.CenterPoint().y() < other.CenterPoint().y())
- return dragged.CenterPoint().y() < other.y() - delta_;
- return dragged.CenterPoint().y() < other.bottom() + delta_;
- }
-
- // Performs comparison both ways and selects stable result.
- bool compare_two_windows(const gfx::Rect bounds1, const gfx::Rect bounds2) {
- // Try comparing windows in both possible orders and see if the comparison
- // is stable.
- bool result1 = compare_bounds(bounds1, bounds2);
- bool result2 = compare_bounds(bounds2, bounds1);
- if (result1 != result2)
- return result1;
-
- // Otherwise it is not possible to be sure that the windows will not bounce.
- // In this case just compare the centers.
- return bounds1.CenterPoint().y() < bounds2.CenterPoint().y();
- }
-
- private:
- aura::Window* dragged_window_;
- float delta_;
-};
+bool CompareWindowPos(const aura::Window* win1, const aura::Window* win2) {
+ return win1->GetTargetBounds().CenterPoint().y() <
+ win2->GetTargetBounds().CenterPoint().y();
+}
} // namespace
@@ -146,8 +98,6 @@ DockedWindowLayoutManager::DockedWindowLayoutManager(
: dock_container_(dock_container),
in_layout_(false),
dragged_window_(NULL),
- is_dragged_window_docked_(false),
- is_dragged_from_dock_(false),
launcher_(NULL),
shelf_layout_manager_(NULL),
shelf_hidden_(false),
@@ -189,79 +139,106 @@ void DockedWindowLayoutManager::RemoveObserver(
}
void DockedWindowLayoutManager::StartDragging(aura::Window* window) {
+ if (window->parent() != dock_container_)
+ return;
DCHECK(!dragged_window_);
dragged_window_ = window;
- // Start observing a window unless it is docked container's child in which
- // case it is already observed.
- if (dragged_window_->parent() != dock_container_)
- dragged_window_->AddObserver(this);
- is_dragged_from_dock_ = window->parent() == dock_container_;
- DCHECK(!is_dragged_window_docked_);
-}
-
-void DockedWindowLayoutManager::DockDraggedWindow(aura::Window* window) {
- OnWindowDocked(window);
Relayout();
}
-void DockedWindowLayoutManager::UndockDraggedWindow() {
- OnWindowUndocked();
- Relayout();
- is_dragged_from_dock_ = false;
-}
-
void DockedWindowLayoutManager::FinishDragging() {
- DCHECK(dragged_window_);
- if (is_dragged_window_docked_)
- OnWindowUndocked();
- DCHECK (!is_dragged_window_docked_);
- // Stop observing a window unless it is docked container's child in which
- // case it needs to keep being observed after the drag completes.
- if (dragged_window_->parent() != dock_container_)
- dragged_window_->RemoveObserver(this);
- dragged_window_ = NULL;
+ if (!dragged_window_)
+ return;
+
+ // If this is the first window getting docked - update alignment.
+ if (alignment_ == DOCKED_ALIGNMENT_NONE) {
+ alignment_ = AlignmentOfWindow(dragged_window_);
+ } else {
+ // There were some docked windows before. Check if the |dragged_window_|
+ // was the only one remaining and if so possibly switch alignment to
+ // opposite side. Ignore popups.
+ bool found_docked_window = false;
+ for (size_t i = 0; i < dock_container_->children().size(); ++i) {
+ aura::Window* window(dock_container_->children()[i]);
+ if (window != dragged_window_ &&
+ window->type() != aura::client::WINDOW_TYPE_POPUP) {
+ found_docked_window = true;
+ break;
+ }
+ }
+ if (!found_docked_window)
+ alignment_ = AlignmentOfWindow(dragged_window_);
+ }
+
+ // We no longer need to observe |dragged_window_| unless it is added back;
+ if (dragged_window_) {
+ if (dragged_window_->parent() != dock_container_)
+ dragged_window_->RemoveObserver(this);
+ dragged_window_ = NULL;
+ }
+
Relayout();
UpdateDockBounds();
}
-void DockedWindowLayoutManager::SetLauncher(ash::Launcher* launcher) {
- DCHECK(!launcher_);
- DCHECK(!shelf_layout_manager_);
- launcher_ = launcher;
- if (launcher_->shelf_widget()) {
- shelf_layout_manager_ = ash::internal::ShelfLayoutManager::ForLauncher(
- launcher_->shelf_widget()->GetNativeWindow());
- WillChangeVisibilityState(shelf_layout_manager_->visibility_state());
- shelf_layout_manager_->AddObserver(this);
+// static
+bool DockedWindowLayoutManager::ShouldWindowDock(aura::Window* window,
+ const gfx::Point& location) {
+ DockedWindowLayoutManager* layout_manager = GetDockLayoutManager(window,
+ location);
+ const DockedAlignment alignment = layout_manager->CalculateAlignment();
+ const gfx::Rect& bounds(window->GetBoundsInScreen());
+ const gfx::Rect docked_bounds = (alignment == DOCKED_ALIGNMENT_NONE) ?
+ layout_manager->dock_container_->GetBoundsInScreen() :
+ layout_manager->docked_bounds_;
+ DockedAlignment dock_edge = DOCKED_ALIGNMENT_NONE;
+ if (alignment == DOCKED_ALIGNMENT_NONE) {
+ // Check if the window is touching the edge - it may need to get docked.
+ dock_edge = layout_manager->AlignmentOfWindow(window);
+ } else if ((docked_bounds.Intersects(bounds) &&
+ docked_bounds.Contains(location)) ||
+ alignment == layout_manager->AlignmentOfWindow(window)) {
+ // A window is being added to other docked windows (on the same side).
+ // Both bounds and pointer location are checked because some drags involve
+ // sticky edges and so the |location| may be outside of the |bounds|.
+ // It is also possible that all the docked windows are minimized or hidden
+ // in which case the dragged window needs to be exactly touching the same
+ // edge that those docked windows were aligned before they got minimized.
+ dock_edge = alignment;
}
-}
-DockedAlignment DockedWindowLayoutManager::GetAlignmentOfWindow(
- const aura::Window* window) const {
- const gfx::Rect& bounds(window->GetBoundsInScreen());
- const gfx::Rect docked_bounds = dock_container_->GetBoundsInScreen();
+ // Do not allow docking on the same side as launcher shelf.
+ if (layout_manager->launcher_ && layout_manager->launcher_->shelf_widget()) {
+ ShelfAlignment shelf_alignment =
+ layout_manager->launcher_->shelf_widget()->GetAlignment();
+ if ((shelf_alignment == SHELF_ALIGNMENT_LEFT &&
+ dock_edge == DOCKED_ALIGNMENT_LEFT) ||
+ (shelf_alignment == SHELF_ALIGNMENT_RIGHT &&
+ dock_edge == DOCKED_ALIGNMENT_RIGHT)) {
+ dock_edge = DOCKED_ALIGNMENT_NONE;
+ }
+ }
// Do not allow docking if a window is vertically maximized (as is the case
// when it is snapped).
const gfx::Rect work_area =
- Shell::GetScreen()->GetDisplayNearestWindow(dock_container_).work_area();
+ Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();
if (bounds.y() == work_area.y() && bounds.height() == work_area.height())
- return DOCKED_ALIGNMENT_NONE;
+ dock_edge = DOCKED_ALIGNMENT_NONE;
- // Do not allow docking on the same side as launcher shelf.
- ShelfAlignment shelf_alignment = SHELF_ALIGNMENT_BOTTOM;
- if (launcher_)
- shelf_alignment = launcher_->alignment();
+ return dock_edge != DOCKED_ALIGNMENT_NONE;
+}
- if (bounds.x() == docked_bounds.x() &&
- shelf_alignment != SHELF_ALIGNMENT_LEFT) {
- return DOCKED_ALIGNMENT_LEFT;
- }
- if (bounds.right() == docked_bounds.right() &&
- shelf_alignment != SHELF_ALIGNMENT_RIGHT) {
- return DOCKED_ALIGNMENT_RIGHT;
+void DockedWindowLayoutManager::SetLauncher(ash::Launcher* launcher) {
+ DCHECK(!launcher_);
+ DCHECK(!shelf_layout_manager_);
+ launcher_ = launcher;
+ if (launcher_->shelf_widget()) {
+ shelf_layout_manager_ = ash::internal::ShelfLayoutManager::ForLauncher(
+ launcher_->shelf_widget()->GetNativeWindow());
+ WillChangeVisibilityState(shelf_layout_manager_->visibility_state());
+ shelf_layout_manager_->AddObserver(this);
}
- return DOCKED_ALIGNMENT_NONE;
}
DockedAlignment DockedWindowLayoutManager::CalculateAlignment() const {
@@ -285,24 +262,22 @@ DockedAlignment DockedWindowLayoutManager::CalculateAlignment() const {
// DockLayoutManager, aura::LayoutManager implementation:
void DockedWindowLayoutManager::OnWindowResized() {
Relayout();
- // When screen resizes update the insets even when dock width or alignment
- // does not change.
+ // When screen resizes we need to update the insets even when dock width or
+ // alignment does not change.
UpdateDockBounds();
}
void DockedWindowLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
if (child->type() == aura::client::WINDOW_TYPE_POPUP)
return;
- // Dragged windows are already observed by StartDragging and do not change
- // docked alignment during the drag.
- if (child == dragged_window_)
- return;
+
// If this is the first window getting docked - update alignment.
- if (alignment_ == DOCKED_ALIGNMENT_NONE) {
- alignment_ = GetAlignmentOfWindow(child);
- DCHECK(alignment_ != DOCKED_ALIGNMENT_NONE);
- }
- child->AddObserver(this);
+ if (alignment_ == DOCKED_ALIGNMENT_NONE)
+ alignment_ = AlignmentOfWindow(child);
+ // We need to observe a child unless it is a |dragged_window_| that just got
+ // added back in which case we are already observing it.
+ if (child != dragged_window_)
+ child->AddObserver(this);
Relayout();
UpdateDockBounds();
}
@@ -310,20 +285,36 @@ void DockedWindowLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
void DockedWindowLayoutManager::OnWindowRemovedFromLayout(aura::Window* child) {
if (child->type() == aura::client::WINDOW_TYPE_POPUP)
return;
- // Dragged windows are stopped being observed by FinishDragging and do not
- // change alignment during the drag. They also cannot be set to be the
- // |last_active_window_|.
- if (child == dragged_window_)
- return;
- // If this is the last window, set alignment and maximize the workspace.
- if (!IsAnyWindowDocked()) {
- alignment_ = DOCKED_ALIGNMENT_NONE;
- docked_width_ = 0;
+
+ // Try to find a child that is not a popup and is not being dragged.
+ bool found_docked_window = false;
+ for (size_t i = 0; i < dock_container_->children().size(); ++i) {
+ aura::Window* window(dock_container_->children()[i]);
+ if (window != dragged_window_ &&
+ window->type() != aura::client::WINDOW_TYPE_POPUP) {
+ found_docked_window = true;
+ break;
+ }
}
+ if (!found_docked_window)
+ alignment_ = DOCKED_ALIGNMENT_NONE;
+
+ // Keep track of former children if they are dragged as they can be reparented
+ // temporarily just for the drag.
+ if (child != dragged_window_)
+ child->RemoveObserver(this);
+
if (last_active_window_ == child)
last_active_window_ = NULL;
- child->RemoveObserver(this);
+
+ // Close the dock and expand workspace work area.
Relayout();
+
+ // When a panel is removed from this layout manager it may still be dragged.
+ // Delay updating dock and workspace bounds until the drag is completed. This
+ // preserves the docked area width until the panel drag is finished.
+ if (child->type() != aura::client::WINDOW_TYPE_PANEL)
+ UpdateDockBounds();
}
void DockedWindowLayoutManager::OnChildWindowVisibilityChanged(
@@ -340,8 +331,11 @@ void DockedWindowLayoutManager::OnChildWindowVisibilityChanged(
void DockedWindowLayoutManager::SetChildBounds(
aura::Window* child,
const gfx::Rect& requested_bounds) {
- // Whenever one of our windows is moved or resized enforce layout.
+ // Whenever one of our windows is moved or resized we need to enforce layout.
SetChildBoundsDirect(child, requested_bounds);
+ if (child->type() == aura::client::WINDOW_TYPE_POPUP)
+ return;
+ Relayout();
}
////////////////////////////////////////////////////////////////////////////////
@@ -394,18 +388,13 @@ void DockedWindowLayoutManager::OnWindowBoundsChanged(
aura::Window* window,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) {
- // Only relayout if the dragged window would get docked.
- if (window == dragged_window_ && is_dragged_window_docked_)
+ if (window == dragged_window_)
Relayout();
}
void DockedWindowLayoutManager::OnWindowDestroying(aura::Window* window) {
if (dragged_window_ == window)
- FinishDragging();
- DCHECK(!dragged_window_);
- DCHECK (!is_dragged_window_docked_);
- if (window == last_active_window_)
- last_active_window_ = NULL;
+ dragged_window_ = NULL;
}
@@ -437,7 +426,7 @@ void DockedWindowLayoutManager::WillChangeVisibilityState(
// to allow the full-screen application to use the full screen.
// TODO(varkha): ShelfLayoutManager::UpdateVisibilityState sets state to
- // SHELF_AUTO_HIDE when in immersive mode. Distinguish this from
+ // SHELF_AUTO_HIDE when in immersive mode. We need to distinguish this from
// when shelf enters auto-hide state based on mouse hover when auto-hide
// setting is enabled and hide all windows (immersive mode should hide docked
// windows).
@@ -473,43 +462,30 @@ void DockedWindowLayoutManager::RestoreWindow(aura::Window* window) {
window->Show();
}
-void DockedWindowLayoutManager::OnWindowDocked(aura::Window* window) {
- DCHECK(!is_dragged_window_docked_);
- is_dragged_window_docked_ = true;
-
- // If there are no other docked windows update alignment.
- if (!IsAnyWindowDocked())
- alignment_ = DOCKED_ALIGNMENT_NONE;
-}
-
-void DockedWindowLayoutManager::OnWindowUndocked() {
- // If this is the first window getting docked - update alignment.
- if (!IsAnyWindowDocked())
- alignment_ = GetAlignmentOfWindow(dragged_window_);
-
- DCHECK (is_dragged_window_docked_);
- is_dragged_window_docked_ = false;
-}
-
-bool DockedWindowLayoutManager::IsAnyWindowDocked() {
- return CalculateAlignment() != DOCKED_ALIGNMENT_NONE;
+DockedAlignment DockedWindowLayoutManager::AlignmentOfWindow(
+ const aura::Window* window) const {
+ const gfx::Rect& bounds(window->GetBoundsInScreen());
+ const gfx::Rect docked_bounds = dock_container_->GetBoundsInScreen();
+ if (bounds.x() == docked_bounds.x())
+ return DOCKED_ALIGNMENT_LEFT;
+ if (bounds.right() == docked_bounds.right())
+ return DOCKED_ALIGNMENT_RIGHT;
+ return DOCKED_ALIGNMENT_NONE;
}
void DockedWindowLayoutManager::Relayout() {
- if (in_layout_)
- return;
- if (alignment_ == DOCKED_ALIGNMENT_NONE && !is_dragged_window_docked_)
+ if (in_layout_ || alignment_ == DOCKED_ALIGNMENT_NONE)
return;
base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
- gfx::Rect dock_bounds = dock_container_->GetBoundsInScreen();
+ gfx::Rect dock_bounds = dock_container_->bounds();
aura::Window* active_window = NULL;
aura::Window::Windows visible_windows;
docked_width_ = 0;
for (size_t i = 0; i < dock_container_->children().size(); ++i) {
aura::Window* window(dock_container_->children()[i]);
- if (!IsUsedByLayout(window) || window == dragged_window_)
+ if (!IsUsedByLayout(window))
continue;
// If the shelf is currently hidden (full-screen mode), hide window until
@@ -529,14 +505,14 @@ void DockedWindowLayoutManager::Relayout() {
visible_windows.push_back(window);
}
- // Consider docked dragged_window_ when fanning out other child windows.
- if (is_dragged_window_docked_) {
+ // Consider windows that were formerly children of the |dock_container_|
+ // when fanning out other child windows.
+ if (dragged_window_ && dragged_window_->parent() != dock_container_)
visible_windows.push_back(dragged_window_);
- DCHECK(!active_window);
- active_window = dragged_window_;
- }
- // Calculate free space or overlap.
+ // Sort windows by their center positions and fan out overlapping
+ // windows.
+ std::sort(visible_windows.begin(), visible_windows.end(), CompareWindowPos);
gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow(
dock_container_);
const gfx::Rect work_area = display.work_area();
@@ -549,19 +525,15 @@ void DockedWindowLayoutManager::Relayout() {
const float delta = (float)available_room /
((available_room > 0 || num_windows <= 1) ?
num_windows + 1 : num_windows - 1);
- float y_pos = work_area.y() + ((available_room > 0) ? delta : 0);
+ float y_pos = (available_room > 0) ? delta : 0;
- // Sort windows by their center positions and fan out overlapping
- // windows.
- std::sort(visible_windows.begin(),
- visible_windows.end(),
- CompareWindowPos(is_dragged_from_dock_ ? dragged_window_ : NULL,
- delta));
- is_dragged_from_dock_ = true;
for (aura::Window::Windows::const_iterator iter = visible_windows.begin();
iter != visible_windows.end(); ++iter) {
aura::Window* window = *iter;
- gfx::Rect bounds = window->GetBoundsInScreen();
+ gfx::Rect bounds = window->GetTargetBounds();
+ // Do not force position of a single window.
+ if (num_windows == 1)
+ y_pos = bounds.y();
// Fan out windows evenly distributing the overlap or remaining free space.
bounds.set_y(std::max(work_area.y(),
@@ -571,27 +543,24 @@ void DockedWindowLayoutManager::Relayout() {
// All docked windows other than the one currently dragged remain stuck
// to the screen edge.
+ if (window == dragged_window_)
+ continue;
switch (alignment_) {
case DOCKED_ALIGNMENT_LEFT:
- bounds.set_x(dock_bounds.x());
+ bounds.set_x(0);
break;
case DOCKED_ALIGNMENT_RIGHT:
bounds.set_x(dock_bounds.right() - bounds.width());
break;
case DOCKED_ALIGNMENT_NONE:
+ NOTREACHED() << "Relayout called when dock alignment is 'NONE'";
break;
}
- if (window == dragged_window_) {
- dragged_bounds_ = bounds;
- continue;
- }
- DCHECK_NE(alignment_, DOCKED_ALIGNMENT_NONE);
// Keep the dock at least kMinDockWidth when all windows in it overhang.
docked_width_ = std::min(kMaxDockWidth,
std::max(docked_width_,
bounds.width() > kMaxDockWidth ?
kMinDockWidth : bounds.width()));
- bounds = ScreenAsh::ConvertRectFromScreen(dock_container_, bounds);
SetChildBoundsDirect(window, bounds);
}
UpdateStacking(active_window);
@@ -600,7 +569,7 @@ void DockedWindowLayoutManager::Relayout() {
void DockedWindowLayoutManager::UpdateDockBounds() {
int dock_inset = docked_width_ + (docked_width_ > 0 ? kMinDockGap : 0);
gfx::Rect bounds = gfx::Rect(
- alignment_ == DOCKED_ALIGNMENT_RIGHT && dock_inset > 0 ?
+ alignment_ == DOCKED_ALIGNMENT_RIGHT ?
dock_container_->bounds().right() - dock_inset:
dock_container_->bounds().x(),
dock_container_->bounds().y(),
@@ -632,7 +601,7 @@ void DockedWindowLayoutManager::UpdateStacking(aura::Window* active_window) {
active_window = last_active_window_;
}
- // Windows are stacked like a deck of cards:
+ // We want to to stack the windows like a deck of cards:
// ,------.
// |,------.|
// |,------.|
@@ -641,7 +610,7 @@ void DockedWindowLayoutManager::UpdateStacking(aura::Window* active_window) {
// |`------'|
// |`------'|
// `------'
- // Use the middle of each window to figure out how to stack the window.
+ // We use the middle of each window to figure out how to stack the window.
// This allows us to update the stacking when a window is being dragged around
// by the titlebar.
std::map<int, aura::Window*> window_ordering;
@@ -656,7 +625,7 @@ void DockedWindowLayoutManager::UpdateStacking(aura::Window* active_window) {
}
int active_center_y = active_window->bounds().CenterPoint().y();
- aura::Window* previous_window = NULL;
+ aura::Window* previous_window = background_widget_->GetNativeWindow();
for (std::map<int, aura::Window*>::const_iterator it =
window_ordering.begin();
it != window_ordering.end() && it->first < active_center_y; ++it) {
@@ -676,8 +645,9 @@ void DockedWindowLayoutManager::UpdateStacking(aura::Window* active_window) {
if (active_window->parent() == dock_container_)
dock_container_->StackChildAtTop(active_window);
- if (active_window != dragged_window_)
- last_active_window_ = active_window;
+ if (dragged_window_ && dragged_window_->parent() == dock_container_)
+ dock_container_->StackChildAtTop(dragged_window_);
+ last_active_window_ = active_window;
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/chromium/ash/wm/dock/docked_window_layout_manager.h b/chromium/ash/wm/dock/docked_window_layout_manager.h
index a3019aa7175..aa02b343423 100644
--- a/chromium/ash/wm/dock/docked_window_layout_manager.h
+++ b/chromium/ash/wm/dock/docked_window_layout_manager.h
@@ -50,9 +50,7 @@ class ShelfLayoutManager;
// its layout manager to this instance, e.g.:
// dock_container->SetLayoutManager(
// new DockedWindowLayoutManager(dock_container));
-//
-// TODO(varkha): extend BaseLayoutManager instead of LayoutManager to inherit
-// common functionality.
+
class ASH_EXPORT DockedWindowLayoutManager
: public aura::LayoutManager,
public ash::ShellObserver,
@@ -72,35 +70,26 @@ class ASH_EXPORT DockedWindowLayoutManager
virtual void RemoveObserver(DockedWindowLayoutManagerObserver* observer);
// Called by a DockedWindowResizer to update which window is being dragged.
- // Starts observing the window unless it is a child.
void StartDragging(aura::Window* window);
-
- // Called by a DockedWindowResizer when a dragged window is docked.
- void DockDraggedWindow(aura::Window* window);
-
- // Called by a DockedWindowResizer when a dragged window is no longer docked.
- void UndockDraggedWindow();
-
- // Called by a DockedWindowResizer when a window is no longer being dragged.
- // Stops observing the window unless it is a child.
void FinishDragging();
+ // Returns true if a window is touching the side of the screen except 2 cases:
+ // when some other windows are already docked on the other side or
+ // when launcher (shelf) is aligned on the same side.
+ static bool ShouldWindowDock(aura::Window* window,
+ const gfx::Point& location);
+
ash::Launcher* launcher() { return launcher_; }
void SetLauncher(ash::Launcher* launcher);
- // Calculates if a window is touching the screen edges and returns edge.
- DockedAlignment GetAlignmentOfWindow(const aura::Window* window) const;
-
// Used to snap docked windows to the side of screen during drag.
DockedAlignment CalculateAlignment() const;
- aura::Window* dock_container() const { return dock_container_; }
-
// Returns current bounding rectangle of docked windows area.
const gfx::Rect& docked_bounds() const { return docked_bounds_; }
- // Returns last known coordinates of |dragged_window_| after Relayout.
- const gfx::Rect dragged_bounds() const { return dragged_bounds_;}
+ // Currently dragged window should be able to dock on another screen
+ aura::Window* dragged_window() const { return dragged_window_;}
// aura::LayoutManager:
virtual void OnWindowResized() OVERRIDE;
@@ -154,14 +143,8 @@ class ASH_EXPORT DockedWindowLayoutManager
void MinimizeWindow(aura::Window* window);
void RestoreWindow(aura::Window* window);
- // Updates docked layout state when a window gets inside the dock.
- void OnWindowDocked(aura::Window* window);
-
- // Updates docked layout state when a window gets outside the dock.
- void OnWindowUndocked();
-
- // Returns true if there are any windows currently docked.
- bool IsAnyWindowDocked();
+ // Calculates if a window is touching the screen edges and returns edge.
+ DockedAlignment AlignmentOfWindow(const aura::Window* window) const;
// Called whenever the window layout might change.
void Relayout();
@@ -182,21 +165,8 @@ class ASH_EXPORT DockedWindowLayoutManager
aura::Window* dock_container_;
// Protect against recursive calls to Relayout().
bool in_layout_;
-
- // A window that is being dragged (whether docked or not).
- // Windows are tracked by docked layout manager only if they are docked;
- // however we need to know if a window is being dragged in order to avoid
- // positioning it or even considering it for layout.
+ // The docked window being dragged.
aura::Window* dragged_window_;
-
- // True if the window being dragged is currently docked.
- bool is_dragged_window_docked_;
-
- // Previously docked windows use a more relaxed dragging sorting algorithm
- // that uses assumption that a window starts being dragged out of position
- // that was previously established in Relayout. This allows easier reordering.
- bool is_dragged_from_dock_;
-
// The launcher we are observing for launcher icon changes.
Launcher* launcher_;
// The shelf layout manager being observed for visibility changes.
@@ -210,9 +180,6 @@ class ASH_EXPORT DockedWindowLayoutManager
// Last bounds that were sent to observers.
gfx::Rect docked_bounds_;
- // Target bounds of a docked window being dragged.
- gfx::Rect dragged_bounds_;
-
// Side of the screen that the dock is positioned at.
DockedAlignment alignment_;
diff --git a/chromium/ash/wm/dock/docked_window_layout_manager_unittest.cc b/chromium/ash/wm/dock/docked_window_layout_manager_unittest.cc
index b2f6ffd9cf4..cf7b476f26a 100644
--- a/chromium/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/chromium/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -5,7 +5,6 @@
#include "ash/wm/dock/docked_window_layout_manager.h"
#include "ash/ash_switches.h"
-#include "ash/display/display_controller.h"
#include "ash/launcher/launcher.h"
#include "ash/launcher/launcher_model.h"
#include "ash/root_window_controller.h"
@@ -28,7 +27,6 @@
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
-#include "ui/gfx/screen.h"
#include "ui/views/widget/widget.h"
namespace ash {
@@ -62,6 +60,11 @@ class DockedWindowLayoutManagerTest
DOCKED_EDGE_RIGHT,
};
+ enum DockedState {
+ UNDOCKED,
+ DOCKED,
+ };
+
aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
NULL,
@@ -133,10 +136,12 @@ class DockedWindowLayoutManagerTest
// Docked windows are parented by dock container during drags.
// All other windows that we are testing here have default container as a
// parent.
- int CorrectContainerIdDuringDrag() {
+ int CorrectContainerIdDuringDrag(DockedState is_docked) {
if (window_type_ == aura::client::WINDOW_TYPE_PANEL)
return internal::kShellWindowId_PanelContainer;
- return internal::kShellWindowId_DockedContainer;
+ if (is_docked == DOCKED)
+ return internal::kShellWindowId_DockedContainer;
+ return internal::kShellWindowId_DefaultContainer;
}
// Test dragging the window vertically (to detach if it is a panel) and then
@@ -181,7 +186,7 @@ class DockedWindowLayoutManagerTest
// Drag enough to detach since our tests assume panels to be initially
// detached.
DragMove(0, dy);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
EXPECT_EQ(initial_bounds.x(), window->GetBoundsInScreen().x());
EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y());
@@ -203,7 +208,7 @@ class DockedWindowLayoutManagerTest
else if (edge == DOCKED_EDGE_RIGHT)
dx += window->GetRootWindow()->bounds().right() - initial_bounds.right();
DragMove(dx, window_type_ == aura::client::WINDOW_TYPE_PANEL ? 0 : dy);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
// Release the mouse and the panel should be attached to the dock.
DragEnd();
@@ -309,7 +314,7 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDragging) {
scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
scoped_ptr<aura::Window> w2(CreateTestWindow(gfx::Rect(0, 0, 210, 202)));
- DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 200);
+ DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 100);
scoped_ptr<aura::Window> w3(CreateTestWindow(gfx::Rect(0, 0, 220, 204)));
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w3.get(), 300);
@@ -336,10 +341,9 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDragging) {
EXPECT_LE(abs(overlap2 - overlap3), 1);
EXPECT_EQ(0, overlap4);
- // Drag w1 below the point where w1 and w2 would swap places. This point is
- // half way between the tops of those two windows. Add 1 because w2 is taller.
+ // Drag w1 below w2.
ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w1.get(), 0, 20));
- DragMove(0, (w2->bounds().y() - w1->bounds().y()) / 2 + 1);
+ DragMove(0, w2->bounds().y() - w1->bounds().y() + 20);
// During the drag the windows get rearranged and the top and the bottom
// should be clamped by the work area.
@@ -360,73 +364,6 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDragging) {
EXPECT_EQ(0, overlap4);
}
-// Adds three windows in bottom display and tests layout after a drag.
-TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDraggingSecondScreen) {
- if (!SupportsMultipleDisplays())
- return;
- if (!SupportsHostWindowResize())
- return;
-
- // Create two screen vertical layout.
- UpdateDisplay("100+100-600x600,100+700-600x600");
- // Layout the secondary display to the bottom of the primary.
- DisplayLayout layout(DisplayLayout::BOTTOM, 0);
- ASSERT_GT(Shell::GetScreen()->GetNumDisplays(), 1);
- Shell::GetInstance()->display_controller()->
- SetLayoutForCurrentDisplays(layout);
-
- scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 600, 201, 201)));
- DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 600 + 20);
- scoped_ptr<aura::Window> w2(CreateTestWindow(gfx::Rect(0, 600, 210, 202)));
- DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 600 + 200);
- scoped_ptr<aura::Window> w3(CreateTestWindow(gfx::Rect(0, 600, 220, 204)));
- DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w3.get(), 600 + 300);
-
- // All windows should be attached and snapped to the right side of the screen.
- EXPECT_EQ(w1->GetRootWindow()->bounds().right(),
- w1->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
- EXPECT_EQ(w2->GetRootWindow()->bounds().right(),
- w2->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
- EXPECT_EQ(w3->GetRootWindow()->bounds().right(),
- w3->GetBoundsInScreen().right());
- EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id());
-
- gfx::Rect work_area =
- Shell::GetScreen()->GetDisplayNearestWindow(w1.get()).work_area();
- // Test that the top and bottom windows are clamped in work area and
- // that the overlaps between the windows differ at most by a pixel.
- int overlap1 = w1->GetBoundsInScreen().y() - work_area.y();
- int overlap2 = w1->GetBoundsInScreen().bottom() - w2->GetBoundsInScreen().y();
- int overlap3 = w2->GetBoundsInScreen().bottom() - w3->GetBoundsInScreen().y();
- int overlap4 = work_area.bottom() - w3->GetBoundsInScreen().bottom();
- EXPECT_EQ(0, overlap1);
- EXPECT_LE(abs(overlap2 - overlap3), 1);
- EXPECT_EQ(0, overlap4);
-
- // Drag w1 below the point where w1 and w2 would swap places. This point is
- // half way between the tops of those two windows. Add 1 because w2 is taller.
- ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w1.get(), 0, 20));
- DragMove(0, (w2->bounds().y() - w1->bounds().y()) / 2 + 1);
-
- // During the drag the windows get rearranged and the top and the bottom
- // should be clamped by the work area.
- EXPECT_EQ(work_area.y(), w2->GetBoundsInScreen().y());
- EXPECT_GT(w1->GetBoundsInScreen().y(), w2->GetBoundsInScreen().y());
- EXPECT_EQ(work_area.bottom(), w3->GetBoundsInScreen().bottom());
- DragEnd();
-
- // Test the new windows order and that the overlaps differ at most by a pixel.
- overlap1 = w2->GetBoundsInScreen().y() - work_area.y();
- overlap2 = w2->GetBoundsInScreen().bottom() - w1->GetBoundsInScreen().y();
- overlap3 = w1->GetBoundsInScreen().bottom() - w3->GetBoundsInScreen().y();
- overlap4 = work_area.bottom() - w3->GetBoundsInScreen().bottom();
- EXPECT_EQ(0, overlap1);
- EXPECT_LE(abs(overlap2 - overlap3), 1);
- EXPECT_EQ(0, overlap4);
-}
-
// Tests run twice - on both panels and normal windows
INSTANTIATE_TEST_CASE_P(NormalOrPanel,
DockedWindowLayoutManagerTest,
diff --git a/chromium/ash/wm/dock/docked_window_resizer.cc b/chromium/ash/wm/dock/docked_window_resizer.cc
index 3e1ef29b0ad..beae1d13a18 100644
--- a/chromium/ash/wm/dock/docked_window_resizer.cc
+++ b/chromium/ash/wm/dock/docked_window_resizer.cc
@@ -16,9 +16,7 @@
#include "ash/wm/dock/docked_window_layout_manager.h"
#include "ash/wm/property_util.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/workspace/magnetism_matcher.h"
-#include "ash/wm/workspace/phantom_window_controller.h"
-#include "ash/wm/workspace/workspace_window_resizer.h"
+#include "ash/wm/workspace_controller.h"
#include "base/command_line.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
@@ -31,18 +29,15 @@
#include "ui/views/widget/widget.h"
namespace ash {
-namespace internal {
namespace {
-DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint(
- const gfx::Point& point) {
- aura::Window* dock_container = Shell::GetContainer(
- wm::GetRootWindowAt(point),
- kShellWindowId_DockedContainer);
- return static_cast<DockedWindowLayoutManager*>(
- dock_container->layout_manager());
-}
+// Distance in pixels that the cursor must move past an edge for a window
+// to move beyond that edge.
+const int kStickyDistance = 64;
+
+// How far in pixels we have to drag to undock a window.
+const int kSnapToDockDistance = 32;
} // namespace
@@ -94,78 +89,37 @@ void DockedWindowResizer::Drag(const gfx::Point& location, int event_flags) {
destroyed_ = NULL;
if (set_tracked_by_workspace)
SetTrackedByWorkspace(GetTarget(), tracked_by_workspace);
-
- DockedWindowLayoutManager* new_dock_layout =
- GetDockedLayoutManagerAtPoint(last_location_);
- if (new_dock_layout != dock_layout_) {
- // The window is being dragged to a new display. If the previous
- // container is the current parent of the window it will be informed of
- // the end of drag when the window is reparented, otherwise let the
- // previous container know the drag is complete. If we told the
- // window's parent that the drag was complete it would begin
- // positioning the window.
- if (is_docked_)
- dock_layout_->UndockDraggedWindow();
- if (dock_layout_ != initial_dock_layout_)
- dock_layout_->FinishDragging();
- is_docked_ = false;
- dock_layout_ = new_dock_layout;
- // The window's initial layout manager already knows that the drag is
- // in progress for this window.
- if (new_dock_layout != initial_dock_layout_)
- new_dock_layout->StartDragging(GetTarget());
- }
-
- // Show snapping animation when a window touches a screen edge or when
- // it is about to get docked.
- DockedAlignment new_docked_alignment = GetDraggedWindowAlignment();
- if (new_docked_alignment != DOCKED_ALIGNMENT_NONE) {
- if (!is_docked_) {
- dock_layout_->DockDraggedWindow(GetTarget());
- is_docked_ = true;
- }
- UpdateSnapPhantomWindow();
- } else {
- if (is_docked_) {
- dock_layout_->UndockDraggedWindow();
- is_docked_ = false;
- }
- // Clear phantom window when a window gets undocked.
- snap_phantom_window_controller_.reset();
- }
}
void DockedWindowResizer::CompleteDrag(int event_flags) {
- snap_phantom_window_controller_.reset();
-
// Temporarily clear kWindowTrackedByWorkspaceKey for panels so that they
// don't get forced into the workspace that may be shrunken because of docked
// windows.
bool tracked_by_workspace = GetTrackedByWorkspace(GetTarget());
- bool set_tracked_by_workspace = was_docked_;
+ bool set_tracked_by_workspace =
+ (was_docked_ && GetTarget()->type() == aura::client::WINDOW_TYPE_PANEL);
if (set_tracked_by_workspace)
SetTrackedByWorkspace(GetTarget(), false);
// The root window can change when dragging into a different screen.
next_window_resizer_->CompleteDrag(event_flags);
- FinishedDragging();
if (set_tracked_by_workspace)
SetTrackedByWorkspace(GetTarget(), tracked_by_workspace);
+ FinishDragging();
}
void DockedWindowResizer::RevertDrag() {
- snap_phantom_window_controller_.reset();
-
// Temporarily clear kWindowTrackedByWorkspaceKey for panels so that they
// don't get forced into the workspace that may be shrunken because of docked
// windows.
bool tracked_by_workspace = GetTrackedByWorkspace(GetTarget());
- bool set_tracked_by_workspace = was_docked_;
+ bool set_tracked_by_workspace =
+ (was_docked_ && GetTarget()->type() == aura::client::WINDOW_TYPE_PANEL);
if (set_tracked_by_workspace)
SetTrackedByWorkspace(GetTarget(), false);
next_window_resizer_->RevertDrag();
- FinishedDragging();
if (set_tracked_by_workspace)
SetTrackedByWorkspace(GetTarget(), tracked_by_workspace);
+ FinishDragging();
}
aura::Window* DockedWindowResizer::GetTarget() {
@@ -181,57 +135,29 @@ DockedWindowResizer::DockedWindowResizer(WindowResizer* next_window_resizer,
: details_(details),
next_window_resizer_(next_window_resizer),
dock_layout_(NULL),
- initial_dock_layout_(NULL),
did_move_or_resize_(false),
was_docked_(false),
- is_docked_(false),
destroyed_(NULL) {
DCHECK(details_.is_resizable);
aura::Window* dock_container = Shell::GetContainer(
details.window->GetRootWindow(),
- kShellWindowId_DockedContainer);
- dock_layout_ = static_cast<DockedWindowLayoutManager*>(
+ internal::kShellWindowId_DockedContainer);
+ DCHECK(dock_container->id() == internal::kShellWindowId_DockedContainer);
+ dock_layout_ = static_cast<internal::DockedWindowLayoutManager*>(
dock_container->layout_manager());
- initial_dock_layout_ = dock_layout_;
was_docked_ = details.window->parent() == dock_container;
- is_docked_ = was_docked_;
-}
-
-DockedAlignment DockedWindowResizer::GetDraggedWindowAlignment() {
- aura::Window* window = GetTarget();
- DockedWindowLayoutManager* layout_manager =
- GetDockedLayoutManagerAtPoint(last_location_);
- const DockedAlignment alignment = layout_manager->CalculateAlignment();
- const gfx::Rect& bounds(window->GetBoundsInScreen());
-
- // Check if the window is touching the edge - it may need to get docked.
- if (alignment == DOCKED_ALIGNMENT_NONE)
- return layout_manager->GetAlignmentOfWindow(window);
-
- // Both bounds and pointer location are checked because some drags involve
- // stickiness at the workspace-to-dock boundary and so the |location| may be
- // outside of the |bounds|.
- // It is also possible that all the docked windows are minimized or hidden
- // in which case the dragged window needs to be exactly touching the same
- // edge that those docked windows were aligned before they got minimized.
- // TODO(varkha): Consider eliminating sticky behavior on that boundary when
- // a pointer enters docked area.
- if ((layout_manager->docked_bounds().Intersects(bounds) &&
- layout_manager->docked_bounds().Contains(last_location_)) ||
- alignment == layout_manager->GetAlignmentOfWindow(window)) {
- // A window is being added to other docked windows (on the same side).
- return alignment;
- }
- return DOCKED_ALIGNMENT_NONE;
}
bool DockedWindowResizer::MaybeSnapToEdge(const gfx::Rect& bounds,
gfx::Point* offset) {
aura::Window* dock_container = Shell::GetContainer(
wm::GetRootWindowAt(last_location_),
- kShellWindowId_DockedContainer);
- DockedAlignment dock_alignment =
- GetDockedLayoutManagerAtPoint(last_location_)->CalculateAlignment();
+ internal::kShellWindowId_DockedContainer);
+ DCHECK(dock_container->id() == internal::kShellWindowId_DockedContainer);
+ internal::DockedWindowLayoutManager* dock_layout =
+ static_cast<internal::DockedWindowLayoutManager*>(
+ dock_container->layout_manager());
+ internal::DockedAlignment dock_alignment = dock_layout->CalculateAlignment();
gfx::Rect dock_bounds = ScreenAsh::ConvertRectFromScreen(
GetTarget()->parent(), dock_container->GetBoundsInScreen());
// Windows only snap magnetically when they are close to the edge of the
@@ -239,33 +165,23 @@ bool DockedWindowResizer::MaybeSnapToEdge(const gfx::Rect& bounds,
// When a window being dragged is the last window that was previously
// docked it is still allowed to magnetically snap to either side.
bool can_snap = was_docked_ ||
- (GetDraggedWindowAlignment() != DOCKED_ALIGNMENT_NONE);
+ internal::DockedWindowLayoutManager::ShouldWindowDock(GetTarget(),
+ last_location_);
if (!can_snap)
return false;
- // Distance in pixels that the cursor must move past an edge for a window
- // to move beyond that edge. Same constant as in WorkspaceWindowResizer
- // is used for consistency.
- const int kStickyDistance = WorkspaceWindowResizer::kStickyDistancePixels;
-
- // Short-range magnetism when retaining docked state. Same constant as in
- // MagnetismMatcher is used for consistency.
- const int kSnapToDockDistance = MagnetismMatcher::kMagneticDistance;
-
- if (dock_alignment == DOCKED_ALIGNMENT_LEFT ||
- (dock_alignment == DOCKED_ALIGNMENT_NONE && was_docked_)) {
+ if (dock_alignment == internal::DOCKED_ALIGNMENT_LEFT ||
+ (dock_alignment == internal::DOCKED_ALIGNMENT_NONE && was_docked_)) {
const int distance = bounds.x() - dock_bounds.x();
- if (distance < (was_docked_ ? kSnapToDockDistance : 0) &&
- distance > -kStickyDistance) {
+ if (distance < kSnapToDockDistance && distance > -kStickyDistance) {
offset->set_x(-distance);
return true;
}
}
- if (dock_alignment == DOCKED_ALIGNMENT_RIGHT ||
- (dock_alignment == DOCKED_ALIGNMENT_NONE && was_docked_)) {
+ if (dock_alignment == internal::DOCKED_ALIGNMENT_RIGHT ||
+ (dock_alignment == internal::DOCKED_ALIGNMENT_NONE && was_docked_)) {
const int distance = dock_bounds.right() - bounds.right();
- if (distance < (was_docked_ ? kSnapToDockDistance : 0) &&
- distance > -kStickyDistance) {
+ if (distance < kSnapToDockDistance && distance > -kStickyDistance) {
offset->set_x(distance);
return true;
}
@@ -275,54 +191,37 @@ bool DockedWindowResizer::MaybeSnapToEdge(const gfx::Rect& bounds,
void DockedWindowResizer::StartedDragging() {
// Tell the dock layout manager that we are dragging this window.
- // At this point we are not yet animating the window as it may not be
- // inside the docked area.
dock_layout_->StartDragging(GetTarget());
- // Reparent workspace windows during the drag to elevate them above workspace.
- // Other windows for which the DockedWindowResizer is instantiated include
- // panels and windows that are already docked. Those do not need reparenting.
- if (GetTarget()->type() != aura::client::WINDOW_TYPE_PANEL &&
- GetTarget()->parent()->id() == kShellWindowId_DefaultContainer) {
- // The window is going to be reparented - avoid completing the drag.
- GetTarget()->SetProperty(kContinueDragAfterReparent, true);
-
- // Reparent the window into the docked windows container in order to get it
- // on top of other docked windows.
- aura::Window* docked_container = Shell::GetContainer(
- GetTarget()->GetRootWindow(),
- kShellWindowId_DockedContainer);
- docked_container->AddChild(GetTarget());
- }
- if (is_docked_)
- dock_layout_->DockDraggedWindow(GetTarget());
}
-void DockedWindowResizer::FinishedDragging() {
+void DockedWindowResizer::FinishDragging() {
if (!did_move_or_resize_)
return;
aura::Window* window = GetTarget();
bool should_dock = was_docked_;
- const bool attached_panel =
- window->type() == aura::client::WINDOW_TYPE_PANEL &&
- window->GetProperty(kPanelAttachedKey);
- // If a window was previously docked then keep it docked if it is resized and
- // still aligned at the screen edge.
- if ((was_docked_ ||
- ((details_.bounds_change & WindowResizer::kBoundsChange_Repositions) &&
- !(details_.bounds_change & WindowResizer::kBoundsChange_Resizes)))) {
- should_dock = GetDraggedWindowAlignment() != DOCKED_ALIGNMENT_NONE;
+ if ((details_.bounds_change & WindowResizer::kBoundsChange_Repositions) &&
+ !(details_.bounds_change & WindowResizer::kBoundsChange_Resizes) &&
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshEnableDockedWindows)) {
+ const bool attached_panel =
+ window->type() == aura::client::WINDOW_TYPE_PANEL &&
+ window->GetProperty(internal::kPanelAttachedKey);
+ should_dock = !attached_panel &&
+ internal::DockedWindowLayoutManager::ShouldWindowDock(window,
+ last_location_);
}
- // Check if the window needs to be docked or returned to workspace.
- aura::Window* dock_container = Shell::GetContainer(
- window->GetRootWindow(),
- kShellWindowId_DockedContainer);
- if (!attached_panel &&
- should_dock != (window->parent() == dock_container)) {
+ // Check if desired docked state is not same as current.
+ // If not same dock or undock accordingly.
+ if (should_dock !=
+ (window->parent()->id() == internal::kShellWindowId_DockedContainer)) {
if (should_dock) {
+ aura::Window* dock_container = Shell::GetContainer(
+ window->GetRootWindow(),
+ internal::kShellWindowId_DockedContainer);
dock_container->AddChild(window);
- } else if (window->parent()->id() == kShellWindowId_DockedContainer) {
+ } else {
// Reparent the window back to workspace.
// We need to be careful to give SetDefaultParentByRootWindow location in
// the right root window (matching the logic in DragWindowResizer) based
@@ -336,25 +235,6 @@ void DockedWindowResizer::FinishedDragging() {
}
}
dock_layout_->FinishDragging();
-
- // If we started the drag in one root window and moved into another root
- // but then canceled the drag we may need to inform the original layout
- // manager that the drag is finished.
- if (initial_dock_layout_ != dock_layout_)
- initial_dock_layout_->FinishDragging();
- is_docked_ = false;
-}
-
-void DockedWindowResizer::UpdateSnapPhantomWindow() {
- if (!did_move_or_resize_ || details_.window_component != HTCAPTION)
- return;
-
- if (!snap_phantom_window_controller_) {
- snap_phantom_window_controller_.reset(
- new PhantomWindowController(GetTarget()));
- }
- snap_phantom_window_controller_->Show(dock_layout_->dragged_bounds());
}
-} // namespace internal
-} // namespace ash
+} // namespace aura
diff --git a/chromium/ash/wm/dock/docked_window_resizer.h b/chromium/ash/wm/dock/docked_window_resizer.h
index 41bb4fecd5f..41dd47d5b38 100644
--- a/chromium/ash/wm/dock/docked_window_resizer.h
+++ b/chromium/ash/wm/dock/docked_window_resizer.h
@@ -5,10 +5,8 @@
#ifndef ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
#define ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
-#include "ash/wm/dock/dock_types.h"
#include "ash/wm/window_resizer.h"
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
namespace gfx {
class Point;
@@ -20,10 +18,10 @@ class RootWindow;
}
namespace ash {
-namespace internal {
+namespace internal {
class DockedWindowLayoutManager;
-class PhantomWindowController;
+}
// DockWindowResizer is used by ToplevelWindowEventFilter to handle dragging,
// moving or resizing of a window while it is docked to the side of a screen.
@@ -54,12 +52,6 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
DockedWindowResizer(WindowResizer* next_window_resizer,
const Details& details);
- // Returns the side of the screen that the window should dock to or
- // DOCKED_ALIGNMENT_NONE when the window is not on a side or when some other
- // windows are already docked on the other side or when launcher (shelf) is
- // aligned on the same side.
- DockedAlignment GetDraggedWindowAlignment();
-
// Checks if the provided window bounds should snap to the side of a screen.
// If so the offset returned gives the necessary adjustment to snap.
bool MaybeSnapToEdge(const gfx::Rect& bounds, gfx::Point* offset);
@@ -70,10 +62,7 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
// Informs the DockLayoutManager that the drag is complete if it was informed
// of the drag start.
- void FinishedDragging();
-
- // Updates the bounds of the phantom window that is used as a docking hint.
- void UpdateSnapPhantomWindow();
+ void FinishDragging();
const Details details_;
@@ -84,20 +73,13 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
// Dock container window.
internal::DockedWindowLayoutManager* dock_layout_;
- internal::DockedWindowLayoutManager* initial_dock_layout_;
// Set to true once Drag() is invoked and the bounds of the window change.
bool did_move_or_resize_;
- // Gives a preview of where the the window will end up.
- scoped_ptr<PhantomWindowController> snap_phantom_window_controller_;
-
// Set to true if the window that is being dragged was docked before drag.
bool was_docked_;
- // True if the dragged window is docked during the drag.
- bool is_docked_;
-
// If non-NULL the destructor sets this to true. Used to determine if this has
// been deleted.
bool* destroyed_;
@@ -105,7 +87,6 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer {
DISALLOW_COPY_AND_ASSIGN(DockedWindowResizer);
};
-} // namespace internal
} // namespace ash
#endif // ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
diff --git a/chromium/ash/wm/dock/docked_window_resizer_unittest.cc b/chromium/ash/wm/dock/docked_window_resizer_unittest.cc
index 49aeca25318..606e6f4f9d7 100644
--- a/chromium/ash/wm/dock/docked_window_resizer_unittest.cc
+++ b/chromium/ash/wm/dock/docked_window_resizer_unittest.cc
@@ -63,6 +63,11 @@ class DockedWindowResizerTest
DOCKED_EDGE_RIGHT,
};
+ enum DockedState {
+ UNDOCKED,
+ DOCKED,
+ };
+
aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
&delegate_,
@@ -140,12 +145,15 @@ class DockedWindowResizerTest
}
// Panels are parented by panel container during drags.
- // All other windows that are tested here are parented by dock container
- // during drags.
- int CorrectContainerIdDuringDrag() {
+ // Docked windows are parented by dock container during drags.
+ // All other windows that we are testing here have default container as a
+ // parent.
+ int CorrectContainerIdDuringDrag(DockedState is_docked) {
if (window_type_ == aura::client::WINDOW_TYPE_PANEL)
return internal::kShellWindowId_PanelContainer;
- return internal::kShellWindowId_DockedContainer;
+ if (is_docked == DOCKED)
+ return internal::kShellWindowId_DockedContainer;
+ return internal::kShellWindowId_DefaultContainer;
}
// Test dragging the window vertically (to detach if it is a panel) and then
@@ -190,7 +198,7 @@ class DockedWindowResizerTest
// Drag enough to detach since our tests assume panels to be initially
// detached.
DragMove(0, dy);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
EXPECT_EQ(initial_bounds.x(), window->GetBoundsInScreen().x());
EXPECT_EQ(initial_bounds.y() + dy, window->GetBoundsInScreen().y());
@@ -212,7 +220,7 @@ class DockedWindowResizerTest
else if (edge == DOCKED_EDGE_RIGHT)
dx += window->GetRootWindow()->bounds().right() - initial_bounds.right();
DragMove(dx, window_type_ == aura::client::WINDOW_TYPE_PANEL ? 0 : dy);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
// Release the mouse and the panel should be attached to the dock.
DragEnd();
@@ -381,10 +389,9 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) {
window->GetBoundsInScreen().right());
EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
- // Try to detach by dragging left less than kSnapToDockDistance.
- // The window should stay docked.
+ // Try to detach by dragging left a bit (should stay docked)
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
- DragMove(-4, -10);
+ DragMove(-10, -10);
// Release the mouse and the window should be still attached to the dock.
DragEnd();
@@ -393,8 +400,7 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) {
window->GetBoundsInScreen().right());
EXPECT_EQ(internal::kShellWindowId_DockedContainer, window->parent()->id());
- // Try to detach by dragging left by kSnapToDockDistance or more.
- // The window should get undocked.
+ // Try to detach by dragging left a bit more (should get undocked)
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
DragMove(-32, -10);
// Release the mouse and the window should be no longer attached to the dock.
@@ -539,7 +545,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
// but not enough to land in the other screen
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
DragMove(70, 0);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(DOCKED), window->parent()->id());
DragEnd();
EXPECT_NE(window->GetRootWindow()->bounds().right(),
window->GetBoundsInScreen().right());
@@ -550,7 +556,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
// Move back left - should dock again.
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
DragMove(-70, 0);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
DragEnd();
EXPECT_EQ(window->GetRootWindow()->bounds().right(),
window->GetBoundsInScreen().right());
@@ -566,7 +572,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
window->bounds().width()/2 + 10,
0));
DragMove(window->bounds().width()/2 - 5, 0);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(DOCKED), window->parent()->id());
DragEnd();
EXPECT_NE(window->GetRootWindow()->bounds().right(),
window->GetBoundsInScreen().right());
@@ -583,7 +589,7 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
DragMove(window->GetRootWindow()->GetBoundsInScreen().x() -
window->GetBoundsInScreen().x(),
0);
- EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
+ EXPECT_EQ(CorrectContainerIdDuringDrag(UNDOCKED), window->parent()->id());
DragEnd();
EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().x(),
window->GetBoundsInScreen().x());
@@ -614,7 +620,7 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne)
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, manager->alignment_);
EXPECT_EQ(w1->bounds().width(), manager->docked_width_);
- DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_RIGHT, w2.get(), 0, 100);
+ DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_RIGHT, w2.get(), 0, 50);
// Both windows should now be attached and snapped to the right edge.
EXPECT_EQ(w2->GetRootWindow()->bounds().right(),
w2->GetBoundsInScreen().right());
@@ -721,11 +727,12 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther)
ASSERT_NO_FATAL_FAILURE(DragStart(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, manager->alignment_);
DragMove(-35, 10);
- // Alignment is set to "NONE" when drag starts.
- EXPECT_EQ(DOCKED_ALIGNMENT_NONE, manager->alignment_);
+ // For NORMAL windows alignment is set to "RIGHT" until the drag is completed.
+ // For PANEL windows alignment is set to "NONE" when drag starts.
+ EXPECT_EQ(test_panels() ? DOCKED_ALIGNMENT_NONE : DOCKED_ALIGNMENT_RIGHT,
+ manager->alignment_);
// Release the mouse and the window should be no longer attached to the edge.
DragEnd();
- EXPECT_EQ(DOCKED_ALIGNMENT_NONE, manager->alignment_);
// Dock should get shrunk and desktop should get expanded.
EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w1->parent()->id());
EXPECT_EQ(internal::kShellWindowId_DefaultContainer, w2->parent()->id());
@@ -817,7 +824,7 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky)
// Drag w2 by a bit more - it should resist the drag (stuck edges)
int start_x = w2->bounds().x();
- ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w2.get(), 100, 5));
+ ASSERT_NO_FATAL_FAILURE(DragStart(w2.get()));
DragMove(-2, 0);
// Window should not actually move.
EXPECT_EQ(start_x, w2->bounds().x());
@@ -881,7 +888,7 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows)
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, manager->alignment_);
EXPECT_EQ(w1->bounds().width(), manager->docked_width_);
- DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_RIGHT, w2.get(), 0, 100);
+ DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_RIGHT, w2.get(), 0, 50);
// Both windows should now be attached and snapped to the right edge.
EXPECT_EQ(w2->GetRootWindow()->bounds().right(),
w2->GetBoundsInScreen().right());
@@ -1024,11 +1031,12 @@ TEST_P(DockedWindowResizerTest, DragToShelf)
// Detach and drag down to shelf.
ASSERT_NO_FATAL_FAILURE(DragStart(w1.get()));
DragMove(-40, 0);
- // Alignment is set to "NONE" when drag starts.
- EXPECT_EQ(DOCKED_ALIGNMENT_NONE, manager->alignment_);
+ // For NORMAL windows alignment is set to "RIGHT" until the drag is completed.
+ // For PANEL windows alignment is set to "NONE" when drag starts.
+ EXPECT_EQ(test_panels() ? DOCKED_ALIGNMENT_NONE : DOCKED_ALIGNMENT_RIGHT,
+ manager->alignment_);
// Release the mouse and the window should be no longer attached to the edge.
DragEnd();
- EXPECT_EQ(DOCKED_ALIGNMENT_NONE, manager->alignment_);
// Drag down almost to shelf. A panel will snap, a regular window won't.
ShelfWidget* shelf = Launcher::ForPrimaryDisplay()->shelf_widget();
diff --git a/chromium/ash/wm/event_client_impl.cc b/chromium/ash/wm/event_client_impl.cc
index 03d4dea0b03..fcdc1b425d3 100644
--- a/chromium/ash/wm/event_client_impl.cc
+++ b/chromium/ash/wm/event_client_impl.cc
@@ -8,7 +8,6 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ui/aura/window.h"
-#include "ui/keyboard/keyboard_util.h"
namespace ash {
namespace internal {
@@ -22,34 +21,26 @@ EventClientImpl::~EventClientImpl() {
bool EventClientImpl::CanProcessEventsWithinSubtree(
const aura::Window* window) const {
const aura::RootWindow* root_window = window ? window->GetRootWindow() : NULL;
- if (!root_window ||
- !Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked()) {
+ if (!root_window)
return true;
- }
-
- const aura::Window* lock_screen_containers = Shell::GetContainer(
- root_window,
- kShellWindowId_LockScreenContainersContainer);
- const aura::Window* lock_background_containers = Shell::GetContainer(
- root_window,
- kShellWindowId_LockScreenBackgroundContainer);
- const aura::Window* lock_screen_related_containers = Shell::GetContainer(
- root_window,
- kShellWindowId_LockScreenRelatedContainersContainer);
- bool can_process_events = (window->Contains(lock_screen_containers) &&
- window->Contains(lock_background_containers) &&
- window->Contains(lock_screen_related_containers)) ||
- lock_screen_containers->Contains(window) ||
- lock_background_containers->Contains(window) ||
- lock_screen_related_containers->Contains(window);
- if (keyboard::IsKeyboardEnabled()) {
- const aura::Window* virtual_keyboard_container = Shell::GetContainer(
+ if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked()) {
+ const aura::Window* lock_screen_containers = Shell::GetContainer(
+ root_window,
+ kShellWindowId_LockScreenContainersContainer);
+ const aura::Window* lock_background_containers = Shell::GetContainer(
+ root_window,
+ kShellWindowId_LockScreenBackgroundContainer);
+ const aura::Window* lock_screen_related_containers = Shell::GetContainer(
root_window,
- kShellWindowId_VirtualKeyboardContainer);
- can_process_events |= (window->Contains(virtual_keyboard_container) ||
- virtual_keyboard_container->Contains(window));
+ kShellWindowId_LockScreenRelatedContainersContainer);
+ return (window->Contains(lock_screen_containers) &&
+ window->Contains(lock_background_containers) &&
+ window->Contains(lock_screen_related_containers)) ||
+ lock_screen_containers->Contains(window) ||
+ lock_background_containers->Contains(window) ||
+ lock_screen_related_containers->Contains(window);
}
- return can_process_events;
+ return true;
}
ui::EventTarget* EventClientImpl::GetToplevelEventTarget() {
diff --git a/chromium/ash/wm/frame_painter.h b/chromium/ash/wm/frame_painter.h
index e79b012d2e9..38f2fb1e697 100644
--- a/chromium/ash/wm/frame_painter.h
+++ b/chromium/ash/wm/frame_painter.h
@@ -160,6 +160,8 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver,
FRIEND_TEST_ALL_PREFIXES(FramePainterTest, GetHeaderOpacity);
FRIEND_TEST_ALL_PREFIXES(FramePainterTest, TitleIconAlignment);
FRIEND_TEST_ALL_PREFIXES(FramePainterTest, ChildWindowVisibility);
+ FRIEND_TEST_ALL_PREFIXES(FramePainterTest,
+ NoCrashShutdownWithAlwaysOnTopWindow);
// Sets the images for a button based on IDs from the |frame_| theme provider.
void SetButtonImages(views::ImageButton* button,
diff --git a/chromium/ash/wm/frame_painter_unittest.cc b/chromium/ash/wm/frame_painter_unittest.cc
index ee9313fcf10..5826be6787d 100644
--- a/chromium/ash/wm/frame_painter_unittest.cc
+++ b/chromium/ash/wm/frame_painter_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
#include "grit/ash_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/aura_constants.h"
@@ -25,6 +26,7 @@
#include "ui/views/controls/button/image_button.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
+#include "ui/views/widget/widget_observer.h"
#include "ui/views/window/non_client_view.h"
using ash::FramePainter;
@@ -148,6 +150,33 @@ FramePainter* CreateTestPainter(Widget* widget) {
return painter;
}
+// Self-owned manager of the frame painter which deletes the painter and itself
+// when its widget is closed.
+class FramePainterOwner : views::WidgetObserver {
+ public:
+ explicit FramePainterOwner(Widget* widget)
+ : frame_painter_(CreateTestPainter(widget)) {
+ widget->AddObserver(this);
+ }
+
+ virtual ~FramePainterOwner() {}
+
+ FramePainter* frame_painter() { return frame_painter_.get(); }
+
+ private:
+ virtual void OnWidgetDestroying(Widget* widget) OVERRIDE {
+ widget->RemoveObserver(this);
+ // Do not delete directly here, since the task of FramePainter causing
+ // the crash of crbug.com/273310 may run after this class handles this
+ // event.
+ base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+ }
+
+ scoped_ptr<FramePainter> frame_painter_;
+
+ DISALLOW_COPY_AND_ASSIGN(FramePainterOwner);
+};
+
} // namespace
namespace ash {
@@ -690,4 +719,33 @@ TEST_F(FramePainterTest, ChildWindowVisibility) {
0));
}
+TEST_F(FramePainterTest, NoCrashShutdownWithAlwaysOnTopWindow) {
+ // Create normal window and an always-on-top window, and leave it as is
+ // and finish the test, then verify it doesn't cause a crash. See
+ // crbug.com/273310. Note that those widgets will be deleted at
+ // RootWindowController::CloseChildWindows(), so this code is memory-safe.
+ Widget* w1 = new Widget;
+ Widget::InitParams params1;
+ params1.context = CurrentContext();
+ w1->Init(params1);
+ FramePainterOwner* o1 = new FramePainterOwner(w1);
+ FramePainter* p1 = o1->frame_painter();
+ w1->SetBounds(gfx::Rect(0, 0, 100, 100));
+ w1->Show();
+ EXPECT_TRUE(p1->UseSoloWindowHeader());
+
+ Widget* w2 = new Widget;
+ Widget::InitParams params2;
+ params2.context = CurrentContext();
+ params2.keep_on_top = true;
+ w2->Init(params2);
+ FramePainterOwner* o2 = new FramePainterOwner(w2);
+ FramePainter* p2 = o2->frame_painter();
+ w2->Show();
+ EXPECT_FALSE(p1->UseSoloWindowHeader());
+ EXPECT_FALSE(p2->UseSoloWindowHeader());
+
+ // Exit with no resource release. They'll be released at shutdown.
+}
+
} // namespace ash
diff --git a/chromium/ash/wm/panels/panel_layout_manager_unittest.cc b/chromium/ash/wm/panels/panel_layout_manager_unittest.cc
index 08f53f7aa8b..ca231ce005d 100644
--- a/chromium/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/chromium/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -128,8 +128,6 @@ class PanelLayoutManagerTest : public test::AshTestBase {
ASSERT_FALSE(icon_bounds.width() == 0 && icon_bounds.height() == 0);
gfx::Rect window_bounds = panel->GetBoundsInScreen();
- ASSERT_LT(icon_bounds.width(), window_bounds.width());
- ASSERT_LT(icon_bounds.height(), window_bounds.height());
gfx::Rect launcher_bounds = launcher->shelf_widget()->
GetWindowBoundsInScreen();
ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
diff --git a/chromium/ash/wm/status_area_layout_manager.cc b/chromium/ash/wm/status_area_layout_manager.cc
index d9e0424d240..e17d84e26d2 100644
--- a/chromium/ash/wm/status_area_layout_manager.cc
+++ b/chromium/ash/wm/status_area_layout_manager.cc
@@ -70,7 +70,7 @@ void StatusAreaLayoutManager::SetChildBounds(
void StatusAreaLayoutManager::LayoutStatusArea() {
// Shelf layout manager may be already doing layout.
- if (shelf_->shelf_layout_manager()->updating_bounds())
+ if (shelf_->shelf_layout_manager()->in_layout())
return;
base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
diff --git a/chromium/ash/wm/window_animations.cc b/chromium/ash/wm/window_animations.cc
index a3c0ca80621..73deafd75c1 100644
--- a/chromium/ash/wm/window_animations.cc
+++ b/chromium/ash/wm/window_animations.cc
@@ -295,6 +295,9 @@ class CrossFadeObserver : public ui::CompositorObserver,
// Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
layer_->GetAnimator()->StopAnimating();
}
+ virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE {
+ layer_->GetAnimator()->StopAnimating();
+ }
// ui::ImplicitAnimationObserver overrides:
virtual void OnImplicitAnimationsCompleted() OVERRIDE {
diff --git a/chromium/ash/wm/window_resizer.cc b/chromium/ash/wm/window_resizer.cc
index 1ea317a1a3f..e312fc179e5 100644
--- a/chromium/ash/wm/window_resizer.cc
+++ b/chromium/ash/wm/window_resizer.cc
@@ -7,7 +7,6 @@
#include "ash/screen_ash.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/dock/docked_window_layout_manager.h"
#include "ash/wm/property_util.h"
#include "ash/wm/window_util.h"
@@ -181,6 +180,14 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
return details.initial_bounds_in_parent;
gfx::Point location = passed_location;
+ aura::Window* dock_container = Shell::GetContainer(
+ details.window->GetRootWindow(),
+ internal::kShellWindowId_DockedContainer);
+ DCHECK_EQ(dock_container->id(), internal::kShellWindowId_DockedContainer);
+ internal::DockedWindowLayoutManager* dock_layout =
+ static_cast<internal::DockedWindowLayoutManager*>(
+ dock_container->layout_manager());
+
int delta_x = location.x() - details.initial_location_in_parent.x();
int delta_y = location.y() - details.initial_location_in_parent.y();
@@ -199,13 +206,6 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
if (details.bounds_change & kBoundsChange_Resizes) {
gfx::Rect work_area =
Shell::GetScreen()->GetDisplayNearestWindow(details.window).work_area();
- aura::Window* dock_container = Shell::GetContainer(
- details.window->GetRootWindow(),
- internal::kShellWindowId_DockedContainer);
- internal::DockedWindowLayoutManager* dock_layout =
- static_cast<internal::DockedWindowLayoutManager*>(
- dock_container->layout_manager());
-
work_area.Union(dock_layout->docked_bounds());
work_area = ScreenAsh::ConvertRectFromScreen(details.window->parent(),
work_area);
@@ -265,13 +265,6 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
ScreenAsh::ConvertRectToScreen(parent, new_bounds);
const gfx::Display& display =
Shell::GetScreen()->GetDisplayMatching(new_bounds_in_screen);
- aura::Window* dock_container = Shell::GetContainer(
- wm::GetRootWindowMatching(new_bounds_in_screen),
- internal::kShellWindowId_DockedContainer);
- internal::DockedWindowLayoutManager* dock_layout =
- static_cast<internal::DockedWindowLayoutManager*>(
- dock_container->layout_manager());
-
gfx::Rect screen_work_area = display.work_area();
screen_work_area.Union(dock_layout->docked_bounds());
screen_work_area.Inset(kMinimumOnScreenArea, 0);
diff --git a/chromium/ash/wm/window_selector.cc b/chromium/ash/wm/window_selector.cc
index 47e20159572..8e87a95163c 100644
--- a/chromium/ash/wm/window_selector.cc
+++ b/chromium/ash/wm/window_selector.cc
@@ -361,10 +361,6 @@ void WindowSelector::OnEvent(ui::Event* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
for (size_t i = 0; i < windows_.size(); ++i) {
if (windows_[i]->Contains(target)) {
- // TODO(flackr): StopPropogation prevents generation of gesture events.
- // We should find a better way to prevent events from being delivered to
- // the window, perhaps a transparent window in front of the target window
- // or using EventClientImpl::CanProcessEventsWithinSubtree.
event->StopPropagation();
break;
}
@@ -385,8 +381,8 @@ void WindowSelector::OnMouseEvent(ui::MouseEvent* event) {
HandleSelectionEvent(target);
}
-void WindowSelector::OnTouchEvent(ui::TouchEvent* event) {
- if (event->type() != ui::ET_TOUCH_PRESSED)
+void WindowSelector::OnGestureEvent(ui::GestureEvent* event) {
+ if (event->type() != ui::ET_GESTURE_TAP)
return;
WindowSelectorWindow* target = GetEventTarget(event);
if (!target)
diff --git a/chromium/ash/wm/window_selector.h b/chromium/ash/wm/window_selector.h
index 9cd1e04fd22..92ed607eabc 100644
--- a/chromium/ash/wm/window_selector.h
+++ b/chromium/ash/wm/window_selector.h
@@ -64,7 +64,7 @@ class WindowSelector : public ui::EventHandler,
// ui::EventHandler:
virtual void OnEvent(ui::Event* event) OVERRIDE;
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
// aura::WindowObserver:
virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
diff --git a/chromium/ash/wm/window_util.cc b/chromium/ash/wm/window_util.cc
index 67dcd95c4c1..7b8e616aa7e 100644
--- a/chromium/ash/wm/window_util.cc
+++ b/chromium/ash/wm/window_util.cc
@@ -161,29 +161,29 @@ void SetPreAutoManageWindowBounds(aura::Window* window,
new gfx::Rect(bounds));
}
-void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& work_area,
+void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& visible_area,
gfx::Rect* bounds) {
AdjustBoundsToEnsureWindowVisibility(
- work_area, kMinimumOnScreenArea, kMinimumOnScreenArea, bounds);
+ visible_area, kMinimumOnScreenArea, kMinimumOnScreenArea, bounds);
}
-void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& work_area,
+void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
int min_width,
int min_height,
gfx::Rect* bounds) {
- bounds->set_width(std::min(bounds->width(), work_area.width()));
- bounds->set_height(std::min(bounds->height(), work_area.height()));
+ bounds->set_width(std::min(bounds->width(), visible_area.width()));
+ bounds->set_height(std::min(bounds->height(), visible_area.height()));
- min_width = std::min(min_width, work_area.width());
- min_height = std::min(min_height, work_area.height());
+ min_width = std::min(min_width, visible_area.width());
+ min_height = std::min(min_height, visible_area.height());
- if (bounds->x() + min_width > work_area.right()) {
- bounds->set_x(work_area.right() - min_width);
+ if (bounds->x() + min_width > visible_area.right()) {
+ bounds->set_x(visible_area.right() - min_width);
} else if (bounds->right() - min_width < 0) {
bounds->set_x(min_width - bounds->width());
}
- if (bounds->y() + min_height > work_area.bottom()) {
- bounds->set_y(work_area.bottom() - min_height);
+ if (bounds->y() + min_height > visible_area.bottom()) {
+ bounds->set_y(visible_area.bottom() - min_height);
} else if (bounds->bottom() - min_height < 0) {
bounds->set_y(min_height - bounds->height());
}
diff --git a/chromium/ash/wm/window_util.h b/chromium/ash/wm/window_util.h
index 1ffeb7db8a3..659d3e11e2d 100644
--- a/chromium/ash/wm/window_util.h
+++ b/chromium/ash/wm/window_util.h
@@ -108,16 +108,16 @@ ASH_EXPORT const gfx::Rect* GetPreAutoManageWindowBounds(
ASH_EXPORT void SetPreAutoManageWindowBounds(aura::Window* window,
const gfx::Rect& bounds);
-// Move the given bounds inside the given work area, including a safety margin
-// given by |kMinimumOnScreenArea|.
+// Move the given bounds inside the given |visible_area|, including a
+// safety margin given by |kMinimumOnScreenArea|.
ASH_EXPORT void AdjustBoundsToEnsureMinimumWindowVisibility(
- const gfx::Rect& work_area,
+ const gfx::Rect& visible_area,
gfx::Rect* bounds);
-// Move the given bounds inside the given work area, including a safety margin
-// given by |min_width| and |min_height|.
+// Move the given bounds inside the given |visible_area|, including a
+// safety margin given by |min_width| and |min_height|.
ASH_EXPORT void AdjustBoundsToEnsureWindowVisibility(
- const gfx::Rect& work_area,
+ const gfx::Rect& visible_area,
int min_width,
int min_height,
gfx::Rect* bounds);
diff --git a/chromium/ash/wm/workspace/phantom_window_controller.cc b/chromium/ash/wm/workspace/phantom_window_controller.cc
index 67272c18a39..4287d5b40d0 100644
--- a/chromium/ash/wm/workspace/phantom_window_controller.cc
+++ b/chromium/ash/wm/workspace/phantom_window_controller.cc
@@ -8,7 +8,6 @@
#include "ash/shell_window_ids.h"
#include "ash/wm/coordinate_conversion.h"
#include "third_party/skia/include/core/SkCanvas.h"
-#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/base/animation/slide_animation.h"
#include "ui/compositor/layer.h"
@@ -92,56 +91,25 @@ void EdgePainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
PhantomWindowController::PhantomWindowController(aura::Window* window)
: window_(window),
phantom_below_window_(NULL),
- phantom_widget_(NULL),
- phantom_widget_start_(NULL) {
+ phantom_widget_(NULL) {
}
PhantomWindowController::~PhantomWindowController() {
Hide();
}
-void PhantomWindowController::Show(const gfx::Rect& bounds_in_screen) {
- if (bounds_in_screen == bounds_in_screen_)
+void PhantomWindowController::Show(const gfx::Rect& bounds) {
+ if (bounds == bounds_)
return;
- bounds_in_screen_ = bounds_in_screen;
- aura::RootWindow* target_root = wm::GetRootWindowMatching(bounds_in_screen);
- // Show the phantom at the current bounds of the window. We'll animate to the
- // target bounds. If phantom exists, update the start bounds.
- if (!phantom_widget_)
+ bounds_ = bounds;
+ if (!phantom_widget_) {
+ // Show the phantom at the bounds of the window. We'll animate to the target
+ // bounds.
start_bounds_ = window_->GetBoundsInScreen();
- else
+ CreatePhantomWidget(start_bounds_);
+ } else {
start_bounds_ = phantom_widget_->GetWindowBoundsInScreen();
- if (phantom_widget_ &&
- phantom_widget_->GetNativeWindow()->GetRootWindow() != target_root) {
- phantom_widget_->Close();
- phantom_widget_ = NULL;
- }
- if (!phantom_widget_)
- phantom_widget_ = CreatePhantomWidget(target_root, start_bounds_);
-
- // Create a secondary widget in a second screen if start_bounds_ lie at least
- // partially in that other screen. This allows animations to start or restart
- // in one root window and progress into another root.
- aura::RootWindow* start_root = wm::GetRootWindowMatching(start_bounds_);
- if (start_root == target_root) {
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
- for (size_t i = 0; i < root_windows.size(); ++i) {
- if (root_windows[i] != target_root &&
- root_windows[i]->GetBoundsInScreen().Intersects(start_bounds_)) {
- start_root = root_windows[i];
- break;
- }
- }
}
- if (phantom_widget_start_ &&
- (phantom_widget_start_->GetNativeWindow()->GetRootWindow() != start_root
- || start_root == target_root)) {
- phantom_widget_start_->Close();
- phantom_widget_start_ = NULL;
- }
- if (!phantom_widget_start_ && start_root != target_root)
- phantom_widget_start_ = CreatePhantomWidget(start_root, start_bounds_);
-
animation_.reset(new ui::SlideAnimation(this));
animation_->SetTweenType(ui::Tween::EASE_IN);
const int kAnimationDurationMS = 200;
@@ -153,9 +121,6 @@ void PhantomWindowController::Hide() {
if (phantom_widget_)
phantom_widget_->Close();
phantom_widget_ = NULL;
- if (phantom_widget_start_)
- phantom_widget_start_->Close();
- phantom_widget_start_ = NULL;
}
bool PhantomWindowController::IsShowing() const {
@@ -164,50 +129,45 @@ bool PhantomWindowController::IsShowing() const {
void PhantomWindowController::AnimationProgressed(
const ui::Animation* animation) {
- const gfx::Rect current_bounds =
- animation->CurrentValueBetween(start_bounds_, bounds_in_screen_);
- if (phantom_widget_start_)
- phantom_widget_start_->SetBounds(current_bounds);
- phantom_widget_->SetBounds(current_bounds);
+ phantom_widget_->SetBounds(
+ animation->CurrentValueBetween(start_bounds_, bounds_));
}
-views::Widget* PhantomWindowController::CreatePhantomWidget(
- aura::RootWindow* root_window,
- const gfx::Rect& bounds_in_screen) {
- views::Widget* phantom_widget = new views::Widget;
+void PhantomWindowController::CreatePhantomWidget(const gfx::Rect& bounds) {
+ DCHECK(!phantom_widget_);
+ phantom_widget_ = new views::Widget;
views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
// PhantomWindowController is used by FrameMaximizeButton to highlight the
// launcher button. Put the phantom in the same window as the launcher so that
// the phantom is visible.
- params.parent = Shell::GetContainer(root_window,
+ params.parent = Shell::GetContainer(wm::GetRootWindowMatching(bounds),
kShellWindowId_ShelfContainer);
params.can_activate = false;
params.keep_on_top = true;
- phantom_widget->set_focus_on_creation(false);
- phantom_widget->Init(params);
- phantom_widget->SetVisibilityChangedAnimationsEnabled(false);
- phantom_widget->GetNativeWindow()->SetName("PhantomWindow");
- phantom_widget->GetNativeWindow()->set_id(kShellWindowId_PhantomWindow);
+ phantom_widget_->set_focus_on_creation(false);
+ phantom_widget_->Init(params);
+ phantom_widget_->SetVisibilityChangedAnimationsEnabled(false);
+ phantom_widget_->GetNativeWindow()->SetName("PhantomWindow");
+ phantom_widget_->GetNativeWindow()->set_id(kShellWindowId_PhantomWindow);
views::View* content_view = new views::View;
content_view->set_background(
views::Background::CreateBackgroundPainter(true, new EdgePainter));
- phantom_widget->SetContentsView(content_view);
- phantom_widget->SetBounds(bounds_in_screen);
+ phantom_widget_->SetContentsView(content_view);
+ phantom_widget_->SetBounds(bounds);
if (phantom_below_window_)
- phantom_widget->StackBelow(phantom_below_window_);
+ phantom_widget_->StackBelow(phantom_below_window_);
else
- phantom_widget->StackAbove(window_);
+ phantom_widget_->StackAbove(window_);
// Show the widget after all the setups.
- phantom_widget->Show();
+ phantom_widget_->Show();
// Fade the window in.
- ui::Layer* widget_layer = phantom_widget->GetNativeWindow()->layer();
+ ui::Layer* widget_layer = phantom_widget_->GetNativeWindow()->layer();
widget_layer->SetOpacity(0);
ui::ScopedLayerAnimationSettings scoped_setter(widget_layer->GetAnimator());
widget_layer->SetOpacity(1);
- return phantom_widget;
}
} // namespace internal
diff --git a/chromium/ash/wm/workspace/phantom_window_controller.h b/chromium/ash/wm/workspace/phantom_window_controller.h
index 5cd40daa2cd..d7622fcc556 100644
--- a/chromium/ash/wm/workspace/phantom_window_controller.h
+++ b/chromium/ash/wm/workspace/phantom_window_controller.h
@@ -13,7 +13,6 @@
#include "ui/gfx/rect.h"
namespace aura {
-class RootWindow;
class Window;
}
@@ -36,14 +35,13 @@ class ASH_EXPORT PhantomWindowController : public ui::AnimationDelegate {
virtual ~PhantomWindowController();
// Bounds last passed to Show().
- const gfx::Rect& bounds_in_screen() const { return bounds_in_screen_; }
+ const gfx::Rect& bounds() const { return bounds_; }
- // Animates the phantom window towards |bounds_in_screen|.
- // Creates two (if start bounds intersect any root window other than the
- // root window that matches the target bounds) or one (otherwise) phantom
- // widgets to display animated rectangle in each root.
+ // Shows the phantom window at the specified location (coordinates of the
+ // parent). If |layer| is non-NULL, it is shown on top of the phantom window.
+ // |layer| is owned by the caller.
// This does not immediately show the window.
- void Show(const gfx::Rect& bounds_in_screen);
+ void Show(const gfx::Rect& bounds);
// Hides the phantom.
void Hide();
@@ -61,12 +59,12 @@ class ASH_EXPORT PhantomWindowController : public ui::AnimationDelegate {
virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
private:
- FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomWindowShow);
+ FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomStyle);
- // Creates, shows and returns a phantom widget at |bounds|
- // with kShellWindowId_ShelfContainer in |root_window| as a parent.
- views::Widget* CreatePhantomWidget(aura::RootWindow* root_window,
- const gfx::Rect& bounds_in_screen);
+ // Creates and shows the |phantom_widget_| at |bounds|.
+ // |layer| is shown on top of the phantom window if it is non-NULL.
+ // |layer| is not owned by this object.
+ void CreatePhantomWidget(const gfx::Rect& bounds);
// Window the phantom is placed beneath.
aura::Window* window_;
@@ -74,24 +72,15 @@ class ASH_EXPORT PhantomWindowController : public ui::AnimationDelegate {
// If set, the phantom window should get stacked below this window.
aura::Window* phantom_below_window_;
- // Initially the bounds of |window_| (in screen coordinates).
- // Each time Show() is invoked |start_bounds_| is then reset to the bounds of
- // |phantom_widget_| and |bounds_| is set to the value passed into Show().
- // The animation animates between these two values.
+ // Initially the bounds of |window_|. Each time Show() is invoked
+ // |start_bounds_| is then reset to the bounds of |phantom_widget_| and
+ // |bounds_| is set to the value passed into Show(). The animation animates
+ // between these two values.
gfx::Rect start_bounds_;
+ gfx::Rect bounds_;
- // Target bounds of the animation in screen coordinates.
- gfx::Rect bounds_in_screen_;
-
- // The primary phantom representation of the window. It is parented by the
- // root window matching the target bounds.
views::Widget* phantom_widget_;
- // If the animation starts on another display, this is the secondary phantom
- // representation of the window used on the initial display, otherwise this is
- // NULL. This allows animation to progress from one display into the other.
- views::Widget* phantom_widget_start_;
-
// Used to transition the bounds.
scoped_ptr<ui::SlideAnimation> animation_;
diff --git a/chromium/ash/wm/workspace/workspace_layout_manager.cc b/chromium/ash/wm/workspace/workspace_layout_manager.cc
index 69bcc16069a..0dd9dbf3464 100644
--- a/chromium/ash/wm/workspace/workspace_layout_manager.cc
+++ b/chromium/ash/wm/workspace/workspace_layout_manager.cc
@@ -48,13 +48,15 @@ void MoveToDisplayForRestore(aura::Window* window) {
return;
// Move only if the restore bounds is outside of
- // the root window. There is no information about in which
+ // the display. There is no information about in which
// display it should be restored, so this is best guess.
// TODO(oshima): Restore information should contain the
// work area information like WindowResizer does for the
// last window location.
- if (!window->GetRootWindow()->GetBoundsInScreen().Intersects(
- *restore_bounds)) {
+ gfx::Rect display_area =
+ Shell::GetScreen()->GetDisplayNearestWindow(window).bounds();
+
+ if (!display_area.Intersects(*restore_bounds)) {
DisplayController* display_controller =
Shell::GetInstance()->display_controller();
const gfx::Display& display =
@@ -87,14 +89,7 @@ void WorkspaceLayoutManager::SetShelf(internal::ShelfLayoutManager* shelf) {
}
void WorkspaceLayoutManager::OnWindowAddedToLayout(Window* child) {
- // Adjust window bounds in case that the new child is given the bounds that
- // is out of the workspace. Exclude the case where bounds is empty
- // (this happens when a views::Widget is created), or the window
- // is added with the bounds because a user explicitly moved to
- // this position (drag and drop for example).
- if (!child->bounds().IsEmpty() &&
- !wm::HasUserChangedWindowPositionOrSize(child))
- AdjustWindowBoundsWhenAdded(child);
+ AdjustWindowBoundsWhenAdded(child);
BaseLayoutManager::OnWindowAddedToLayout(child);
UpdateDesktopVisibility();
RearrangeVisibleWindowOnShow(child);
@@ -252,6 +247,14 @@ void WorkspaceLayoutManager::AdjustWindowBoundsForWorkAreaChange(
void WorkspaceLayoutManager::AdjustWindowBoundsWhenAdded(
Window* window) {
+ // Don't adjust window bounds if the bounds are empty as this
+ // happens when a new views::Widget is created.
+ // When a window is dragged and dropped onto a different
+ // root window, the bounds will be updated after they are added
+ // to the root window.
+ if (window->bounds().IsEmpty())
+ return;
+
if (!GetTrackedByWorkspace(window))
return;
@@ -261,9 +264,14 @@ void WorkspaceLayoutManager::AdjustWindowBoundsWhenAdded(
gfx::Rect bounds = window->bounds();
int min_width = bounds.width() * kMinimumPercentOnScreenArea;
int min_height = bounds.height() * kMinimumPercentOnScreenArea;
+ // Use entire display instead of workarea because the workarea can
+ // be further shrunk by the docked area. The logic ensures 30%
+ // visibility which should be enough to see where the window gets
+ // moved.
+ gfx::Rect display_area =
+ Shell::GetScreen()->GetDisplayNearestWindow(window).bounds();
ash::wm::AdjustBoundsToEnsureWindowVisibility(
- work_area_, min_width, min_height, &bounds);
-
+ display_area, min_width, min_height, &bounds);
if (window->bounds() != bounds)
window->SetBounds(bounds);
}
diff --git a/chromium/ash/wm/workspace/workspace_layout_manager_unittest.cc b/chromium/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 3dce5b015c9..13cfdea04a3 100644
--- a/chromium/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/chromium/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -304,6 +304,15 @@ TEST_F(WorkspaceLayoutManagerTest, WindowShouldBeOnScreenWhenAdded) {
EXPECT_GT(bounds.width(), out_window->bounds().width() * 0.29);
EXPECT_GT(bounds.height(), out_window->bounds().height() * 0.29);
+ aura::Window* parent = out_window->parent();
+ parent->RemoveChild(out_window.get());
+ out_window->SetBounds(gfx::Rect(-200, -200, 200, 200));
+ // UserHasChangedWindowPositionOrSize flag shouldn't turn off this behavior.
+ wm::SetUserHasChangedWindowPositionOrSize(window.get(), true);
+ parent->AddChild(out_window.get());
+ EXPECT_GT(bounds.width(), out_window->bounds().width() * 0.29);
+ EXPECT_GT(bounds.height(), out_window->bounds().height() * 0.29);
+
// Make sure we always make more than 1/3 of the window edge visible even
// if the initial bounds intersects with display.
window_bounds.SetRect(-150, -150, 200, 200);
diff --git a/chromium/ash/wm/workspace/workspace_window_resizer.cc b/chromium/ash/wm/workspace/workspace_window_resizer.cc
index 4b8c0aaf7e9..2143e45668b 100644
--- a/chromium/ash/wm/workspace/workspace_window_resizer.cc
+++ b/chromium/ash/wm/workspace/workspace_window_resizer.cc
@@ -87,13 +87,8 @@ scoped_ptr<WindowResizer> CreateWindowResizer(
window_resizer = PanelWindowResizer::Create(
window_resizer, window, point_in_parent, window_component, source);
}
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshEnableDockedWindows) &&
- window_resizer && window->parent() &&
- (window->parent()->id() == internal::kShellWindowId_DefaultContainer ||
- window->parent()->id() == internal::kShellWindowId_DockedContainer ||
- window->parent()->id() == internal::kShellWindowId_PanelContainer)) {
- window_resizer = internal::DockedWindowResizer::Create(
+ if (window_resizer) {
+ window_resizer = DockedWindowResizer::Create(
window_resizer, window, point_in_parent, window_component, source);
}
return make_scoped_ptr<WindowResizer>(window_resizer);
@@ -103,6 +98,10 @@ namespace internal {
namespace {
+// Distance in pixels that the cursor must move past an edge for a window
+// to move or resize beyond that edge.
+const int kStickyDistancePixels = 64;
+
// Snapping distance used instead of WorkspaceWindowResizer::kScreenEdgeInset
// when resizing a window using touchscreen.
const int kScreenEdgeInsetForTouchResize = 32;
@@ -117,7 +116,7 @@ bool ShouldStickToEdge(int distance_from_edge, int sticky_size) {
distance_from_edge > -sticky_size;
}
return distance_from_edge < sticky_size &&
- distance_from_edge > -sticky_size * 2;
+ distance_from_edge > -sticky_size * 2;
}
// Returns the coordinate along the secondary axis to snap to.
@@ -260,9 +259,6 @@ const int WorkspaceWindowResizer::kMinOnscreenHeight = 32;
// static
const int WorkspaceWindowResizer::kScreenEdgeInset = 8;
-// static
-const int WorkspaceWindowResizer::kStickyDistancePixels = 64;
-
// Represents the width or height of a window with constraints on its minimum
// and maximum size. 0 represents a lack of a constraint.
class WindowSize {
@@ -509,7 +505,7 @@ gfx::Rect WorkspaceWindowResizer::GetFinalBounds(
const gfx::Rect& bounds) const {
if (snap_phantom_window_controller_.get() &&
snap_phantom_window_controller_->IsShowing()) {
- return snap_phantom_window_controller_->bounds_in_screen();
+ return snap_phantom_window_controller_->bounds();
}
return bounds;
}
@@ -750,12 +746,8 @@ void WorkspaceWindowResizer::AdjustBoundsForMainWindow(
}
if (sticky_size > 0) {
- // Possibly stick to edge except when a mouse pointer is outside the
- // work area.
- if (!(display.work_area().Contains(last_mouse_location_in_screen) &&
- StickToWorkAreaOnMove(work_area, sticky_size, bounds))) {
+ if (!StickToWorkAreaOnMove(work_area, sticky_size, bounds))
MagneticallySnapToOtherWindows(bounds);
- }
}
} else if (sticky_size > 0) {
MagneticallySnapResizeToOtherWindows(bounds);
diff --git a/chromium/ash/wm/workspace/workspace_window_resizer.h b/chromium/ash/wm/workspace/workspace_window_resizer.h
index 76176b1a2b4..61f18969cbc 100644
--- a/chromium/ash/wm/workspace/workspace_window_resizer.h
+++ b/chromium/ash/wm/workspace/workspace_window_resizer.h
@@ -41,10 +41,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
// this close to an edge of the screen it snaps to the edge.
static const int kScreenEdgeInset;
- // Distance in pixels that the cursor must move past an edge for a window
- // to move or resize beyond that edge.
- static const int kStickyDistancePixels;
-
virtual ~WorkspaceWindowResizer();
static WorkspaceWindowResizer* Create(
@@ -69,7 +65,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
private:
FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, CancelSnapPhantom);
FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomSnapMaxSize);
- FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomWindowShow);
// Type of snapping.
enum SnapType {
diff --git a/chromium/ash/wm/workspace/workspace_window_resizer_unittest.cc b/chromium/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 8459c54ef5f..a00d0121429 100644
--- a/chromium/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/chromium/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -30,36 +30,6 @@
#include "ui/gfx/screen.h"
#include "ui/views/widget/widget.h"
-namespace ui {
-
-// Class to provide access to SlideAnimation internals for testing.
-class SlideAnimation::TestApi {
- public:
- explicit TestApi(SlideAnimation* animation) : animation_(animation) {}
-
- void SetStartTime(base::TimeTicks ticks) {
- animation_->SetStartTime(ticks);
- }
-
- void Step(base::TimeTicks ticks) {
- animation_->Step(ticks);
- }
-
- void RunTillComplete() {
- SetStartTime(base::TimeTicks());
- Step(base::TimeTicks() +
- base::TimeDelta::FromMilliseconds(animation_->GetSlideDuration()));
- EXPECT_EQ(1.0, animation_->GetCurrentValue());
- }
-
- private:
- SlideAnimation* animation_;
-
- DISALLOW_COPY_AND_ASSIGN(TestApi);
-};
-
-}
-
namespace ash {
namespace internal {
namespace {
@@ -200,12 +170,6 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
touch_resize_window_->set_hit_test_bounds_override_inner(mouse_insets);
}
- // Simulate running the animation.
- void RunAnimationTillComplete(ui::SlideAnimation* animation) {
- ui::SlideAnimation::TestApi test_api(animation);
- test_api.RunTillComplete();
- }
-
TestWindowDelegate delegate_;
TestWindowDelegate delegate2_;
TestWindowDelegate delegate3_;
@@ -878,12 +842,8 @@ TEST_F(WorkspaceWindowResizerTest, SnapToEdge) {
Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- // Click 50px to the right so that the mouse pointer does not leave the
- // workspace ensuring sticky behavior.
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
- window_.get(),
- window_->bounds().origin() + gfx::Vector2d(50, 0),
- HTCAPTION,
+ window_.get(), gfx::Point(), HTCAPTION,
aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
ASSERT_TRUE(resizer.get());
// Move to an x-coordinate of 15, which should not snap.
@@ -998,12 +958,8 @@ TEST_F(WorkspaceWindowResizerTestSticky, StickToEdge) {
Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- // Click 50px to the right so that the mouse pointer does not leave the
- // workspace ensuring sticky behavior.
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
- window_.get(),
- window_->bounds().origin() + gfx::Vector2d(50, 0),
- HTCAPTION,
+ window_.get(), gfx::Point(), HTCAPTION,
aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
ASSERT_TRUE(resizer.get());
// Move to an x-coordinate of 15, which should not stick.
@@ -1038,22 +994,6 @@ TEST_F(WorkspaceWindowResizerTestSticky, StickToEdge) {
// No need to test dragging < 0 as we force that to 0.
}
-// Verifies not sticking to edges when a mouse pointer is outside of work area.
-TEST_F(WorkspaceWindowResizerTestSticky, NoStickToEdgeWhenOutside) {
- Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
- SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
- window_->SetBounds(gfx::Rect(96, 112, 320, 160));
- scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
- window_.get(), gfx::Point(), HTCAPTION,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
- ASSERT_TRUE(resizer.get());
- // Move to an x-coordinate of 15, which should not stick.
- resizer->Drag(CalculateDragPoint(*resizer, 15 - 96, 0), 0);
- // Move to -15, should still stick to 0.
- resizer->Drag(CalculateDragPoint(*resizer, -15 - 96, 0), 0);
- EXPECT_EQ("-15,112 320x160", window_->bounds().ToString());
-}
-
// Verifies a resize sticks when dragging TOPLEFT.
TEST_F(WorkspaceWindowResizerTestSticky, StickToWorkArea_TOPLEFT) {
window_->SetBounds(gfx::Rect(100, 200, 20, 30));
@@ -1865,114 +1805,5 @@ TEST_F(WorkspaceWindowResizerTest, TouchResizeToEdge_BOTTOM) {
EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 100).ToString(),
touch_resize_window_->bounds().ToString());
}
-
-TEST_F(WorkspaceWindowResizerTest, PhantomWindowShow) {
- if (!SupportsMultipleDisplays())
- return;
-
- UpdateDisplay("500x400,500x400");
- window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
- Shell::GetScreen()->GetPrimaryDisplay());
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
- EXPECT_EQ(root_windows[0], window_->GetRootWindow());
-
- scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
- window_.get(), gfx::Point(), HTCAPTION,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE, empty_windows()));
- ASSERT_TRUE(resizer.get());
- EXPECT_FALSE(resizer->snap_phantom_window_controller_.get());
-
- // The pointer is on the edge but not shared. The snap phantom window
- // controller should be non-NULL.
- resizer->Drag(CalculateDragPoint(*resizer, 499, 0), 0);
- EXPECT_TRUE(resizer->snap_phantom_window_controller_.get());
- PhantomWindowController* phantom_controller(
- resizer->snap_phantom_window_controller_.get());
-
- // phantom widget only in the left screen.
- phantom_controller->Show(gfx::Rect(100, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_FALSE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[0],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
-
- // Move phantom widget into the right screen. Test that 2 widgets got created.
- phantom_controller->Show(gfx::Rect(600, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_TRUE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[1],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(
- root_windows[0],
- phantom_controller->phantom_widget_start_->GetNativeWindow()->
- GetRootWindow());
- RunAnimationTillComplete(phantom_controller->animation_.get());
-
- // Move phantom widget only in the right screen. Start widget should close.
- phantom_controller->Show(gfx::Rect(700, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_FALSE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[1],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
- RunAnimationTillComplete(phantom_controller->animation_.get());
-
- // Move phantom widget into the left screen. Start widget should open.
- phantom_controller->Show(gfx::Rect(100, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_TRUE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[0],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(
- root_windows[1],
- phantom_controller->phantom_widget_start_->GetNativeWindow()->
- GetRootWindow());
- RunAnimationTillComplete(phantom_controller->animation_.get());
-
- // Move phantom widget while in the left screen. Start widget should close.
- phantom_controller->Show(gfx::Rect(200, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_FALSE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[0],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
- RunAnimationTillComplete(phantom_controller->animation_.get());
-
- // Move phantom widget spanning both screens with most of the window in the
- // right screen. Two widgets are created.
- phantom_controller->Show(gfx::Rect(495, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_TRUE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[1],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(
- root_windows[0],
- phantom_controller->phantom_widget_start_->GetNativeWindow()->
- GetRootWindow());
- RunAnimationTillComplete(phantom_controller->animation_.get());
-
- // Move phantom widget back into the left screen. Phantom widgets should swap.
- phantom_controller->Show(gfx::Rect(200, 100, 50, 60));
- EXPECT_TRUE(phantom_controller->phantom_widget_);
- EXPECT_TRUE(phantom_controller->phantom_widget_start_);
- EXPECT_EQ(
- root_windows[0],
- phantom_controller->phantom_widget_->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(
- root_windows[1],
- phantom_controller->phantom_widget_start_->GetNativeWindow()->
- GetRootWindow());
- RunAnimationTillComplete(phantom_controller->animation_.get());
-
- // Hide phantom controller. Both widgets should close.
- phantom_controller->Hide();
- EXPECT_FALSE(phantom_controller->phantom_widget_);
- EXPECT_FALSE(phantom_controller->phantom_widget_start_);
-}
-
} // namespace internal
} // namespace ash
diff --git a/chromium/ash/wm/workspace_controller.cc b/chromium/ash/wm/workspace_controller.cc
index 7fbbda2f7af..e2ee3f5c222 100644
--- a/chromium/ash/wm/workspace_controller.cc
+++ b/chromium/ash/wm/workspace_controller.cc
@@ -39,6 +39,8 @@ WorkspaceController::WorkspaceController(aura::Window* viewport)
event_handler_(new WorkspaceEventHandler(viewport_)) {
SetWindowVisibilityAnimationTransition(
viewport_, views::corewm::ANIMATE_NONE);
+ // Do this so when animating out windows don't extend beyond the bounds.
+ viewport_->layer()->SetMasksToBounds(true);
// The layout-manager cannot be created in the initializer list since it
// depends on the window to have been initialized.
diff --git a/chromium/ash/wm/workspace_controller_unittest.cc b/chromium/ash/wm/workspace_controller_unittest.cc
index 7dca75a08ba..f6a4ffb0ef2 100644
--- a/chromium/ash/wm/workspace_controller_unittest.cc
+++ b/chromium/ash/wm/workspace_controller_unittest.cc
@@ -1118,16 +1118,8 @@ class DragMaximizedNonTrackedWindowObserver
}
// aura::WindowObserver overrides:
- // Counts number of times a window is reparented. Ignores reparenting into and
- // from a docked container which is expected when a tab is dragged.
virtual void OnWindowHierarchyChanged(
const HierarchyChangeParams& params) OVERRIDE {
- if ((params.old_parent->id() == kShellWindowId_DefaultContainer &&
- params.new_parent->id() == kShellWindowId_DockedContainer) ||
- (params.old_parent->id() == kShellWindowId_DockedContainer &&
- params.new_parent->id() == kShellWindowId_DefaultContainer)) {
- return;
- }
change_count_++;
}