merge from open-source master
This commit is contained in:
@@ -159,8 +159,8 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time">
|
<activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"
|
||||||
android:screenOrientation="portrait"
|
android:screenOrientation="portrait">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
@@ -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. -->
|
<!-- 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>
|
<string name="install_applications">Unknown sources</string>
|
||||||
<!-- Applications settings screen, setting check box summary. This is the summary for "Unknown sources" checkbox -->
|
<!-- 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 -->
|
<!-- 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
|
<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
|
from unknown sources. You agree that you are solely responsible for any
|
||||||
|
Reference in New Issue
Block a user