Merge change 4417 into donut
* changes:
Make name of Subscribed Feeds provider localizable.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f3c8ee9..aa768b1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,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" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76ef06e..a606565 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,6 +18,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Title of the feed synchronization activity. -->
+ <string name="app_label">Sync Feeds</string>
<!-- Sync settings -->
<!-- Main Settings screen setting option name to go into the screen for data sync settings-->
<string name="sync_settings">Data synchronization</string>