Skip to content

GitLab

T
tangled
Commit 7d3e9431 authored by Nnamdi Theodore Johnson-Kanu's avatar Nnamdi Theodore Johnson-Kanu Committed by Commit Bot
Browse files
Options

[CrOS Settings] Move OS Date/Time strings from settings strings 

This CL moves chromeOS strings for settings Date/Time page from
settings_strings.grdp to os_settings_strings.grdp. It continues
the process of moving all chromeOS specific strings.

Bug: 967883
Change-Id: Ie0f1edeea54b8399f205ca2facc0b8b2c2f5d55e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2069968
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746642}
parent b43b84d3
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 46 deletions
chrome/app/os_settings_strings.grdp
View file @ 7d3e9431
......@@ -2254,5 +2254,49 @@
<message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_FINGER_IMMOBILE" desc="Warning text in the add fingerprint dialog to tell users they should move their finger slightly to capture different parts of the fingerprint.">
Move slightly to capture a different part of the fingerprint.
</message>
<!-- Date/Time (OS settings) -->
<message name="IDS_SETTINGS_DATE_TIME" desc="Name of the settings page which displays date and time preferences.">
Date and time
</message>
<message name="IDS_SETTINGS_TIME_ZONE_BUTTON" desc="Label for the button that opens time zone settings page.">
Time zone
</message>
<message name="IDS_SETTINGS_TIME_ZONE_SUBPAGE_TITLE" desc="The title of the dialog that allows user to control different time zone settings.">
Time zone
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_SET_AUTOMATICALLY" desc="The name for the radio button that turns automatic time zone detection on.">
Set automatically
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_CHOOSE_FROM_LIST" desc="The name for the radio button that turns automatic time zone detection off, and allows user to select time zone from the list of all supported time zones.">
Choose from list
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_DISABLED" desc="Display name for the automatic time zone detection mode which disables automatic detection.">
Automatic time zone detection is disabled
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_IP_ONLY_DEFAULT" desc="Display name for the automatic time zone detection mode which enables time zone detection sending unprecise location to Google servers. Default means that this is the default time zone detection mode.">
Use your IP address to determine location (default)
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_WIFI_AP" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi Access Point names to Google servers.">
Use only Wi-Fi to determine location
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_ALL_INFO" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi and Cellular Access Point names to Google servers.">
Use Wi-Fi or mobile networks to determine location
</message>
<message name="IDS_SETTINGS_TIME_ZONE" desc="Label for the picker which allows users to choose their time zone.">
Time zone
</message>
<message name="IDS_SETTINGS_TIME_ZONE_GEOLOCATION" desc="Label for the checkbox which enables setting the time zone automatically with the detected location of the device.">
Set time zone automatically using your location
</message>
<message name="IDS_SETTINGS_SELECT_TIME_ZONE_RESOLVE_METHOD" desc="Label for the drop-down menu that allows user to select specific method to automatically resolve device time zone.">
Time zone detection method
</message>
<message name="IDS_SETTINGS_USE_24_HOUR_CLOCK" desc="Label for the checkbox which enables a 24-hour clock (as opposed to a 12-hour clock).">
Use 24-hour clock
</message>
<message name="IDS_SETTINGS_SET_DATE_TIME" desc="Label for the button that shows the dialog for setting the system date and time.">
Set date and time
</message>
</if>
</grit-part>
\ No newline at end of file
chrome/app/settings_strings.grdp
View file @ 7d3e9431
......@@ -799,52 +799,6 @@
</message>
</if>
<!-- Date/Time Page -->
<if expr="chromeos">
<message name="IDS_SETTINGS_DATE_TIME" desc="Name of the settings page which displays date and time preferences.">
Date and time
</message>
<message name="IDS_SETTINGS_TIME_ZONE_BUTTON" desc="Label for the button that opens time zone settings page.">
Time zone
</message>
<message name="IDS_SETTINGS_TIME_ZONE_SUBPAGE_TITLE" desc="The title of the dialog that allows user to control different time zone settings.">
Time zone
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_SET_AUTOMATICALLY" desc="The name for the radio button that turns automatic time zone detection on.">
Set automatically
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_CHOOSE_FROM_LIST" desc="The name for the radio button that turns automatic time zone detection off, and allows user to select time zone from the list of all supported time zones.">
Choose from list
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_DISABLED" desc="Display name for the automatic time zone detection mode which disables automatic detection.">
Automatic time zone detection is disabled
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_IP_ONLY_DEFAULT" desc="Display name for the automatic time zone detection mode which enables time zone detection sending unprecise location to Google servers. Default means that this is the default time zone detection mode.">
Use your IP address to determine location (default)
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_WIFI_AP" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi Access Point names to Google servers.">
Use only Wi-Fi to determine location
</message>
<message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_ALL_INFO" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi and Cellular Access Point names to Google servers.">
Use Wi-Fi or mobile networks to determine location
</message>
<message name="IDS_SETTINGS_TIME_ZONE" desc="Label for the picker which allows users to choose their time zone.">
Time zone
</message>
<message name="IDS_SETTINGS_TIME_ZONE_GEOLOCATION" desc="Label for the checkbox which enables setting the time zone automatically with the detected location of the device.">
Set time zone automatically using your location
</message>
<message name="IDS_SETTINGS_SELECT_TIME_ZONE_RESOLVE_METHOD" desc="Label for the drop-down menu that allows user to select specific method to automatically resolve device time zone.">
Time zone detection method
</message>
<message name="IDS_SETTINGS_USE_24_HOUR_CLOCK" desc="Label for the checkbox which enables a 24-hour clock (as opposed to a 12-hour clock).">
Use 24-hour clock
</message>
<message name="IDS_SETTINGS_SET_DATE_TIME" desc="Label for the button that shows the dialog for setting the system date and time.">
Set date and time
</message>
</if>
<!-- Easy Unlock Page -->
<if expr="chromeos">
<message name="IDS_SETTINGS_EASY_UNLOCK_SETUP" desc="The label of the button to set up Easy Unlock section on the settings page.">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment