commit 340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74
author Eric Fischer <enf@google.com> Fri Oct 01 11:45:47 2010 -0700
committer Eric Fischer <enf@google.com> Fri Oct 01 11:45:47 2010 -0700
tree 66a02278979df60104456310960a5269031c21d3
parent 95d7a702c3a36ffe79da099b717dc76d62a5bab2

Separate the Settings activity name into two different strings.

The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.

Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1094cf4..34be57e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -48,7 +48,8 @@
 
         <!-- Settings -->
 
-        <activity android:name="Settings" android:label="@string/settings_label"
+        <activity android:name="Settings"
+                android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings"
                 android:clearTaskOnLaunch="true"
                 android:launchMode="singleTop">