OSDN Git Service

am 69c51fea: New icons
authorMike Cleron <mcleron@google.com>
Tue, 29 Sep 2009 07:51:39 +0000 (00:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Sep 2009 07:51:39 +0000 (00:51 -0700)
Merge commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6' into eclair-plus-aosp

* commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6':
  New icons

AndroidManifest.xml
res/values/strings.xml

index 0af6866..aa0f8f6 100644 (file)
             </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>
index feeb3f0..6713ded 100644 (file)
     <!-- 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