Skip to content

Commit

Permalink
Move ash chromeos specific strings to ash_chromeos_strings
Browse files Browse the repository at this point in the history
BUG=none

Review URL: https://codereview.chromium.org/12463022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186780 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
stevenjb@chromium.org committed Mar 7, 2013
1 parent 9bcdc20 commit f1065b5
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 105 deletions.
2 changes: 2 additions & 0 deletions ash/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ derat@chromium.org
jamescook@chromium.org
sky@chromium.org

per-file ash_strings.grd=*
per-file ash_chromeos_strings.grd=*
per-file root_window_controller.*=oshima@chromium.org
per-file screen_ash.*=oshima@chromium.org
per-file extended_desktop_unittest.*=oshima@chromium.org
113 changes: 113 additions & 0 deletions ash/ash_chromeos_strings.grdp
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- ChromeOS-specific strings (included from ash_strings.grd).
Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->
<grit-part>

<!-- Status Tray Network strings -->
<message name="IDS_ASH_STATUS_TRAY_NETWORK" desc="The label used in the network dialog header.">
Network
</message>
<message name="IDS_ASH_STATUS_TRAY_VPN" desc="The label used in the VPN detailed view header.">
Private Network
</message>
<message name="IDS_ASH_STATUS_TRAY_ETHERNET" desc="The ethernet network device.">
Ethernet
</message>
<message name="IDS_ASH_STATUS_TRAY_WIFI" desc="The wifi network device.">
Wi-Fi
</message>
<message name="IDS_ASH_STATUS_TRAY_CELLULAR" desc="The accessible text for the cellular button.">
Cellular
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_INFO" desc="The accessible text for the network info button.">
Network Info
</message>
<message name="IDS_ASH_STATUS_TRAY_IP" desc="The label for the IP address of the network:">
IP Address
</message>
<message name="IDS_ASH_STATUS_TRAY_NO_NETWORKS" desc="The message to display in the network info bubble when it is otherwise empty.">
No network information available
</message>
<message name="IDS_ASH_STATUS_TRAY_NO_CELLULAR_NETWORKS" desc="The message to display in the network list when no cellular networks are available.">
No cellular network available
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED" desc="Description in status area or network dropdown when no network is connected.">
No network
</message>
<message name="IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED" desc="The label used in system tray bubble to display vpn is disconnected.">
VPN disconnected
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED" desc="Message for the network tray tooltip and default menu text when connected to a network.">
Connected to <ph name="NAME">$1<ex>GoogleGuest</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING" desc="Message for the network tray tooltip and default menu text when connecting to a network.">
Connecting to <ph name="NAME">$1<ex>GoogleGuest</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_ACTIVATING" desc="Message for the network tray tooltip and default menu text when activating a network.">
Activating <ph name="NAME">$1<ex>YBH Cellular</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_CONNECTING" desc="Message for the network list when connecting to a network.">
<ph name="NAME">$1<ex>GoogleGuest</ex></ph>: Connecting...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATING" desc="Message for the network list when activating a network.">
<ph name="NAME">$1<ex>YBH Cellular</ex></ph>: Activating...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATE" desc="Message for the network list to activate the network.">
Activate <ph name="NETWORKSERVICE">$1<ex>YBH Cellular</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_SETTINGS" desc="The label used in the settings entry in the network dialog.">
Settings...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_PROXY_SETTINGS" desc="The label used in the proxy settings entry in the network dialog in the login screen.">
Proxy...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED" desc="The label used in the tray popup to notify that Wi-Fi is turned on.">
Wi-Fi is turned on.
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED" desc="The label used in the tray popup to notify that Wi-Fi is turned off.">
Wi-Fi is turned off.
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_NO_VPN" desc="The label used in the tray popup to notify no vpn is configured.">
VPN is not configured.
</message>
<message name="IDS_ASH_STATUS_TRAY_ENABLE_WIFI" desc="The label used for the item to enable wifi.">
Enable Wi-Fi
</message>
<message name="IDS_ASH_STATUS_TRAY_DISABLE_WIFI" desc="The label used for the item to disable wifi.">
Disable Wi-Fi
</message>
<message name="IDS_ASH_STATUS_TRAY_OTHER_WIFI" desc="The label used for the item to display other Wi-Fi networks.">
Join other...
</message>
<message name="IDS_ASH_STATUS_TRAY_OTHER_VPN" desc="The label used for the item to configure other private networks.">
Join other...
</message>
<message name="IDS_ASH_STATUS_TRAY_TURN_ON_WIFI" desc="The label used for the item to turn on Wi-Fi networks.">
Turn Wi-Fi on...
</message>
<message name="IDS_ASH_STATUS_TRAY_ENABLE_MOBILE" desc="The label used for the item to enable cellular networks.">
Enable mobile data
</message>
<message name="IDS_ASH_STATUS_TRAY_DISABLE_MOBILE" desc="The label used for the item to disable cellular networks.">
Disable mobile data
</message>
<message name="IDS_ASH_STATUS_TRAY_SETUP_MOBILE" desc="The label used for the item to setup cellular network when no SIM card in installed.">
Setup mobile data
</message>
<message name="IDS_ASH_STATUS_TRAY_OTHER_MOBILE" desc="The label used for the item to display other cellular networks.">
Mobile ...
</message>
<message name="IDS_ASH_STATUS_TRAY_MOBILE_VIEW_ACCOUNT" desc="In the network popup bubble, the text of the top-up URL link.">
View mobile account
</message>
<message name="IDS_ASH_STATUS_TRAY_WIFI_SCANNING_MESSAGE" desc="Scanning for wifi networks">
Searching for Wi-Fi networks...
</message>
<message name="IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR" desc="Message for the status area when initializing the cellular device.">
Initializing cellular modem...
</message>
<message name="IDS_ASH_STATUS_TRAY_CELLULAR_SCANNING" desc="Message when scanning for cellular networks">
Searching for cellular networks...
</message>

