am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b9945c5..6feb98f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -160,8 +160,8 @@
</intent-filter>
</activity>
- <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time">
- android:screenOrientation="portrait"
+ <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"
+ android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b49d1d..a32a3ee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1389,7 +1389,7 @@
<!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites. -->
<string name="install_applications">Unknown sources</string>
<!-- Applications settings screen, setting check box summary. This is the summary for "Unknown sources" checkbox -->
- <string name="install_unknown_applications">Allow install of non-Market applications</string>
+ <string name="install_unknown_applications">Allow installation of non-Market applications</string>
<!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
<string name="install_all_warning">Your phone and personal data are more vulnerable to attack by applications
from unknown sources. You agree that you are solely responsible for any