merge from open-source master

This commit is contained in:
Jean-Baptiste Queru
2009-09-01 08:28:18 -07:00
2 changed files with 3 additions and 3 deletions

View File

@@ -159,8 +159,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>

View File

@@ -1305,7 +1305,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