OSDN Git Service

Merge "Increased char limit for translations" into qt-dev
authorJoshua Mccloskey <joshmccloskey@google.com>
Tue, 14 May 2019 19:13:11 +0000 (19:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 May 2019 19:13:11 +0000 (19:13 +0000)
1  2 
res/values/strings.xml

diff --combined res/values/strings.xml
      <string name="security_settings_face_preference_title">Face authentication</string>
      <!-- Introduction title shown in face enrollment education screen [CHAR LIMIT=40] -->
      <string name="security_settings_face_enroll_education_title">How to set up Face unlock</string>
-     <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->
+     <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->
      <string name="security_settings_face_enroll_education_title_unlock_disabled">Use your face to authenticate</string>
      <!-- Introduction detail message shown in face education [CHAR LIMIT=NONE] -->
      <string name="security_settings_face_enroll_education_message"></string>
 +    <!-- Button that takes the user to the enrollment activity [CHAR LIMIT=20] -->
 +    <string name="security_settings_face_enroll_education_start">Start</string>
      <!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->
      <string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>
      <!-- Additional details shown when the accessibility toggle is expanded. [CHAR LIMIT=NONE]-->
      <string name="security_settings_face_enroll_introduction_cancel">Cancel</string>
      <!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->
      <string name="security_settings_face_enroll_introduction_title">Unlock with your face</string>
-     <!-- Introduction title shown in face enrollment to introduce the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->
+     <!-- Introduction title shown in face enrollment to introduce the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->
      <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Use your face to authenticate</string>
      <!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]-->
      <string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>