Merge "display amount of storage on /sdcard by downloads, music etc"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b481ffe..49d939c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2429,9 +2429,9 @@
<!-- Summary for on-screen keyboard settings -->
<string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string>
<!-- Title for built-in keyboard settings -->
- <string name="builtin_keyboard_settings_title">Built-in keyboard</string>
+ <string name="builtin_keyboard_settings_title">Physical keyboard</string>
<!-- Summary for built-in keyboard settings -->
- <string name="builtin_keyboard_settings_summary">Built-in, physical keyboard settings</string>
+ <string name="builtin_keyboard_settings_summary">Physical keyboard settings</string>
<!-- Development Settings. the title for the item to take the user to Development settings. Development settings are settings meant for application developers. -->
<string name="development_settings_title">Development</string>
@@ -2956,11 +2956,11 @@
<!-- Summary of preference to enable/dislable access to credential storage [CHAR LIMIT=NONE] -->
<string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string>
<!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
- <string name="credentials_install" product="nosdcard">Install from USB storage</string>
+ <string name="credentials_install" product="nosdcard">Install from storage</string>
<!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
<string name="credentials_install" product="default">Install from SD card</string>
<!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
- <string name="credentials_install_summary" product="nosdcard">Install certificates from USB storage</string>
+ <string name="credentials_install_summary" product="nosdcard">Install certificates from storage</string>
<!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
<string name="credentials_install_summary" product="default">Install certificates from SD card</string>
<!-- Title of preference to set the password for credential storage [CHAR LIMIT=30] -->