am 8cd8b0b7: Merge change 25969 into eclair

Merge commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d' into eclair-plus-aosp

* commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d':
  Fix power widget dimensions.

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 908c955..152c636 100644 (file)
--- 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 6cdbc33..32dffb0 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1312,7 +1312,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