diff options
| author | Eric Fischer <enf@google.com> | 2009-06-17 15:17:29 -0700 |
|---|---|---|
| committer | Eric Fischer <enf@google.com> | 2009-06-17 15:17:29 -0700 |
| commit | f204ab3ebc089373c44b6977f0db4b82891f128d (patch) | |
| tree | 33956c1c749ff9abdd861224eac7cc68aed8c65c /packages/VpnServices | |
| parent | 0781df943e5a7a72ac82394874b6200d14ddd02c (diff) | |
| download | frameworks_base-f204ab3ebc089373c44b6977f0db4b82891f128d.zip frameworks_base-f204ab3ebc089373c44b6977f0db4b82891f128d.tar.gz frameworks_base-f204ab3ebc089373c44b6977f0db4b82891f128d.tar.bz2 | |
Squashed commit of the following:
commit 8e1a200225b7e4756b83d17d679a71a06a38b696
Author: Eric Fischer <enf@google.com>
Date: Tue Jun 16 16:32:56 2009 -0700
Make names of Settings, VPN, Subscribed Feeds providers localizable.
Diffstat (limited to 'packages/VpnServices')
| -rw-r--r-- | packages/VpnServices/AndroidManifest.xml | 2 | ||||
| -rwxr-xr-x | packages/VpnServices/res/values/strings.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/VpnServices/AndroidManifest.xml b/packages/VpnServices/AndroidManifest.xml index e48b2da..6092e30 100644 --- a/packages/VpnServices/AndroidManifest.xml +++ b/packages/VpnServices/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.android.server.vpn" android:sharedUserId="android.uid.system" > - <application android:label="VPN Services"> + <application android:label="@string/app_label"> <service android:name=".VpnServiceBinder" android:process=":remote"> <intent-filter> diff --git a/packages/VpnServices/res/values/strings.xml b/packages/VpnServices/res/values/strings.xml index 892850a..e42c1e8 100755 --- a/packages/VpnServices/res/values/strings.xml +++ b/packages/VpnServices/res/values/strings.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <!-- Title for the VPN Services activity. --> + <string name="app_label">VPN Services</string> + <string name="vpn_notification_title">%s VPN %s</string> <string name="vpn_notification_connected">connected</string> <string name="vpn_notification_disconnected">disconnected</string> |