am cfcad4e4: am d3abea0d: Fix a few more cases of USB storage missed at 4am pass...

Merge commit 'cfcad4e45f422606b5ce5e09a6e53ba58e790f63'

* commit 'cfcad4e45f422606b5ce5e09a6e53ba58e790f63':
  Fix a few more cases of USB storage missed at 4am pass...
This commit is contained in:
Roy West
2010-10-16 08:59:43 -07:00
committed by Android Git Automerger

View File

@@ -1894,7 +1894,7 @@
<string name="filter_apps_running">Running</string> <string name="filter_apps_running">Running</string>
<!-- Text for filter option in ManageApps screen to display list of <!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. [CHAR LIMIT=30] --> packages installed on sdcard. [CHAR LIMIT=30] -->
<string name="filter_apps_onsdcard" product="nosdcard">In shared storage</string> <string name="filter_apps_onsdcard" product="nosdcard">USB</string>
<!-- Text for filter option in ManageApps screen to display list of <!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. --> packages installed on sdcard. -->
<string name="filter_apps_onsdcard" product="default">On SD card</string> <string name="filter_apps_onsdcard" product="default">On SD card</string>
@@ -1940,7 +1940,7 @@ found in the list of installed applications.</string>
<!-- Manage applications, text for Move button to move app to internal storage --> <!-- Manage applications, text for Move button to move app to internal storage -->
<string name="move_app_to_internal">Move to phone</string> <string name="move_app_to_internal">Move to phone</string>
<!-- Manage applications, text for Move button to move app to sdcard [CHAR LIMIT=25] --> <!-- Manage applications, text for Move button to move app to sdcard [CHAR LIMIT=25] -->
<string name="move_app_to_sdcard" product="nosdcard">Move to shared storage</string> <string name="move_app_to_sdcard" product="nosdcard">Move to USB storage</string>
<!-- Manage applications, text for Move button to move app to sdcard --> <!-- Manage applications, text for Move button to move app to sdcard -->
<string name="move_app_to_sdcard" product="default">Move to SD card</string> <string name="move_app_to_sdcard" product="default">Move to SD card</string>
<!-- Manage applications, title for dialog when killing persistent apps--> <!-- Manage applications, title for dialog when killing persistent apps-->
@@ -2652,11 +2652,11 @@ found in the list of installed applications.</string>
<!-- Description of dialog to enable/dislable access to credential storage --> <!-- Description of dialog to enable/dislable access to credential storage -->
<string name="credentials_unlock_hint">Enter the credential storage password.</string> <string name="credentials_unlock_hint">Enter the credential storage password.</string>
<!-- Title of preference to install certificates from SD card [CHAR LIMIT=25] --> <!-- Title of preference to install certificates from SD card [CHAR LIMIT=25] -->
<string name="credentials_install_certificates" product="nosdcard">Install from shared storage</string> <string name="credentials_install_certificates" product="nosdcard">Install from USB storage</string>
<!-- Title of preference to install certificates from SD card --> <!-- Title of preference to install certificates from SD card -->
<string name="credentials_install_certificates" product="default">Install from SD card</string> <string name="credentials_install_certificates" product="default">Install from SD card</string>
<!-- Summary of preference to install certificates from SD card [CHAR LIMIT=25] --> <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=25] -->
<string name="credentials_install_certificates_summary" product="nosdcard">Install encrypted certificates from shared storage</string> <string name="credentials_install_certificates_summary" product="nosdcard">Install encrypted certificates from USB storage</string>
<!-- Summary of preference to install certificates from SD card --> <!-- Summary of preference to install certificates from SD card -->
<string name="credentials_install_certificates_summary" product="default">Install encrypted certificates from SD card</string> <string name="credentials_install_certificates_summary" product="default">Install encrypted certificates from SD card</string>
<!-- Title of preference to set storage password --> <!-- Title of preference to set storage password -->