Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f204ab3e authored by Eric Fischer's avatar Eric Fischer
Browse files

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.
parent 0781df94

packages/SettingsProvider/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
        android:sharedUserId="android.uid.system">



    <application android:allowClearUserData="false"

                 android:label="Settings Storage"

                 android:label="@string/app_label"

                 android:icon="@drawable/ic_launcher_settings">



        <provider android:name="SettingsProvider" android:authorities="settings"

packages/SettingsProvider/res/values/strings.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/**

 * Copyright (c) 2007, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); 

 * you may not use this file except in compliance with the License. 

 * You may obtain a copy of the License at 

 *

 *     http://www.apache.org/licenses/LICENSE-2.0 

 *

 * Unless required by applicable law or agreed to in writing, software 

 * distributed under the License is distributed on an "AS IS" BASIS, 

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

 * See the License for the specific language governing permissions and 

 * limitations under the License.

 */

-->

<resources>

    <!-- Name of the activity for Settings storage. -->

    <string name="app_label">Settings Storage</string>

</resources>

packages/SubscribedFeedsProvider/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    <application android:process="system"

                 android:allowClearUserData="false"

                 android:icon="@drawable/app_icon"

                 android:label="Sync Feeds">

                 android:label="@string/app_label">

        <uses-library android:name="com.google.android.gtalkservice" />

        <provider android:name="SubscribedFeedsProvider"

                android:authorities="subscribedfeeds" android:syncable="false"

packages/SubscribedFeedsProvider/res/values/strings.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

    <!-- Title of the feed synchronization activity. -->

    <string name="app_label">Sync Feeds</string>

</resources>

packages/VpnServices/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>