OSDN Git Service

Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev
authorDaniel Nishi <dhnishi@google.com>
Thu, 30 Jun 2016 21:17:17 +0000 (21:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jun 2016 21:17:19 +0000 (21:17 +0000)
1  2 
res/values/strings.xml

diff --combined res/values/strings.xml
      <string name="help_url_remote_display" translatable="false"></string>
      <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
      <string name="help_url_fingerprint" translatable="false"></string>
 +    <!-- Help URL, Gesture settings -->
 +    <string name="help_url_gestures" translatable="false"></string>
  
      <!-- User account title [CHAR LIMIT=30] -->
      <string name="user_account_title">Account for content</string>
      <string name="support_escalation_24_7_title">We\'re here for you 24/7</string>
  
      <!-- Summary text for connecting to customer support [CHAR LIMIT=NONE]-->
 -    <string name="support_escalation_summary">Our support team is here to address any issues</string>
 +    <string name="support_escalation_summary">Our support team is here to help address any issues</string>
  
      <!-- Summary text for connecting to 24/7 customer support [CHAR LIMIT=NONE]-->
      <string name="support_escalation_24_7_summary">Our support team is available all day, every day</string>
  
      <!-- Summary text when customer support is closed. [CHAR LIMIT=NONE]-->
 -    <string name="support_escalation_closed_summary">Call us during support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string>
 +    <string name="support_escalation_closed_summary">Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string>
  
 -    <!-- Summary text when customer support is unavailble in the region. [CHAR LIMIT=NONE]-->
 +    <!-- Summary text when customer support is unavailable in the region. [CHAR LIMIT=NONE]-->
      <string name="support_escalation_unavailable_summary">Search help or explore tips &amp; tricks</string>
  
      <!-- Template for formatting support hours eg Mon - Fri, 8:00 AM - 19:30 PM. [CHAR LIMIT=NONE]-->
      <string name="support_escalation_by_chat">Chat</string>
  
      <!-- Button label for visiting the tips & tricks site [CHAR LIMIT=60]-->
 -    <string name="support_tips_and_tricks_title">Tips &amp; tricks</string>
 +    <string name="support_tips_and_tricks_title">Explore tips &amp; tricks</string>
 +
 +    <!-- Button label for visiting help and/or send feedback [CHAR LIMIT=60]-->
 +    <string name="support_help_feedback_title">Search help &amp; send feedback</string>
  
      <!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]-->
      <string name="support_sign_in_required_title">Sign in for support</string>
      <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string>
      <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
      <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string>
+     <string name="automatic_storage_manager_freed_bytes"><xliff:g id="size" example="3.25MB">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
  </resources>