</grit-part>
111 changes: 6 additions & 105 deletions ash/ash_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -245,111 +245,6 @@ Press Ctrl+Alt+Z to disable.
<message name="IDS_ASH_STATUS_TRAY_LOCK" desc="The label used for the button in the status tray to lock the screen.">
Lock
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK" desc="The label used in the network dialog header.">
Network
</message>
<message name="IDS_ASH_STATUS_TRAY_VPN" desc="The label used in the VPN detailed view header.">
Private Network
</message>
<message name="IDS_ASH_STATUS_TRAY_ETHERNET" desc="The ethernet network device.">
Ethernet
</message>
<message name="IDS_ASH_STATUS_TRAY_WIFI" desc="The wifi network device.">
Wi-Fi
</message>
<message name="IDS_ASH_STATUS_TRAY_CELLULAR" desc="The accessible text for the cellular button.">
Cellular
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_INFO" desc="The accessible text for the network info button.">
Network Info
</message>
<message name="IDS_ASH_STATUS_TRAY_IP" desc="The label for the IP address of the network:">
IP Address
</message>
<message name="IDS_ASH_STATUS_TRAY_NO_NETWORKS" desc="The message to display in the network info bubble when it is otherwise empty.">
No network information available
</message>
<message name="IDS_ASH_STATUS_TRAY_NO_CELLULAR_NETWORKS" desc="The message to display in the network list when no cellular networks are available.">
No cellular network available
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED" desc="Description in status area or network dropdown when no network is connected.">
No network
</message>
<message name="IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED" desc="The label used in system tray bubble to display vpn is disconnected.">
VPN disconnected
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED" desc="Message for the network tray tooltip and default menu text when connected to a network.">
Connected to <ph name="NAME">$1<ex>GoogleGuest</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING" desc="Message for the network tray tooltip and default menu text when connecting to a network.">
Connecting to <ph name="NAME">$1<ex>GoogleGuest</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_ACTIVATING" desc="Message for the network tray tooltip and default menu text when activating a network.">
Activating <ph name="NAME">$1<ex>YBH Cellular</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_CONNECTING" desc="Message for the network list when connecting to a network.">
<ph name="NAME">$1<ex>GoogleGuest</ex></ph>: Connecting...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATING" desc="Message for the network list when activating a network.">
<ph name="NAME">$1<ex>YBH Cellular</ex></ph>: Activating...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATE" desc="Message for the network list to activate the network.">
Activate <ph name="NETWORKSERVICE">$1<ex>YBH Cellular</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_SETTINGS" desc="The label used in the settings entry in the network dialog.">
Settings...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_PROXY_SETTINGS" desc="The label used in the proxy settings entry in the network dialog in the login screen.">
Proxy...
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED" desc="The label used in the tray popup to notify that Wi-Fi is turned on.">
Wi-Fi is turned on.
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED" desc="The label used in the tray popup to notify that Wi-Fi is turned off.">
Wi-Fi is turned off.
</message>
<message name="IDS_ASH_STATUS_TRAY_NETWORK_NO_VPN" desc="The label used in the tray popup to notify no vpn is configured.">
VPN is not configured.
</message>
<message name="IDS_ASH_STATUS_TRAY_ENABLE_WIFI" desc="The label used for the item to enable wifi.">
Enable Wi-Fi
</message>
<message name="IDS_ASH_STATUS_TRAY_DISABLE_WIFI" desc="The label used for the item to disable wifi.">
Disable Wi-Fi
</message>
<message name="IDS_ASH_STATUS_TRAY_OTHER_WIFI" desc="The label used for the item to display other Wi-Fi networks.">
Join other...
</message>
<message name="IDS_ASH_STATUS_TRAY_OTHER_VPN" desc="The label used for the item to configure other private networks.">
Join other...
</message>
<message name="IDS_ASH_STATUS_TRAY_TURN_ON_WIFI" desc="The label used for the item to turn on Wi-Fi networks.">
Turn Wi-Fi on...
</message>
<message name="IDS_ASH_STATUS_TRAY_ENABLE_MOBILE" desc="The label used for the item to enable cellular networks.">
Enable mobile data
</message>
<message name="IDS_ASH_STATUS_TRAY_DISABLE_MOBILE" desc="The label used for the item to disable cellular networks.">
Disable mobile data
</message>
<message name="IDS_ASH_STATUS_TRAY_SETUP_MOBILE" desc="The label used for the item to setup cellular network when no SIM card in installed.">
Setup mobile data
</message>
<message name="IDS_ASH_STATUS_TRAY_OTHER_MOBILE" desc="The label used for the item to display other cellular networks.">
Mobile ...
</message>
<message name="IDS_ASH_STATUS_TRAY_MOBILE_VIEW_ACCOUNT" desc="In the network popup bubble, the text of the top-up URL link.">
View mobile account
</message>
<message name="IDS_ASH_STATUS_TRAY_WIFI_SCANNING_MESSAGE" desc="Scanning for wifi networks">
Searching for Wi-Fi networks...
</message>
<message name="IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR" desc="Message for the status area when initializing the cellular device.">
Initializing cellular modem...
</message>
<message name="IDS_ASH_STATUS_TRAY_CELLULAR_SCANNING" desc="Message when scanning for cellular networks">
Searching for cellular networks...
</message>
<message name="IDS_ASH_STATUS_TRAY_SMS" desc="The label used in the status tray for SMS.">
SMS
</message>
Expand Down Expand Up @@ -586,6 +481,12 @@ Press Shift + Alt to switch.
<message name="IDS_ASH_INTERNAL_DISPLAY_NAME" desc="The name of the internal display which is shown in the display settings.">
Internal Display
</message>

<!-- ChromeOS-specific strings -->
<if expr="pp_ifdef('chromeos')">
<part file="ash_chromeos_strings.grdp" />
</if>

</messages>
</release>
</grit>
Expand Down

0 comments on commit f1065b5

Please sign in to comment.