diff options
46 files changed, 1215 insertions, 1118 deletions
diff --git a/Android.bp b/Android.bp index d8848029af3e..825fcc9bea86 100644 --- a/Android.bp +++ b/Android.bp @@ -151,6 +151,9 @@ java_library { visibility: [ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST "//external/robolectric-shadows:__subpackages__", + //This will eventually replace the item above, and serves the + //same purpose. + "//external/robolectric:__subpackages__", "//frameworks/layoutlib:__subpackages__", ], } diff --git a/core/java/Android.bp b/core/java/Android.bp index d3303e901e01..21c68b166e80 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -487,3 +487,9 @@ java_library { } // protolog end + +// temporary placeholder until the real module is available +java_library { + name: "framework-configinfrastructure", + sdk_version: "module_current", +} diff --git a/core/java/android/app/IntentService.java b/core/java/android/app/IntentService.java index 2e833084641c..99f864c32803 100644 --- a/core/java/android/app/IntentService.java +++ b/core/java/android/app/IntentService.java @@ -57,8 +57,7 @@ import android.os.Message; * @deprecated IntentService is subject to all the * <a href="{@docRoot}about/versions/oreo/background.html">background execution limits</a> * imposed with Android 8.0 (API level 26). Consider using {@link androidx.work.WorkManager} - * or {@link androidx.core.app.JobIntentService}, which uses jobs - * instead of services when running on Android 8.0 or higher. + * instead. */ @Deprecated public abstract class IntentService extends Service { diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 98a8cbd8a73c..753d52e440b5 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -2605,31 +2605,31 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <table> * <thead> * <tr> - * <th align="left">Input Format</th> - * <th align="left">Output Format</th> - * <th align="left">Capability</th> + * <th style="text-align: left;">Input Format</th> + * <th style="text-align: left;">Output Format</th> + * <th style="text-align: left;">Capability</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#PRIVATE }</td> - * <td align="left">{@link android.graphics.ImageFormat#JPEG }</td> - * <td align="left">PRIVATE_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#PRIVATE }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: left;">PRIVATE_REPROCESSING</td> * </tr> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#PRIVATE }</td> - * <td align="left">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="left">PRIVATE_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#PRIVATE }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: left;">PRIVATE_REPROCESSING</td> * </tr> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="left">{@link android.graphics.ImageFormat#JPEG }</td> - * <td align="left">YUV_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: left;">YUV_REPROCESSING</td> * </tr> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="left">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="left">YUV_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: left;">YUV_REPROCESSING</td> * </tr> * </tbody> * </table> @@ -2646,26 +2646,26 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <table> * <thead> * <tr> - * <th align="left">Input Format</th> - * <th align="left">Output Format</th> - * <th align="left">Capability</th> + * <th style="text-align: left;">Input Format</th> + * <th style="text-align: left;">Output Format</th> + * <th style="text-align: left;">Capability</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#PRIVATE }</td> - * <td align="left">{@link android.graphics.ImageFormat#Y8 }</td> - * <td align="left">PRIVATE_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#PRIVATE }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#Y8 }</td> + * <td style="text-align: left;">PRIVATE_REPROCESSING</td> * </tr> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#Y8 }</td> - * <td align="left">{@link android.graphics.ImageFormat#JPEG }</td> - * <td align="left">YUV_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#Y8 }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: left;">YUV_REPROCESSING</td> * </tr> * <tr> - * <td align="left">{@link android.graphics.ImageFormat#Y8 }</td> - * <td align="left">{@link android.graphics.ImageFormat#Y8 }</td> - * <td align="left">YUV_REPROCESSING</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#Y8 }</td> + * <td style="text-align: left;">{@link android.graphics.ImageFormat#Y8 }</td> + * <td style="text-align: left;">YUV_REPROCESSING</td> * </tr> * </tbody> * </table> @@ -2701,60 +2701,60 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <table> * <thead> * <tr> - * <th align="center">Format</th> - * <th align="center">Size</th> - * <th align="center">Hardware Level</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">Format</th> + * <th style="text-align: center;">Size</th> + * <th style="text-align: center;">Hardware Level</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">JPEG</td> - * <td align="center">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> - * <td align="center">Any</td> - * <td align="center"></td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">JPEG</td> - * <td align="center">1920x1080 (1080p)</td> - * <td align="center">Any</td> - * <td align="center">if 1080p <= activeArraySize</td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">1920x1080 (1080p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 1080p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">JPEG</td> - * <td align="center">1280x720 (720)</td> - * <td align="center">Any</td> - * <td align="center">if 720p <= activeArraySize</td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">1280x720 (720)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 720p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">JPEG</td> - * <td align="center">640x480 (480p)</td> - * <td align="center">Any</td> - * <td align="center">if 480p <= activeArraySize</td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">640x480 (480p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 480p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">JPEG</td> - * <td align="center">320x240 (240p)</td> - * <td align="center">Any</td> - * <td align="center">if 240p <= activeArraySize</td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">320x240 (240p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 240p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">all output sizes available for JPEG</td> - * <td align="center">FULL</td> - * <td align="center"></td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">all output sizes available for JPEG</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">all output sizes available for JPEG, up to the maximum video size</td> - * <td align="center">LIMITED</td> - * <td align="center"></td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">all output sizes available for JPEG, up to the maximum video size</td> + * <td style="text-align: center;">LIMITED</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">IMPLEMENTATION_DEFINED</td> - * <td align="center">same as YUV_420_888</td> - * <td align="center">Any</td> - * <td align="center"></td> + * <td style="text-align: center;">IMPLEMENTATION_DEFINED</td> + * <td style="text-align: center;">same as YUV_420_888</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> * </tr> * </tbody> * </table> @@ -2769,66 +2769,66 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <table> * <thead> * <tr> - * <th align="center">Format</th> - * <th align="center">Size</th> - * <th align="center">Hardware Level</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">Format</th> + * <th style="text-align: center;">Size</th> + * <th style="text-align: center;">Hardware Level</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">JPEG</td> - * <td align="center">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> - * <td align="center">Any</td> - * <td align="center"></td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">JPEG</td> - * <td align="center">1920x1080 (1080p)</td> - * <td align="center">Any</td> - * <td align="center">if 1080p <= activeArraySize</td> + * <td style="text-align: center;">JPEG</td> + * <td style="text-align: center;">1920x1080 (1080p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 1080p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> - * <td align="center">FULL</td> - * <td align="center"></td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">1920x1080 (1080p)</td> - * <td align="center">FULL</td> - * <td align="center">if 1080p <= activeArraySize</td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">1920x1080 (1080p)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 1080p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">1280x720 (720)</td> - * <td align="center">FULL</td> - * <td align="center">if 720p <= activeArraySize</td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">1280x720 (720)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 720p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">640x480 (480p)</td> - * <td align="center">FULL</td> - * <td align="center">if 480p <= activeArraySize</td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">640x480 (480p)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 480p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">320x240 (240p)</td> - * <td align="center">FULL</td> - * <td align="center">if 240p <= activeArraySize</td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">320x240 (240p)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 240p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">YUV_420_888</td> - * <td align="center">all output sizes available for FULL hardware level, up to the maximum video size</td> - * <td align="center">LIMITED</td> - * <td align="center"></td> + * <td style="text-align: center;">YUV_420_888</td> + * <td style="text-align: center;">all output sizes available for FULL hardware level, up to the maximum video size</td> + * <td style="text-align: center;">LIMITED</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">IMPLEMENTATION_DEFINED</td> - * <td align="center">same as YUV_420_888</td> - * <td align="center">Any</td> - * <td align="center"></td> + * <td style="text-align: center;">IMPLEMENTATION_DEFINED</td> + * <td style="text-align: center;">same as YUV_420_888</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> * </tr> * </tbody> * </table> @@ -2961,17 +2961,67 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * check if it limits the maximum size for image data.</p> * <p>For applications targeting SDK version older than 31, the following table * describes the minimum required output stream configurations based on the - * hardware level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}): - * Format | Size | Hardware Level | Notes - * :-------------------------------------------------:|:--------------------------------------------:|:--------------:|:--------------: - * {@link android.graphics.ImageFormat#JPEG } | {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1) | Any | - * {@link android.graphics.ImageFormat#JPEG } | 1920x1080 (1080p) | Any | if 1080p <= activeArraySize - * {@link android.graphics.ImageFormat#JPEG } | 1280x720 (720p) | Any | if 720p <= activeArraySize - * {@link android.graphics.ImageFormat#JPEG } | 640x480 (480p) | Any | if 480p <= activeArraySize - * {@link android.graphics.ImageFormat#JPEG } | 320x240 (240p) | Any | if 240p <= activeArraySize - * {@link android.graphics.ImageFormat#YUV_420_888 } | all output sizes available for JPEG | FULL | - * {@link android.graphics.ImageFormat#YUV_420_888 } | all output sizes available for JPEG, up to the maximum video size | LIMITED | - * {@link android.graphics.ImageFormat#PRIVATE } | same as YUV_420_888 | Any |</p> + * hardware level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}):</p> + * <table> + * <thead> + * <tr> + * <th style="text-align: center;">Format</th> + * <th style="text-align: center;">Size</th> + * <th style="text-align: center;">Hardware Level</th> + * <th style="text-align: center;">Notes</th> + * </tr> + * </thead> + * <tbody> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">1920x1080 (1080p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 1080p <= activeArraySize</td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">1280x720 (720p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 720p <= activeArraySize</td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">640x480 (480p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 480p <= activeArraySize</td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">320x240 (240p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 240p <= activeArraySize</td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">all output sizes available for JPEG</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;"></td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">all output sizes available for JPEG, up to the maximum video size</td> + * <td style="text-align: center;">LIMITED</td> + * <td style="text-align: center;"></td> + * </tr> + * <tr> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#PRIVATE }</td> + * <td style="text-align: center;">same as YUV_420_888</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> + * </tr> + * </tbody> + * </table> * <p>For applications targeting SDK version 31 or newer, if the mobile device declares to be * media performance class 12 or higher by setting * {@link android.os.Build.VERSION#MEDIA_PERFORMANCE_CLASS } to be 31 or larger, @@ -2983,66 +3033,66 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <table> * <thead> * <tr> - * <th align="center">Format</th> - * <th align="center">Size</th> - * <th align="center">Hardware Level</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">Format</th> + * <th style="text-align: center;">Size</th> + * <th style="text-align: center;">Hardware Level</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#JPEG }</td> - * <td align="center">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1)</td> - * <td align="center">Any</td> - * <td align="center"></td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#JPEG }</td> - * <td align="center">1920x1080 (1080p)</td> - * <td align="center">Any</td> - * <td align="center">if 1080p <= activeArraySize</td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td> + * <td style="text-align: center;">1920x1080 (1080p)</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;">if 1080p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="center">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> - * <td align="center">FULL</td> - * <td align="center"></td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="center">1920x1080 (1080p)</td> - * <td align="center">FULL</td> - * <td align="center">if 1080p <= activeArraySize</td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">1920x1080 (1080p)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 1080p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="center">1280x720 (720)</td> - * <td align="center">FULL</td> - * <td align="center">if 720p <= activeArraySize</td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">1280x720 (720)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 720p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="center">640x480 (480p)</td> - * <td align="center">FULL</td> - * <td align="center">if 480p <= activeArraySize</td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">640x480 (480p)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 480p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="center">320x240 (240p)</td> - * <td align="center">FULL</td> - * <td align="center">if 240p <= activeArraySize</td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">320x240 (240p)</td> + * <td style="text-align: center;">FULL</td> + * <td style="text-align: center;">if 240p <= activeArraySize</td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td> - * <td align="center">all output sizes available for FULL hardware level, up to the maximum video size</td> - * <td align="center">LIMITED</td> - * <td align="center"></td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td> + * <td style="text-align: center;">all output sizes available for FULL hardware level, up to the maximum video size</td> + * <td style="text-align: center;">LIMITED</td> + * <td style="text-align: center;"></td> * </tr> * <tr> - * <td align="center">{@link android.graphics.ImageFormat#PRIVATE }</td> - * <td align="center">same as YUV_420_888</td> - * <td align="center">Any</td> - * <td align="center"></td> + * <td style="text-align: center;">{@link android.graphics.ImageFormat#PRIVATE }</td> + * <td style="text-align: center;">same as YUV_420_888</td> + * <td style="text-align: center;">Any</td> + * <td style="text-align: center;"></td> * </tr> * </tbody> * </table> diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 3e1deb27584e..1a15596af566 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -990,18 +990,18 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center"></td> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device auto exposure algorithm is disabled</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;"></td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device auto exposure algorithm is disabled</td> * </tr> * </tbody> * </table> @@ -1009,120 +1009,120 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device initiates AE scan</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values changing</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device initiates AE scan</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values changing</td> * </tr> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">SEARCHING</td> - * <td align="center">Camera device finishes AE scan</td> - * <td align="center">CONVERGED</td> - * <td align="center">Good values, not changing</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Camera device finishes AE scan</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Good values, not changing</td> * </tr> * <tr> - * <td align="center">SEARCHING</td> - * <td align="center">Camera device finishes AE scan</td> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Converged but too dark w/o flash</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Camera device finishes AE scan</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Converged but too dark w/o flash</td> * </tr> * <tr> - * <td align="center">SEARCHING</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">CONVERGED</td> - * <td align="center">Camera device initiates AE scan</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values changing</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Camera device initiates AE scan</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values changing</td> * </tr> * <tr> - * <td align="center">CONVERGED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Camera device initiates AE scan</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values changing</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Camera device initiates AE scan</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values changing</td> * </tr> * <tr> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values not good after unlock</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values not good after unlock</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> - * <td align="center">CONVERGED</td> - * <td align="center">Values good after unlock</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Values good after unlock</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Exposure good, but too dark</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Exposure good, but too dark</td> * </tr> * <tr> - * <td align="center">PRECAPTURE</td> - * <td align="center">Sequence done. {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> - * <td align="center">CONVERGED</td> - * <td align="center">Ready for high-quality capture</td> + * <td style="text-align: center;">PRECAPTURE</td> + * <td style="text-align: center;">Sequence done. {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is OFF</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Ready for high-quality capture</td> * </tr> * <tr> - * <td align="center">PRECAPTURE</td> - * <td align="center">Sequence done. {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Ready for high-quality capture</td> + * <td style="text-align: center;">PRECAPTURE</td> + * <td style="text-align: center;">Sequence done. {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Ready for high-quality capture</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">aeLock is ON and aePrecaptureTrigger is START</td> - * <td align="center">LOCKED</td> - * <td align="center">Precapture trigger is ignored when AE is already locked</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">aeLock is ON and aePrecaptureTrigger is START</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Precapture trigger is ignored when AE is already locked</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">aeLock is ON and aePrecaptureTrigger is CANCEL</td> - * <td align="center">LOCKED</td> - * <td align="center">Precapture trigger is ignored when AE is already locked</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">aeLock is ON and aePrecaptureTrigger is CANCEL</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Precapture trigger is ignored when AE is already locked</td> * </tr> * <tr> - * <td align="center">Any state (excluding LOCKED)</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is START</td> - * <td align="center">PRECAPTURE</td> - * <td align="center">Start AE precapture metering sequence</td> + * <td style="text-align: center;">Any state (excluding LOCKED)</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is START</td> + * <td style="text-align: center;">PRECAPTURE</td> + * <td style="text-align: center;">Start AE precapture metering sequence</td> * </tr> * <tr> - * <td align="center">Any state (excluding LOCKED)</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Currently active precapture metering sequence is canceled</td> + * <td style="text-align: center;">Any state (excluding LOCKED)</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Currently active precapture metering sequence is canceled</td> * </tr> * </tbody> * </table> @@ -1138,54 +1138,54 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device finished AE scan</td> - * <td align="center">CONVERGED</td> - * <td align="center">Values are already good, transient states are skipped by camera device.</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device finished AE scan</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Values are already good, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">Any state (excluding LOCKED)</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is START, sequence done</td> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Converged but too dark w/o flash after a precapture sequence, transient states are skipped by camera device.</td> + * <td style="text-align: center;">Any state (excluding LOCKED)</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is START, sequence done</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Converged but too dark w/o flash after a precapture sequence, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">Any state (excluding LOCKED)</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is START, sequence done</td> - * <td align="center">CONVERGED</td> - * <td align="center">Converged after a precapture sequence, transient states are skipped by camera device.</td> + * <td style="text-align: center;">Any state (excluding LOCKED)</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is START, sequence done</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Converged after a precapture sequence, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">Any state (excluding LOCKED)</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is CANCEL, converged</td> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Converged but too dark w/o flash after a precapture sequence is canceled, transient states are skipped by camera device.</td> + * <td style="text-align: center;">Any state (excluding LOCKED)</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is CANCEL, converged</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Converged but too dark w/o flash after a precapture sequence is canceled, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">Any state (excluding LOCKED)</td> - * <td align="center">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is CANCEL, converged</td> - * <td align="center">CONVERGED</td> - * <td align="center">Converged after a precapture sequences canceled, transient states are skipped by camera device.</td> + * <td style="text-align: center;">Any state (excluding LOCKED)</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} is CANCEL, converged</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Converged after a precapture sequences canceled, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">CONVERGED</td> - * <td align="center">Camera device finished AE scan</td> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Converged but too dark w/o flash after a new scan, transient states are skipped by camera device.</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Camera device finished AE scan</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Converged but too dark w/o flash after a new scan, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">FLASH_REQUIRED</td> - * <td align="center">Camera device finished AE scan</td> - * <td align="center">CONVERGED</td> - * <td align="center">Converged after a new scan, transient states are skipped by camera device.</td> + * <td style="text-align: center;">FLASH_REQUIRED</td> + * <td style="text-align: center;">Camera device finished AE scan</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Converged after a new scan, transient states are skipped by camera device.</td> * </tr> * </tbody> * </table> @@ -1413,18 +1413,18 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center"></td> - * <td align="center">INACTIVE</td> - * <td align="center">Never changes</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;"></td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Never changes</td> * </tr> * </tbody> * </table> @@ -1432,66 +1432,66 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">ACTIVE_SCAN</td> - * <td align="center">Start AF sweep, Lens now moving</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">ACTIVE_SCAN</td> + * <td style="text-align: center;">Start AF sweep, Lens now moving</td> * </tr> * <tr> - * <td align="center">ACTIVE_SCAN</td> - * <td align="center">AF sweep done</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Focused, Lens now locked</td> + * <td style="text-align: center;">ACTIVE_SCAN</td> + * <td style="text-align: center;">AF sweep done</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Focused, Lens now locked</td> * </tr> * <tr> - * <td align="center">ACTIVE_SCAN</td> - * <td align="center">AF sweep done</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">Not focused, Lens now locked</td> + * <td style="text-align: center;">ACTIVE_SCAN</td> + * <td style="text-align: center;">AF sweep done</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">Not focused, Lens now locked</td> * </tr> * <tr> - * <td align="center">ACTIVE_SCAN</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Cancel/reset AF, Lens now locked</td> + * <td style="text-align: center;">ACTIVE_SCAN</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Cancel/reset AF, Lens now locked</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Cancel/reset AF</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Cancel/reset AF</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">ACTIVE_SCAN</td> - * <td align="center">Start new sweep, Lens now moving</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">ACTIVE_SCAN</td> + * <td style="text-align: center;">Start new sweep, Lens now moving</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Cancel/reset AF</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Cancel/reset AF</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">ACTIVE_SCAN</td> - * <td align="center">Start new sweep, Lens now moving</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">ACTIVE_SCAN</td> + * <td style="text-align: center;">Start new sweep, Lens now moving</td> * </tr> * <tr> - * <td align="center">Any state</td> - * <td align="center">Mode change</td> - * <td align="center">INACTIVE</td> - * <td align="center"></td> + * <td style="text-align: center;">Any state</td> + * <td style="text-align: center;">Mode change</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;"></td> * </tr> * </tbody> * </table> @@ -1504,36 +1504,36 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Focus is already good or good after a scan, lens is now locked.</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Focus is already good or good after a scan, lens is now locked.</td> * </tr> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">Focus failed after a scan, lens is now locked.</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">Focus failed after a scan, lens is now locked.</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Focus is already good or good after a scan, lens is now locked.</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Focus is already good or good after a scan, lens is now locked.</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Focus is good after a scan, lens is not locked.</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Focus is good after a scan, lens is not locked.</td> * </tr> * </tbody> * </table> @@ -1541,102 +1541,102 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device initiates new scan</td> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Start AF scan, Lens now moving</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device initiates new scan</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Start AF scan, Lens now moving</td> * </tr> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF state query, Lens now locked</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF state query, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Camera device completes current scan</td> - * <td align="center">PASSIVE_FOCUSED</td> - * <td align="center">End AF scan, Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Camera device completes current scan</td> + * <td style="text-align: center;">PASSIVE_FOCUSED</td> + * <td style="text-align: center;">End AF scan, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Camera device fails current scan</td> - * <td align="center">PASSIVE_UNFOCUSED</td> - * <td align="center">End AF scan, Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Camera device fails current scan</td> + * <td style="text-align: center;">PASSIVE_UNFOCUSED</td> + * <td style="text-align: center;">End AF scan, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Immediate transition, if focus is good. Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Immediate transition, if focus is good. Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">Immediate transition, if focus is bad. Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">Immediate transition, if focus is bad. Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Reset lens position, Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Reset lens position, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_FOCUSED</td> - * <td align="center">Camera device initiates new scan</td> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Start AF scan, Lens now moving</td> + * <td style="text-align: center;">PASSIVE_FOCUSED</td> + * <td style="text-align: center;">Camera device initiates new scan</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Start AF scan, Lens now moving</td> * </tr> * <tr> - * <td align="center">PASSIVE_UNFOCUSED</td> - * <td align="center">Camera device initiates new scan</td> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Start AF scan, Lens now moving</td> + * <td style="text-align: center;">PASSIVE_UNFOCUSED</td> + * <td style="text-align: center;">Camera device initiates new scan</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Start AF scan, Lens now moving</td> * </tr> * <tr> - * <td align="center">PASSIVE_FOCUSED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Immediate transition, lens now locked</td> + * <td style="text-align: center;">PASSIVE_FOCUSED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Immediate transition, lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_UNFOCUSED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">Immediate transition, lens now locked</td> + * <td style="text-align: center;">PASSIVE_UNFOCUSED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">Immediate transition, lens now locked</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">No effect</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">No effect</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Restart AF scan</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Restart AF scan</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">No effect</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">No effect</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Restart AF scan</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Restart AF scan</td> * </tr> * </tbody> * </table> @@ -1644,102 +1644,102 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device initiates new scan</td> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Start AF scan, Lens now moving</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device initiates new scan</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Start AF scan, Lens now moving</td> * </tr> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF state query, Lens now locked</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF state query, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Camera device completes current scan</td> - * <td align="center">PASSIVE_FOCUSED</td> - * <td align="center">End AF scan, Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Camera device completes current scan</td> + * <td style="text-align: center;">PASSIVE_FOCUSED</td> + * <td style="text-align: center;">End AF scan, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Camera device fails current scan</td> - * <td align="center">PASSIVE_UNFOCUSED</td> - * <td align="center">End AF scan, Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Camera device fails current scan</td> + * <td style="text-align: center;">PASSIVE_UNFOCUSED</td> + * <td style="text-align: center;">End AF scan, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Eventual transition once the focus is good. Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Eventual transition once the focus is good. Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">Eventual transition if cannot find focus. Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">Eventual transition if cannot find focus. Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Reset lens position, Lens now locked</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Reset lens position, Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_FOCUSED</td> - * <td align="center">Camera device initiates new scan</td> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Start AF scan, Lens now moving</td> + * <td style="text-align: center;">PASSIVE_FOCUSED</td> + * <td style="text-align: center;">Camera device initiates new scan</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Start AF scan, Lens now moving</td> * </tr> * <tr> - * <td align="center">PASSIVE_UNFOCUSED</td> - * <td align="center">Camera device initiates new scan</td> - * <td align="center">PASSIVE_SCAN</td> - * <td align="center">Start AF scan, Lens now moving</td> + * <td style="text-align: center;">PASSIVE_UNFOCUSED</td> + * <td style="text-align: center;">Camera device initiates new scan</td> + * <td style="text-align: center;">PASSIVE_SCAN</td> + * <td style="text-align: center;">Start AF scan, Lens now moving</td> * </tr> * <tr> - * <td align="center">PASSIVE_FOCUSED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">Immediate trans. Lens now locked</td> + * <td style="text-align: center;">PASSIVE_FOCUSED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">Immediate trans. Lens now locked</td> * </tr> * <tr> - * <td align="center">PASSIVE_UNFOCUSED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">Immediate trans. Lens now locked</td> + * <td style="text-align: center;">PASSIVE_UNFOCUSED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">Immediate trans. Lens now locked</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">No effect</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">No effect</td> * </tr> * <tr> - * <td align="center">FOCUSED_LOCKED</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Restart AF scan</td> + * <td style="text-align: center;">FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Restart AF scan</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_TRIGGER</td> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">No effect</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_TRIGGER</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">No effect</td> * </tr> * <tr> - * <td align="center">NOT_FOCUSED_LOCKED</td> - * <td align="center">AF_CANCEL</td> - * <td align="center">INACTIVE</td> - * <td align="center">Restart AF scan</td> + * <td style="text-align: center;">NOT_FOCUSED_LOCKED</td> + * <td style="text-align: center;">AF_CANCEL</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Restart AF scan</td> * </tr> * </tbody> * </table> @@ -1751,30 +1751,30 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">any state</td> - * <td align="center">CAF-->AUTO mode switch</td> - * <td align="center">INACTIVE</td> - * <td align="center">Mode switch without trigger, initial state must be INACTIVE</td> + * <td style="text-align: center;">any state</td> + * <td style="text-align: center;">CAF-->AUTO mode switch</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Mode switch without trigger, initial state must be INACTIVE</td> * </tr> * <tr> - * <td align="center">any state</td> - * <td align="center">CAF-->AUTO mode switch with AF_TRIGGER</td> - * <td align="center">trigger-reachable states from INACTIVE</td> - * <td align="center">Mode switch with trigger, INACTIVE is skipped</td> + * <td style="text-align: center;">any state</td> + * <td style="text-align: center;">CAF-->AUTO mode switch with AF_TRIGGER</td> + * <td style="text-align: center;">trigger-reachable states from INACTIVE</td> + * <td style="text-align: center;">Mode switch with trigger, INACTIVE is skipped</td> * </tr> * <tr> - * <td align="center">any state</td> - * <td align="center">AUTO-->CAF mode switch</td> - * <td align="center">passively reachable states from INACTIVE</td> - * <td align="center">Mode switch without trigger, passive transient state is skipped</td> + * <td style="text-align: center;">any state</td> + * <td style="text-align: center;">AUTO-->CAF mode switch</td> + * <td style="text-align: center;">passively reachable states from INACTIVE</td> + * <td style="text-align: center;">Mode switch without trigger, passive transient state is skipped</td> * </tr> * </tbody> * </table> @@ -2053,18 +2053,18 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center"></td> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device auto white balance algorithm is disabled</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;"></td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device auto white balance algorithm is disabled</td> * </tr> * </tbody> * </table> @@ -2072,54 +2072,54 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device initiates AWB scan</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values changing</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device initiates AWB scan</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values changing</td> * </tr> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">SEARCHING</td> - * <td align="center">Camera device finishes AWB scan</td> - * <td align="center">CONVERGED</td> - * <td align="center">Good values, not changing</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Camera device finishes AWB scan</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Good values, not changing</td> * </tr> * <tr> - * <td align="center">SEARCHING</td> - * <td align="center">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">CONVERGED</td> - * <td align="center">Camera device initiates AWB scan</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values changing</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Camera device initiates AWB scan</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values changing</td> * </tr> * <tr> - * <td align="center">CONVERGED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is ON</td> - * <td align="center">LOCKED</td> - * <td align="center">Values locked</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is ON</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">Values locked</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is OFF</td> - * <td align="center">SEARCHING</td> - * <td align="center">Values not good after unlock</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is OFF</td> + * <td style="text-align: center;">SEARCHING</td> + * <td style="text-align: center;">Values not good after unlock</td> * </tr> * </tbody> * </table> @@ -2132,24 +2132,24 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <table> * <thead> * <tr> - * <th align="center">State</th> - * <th align="center">Transition Cause</th> - * <th align="center">New State</th> - * <th align="center">Notes</th> + * <th style="text-align: center;">State</th> + * <th style="text-align: center;">Transition Cause</th> + * <th style="text-align: center;">New State</th> + * <th style="text-align: center;">Notes</th> * </tr> * </thead> * <tbody> * <tr> - * <td align="center">INACTIVE</td> - * <td align="center">Camera device finished AWB scan</td> - * <td align="center">CONVERGED</td> - * <td align="center">Values are already good, transient states are skipped by camera device.</td> + * <td style="text-align: center;">INACTIVE</td> + * <td style="text-align: center;">Camera device finished AWB scan</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Values are already good, transient states are skipped by camera device.</td> * </tr> * <tr> - * <td align="center">LOCKED</td> - * <td align="center">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is OFF</td> - * <td align="center">CONVERGED</td> - * <td align="center">Values good after unlock, transient states are skipped by camera device.</td> + * <td style="text-align: center;">LOCKED</td> + * <td style="text-align: center;">{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} is OFF</td> + * <td style="text-align: center;">CONVERGED</td> + * <td style="text-align: center;">Values good after unlock, transient states are skipped by camera device.</td> * </tr> * </tbody> * </table> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index f4e72fd2e3f6..482fb9d5d15f 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -235,7 +235,7 @@ <string name="shutdown_confirm" product="default" msgid="136816458966692315">"Telefon će se isključiti."</string> <string name="shutdown_confirm_question" msgid="796151167261608447">"Želite li ugasiti telefon?"</string> <string name="reboot_safemode_title" msgid="5853949122655346734">"Ponovo pokreni uređaj u sigurnom načinu rada"</string> - <string name="reboot_safemode_confirm" msgid="1658357874737219624">"Želite li pokrenuti uređaj u sigurnom načinu rada? To će onemogućiti sve aplikacije trećih strana koje ste instalirali. One će biti obnovljene kada ponovo pokrenete uređaj."</string> + <string name="reboot_safemode_confirm" msgid="1658357874737219624">"Želite li ponovo pokrenuti uređaj u sigurnom načinu rada? To će onemogućiti sve aplikacije trećih strana koje ste instalirali. Obnovit će se kada još jednom ponovo pokrenete uređaj."</string> <string name="recent_tasks_title" msgid="8183172372995396653">"Nedavni zadaci"</string> <string name="no_recent_tasks" msgid="9063946524312275906">"Nema nedavno pokrenutih aplikacija."</string> <string name="global_actions" product="tablet" msgid="4412132498517933867">"Opcije tableta"</string> @@ -1006,7 +1006,7 @@ <string name="factorytest_failed" msgid="3190979160945298006">"Fabrički test nije uspio"</string> <string name="factorytest_not_system" msgid="5658160199925519869">"Akcija FACTORY_TEST podržana je samo za pakete instalirane u facsikli /system/app."</string> <string name="factorytest_no_action" msgid="339252838115675515">"Nije pronađen paket koji omogućava akciju FACTORY_TEST."</string> - <string name="factorytest_reboot" msgid="2050147445567257365">"Ponovno pokretanje"</string> + <string name="factorytest_reboot" msgid="2050147445567257365">"Ponovo pokreni"</string> <string name="js_dialog_title" msgid="7464775045615023241">"Stranica na \"<xliff:g id="TITLE">%s</xliff:g>\" kaže:"</string> <string name="js_dialog_title_default" msgid="3769524569903332476">"JavaScript"</string> <string name="js_dialog_before_unload_title" msgid="7012587995876771246">"Potvrdite navigaciju"</string> @@ -1367,7 +1367,7 @@ <string name="console_running_notification_title" msgid="6087888939261635904">"Serijska konzola omogućena"</string> <string name="console_running_notification_message" msgid="7892751888125174039">"Performanse su smanjene. Da onemogućite, provjerite program za učitavanje operativnog sistema."</string> <string name="mte_override_notification_title" msgid="4731115381962792944">"Eksperimentalni MTE je omogućen"</string> - <string name="mte_override_notification_message" msgid="2441170442725738942">"Moguće da će to uticati na performanse i stabilnost. Ponovo pokrenite da onemogućite. Ako je omogućeno pomoću arm64.memtag.bootctl, unaprijed ga postavite na \"Ništa\"."</string> + <string name="mte_override_notification_message" msgid="2441170442725738942">"To može uticati na performanse i stabilnost. Ponovo pokrenite da onemogućite. Ako je omogućeno pomoću arm64.memtag.bootctl, prvo postavite na \"Ništa\"."</string> <string name="usb_contaminant_detected_title" msgid="4359048603069159678">"Tečnost ili nečistoće u USB priključku"</string> <string name="usb_contaminant_detected_message" msgid="7346100585390795743">"USB priključak je automatski onemogućen. Dodirnite da saznate više."</string> <string name="usb_contaminant_not_detected_title" msgid="2651167729563264053">"USB priključak je sada sigurno koristiti"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 0d8285251ea5..0ca31871c000 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -33,18 +33,18 @@ <string name="defaultVoiceMailAlphaTag" msgid="2190754495304236490">"Voicemail"</string> <string name="defaultMsisdnAlphaTag" msgid="2285034592902077488">"MSISDN1"</string> <string name="mmiError" msgid="2862759606579822246">"Connection problem or invalid MMI code."</string> - <string name="mmiFdnError" msgid="3975490266767565852">"Operation is restricted to fixed dialling numbers only."</string> - <string name="mmiErrorWhileRoaming" msgid="1204173664713870114">"Cannot change call forwarding settings from your phone while you are roaming."</string> + <string name="mmiFdnError" msgid="3975490266767565852">"Operation is restricted to fixed dialing numbers only."</string> + <string name="mmiErrorWhileRoaming" msgid="1204173664713870114">"Can not change call forwarding settings from your phone while you are roaming."</string> <string name="serviceEnabled" msgid="7549025003394765639">"Service was enabled."</string> <string name="serviceEnabledFor" msgid="1463104778656711613">"Service was enabled for:"</string> <string name="serviceDisabled" msgid="641878791205871379">"Service has been disabled."</string> <string name="serviceRegistered" msgid="3856192211729577482">"Registration was successful."</string> - <string name="serviceErased" msgid="997354043770513494">"Erase successful."</string> + <string name="serviceErased" msgid="997354043770513494">"Erasure was successful."</string> <string name="passwordIncorrect" msgid="917087532676155877">"Incorrect password."</string> <string name="mmiComplete" msgid="6341884570892520140">"MMI complete."</string> - <string name="badPin" msgid="888372071306274355">"The old PIN that you typed is incorrect."</string> - <string name="badPuk" msgid="4232069163733147376">"The PUK that you typed isn\'t correct."</string> - <string name="mismatchPin" msgid="2929611853228707473">"The PINs that you typed don\'t match."</string> + <string name="badPin" msgid="888372071306274355">"The old PIN you typed isn\'t correct."</string> + <string name="badPuk" msgid="4232069163733147376">"The PUK you typed isn\'t correct."</string> + <string name="mismatchPin" msgid="2929611853228707473">"The PINs you typed don\'t match."</string> <string name="invalidPin" msgid="7542498253319440408">"Type a PIN that is 4 to 8 numbers."</string> <string name="invalidPuk" msgid="8831151490931907083">"Type a PUK that is 8 numbers or longer."</string> <string name="needPuk" msgid="7321876090152422918">"Your SIM card is PUK-locked. Type the PUK code to unlock it."</string> @@ -57,7 +57,7 @@ <string name="imei" msgid="2157082351232630390">"IMEI"</string> <string name="meid" msgid="3291227361605924674">"MEID"</string> <string name="ClipMmi" msgid="4110549342447630629">"Incoming Caller ID"</string> - <string name="ClirMmi" msgid="6752346475055446417">"Hide outgoing caller ID"</string> + <string name="ClirMmi" msgid="6752346475055446417">"Hide Outgoing Caller ID"</string> <string name="ColpMmi" msgid="4736462893284419302">"Connected Line ID"</string> <string name="ColrMmi" msgid="5889782479745764278">"Connected Line ID Restriction"</string> <string name="CfMmi" msgid="8390012691099787178">"Call forwarding"</string> @@ -67,7 +67,7 @@ <string name="PinMmi" msgid="7133542099618330959">"PIN change"</string> <string name="CnipMmi" msgid="4897531155968151160">"Calling number present"</string> <string name="CnirMmi" msgid="885292039284503036">"Calling number restricted"</string> - <string name="ThreeWCMmi" msgid="2436550866139999411">"Three-way calling"</string> + <string name="ThreeWCMmi" msgid="2436550866139999411">"Three way calling"</string> <string name="RuacMmi" msgid="1876047385848991110">"Rejection of undesired annoying calls"</string> <string name="CndMmi" msgid="185136449405618437">"Calling number delivery"</string> <string name="DndMmi" msgid="8797375819689129800">"Do not disturb"</string> @@ -93,7 +93,7 @@ <string name="notification_channel_mobile_data_status" msgid="1941911162076442474">"Mobile data status"</string> <string name="notification_channel_sms" msgid="1243384981025535724">"SMS messages"</string> <string name="notification_channel_voice_mail" msgid="8457433203106654172">"Voicemail messages"</string> - <string name="notification_channel_wfc" msgid="9048240466765169038">"Wi-Fi Calling"</string> + <string name="notification_channel_wfc" msgid="9048240466765169038">"Wi-Fi calling"</string> <string name="notification_channel_sim" msgid="5098802350325677490">"SIM status"</string> <string name="notification_channel_sim_high_prio" msgid="642361929452850928">"High priority SIM status"</string> <string name="peerTtyModeFull" msgid="337553730440832160">"Peer requested TTY Mode FULL"</string> @@ -111,7 +111,7 @@ <string name="roamingText0" msgid="7793257871609854208">"Roaming Indicator On"</string> <string name="roamingText1" msgid="5073028598334616445">"Roaming Indicator Off"</string> <string name="roamingText2" msgid="2834048284153110598">"Roaming Indicator Flashing"</string> - <string name="roamingText3" msgid="831690234035748988">"Out of local area"</string> + <string name="roamingText3" msgid="831690234035748988">"Out of Neighborhood"</string> <string name="roamingText4" msgid="2171252529065590728">"Out of Building"</string> <string name="roamingText5" msgid="4294671587635796641">"Roaming - Preferred System"</string> <string name="roamingText6" msgid="5536156746637992029">"Roaming - Available System"</string> @@ -132,15 +132,15 @@ <!-- no translation found for wfcSpnFormat_spn (2982505428519096311) --> <skip /> <string name="wfcSpnFormat_spn_wifi_calling" msgid="3165949348000906194">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi Calling"</string> - <string name="wfcSpnFormat_spn_wifi_calling_vo_hyphen" msgid="3836827895369365298">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi calling"</string> - <string name="wfcSpnFormat_wlan_call" msgid="4895315549916165700">"WLAN call"</string> + <string name="wfcSpnFormat_spn_wifi_calling_vo_hyphen" msgid="3836827895369365298">"<xliff:g id="SPN">%s</xliff:g> WiFi Calling"</string> + <string name="wfcSpnFormat_wlan_call" msgid="4895315549916165700">"WLAN Call"</string> <string name="wfcSpnFormat_spn_wlan_call" msgid="255919245825481510">"<xliff:g id="SPN">%s</xliff:g> WLAN Call"</string> <string name="wfcSpnFormat_spn_wifi" msgid="7232899594327126970">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi"</string> - <string name="wfcSpnFormat_wifi_calling_bar_spn" msgid="8383917598312067365">"Wi-Fi Calling | <xliff:g id="SPN">%s</xliff:g>"</string> + <string name="wfcSpnFormat_wifi_calling_bar_spn" msgid="8383917598312067365">"WiFi Calling | <xliff:g id="SPN">%s</xliff:g>"</string> <string name="wfcSpnFormat_spn_vowifi" msgid="6865214948822061486">"<xliff:g id="SPN">%s</xliff:g> VoWifi"</string> <string name="wfcSpnFormat_wifi_calling" msgid="6178935388378661755">"Wi-Fi Calling"</string> <string name="wfcSpnFormat_wifi" msgid="1376356951297043426">"Wi-Fi"</string> - <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="7178561009225028264">"Wi-Fi Calling"</string> + <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="7178561009225028264">"WiFi Calling"</string> <string name="wfcSpnFormat_vowifi" msgid="8371335230890725606">"VoWifi"</string> <string name="wifi_calling_off_summary" msgid="5626710010766902560">"Off"</string> <string name="wfc_mode_wifi_preferred_summary" msgid="1035175836270943089">"Call over Wi-Fi"</string> @@ -148,7 +148,7 @@ <string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi only"</string> <!-- no translation found for crossSimFormat_spn (9125246077491634262) --> <skip /> - <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup calling"</string> + <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup Calling"</string> <string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string> <string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> <string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string> @@ -172,13 +172,13 @@ <string name="httpErrorFile" msgid="3400658466057744084">"Couldn\'t access the file."</string> <string name="httpErrorFileNotFound" msgid="5191433324871147386">"Couldn\'t find the requested file."</string> <string name="httpErrorTooManyRequests" msgid="2149677715552037198">"Too many requests are being processed. Try again later."</string> - <string name="notification_title" msgid="5783748077084481121">"Sign-in error for <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> + <string name="notification_title" msgid="5783748077084481121">"Signin error for <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="2341041749565687871">"Sync"</string> <string name="contentServiceSyncNotificationTitle" msgid="5766411446676388623">"Can\'t sync"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="4562226280528716090">"Attempted to delete too many <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> <string name="low_memory" product="tablet" msgid="5557552311566179924">"Tablet storage is full. Delete some files to free space."</string> - <string name="low_memory" product="watch" msgid="3479447988234030194">"Watch storage is full. Delete some files to free up space."</string> - <string name="low_memory" product="tv" msgid="6663680413790323318">"Android TV device storage is full. Delete some files to free up space."</string> + <string name="low_memory" product="watch" msgid="3479447988234030194">"Watch storage is full. Delete some files to free space."</string> + <string name="low_memory" product="tv" msgid="6663680413790323318">"Android TV device storage is full. Delete some files to free space."</string> <string name="low_memory" product="default" msgid="2539532364144025569">"Phone storage is full. Delete some files to free space."</string> <string name="ssl_ca_cert_warning" msgid="7233573909730048571">"{count,plural, =1{Certificate authority installed}other{Certificate authorities installed}}"</string> <string name="ssl_ca_cert_noti_by_unknown" msgid="4961102218216815242">"By an unknown third party"</string> @@ -192,16 +192,16 @@ <string name="network_logging_notification_title" msgid="554983187553845004">"Device is managed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Your organization manages this device and may monitor network traffic. Tap for details."</string> <string name="location_changed_notification_title" msgid="3620158742816699316">"Apps can access your location"</string> - <string name="location_changed_notification_text" msgid="7158423339982706912">"Contact your IT admin to find out more"</string> - <string name="geofencing_service" msgid="3826902410740315456">"Geofencing service"</string> + <string name="location_changed_notification_text" msgid="7158423339982706912">"Contact your IT admin to learn more"</string> + <string name="geofencing_service" msgid="3826902410740315456">"Geofencing Service"</string> <string name="country_detector" msgid="7023275114706088854">"Country Detector"</string> <string name="location_service" msgid="2439187616018455546">"Location Service"</string> - <string name="gnss_service" msgid="8907781262179951385">"GNSS service"</string> + <string name="gnss_service" msgid="8907781262179951385">"GNSS Service"</string> <string name="sensor_notification_service" msgid="7474531979178682676">"Sensor Notification Service"</string> <string name="twilight_service" msgid="8964898045693187224">"Twilight Service"</string> - <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS time update service"</string> - <string name="device_policy_manager_service" msgid="5085762851388850332">"Device Policy manager service"</string> - <string name="music_recognition_manager_service" msgid="7481956037950276359">"Music recognition manager service"</string> + <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS Time Update Service"</string> + <string name="device_policy_manager_service" msgid="5085762851388850332">"Device Policy Manager Service"</string> + <string name="music_recognition_manager_service" msgid="7481956037950276359">"Music Recognition Manager Service"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Your device will be erased"</string> <string name="factory_reset_message" msgid="2657049595153992213">"The admin app can\'t be used. Your device will now be erased.\n\nIf you have questions, contact your organization\'s admin."</string> <string name="printing_disabled_by" msgid="3517499806528864633">"Printing disabled by <xliff:g id="OWNER_APP">%s</xliff:g>."</string> @@ -234,9 +234,9 @@ <string name="shutdown_confirm" product="default" msgid="136816458966692315">"Your phone will shut down."</string> <string name="shutdown_confirm_question" msgid="796151167261608447">"Do you want to shut down?"</string> <string name="reboot_safemode_title" msgid="5853949122655346734">"Reboot to safe mode"</string> - <string name="reboot_safemode_confirm" msgid="1658357874737219624">"Do you want to reboot into safe mode? This will disable all third-party applications that you have installed. They will be restored when you reboot again."</string> + <string name="reboot_safemode_confirm" msgid="1658357874737219624">"Do you want to reboot into safe mode? This will disable all third party applications you have installed. They will be restored when you reboot again."</string> <string name="recent_tasks_title" msgid="8183172372995396653">"Recent"</string> - <string name="no_recent_tasks" msgid="9063946524312275906">"No recent apps"</string> + <string name="no_recent_tasks" msgid="9063946524312275906">"No recent apps."</string> <string name="global_actions" product="tablet" msgid="4412132498517933867">"Tablet options"</string> <string name="global_actions" product="tv" msgid="3871763739487450369">"Android TV options"</string> <string name="global_actions" product="default" msgid="6410072189971495460">"Phone options"</string> @@ -249,9 +249,9 @@ <string name="global_action_logout" msgid="6093581310002476511">"End session"</string> <string name="global_action_screenshot" msgid="2610053466156478564">"Screenshot"</string> <string name="bugreport_title" msgid="8549990811777373050">"Bug report"</string> - <string name="bugreport_message" msgid="5212529146119624326">"This will collect information about your current device state, to send as an email message. It will take a little time from starting the bug report until it is ready to be sent. Please be patient."</string> + <string name="bugreport_message" msgid="5212529146119624326">"This will collect information about your current device state, to send as an e-mail message. It will take a little time from starting the bug report until it is ready to be sent; please be patient."</string> <string name="bugreport_option_interactive_title" msgid="7968287837902871289">"Interactive report"</string> - <string name="bugreport_option_interactive_summary" msgid="8493795476325339542">"Use this under most circumstances. It allows you to track progress of the report, enter more details about the problem and take screenshots. It might omit some less-used sections that take a long time to report."</string> + <string name="bugreport_option_interactive_summary" msgid="8493795476325339542">"Use this under most circumstances. It allows you to track progress of the report, enter more details about the problem, and take screenshots. It might omit some less-used sections that take a long time to report."</string> <string name="bugreport_option_full_title" msgid="7681035745950045690">"Full report"</string> <string name="bugreport_option_full_summary" msgid="1975130009258435885">"Use this option for minimal system interference when your device is unresponsive or too slow, or when you need all report sections. Does not allow you to enter more details or take additional screenshots."</string> <string name="bugreport_countdown" msgid="6418620521782120755">"{count,plural, =1{Taking screenshot for bug report in # second.}other{Taking screenshot for bug report in # seconds.}}"</string> @@ -320,7 +320,7 @@ <string name="permgrouplab_nearby_devices" msgid="5529147543651181991">"Nearby devices"</string> <string name="permgroupdesc_nearby_devices" msgid="3213561597116913508">"discover and connect to nearby devices"</string> <string name="permgrouplab_calllog" msgid="7926834372073550288">"Call logs"</string> - <string name="permgroupdesc_calllog" msgid="2026996642917801803">"read and write phone call logs"</string> + <string name="permgroupdesc_calllog" msgid="2026996642917801803">"read and write phone call log"</string> <string name="permgrouplab_phone" msgid="570318944091926620">"Phone"</string> <string name="permgroupdesc_phone" msgid="270048070781478204">"make and manage phone calls"</string> <string name="permgrouplab_sensors" msgid="9134046949784064495">"Body sensors"</string> @@ -336,7 +336,7 @@ <string name="capability_title_canControlMagnification" msgid="7701572187333415795">"Control display magnification"</string> <string name="capability_desc_canControlMagnification" msgid="2206586716709254805">"Control the display\'s zoom level and positioning."</string> <string name="capability_title_canPerformGestures" msgid="9106545062106728987">"Perform gestures"</string> - <string name="capability_desc_canPerformGestures" msgid="6619457251067929726">"Can tap, swipe, pinch and perform other gestures."</string> + <string name="capability_desc_canPerformGestures" msgid="6619457251067929726">"Can tap, swipe, pinch, and perform other gestures."</string> <string name="capability_title_canCaptureFingerprintGestures" msgid="1189053104594608091">"Fingerprint gestures"</string> <string name="capability_desc_canCaptureFingerprintGestures" msgid="6861869337457461274">"Can capture gestures performed on the device\'s fingerprint sensor."</string> <string name="capability_title_canTakeScreenshot" msgid="3895812893130071930">"Take screenshot"</string> @@ -349,24 +349,24 @@ <string name="permdesc_expandStatusBar" msgid="7180756900448498536">"Allows the app to expand or collapse the status bar."</string> <string name="permlab_fullScreenIntent" msgid="4310888199502509104">"display notifications as full screen activities on a locked device"</string> <string name="permdesc_fullScreenIntent" msgid="1100721419406643997">"Allows the app to display notifications as full screen activities on a locked device"</string> - <string name="permlab_install_shortcut" msgid="7451554307502256221">"Install shortcuts"</string> - <string name="permdesc_install_shortcut" msgid="4476328467240212503">"Allows an application to add Home screen shortcuts without user intervention."</string> + <string name="permlab_install_shortcut" msgid="7451554307502256221">"install shortcuts"</string> + <string name="permdesc_install_shortcut" msgid="4476328467240212503">"Allows an application to add Homescreen shortcuts without user intervention."</string> <string name="permlab_uninstall_shortcut" msgid="295263654781900390">"uninstall shortcuts"</string> - <string name="permdesc_uninstall_shortcut" msgid="1924735350988629188">"Allows the application to remove Home screen shortcuts without user intervention."</string> + <string name="permdesc_uninstall_shortcut" msgid="1924735350988629188">"Allows the application to remove Homescreen shortcuts without user intervention."</string> <string name="permlab_processOutgoingCalls" msgid="4075056020714266558">"reroute outgoing calls"</string> - <string name="permdesc_processOutgoingCalls" msgid="7833149750590606334">"Allows the app to see the number being dialled during an outgoing call with the option to redirect the call to a different number or abort the call altogether."</string> + <string name="permdesc_processOutgoingCalls" msgid="7833149750590606334">"Allows the app to see the number being dialed during an outgoing call with the option to redirect the call to a different number or abort the call altogether."</string> <string name="permlab_answerPhoneCalls" msgid="4131324833663725855">"answer phone calls"</string> <string name="permdesc_answerPhoneCalls" msgid="894386681983116838">"Allows the app to answer an incoming phone call."</string> <string name="permlab_receiveSms" msgid="505961632050451881">"receive text messages (SMS)"</string> - <string name="permdesc_receiveSms" msgid="1797345626687832285">"Allows the app to receive and process SMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> + <string name="permdesc_receiveSms" msgid="1797345626687832285">"Allows the app to receive and process SMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_receiveMms" msgid="4000650116674380275">"receive text messages (MMS)"</string> - <string name="permdesc_receiveMms" msgid="958102423732219710">"Allows the app to receive and process MMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> + <string name="permdesc_receiveMms" msgid="958102423732219710">"Allows the app to receive and process MMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_bindCellBroadcastService" msgid="586746677002040651">"Forward cell broadcast messages"</string> <string name="permdesc_bindCellBroadcastService" msgid="6540910200973641606">"Allows the app to bind to the cell broadcast module in order to forward cell broadcast messages as they are received. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency cell broadcast is received."</string> <string name="permlab_manageOngoingCalls" msgid="281244770664231782">"Manage ongoing calls"</string> <string name="permdesc_manageOngoingCalls" msgid="7003138133829915265">"Allows an app to see details about ongoing calls on your device and to control these calls."</string> - <string name="permlab_readCellBroadcasts" msgid="5869884450872137693">"read mobile broadcast messages"</string> - <string name="permdesc_readCellBroadcasts" msgid="672513437331980168">"Allows the app to read mobile broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency mobile broadcast is received."</string> + <string name="permlab_readCellBroadcasts" msgid="5869884450872137693">"read cell broadcast messages"</string> + <string name="permdesc_readCellBroadcasts" msgid="672513437331980168">"Allows the app to read cell broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency cell broadcast is received."</string> <string name="permlab_subscribedFeedsRead" msgid="217624769238425461">"read subscribed feeds"</string> <string name="permdesc_subscribedFeedsRead" msgid="6911349196661811865">"Allows the app to get details about the currently synced feeds."</string> <string name="permlab_sendSms" msgid="7757368721742014252">"send and view SMS messages"</string> @@ -381,7 +381,7 @@ <string name="permdesc_getTasks" msgid="7388138607018233726">"Allows the app to retrieve information about currently and recently running tasks. This may allow the app to discover information about which applications are used on the device."</string> <string name="permlab_manageProfileAndDeviceOwners" msgid="639849495253987493">"manage profile and device owners"</string> <string name="permdesc_manageProfileAndDeviceOwners" msgid="7304240671781989283">"Allows apps to set the profile owners and the device owner."</string> - <string name="permlab_reorderTasks" msgid="7598562301992923804">"re-order running apps"</string> + <string name="permlab_reorderTasks" msgid="7598562301992923804">"reorder running apps"</string> <string name="permdesc_reorderTasks" msgid="8796089937352344183">"Allows the app to move tasks to the foreground and background. The app may do this without your input."</string> <string name="permlab_enableCarMode" msgid="893019409519325311">"enable car mode"</string> <string name="permdesc_enableCarMode" msgid="56419168820473508">"Allows the app to enable the car mode."</string> @@ -394,13 +394,13 @@ <string name="permlab_useDataInBackground" msgid="783415807623038947">"use data in the background"</string> <string name="permdesc_useDataInBackground" msgid="1230753883865891987">"This app can use data in the background. This may increase data usage."</string> <string name="permlab_persistentActivity" msgid="464970041740567970">"make app always run"</string> - <string name="permdesc_persistentActivity" product="tablet" msgid="6055271149187369916">"Allows the app to make parts of itself persistent in memory. This can limit the memory available to other apps, slowing down the tablet."</string> - <string name="permdesc_persistentActivity" product="tv" msgid="6800526387664131321">"Allows the app to make parts of itself persistent in memory. This can limit the memory available to other apps slowing down your Android TV device."</string> - <string name="permdesc_persistentActivity" product="default" msgid="1914841924366562051">"Allows the app to make parts of itself persistent in memory. This can limit the memory available to other apps, slowing down the phone."</string> + <string name="permdesc_persistentActivity" product="tablet" msgid="6055271149187369916">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the tablet."</string> + <string name="permdesc_persistentActivity" product="tv" msgid="6800526387664131321">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down your Android TV device."</string> + <string name="permdesc_persistentActivity" product="default" msgid="1914841924366562051">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the phone."</string> <string name="permlab_foregroundService" msgid="1768855976818467491">"run foreground service"</string> <string name="permdesc_foregroundService" msgid="8720071450020922795">"Allows the app to make use of foreground services."</string> <string name="permlab_getPackageSize" msgid="375391550792886641">"measure app storage space"</string> - <string name="permdesc_getPackageSize" msgid="742743530909966782">"Allows the app to retrieve its code, data and cache sizes"</string> + <string name="permdesc_getPackageSize" msgid="742743530909966782">"Allows the app to retrieve its code, data, and cache sizes"</string> <string name="permlab_writeSettings" msgid="8057285063719277394">"modify system settings"</string> <string name="permdesc_writeSettings" msgid="8293047411196067188">"Allows the app to modify the system\'s settings data. Malicious apps may corrupt your system\'s configuration."</string> <string name="permlab_receiveBootCompleted" msgid="6643339400247325379">"run at startup"</string> @@ -412,9 +412,9 @@ <string name="permdesc_broadcastSticky" product="tv" msgid="2338185920171000650">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make your Android TV device slow or unstable by causing it to use too much memory."</string> <string name="permdesc_broadcastSticky" product="default" msgid="134529339678913453">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the phone slow or unstable by causing it to use too much memory."</string> <string name="permlab_readContacts" msgid="8776395111787429099">"read your contacts"</string> - <string name="permdesc_readContacts" product="tablet" msgid="6430093481659992692">"Allows the app to read data about your contacts stored on your tablet. Apps will also have access to the accounts on your tablet that have created contacts. This may include any accounts created by apps that you have installed. This permission allows any apps to save your contact data, and malicious apps may share contact data without your knowledge."</string> - <string name="permdesc_readContacts" product="tv" msgid="8400138591135554789">"Allows the app to read data about your contacts stored on your Android TV device. Apps will also have access to the accounts on your Android TV device that have created contacts. This may include any accounts created by apps that you have installed. This permission allows any apps to save your contact data, and malicious apps may share contact data without your knowledge."</string> - <string name="permdesc_readContacts" product="default" msgid="4911989776203207644">"Allows the app to read data about your contacts stored on your phone. Apps will also have access to the accounts on your phone that have created contacts. This may include any accounts created by apps that you have installed. This permission allows any apps to save your contact data, and malicious apps may share contact data without your knowledge."</string> + <string name="permdesc_readContacts" product="tablet" msgid="6430093481659992692">"Allows the app to read data about your contacts stored on your tablet. Apps will also have access to the accounts on your tablet that have created contacts. This may include accounts created by apps you have installed. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string> + <string name="permdesc_readContacts" product="tv" msgid="8400138591135554789">"Allows the app to read data about your contacts stored on your Android TV device. Apps will also have access to the accounts on your Android TV device that have created contacts. This may include accounts created by apps you have installed. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string> + <string name="permdesc_readContacts" product="default" msgid="4911989776203207644">"Allows the app to read data about your contacts stored on your phone. Apps will also have access to the accounts on your phone that have created contacts. This may include accounts created by apps you have installed. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string> <string name="permlab_writeContacts" msgid="8919430536404830430">"modify your contacts"</string> <string name="permdesc_writeContacts" product="tablet" msgid="6422419281427826181">"Allows the app to modify the data about your contacts stored on your tablet. This permission allows apps to delete contact data."</string> <string name="permdesc_writeContacts" product="tv" msgid="6488872735379978935">"Allows the app to modify the data about your contacts stored on your Android TV device. This permission allows apps to delete contact data."</string> @@ -423,26 +423,26 @@ <string name="permdesc_readCallLog" msgid="8964770895425873433">"This app can read your call history."</string> <string name="permlab_writeCallLog" msgid="670292975137658895">"write call log"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="2657525794731690397">"Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> - <string name="permdesc_writeCallLog" product="tv" msgid="3934939195095317432">"Allows the app to modify your Android TV device\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to delete or modify your call log."</string> + <string name="permdesc_writeCallLog" product="tv" msgid="3934939195095317432">"Allows the app to modify your Android TV device\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="default" msgid="5903033505665134802">"Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permlab_bodySensors" msgid="662918578601619569">"Access body sensor data, like heart rate, while in use"</string> - <string name="permdesc_bodySensors" product="default" msgid="7652650410295512140">"Allows the app to access body sensor data, such as heart rate, temperature and blood oxygen percentage, while the app is in use."</string> + <string name="permdesc_bodySensors" product="default" msgid="7652650410295512140">"Allows the app to access body sensor data, such as heart rate, temperature, and blood oxygen percentage, while the app is in use."</string> <string name="permlab_bodySensors_background" msgid="4912560779957760446">"Access body sensor data, like heart rate, while in the background"</string> - <string name="permdesc_bodySensors_background" product="default" msgid="8870726027557749417">"Allows the app to access body sensor data, such as heart rate, temperature and blood oxygen percentage, while the app is in the background."</string> + <string name="permdesc_bodySensors_background" product="default" msgid="8870726027557749417">"Allows the app to access body sensor data, such as heart rate, temperature, and blood oxygen percentage, while the app is in the background."</string> <string name="permlab_readCalendar" msgid="6408654259475396200">"Read calendar events and details"</string> <string name="permdesc_readCalendar" product="tablet" msgid="515452384059803326">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string> <string name="permdesc_readCalendar" product="tv" msgid="5811726712981647628">"This app can read all calendar events stored on your Android TV device and share or save your calendar data."</string> <string name="permdesc_readCalendar" product="default" msgid="9118823807655829957">"This app can read all calendar events stored on your phone and share or save your calendar data."</string> - <string name="permlab_writeCalendar" msgid="6422137308329578076">"add or modify calendar events and send emails to guests without owners\' knowledge"</string> - <string name="permdesc_writeCalendar" product="tablet" msgid="8722230940717092850">"This app can add, remove or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> - <string name="permdesc_writeCalendar" product="tv" msgid="951246749004952706">"This app can add, remove or change calendar events on your Android TV device. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> - <string name="permdesc_writeCalendar" product="default" msgid="5416380074475634233">"This app can add, remove or change calendar events on your phone. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permlab_writeCalendar" msgid="6422137308329578076">"add or modify calendar events and send email to guests without owners\' knowledge"</string> + <string name="permdesc_writeCalendar" product="tablet" msgid="8722230940717092850">"This app can add, remove, or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="951246749004952706">"This app can add, remove, or change calendar events on your Android TV device. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="default" msgid="5416380074475634233">"This app can add, remove, or change calendar events on your phone. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string> <string name="permlab_accessLocationExtraCommands" msgid="5162339812057983988">"access extra location provider commands"</string> <string name="permdesc_accessLocationExtraCommands" msgid="355369611979907967">"Allows the app to access extra location provider commands. This may allow the app to interfere with the operation of the GPS or other location sources."</string> <string name="permlab_accessFineLocation" msgid="6426318438195622966">"access precise location only in the foreground"</string> - <string name="permdesc_accessFineLocation" msgid="6732174080240016335">"This app can get your precise location from Location Services while the app is in use. Location Services for your device must be turned on for the app to get location. This may increase battery usage."</string> + <string name="permdesc_accessFineLocation" msgid="6732174080240016335">"This app can get your precise location from location services while the app is in use. Location services for your device must be turned on for the app to get location. This may increase battery usage."</string> <string name="permlab_accessCoarseLocation" msgid="1561042925407799741">"access approximate location only in the foreground"</string> - <string name="permdesc_accessCoarseLocation" msgid="778521847873199160">"This app can get your approximate location from Location Services while the app is in use. Location Services for your device must be turned on for the app to get location."</string> + <string name="permdesc_accessCoarseLocation" msgid="778521847873199160">"This app can get your approximate location from location services while the app is in use. Location services for your device must be turned on for the app to get location."</string> <string name="permlab_accessBackgroundLocation" msgid="1721164702777366138">"access location in the background"</string> <string name="permdesc_accessBackgroundLocation" msgid="8264885066095638105">"This app can access location at any time, even while the app is not in use."</string> <string name="permlab_modifyAudioSettings" msgid="6129039778010031815">"change your audio settings"</string> @@ -453,13 +453,13 @@ <string name="permdesc_recordBackgroundAudio" msgid="1992623135737407516">"This app can record audio using the microphone at any time."</string> <string name="permlab_sim_communication" msgid="176788115994050692">"send commands to the SIM"</string> <string name="permdesc_sim_communication" msgid="4179799296415957960">"Allows the app to send commands to the SIM. This is very dangerous."</string> - <string name="permlab_activityRecognition" msgid="1782303296053990884">"recognise physical activity"</string> - <string name="permdesc_activityRecognition" msgid="8667484762991357519">"This app can recognise your physical activity."</string> + <string name="permlab_activityRecognition" msgid="1782303296053990884">"recognize physical activity"</string> + <string name="permdesc_activityRecognition" msgid="8667484762991357519">"This app can recognize your physical activity."</string> <string name="permlab_camera" msgid="6320282492904119413">"take pictures and videos"</string> <string name="permdesc_camera" msgid="5240801376168647151">"This app can take pictures and record videos using the camera while the app is in use."</string> <string name="permlab_backgroundCamera" msgid="7549917926079731681">"take pictures and videos in the background"</string> <string name="permdesc_backgroundCamera" msgid="1615291686191138250">"This app can take pictures and record videos using the camera at any time."</string> - <string name="permlab_systemCamera" msgid="3642917457796210580">"Grant an application or service access to system cameras to take pictures and videos"</string> + <string name="permlab_systemCamera" msgid="3642917457796210580">"Allow an application or service access to system cameras to take pictures and videos"</string> <string name="permdesc_systemCamera" msgid="5938360914419175986">"This privileged or system app can take pictures and record videos using a system camera at any time. Requires the android.permission.CAMERA permission to be held by the app as well"</string> <string name="permlab_cameraOpenCloseListener" msgid="5548732769068109315">"Allow an application or service to receive callbacks about camera devices being opened or closed."</string> <string name="permdesc_cameraOpenCloseListener" msgid="2002636131008772908">"This app can receive callbacks when any camera device is being opened (by what application) or closed."</string> @@ -471,14 +471,14 @@ <string name="permlab_accessImsCallService" msgid="442192920714863782">"access IMS call service"</string> <string name="permdesc_accessImsCallService" msgid="6328551241649687162">"Allows the app to use the IMS service to make calls without your intervention."</string> <string name="permlab_readPhoneState" msgid="8138526903259297969">"read phone status and identity"</string> - <string name="permdesc_readPhoneState" msgid="7229063553502788058">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active and the remote number connected by a call."</string> + <string name="permdesc_readPhoneState" msgid="7229063553502788058">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active, and the remote number connected by a call."</string> <string name="permlab_readBasicPhoneState" msgid="3214853233263871347">"read basic telephony status and identity"</string> <string name="permdesc_readBasicPhoneState" msgid="828185691675460520">"Allows the app to access the basic telephony features of the device."</string> <string name="permlab_manageOwnCalls" msgid="9033349060307561370">"route calls through the system"</string> <string name="permdesc_manageOwnCalls" msgid="4431178362202142574">"Allows the app to route its calls through the system in order to improve the calling experience."</string> <string name="permlab_callCompanionApp" msgid="3654373653014126884">"see and control calls through the system."</string> <string name="permdesc_callCompanionApp" msgid="8474168926184156261">"Allows the app to see and control ongoing calls on the device. This includes information such as call numbers for calls and the state of the calls."</string> - <string name="permlab_exemptFromAudioRecordRestrictions" msgid="1164725468350759486">"exempt from audio recording restrictions"</string> + <string name="permlab_exemptFromAudioRecordRestrictions" msgid="1164725468350759486">"exempt from audio record restrictions"</string> <string name="permdesc_exemptFromAudioRecordRestrictions" msgid="2425117015896871976">"Exempt the app from restrictions to record audio."</string> <string name="permlab_acceptHandover" msgid="2925523073573116523">"continue a call from another app"</string> <string name="permdesc_acceptHandovers" msgid="7129026180128626870">"Allows the app to continue a call which was started in another app."</string> @@ -505,64 +505,64 @@ <string name="permdesc_setTimeZone" product="tv" msgid="9069045914174455938">"Allows the app to change your Android TV device\'s time zone."</string> <string name="permdesc_setTimeZone" product="default" msgid="4611828585759488256">"Allows the app to change the phone\'s time zone."</string> <string name="permlab_getAccounts" msgid="5304317160463582791">"find accounts on the device"</string> - <string name="permdesc_getAccounts" product="tablet" msgid="1784452755887604512">"Allows the app to get the list of accounts known by the tablet. This may include any accounts created by applications that you have installed."</string> - <string name="permdesc_getAccounts" product="tv" msgid="437604680436540822">"Allows the app to get the list of accounts known by your Android TV device. This may include any accounts created by applications that you have installed."</string> - <string name="permdesc_getAccounts" product="default" msgid="2491273043569751867">"Allows the app to get the list of accounts known by the phone. This may include any accounts created by applications that you have installed."</string> + <string name="permdesc_getAccounts" product="tablet" msgid="1784452755887604512">"Allows the app to get the list of accounts known by the tablet. This may include any accounts created by applications you have installed."</string> + <string name="permdesc_getAccounts" product="tv" msgid="437604680436540822">"Allows the app to get the list of accounts known by your Android TV device. This may include any accounts created by applications you have installed."</string> + <string name="permdesc_getAccounts" product="default" msgid="2491273043569751867">"Allows the app to get the list of accounts known by the phone. This may include any accounts created by applications you have installed."</string> <string name="permlab_accessNetworkState" msgid="2349126720783633918">"view network connections"</string> <string name="permdesc_accessNetworkState" msgid="4394564702881662849">"Allows the app to view information about network connections such as which networks exist and are connected."</string> <string name="permlab_createNetworkSockets" msgid="3224420491603590541">"have full network access"</string> - <string name="permdesc_createNetworkSockets" msgid="7722020828749535988">"Allows the app to create network sockets and use customised network protocols. The browser and other applications provide means to send data to the Internet, so this permission is not required to send data to the Internet."</string> + <string name="permdesc_createNetworkSockets" msgid="7722020828749535988">"Allows the app to create network sockets and use custom network protocols. The browser and other applications provide means to send data to the internet, so this permission is not required to send data to the internet."</string> <string name="permlab_changeNetworkState" msgid="8945711637530425586">"change network connectivity"</string> <string name="permdesc_changeNetworkState" msgid="649341947816898736">"Allows the app to change the state of network connectivity."</string> <string name="permlab_changeTetherState" msgid="9079611809931863861">"change tethered connectivity"</string> <string name="permdesc_changeTetherState" msgid="3025129606422533085">"Allows the app to change the state of tethered network connectivity."</string> <string name="permlab_accessWifiState" msgid="5552488500317911052">"view Wi-Fi connections"</string> <string name="permdesc_accessWifiState" msgid="6913641669259483363">"Allows the app to view information about Wi-Fi networking, such as whether Wi-Fi is enabled and name of connected Wi-Fi devices."</string> - <string name="permlab_changeWifiState" msgid="7947824109713181554">"Connect and disconnect from Wi-Fi"</string> + <string name="permlab_changeWifiState" msgid="7947824109713181554">"connect and disconnect from Wi-Fi"</string> <string name="permdesc_changeWifiState" msgid="7170350070554505384">"Allows the app to connect to and disconnect from Wi-Fi access points and to make changes to device configuration for Wi-Fi networks."</string> <string name="permlab_changeWifiMulticastState" msgid="285626875870754696">"allow Wi-Fi Multicast reception"</string> <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="191079868596433554">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your tablet. It uses more power than the non-multicast mode."</string> <string name="permdesc_changeWifiMulticastState" product="tv" msgid="1336952358450652595">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your Android TV device. It uses more power than the non-multicast mode."</string> <string name="permdesc_changeWifiMulticastState" product="default" msgid="8296627590220222740">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your phone. It uses more power than the non-multicast mode."</string> - <string name="permlab_bluetoothAdmin" msgid="6490373569441946064">"Access Bluetooth settings"</string> - <string name="permdesc_bluetoothAdmin" product="tablet" msgid="5370837055438574863">"Allows the app to configure the local Bluetooth tablet and to discover and pair with remote devices."</string> - <string name="permdesc_bluetoothAdmin" product="tv" msgid="1623992984547014588">"Allows the app to configure Bluetooth on your Android TV device and to discover and pair with remote devices."</string> - <string name="permdesc_bluetoothAdmin" product="default" msgid="7381341743021234863">"Allows the app to configure the local Bluetooth phone and to discover and pair with remote devices."</string> + <string name="permlab_bluetoothAdmin" msgid="6490373569441946064">"access Bluetooth settings"</string> + <string name="permdesc_bluetoothAdmin" product="tablet" msgid="5370837055438574863">"Allows the app to configure the local Bluetooth tablet, and to discover and pair with remote devices."</string> + <string name="permdesc_bluetoothAdmin" product="tv" msgid="1623992984547014588">"Allows the app to configure Bluetooth on your Android TV device, and to discover and pair with remote devices."</string> + <string name="permdesc_bluetoothAdmin" product="default" msgid="7381341743021234863">"Allows the app to configure the local Bluetooth phone, and to discover and pair with remote devices."</string> <string name="permlab_accessWimaxState" msgid="7029563339012437434">"connect and disconnect from WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="5372734776802067708">"Allows the app to determine whether WiMAX is enabled and information about any WiMAX networks that are connected."</string> <string name="permlab_changeWimaxState" msgid="6223305780806267462">"change WiMAX state"</string> <string name="permdesc_changeWimaxState" product="tablet" msgid="4011097664859480108">"Allows the app to connect the tablet to and disconnect the tablet from WiMAX networks."</string> <string name="permdesc_changeWimaxState" product="tv" msgid="5373274458799425276">"Allows the app to connect your Android TV device to and disconnect your Android TV device from WiMAX networks."</string> <string name="permdesc_changeWimaxState" product="default" msgid="1551666203780202101">"Allows the app to connect the phone to and disconnect the phone from WiMAX networks."</string> - <string name="permlab_bluetooth" msgid="586333280736937209">"Pair with Bluetooth devices"</string> - <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Allows the app to view the configuration of Bluetooth on the tablet and to make and accept connections with paired devices."</string> - <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Allows the app to view the configuration of Bluetooth on your Android TV device and to make and accept connections with paired devices."</string> - <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Allows the app to view the configuration of the Bluetooth on the phone and to make and accept connections with paired devices."</string> + <string name="permlab_bluetooth" msgid="586333280736937209">"pair with Bluetooth devices"</string> + <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Allows the app to view the configuration of Bluetooth on the tablet, and to make and accept connections with paired devices."</string> + <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Allows the app to view the configuration of Bluetooth on your Android TV device, and to make and accept connections with paired devices."</string> + <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Allows the app to view the configuration of the Bluetooth on the phone, and to make and accept connections with paired devices."</string> <string name="permlab_bluetooth_scan" msgid="5402587142833124594">"discover and pair nearby Bluetooth devices"</string> <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Allows the app to discover and pair nearby Bluetooth devices"</string> <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"connect to paired Bluetooth devices"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"Allows the app to connect to paired Bluetooth devices"</string> <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"advertise to nearby Bluetooth devices"</string> <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Allows the app to advertise to nearby Bluetooth devices"</string> - <string name="permlab_uwb_ranging" msgid="8141915781475770665">"determine relative position between nearby ultra-wideband devices"</string> - <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Allow the app to determine relative position between nearby ultra-wideband devices"</string> + <string name="permlab_uwb_ranging" msgid="8141915781475770665">"determine relative position between nearby Ultra-Wideband devices"</string> + <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Allow the app to determine relative position between nearby Ultra-Wideband devices"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"interact with nearby Wi‑Fi devices"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Allows the app to advertise, connect and determine the relative position of nearby Wi‑Fi devices"</string> - <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Preferred NFC payment service information"</string> - <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Allows the app to get preferred NFC payment service information, such as registered aids and route destination."</string> - <string name="permlab_nfc" msgid="1904455246837674977">"control Near-Field Communication"</string> - <string name="permdesc_nfc" msgid="8352737680695296741">"Allows the app to communicate with Near Field Communication (NFC) tags, cards and readers."</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Allows the app to advertise, connect, and determine the relative position of nearby Wi‑Fi devices"</string> + <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Preferred NFC Payment Service Information"</string> + <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Allows the app to get preferred nfc payment service information like registered aids and route destination."</string> + <string name="permlab_nfc" msgid="1904455246837674977">"control Near Field Communication"</string> + <string name="permdesc_nfc" msgid="8352737680695296741">"Allows the app to communicate with Near Field Communication (NFC) tags, cards, and readers."</string> <string name="permlab_disableKeyguard" msgid="3605253559020928505">"disable your screen lock"</string> <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"Allows the app to disable the keylock and any associated password security. For example, the phone disables the keylock when receiving an incoming phone call, then re-enables the keylock when the call is finished."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"request screen lock complexity"</string> - <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Allows the app to learn the screen lock complexity level (high, medium, low or none), which indicates the possible range of length and type of the screen lock. The app can also suggest to users that they update the screen lock to a certain level but users can freely ignore and navigate away. Note that the screen lock is not stored in plain text so the app does not know the exact password."</string> + <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Allows the app to learn the screen lock complexity level (high, medium, low or none), which indicates the possible range of length and type of the screen lock. The app can also suggest to users that they update the screen lock to a certain level but users can freely ignore and navigate away. Note that the screen lock is not stored in plaintext so the app does not know the exact password."</string> <string name="permlab_postNotification" msgid="4875401198597803658">"show notifications"</string> <string name="permdesc_postNotification" msgid="5974977162462877075">"Allows the app to show notifications"</string> <string name="permlab_useBiometric" msgid="6314741124749633786">"use biometric hardware"</string> <string name="permdesc_useBiometric" msgid="7502858732677143410">"Allows the app to use biometric hardware for authentication"</string> <string name="permlab_manageFingerprint" msgid="7432667156322821178">"manage fingerprint hardware"</string> <string name="permdesc_manageFingerprint" msgid="2025616816437339865">"Allows the app to invoke methods to add and delete fingerprint templates for use."</string> - <string name="permlab_useFingerprint" msgid="1001421069766751922">"Use fingerprint hardware"</string> + <string name="permlab_useFingerprint" msgid="1001421069766751922">"use fingerprint hardware"</string> <string name="permdesc_useFingerprint" msgid="412463055059323742">"Allows the app to use fingerprint hardware for authentication"</string> <string name="permlab_audioWrite" msgid="8501705294265669405">"modify your music collection"</string> <string name="permdesc_audioWrite" msgid="8057399517013412431">"Allows the app to modify your music collection."</string> @@ -574,15 +574,15 @@ <string name="permdesc_mediaLocation" msgid="597912899423578138">"Allows the app to read locations from your media collection."</string> <string name="biometric_app_setting_name" msgid="3339209978734534457">"Use biometrics"</string> <string name="biometric_or_screen_lock_app_setting_name" msgid="5348462421758257752">"Use biometrics or screen lock"</string> - <string name="biometric_dialog_default_title" msgid="55026799173208210">"Verify that it’s you"</string> + <string name="biometric_dialog_default_title" msgid="55026799173208210">"Verify it’s you"</string> <string name="biometric_dialog_default_subtitle" msgid="8457232339298571992">"Use your biometric to continue"</string> <string name="biometric_or_screen_lock_dialog_default_subtitle" msgid="159539678371552009">"Use your biometric or screen lock to continue"</string> <string name="biometric_error_hw_unavailable" msgid="2494077380540615216">"Biometric hardware unavailable"</string> - <string name="biometric_error_user_canceled" msgid="6732303949695293730">"Authentication cancelled"</string> - <string name="biometric_not_recognized" msgid="5106687642694635888">"Not recognised"</string> - <string name="biometric_error_canceled" msgid="8266582404844179778">"Authentication cancelled"</string> - <string name="biometric_error_device_not_secured" msgid="3129845065043995924">"No pin, pattern or password set"</string> - <string name="biometric_error_generic" msgid="6784371929985434439">"Error while authenticating"</string> + <string name="biometric_error_user_canceled" msgid="6732303949695293730">"Authentication canceled"</string> + <string name="biometric_not_recognized" msgid="5106687642694635888">"Not recognized"</string> + <string name="biometric_error_canceled" msgid="8266582404844179778">"Authentication canceled"</string> + <string name="biometric_error_device_not_secured" msgid="3129845065043995924">"No pin, pattern, or password set"</string> + <string name="biometric_error_generic" msgid="6784371929985434439">"Error authenticating"</string> <string name="screen_lock_app_setting_name" msgid="6054944352976789228">"Use screen lock"</string> <string name="screen_lock_dialog_default_subtitle" msgid="120359538048533695">"Enter your screen lock to continue"</string> <string name="fingerprint_acquired_partial" msgid="4323789264604479684">"Press firmly on the sensor"</string> @@ -597,16 +597,16 @@ <string name="fingerprint_acquired_immobile" msgid="1621891895241888048">"Change the position of your finger slightly each time"</string> <string-array name="fingerprint_acquired_vendor"> </string-array> - <string name="fingerprint_error_not_match" msgid="4599441812893438961">"Fingerprint not recognised"</string> - <string name="fingerprint_udfps_error_not_match" msgid="8236930793223158856">"Fingerprint not recognised"</string> + <string name="fingerprint_error_not_match" msgid="4599441812893438961">"Fingerprint not recognized"</string> + <string name="fingerprint_udfps_error_not_match" msgid="8236930793223158856">"Fingerprint not recognized"</string> <string name="fingerprint_authenticated" msgid="2024862866860283100">"Fingerprint authenticated"</string> <string name="face_authenticated_no_confirmation_required" msgid="8867889115112348167">"Face authenticated"</string> - <string name="face_authenticated_confirmation_required" msgid="6872632732508013755">"Face authenticated. Please press confirm"</string> + <string name="face_authenticated_confirmation_required" msgid="6872632732508013755">"Face authenticated, please press confirm"</string> <string name="fingerprint_error_hw_not_available" msgid="4571700896929561202">"Fingerprint hardware not available."</string> <string name="fingerprint_error_no_space" msgid="7285481581905967580">"Can’t set up fingerprint"</string> - <string name="fingerprint_error_timeout" msgid="2946635815726054226">"Fingerprint timeout reached. Try again."</string> - <string name="fingerprint_error_canceled" msgid="540026881380070750">"Fingerprint operation cancelled."</string> - <string name="fingerprint_error_user_canceled" msgid="7685676229281231614">"Fingerprint operation cancelled by user."</string> + <string name="fingerprint_error_timeout" msgid="2946635815726054226">"Fingerprint time out reached. Try again."</string> + <string name="fingerprint_error_canceled" msgid="540026881380070750">"Fingerprint operation canceled."</string> + <string name="fingerprint_error_user_canceled" msgid="7685676229281231614">"Fingerprint operation canceled by user."</string> <string name="fingerprint_error_lockout" msgid="7853461265604738671">"Too many attempts. Try again later."</string> <string name="fingerprint_error_lockout_permanent" msgid="3895478283943513746">"Too many attempts. Fingerprint sensor disabled."</string> <string name="fingerprint_error_unable_to_process" msgid="1148553603490048742">"Try again."</string> @@ -647,7 +647,7 @@ <string name="face_acquired_not_detected" msgid="2945945257956443257">"Position your face directly in front of the phone."</string> <string name="face_acquired_too_much_motion" msgid="8199691445085189528">"Too much motion. Hold phone steady."</string> <string name="face_acquired_recalibrate" msgid="8724013080976469746">"Please re-enroll your face."</string> - <string name="face_acquired_too_different" msgid="4699657338753282542">"No longer able to recognise face. Try again."</string> + <string name="face_acquired_too_different" msgid="4699657338753282542">"No longer able to recognize face. Try again."</string> <string name="face_acquired_too_similar" msgid="7684650785108399370">"Too similar, please change your pose."</string> <string name="face_acquired_pan_too_extreme" msgid="7822191262299152527">"Turn your head a little less."</string> <string name="face_acquired_tilt_too_extreme" msgid="8618210742620248049">"Tilt your head a little less."</string> @@ -659,8 +659,8 @@ <string name="face_error_hw_not_available" msgid="5085202213036026288">"Can’t verify face. Hardware not available."</string> <string name="face_error_timeout" msgid="2598544068593889762">"Try Face Unlock again"</string> <string name="face_error_no_space" msgid="5649264057026021723">"Can’t store new face data. Delete an old one first."</string> - <string name="face_error_canceled" msgid="2164434737103802131">"Face operation cancelled."</string> - <string name="face_error_user_canceled" msgid="5766472033202928373">"Face Unlock cancelled by user"</string> + <string name="face_error_canceled" msgid="2164434737103802131">"Face operation canceled."</string> + <string name="face_error_user_canceled" msgid="5766472033202928373">"Face Unlock canceled by user"</string> <string name="face_error_lockout" msgid="7864408714994529437">"Too many attempts. Try again later."</string> <string name="face_error_lockout_permanent" msgid="3277134834042995260">"Too many attempts. Face Unlock disabled."</string> <string name="face_error_lockout_screen_lock" msgid="5062609811636860928">"Too many attempts. Enter screen lock instead."</string> @@ -680,7 +680,7 @@ <string name="permlab_readSyncSettings" msgid="6250532864893156277">"read sync settings"</string> <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"Allows the app to read the sync settings for an account. For example, this can determine whether the People app is synced with an account."</string> <string name="permlab_writeSyncSettings" msgid="6583154300780427399">"toggle sync on and off"</string> - <string name="permdesc_writeSyncSettings" msgid="6029151549667182687">"Allows an app to modify the sync settings for an account. For example, this can be used to enable syncing of the People app with an account."</string> + <string name="permdesc_writeSyncSettings" msgid="6029151549667182687">"Allows an app to modify the sync settings for an account. For example, this can be used to enable sync of the People app with an account."</string> <string name="permlab_readSyncStats" msgid="3747407238320105332">"read sync statistics"</string> <string name="permdesc_readSyncStats" msgid="3867809926567379434">"Allows an app to read the sync stats for an account, including the history of sync events and how much data is synced."</string> <string name="permlab_sdcardRead" msgid="5791467020950064920">"read the contents of your shared storage"</string> @@ -750,12 +750,12 @@ <string name="policylab_limitPassword" msgid="4851829918814422199">"Set password rules"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Control the length and the characters allowed in screen lock passwords and PINs."</string> <string name="policylab_watchLogin" msgid="7599669460083719504">"Monitor screen unlock attempts"</string> - <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Monitor the number of incorrect passwords typed when unlocking the screen and lock the tablet or erase all the tablet\'s data if too many incorrect passwords are typed."</string> - <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock your Android TV device or delete all of your Android TV device\'s data if too many incorrect passwords are typed."</string> - <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the infotainment system or erase all the infotainment system\'s data if too many incorrect passwords are typed."</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Monitor the number of incorrect passwords typed when unlocking the screen and lock the phone or erase all the phone\'s data if too many incorrect passwords are typed."</string> + <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the tablet or erase all the tablet\'s data if too many incorrect passwords are typed."</string> + <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock your Android TV device or erase all your Android TV device\'s data if too many incorrect passwords are typed."</string> + <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Monitor the number of incorrect passwords typed. when unlocking the screen, and lock the infotainment system or erase all the infotainment system\'s data if too many incorrect passwords are typed."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Monitor the number of incorrect passwords typed. when unlocking the screen, and lock the phone or erase all the phone\'s data if too many incorrect passwords are typed."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the tablet or erase all this user\'s data if too many incorrect passwords are typed."</string> - <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock your Android TV device or delete all of this user\'s data if too many incorrect passwords are typed."</string> + <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock your Android TV device or erase all this user\'s data if too many incorrect passwords are typed."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the infotainment system or erase all this profile\'s data if too many incorrect passwords are typed."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="9177645136475155924">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the phone or erase all this user\'s data if too many incorrect passwords are typed."</string> <string name="policylab_resetPassword" msgid="214556238645096520">"Change the screen lock"</string> @@ -764,19 +764,19 @@ <string name="policydesc_forceLock" msgid="1008844760853899693">"Control how and when the screen locks."</string> <string name="policylab_wipeData" msgid="1359485247727537311">"Erase all data"</string> <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"Erase the tablet\'s data without warning by performing a factory data reset."</string> - <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Delete your Android TV device\'s data without warning by performing a factory data reset."</string> + <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Erase your Android TV device\'s data without warning by performing a factory data reset."</string> <string name="policydesc_wipeData" product="automotive" msgid="660804547737323300">"Erase the infotainment system\'s data without warning by performing a factory data reset."</string> <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"Erase the phone\'s data without warning by performing a factory data reset."</string> <string name="policylab_wipeData_secondaryUser" product="automotive" msgid="115034358520328373">"Erase profile data"</string> <string name="policylab_wipeData_secondaryUser" product="default" msgid="413813645323433166">"Erase user data"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"Erase this user\'s data on this tablet without warning."</string> - <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2293713284515865200">"Delete this user\'s data on this Android TV device without warning."</string> + <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2293713284515865200">"Erase this user\'s data on this Android TV device without warning."</string> <string name="policydesc_wipeData_secondaryUser" product="automotive" msgid="4658832487305780879">"Erase this profile\'s data on this infotainment system without warning."</string> <string name="policydesc_wipeData_secondaryUser" product="default" msgid="2788325512167208654">"Erase this user\'s data on this phone without warning."</string> <string name="policylab_setGlobalProxy" msgid="215332221188670221">"Set the device global proxy"</string> <string name="policydesc_setGlobalProxy" msgid="7149665222705519604">"Set the device global proxy to be used while policy is enabled. Only the device owner can set the global proxy."</string> - <string name="policylab_expirePassword" msgid="6015404400532459169">"Set screen lock password expiry"</string> - <string name="policydesc_expirePassword" msgid="9136524319325960675">"Change how frequently the screen lock password, PIN or pattern must be changed."</string> + <string name="policylab_expirePassword" msgid="6015404400532459169">"Set screen lock password expiration"</string> + <string name="policydesc_expirePassword" msgid="9136524319325960675">"Change how frequently the screen lock password, PIN, or pattern must be changed."</string> <string name="policylab_encryptedStorage" msgid="9012936958126670110">"Set storage encryption"</string> <string name="policydesc_encryptedStorage" msgid="1102516950740375617">"Require that stored app data be encrypted."</string> <string name="policylab_disableCamera" msgid="5749486347810162018">"Disable cameras"</string> @@ -787,8 +787,8 @@ <item msgid="8996339953292723951">"Home"</item> <item msgid="7740243458912727194">"Mobile"</item> <item msgid="8526146065496663766">"Work"</item> - <item msgid="8150904584178569699">"Work fax"</item> - <item msgid="4537253139152229577">"Home fax"</item> + <item msgid="8150904584178569699">"Work Fax"</item> + <item msgid="4537253139152229577">"Home Fax"</item> <item msgid="6751245029698664340">"Pager"</item> <item msgid="1692790665884224905">"Other"</item> <item msgid="6216981255272016212">"Custom"</item> @@ -830,8 +830,8 @@ <string name="phoneTypeHome" msgid="3880132427643623588">"Home"</string> <string name="phoneTypeMobile" msgid="1178852541462086735">"Mobile"</string> <string name="phoneTypeWork" msgid="6604967163358864607">"Work"</string> - <string name="phoneTypeFaxWork" msgid="6757519896109439123">"Work fax"</string> - <string name="phoneTypeFaxHome" msgid="6678559953115904345">"Home fax"</string> + <string name="phoneTypeFaxWork" msgid="6757519896109439123">"Work Fax"</string> + <string name="phoneTypeFaxHome" msgid="6678559953115904345">"Home Fax"</string> <string name="phoneTypePager" msgid="576402072263522767">"Pager"</string> <string name="phoneTypeOther" msgid="6918196243648754715">"Other"</string> <string name="phoneTypeCallback" msgid="3455781500844157767">"Callback"</string> @@ -842,7 +842,7 @@ <string name="phoneTypeOtherFax" msgid="3037145630364770357">"Other Fax"</string> <string name="phoneTypeRadio" msgid="2637819130239264771">"Radio"</string> <string name="phoneTypeTelex" msgid="2558783611711876562">"Telex"</string> - <string name="phoneTypeTtyTdd" msgid="532038552105328779">"TTY/TDD"</string> + <string name="phoneTypeTtyTdd" msgid="532038552105328779">"TTY TDD"</string> <string name="phoneTypeWorkMobile" msgid="7522314392003565121">"Work Mobile"</string> <string name="phoneTypeWorkPager" msgid="3748332310638505234">"Work Pager"</string> <string name="phoneTypeAssistant" msgid="757550783842231039">"Assistant"</string> @@ -873,7 +873,7 @@ <string name="imProtocolGoogleTalk" msgid="9194016024343166782">"Hangouts"</string> <string name="imProtocolIcq" msgid="2410325380427389521">"ICQ"</string> <string name="imProtocolJabber" msgid="7919269388889582015">"Jabber"</string> - <string name="imProtocolNetMeeting" msgid="4985002408136148256">"Net Meeting"</string> + <string name="imProtocolNetMeeting" msgid="4985002408136148256">"NetMeeting"</string> <string name="orgTypeWork" msgid="8684458700669564172">"Work"</string> <string name="orgTypeOther" msgid="5450675258408005553">"Other"</string> <string name="orgTypeCustom" msgid="1126322047677329218">"Custom"</string> @@ -900,12 +900,12 @@ <string name="keyguard_password_enter_pin_code" msgid="6401406801060956153">"Type PIN code"</string> <string name="keyguard_password_enter_puk_code" msgid="3112256684547584093">"Type PUK and new PIN code"</string> <string name="keyguard_password_enter_puk_prompt" msgid="2825313071899938305">"PUK code"</string> - <string name="keyguard_password_enter_pin_prompt" msgid="5505434724229581207">"New PIN Code"</string> + <string name="keyguard_password_enter_pin_prompt" msgid="5505434724229581207">"New PIN code"</string> <string name="keyguard_password_entry_touch_hint" msgid="4032288032993261520"><font size="17">"Tap to type password"</font></string> <string name="keyguard_password_enter_password_code" msgid="2751130557661643482">"Type password to unlock"</string> <string name="keyguard_password_enter_pin_password_code" msgid="7792964196473964340">"Type PIN to unlock"</string> <string name="keyguard_password_wrong_pin_code" msgid="8583732939138432793">"Incorrect PIN code."</string> - <string name="keyguard_label_text" msgid="3841953694564168384">"To unlock, press Menu, then 0."</string> + <string name="keyguard_label_text" msgid="3841953694564168384">"To unlock, press Menu then 0."</string> <string name="emergency_call_dialog_number_for_display" msgid="2978165477085612673">"Emergency number"</string> <string name="lockscreen_carrier_default" msgid="6192313772955399160">"No service"</string> <string name="lockscreen_screen_locked" msgid="7364905540516041817">"Screen locked."</string> @@ -933,7 +933,7 @@ <string name="lockscreen_transport_play_description" msgid="106868788691652733">"Play"</string> <string name="lockscreen_transport_stop_description" msgid="1449552232598355348">"Stop"</string> <string name="lockscreen_transport_rew_description" msgid="7680106856221622779">"Rewind"</string> - <string name="lockscreen_transport_ffw_description" msgid="4763794746640196772">"Fast-forward"</string> + <string name="lockscreen_transport_ffw_description" msgid="4763794746640196772">"Fast forward"</string> <string name="emergency_calls_only" msgid="3057351206678279851">"Emergency calls only"</string> <string name="lockscreen_network_locked_message" msgid="2814046965899249635">"Network locked"</string> <string name="lockscreen_sim_puk_locked_message" msgid="6618356415831082174">"SIM card is PUK-locked."</string> @@ -943,9 +943,9 @@ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6458790975898594240">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string> <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="3118353451602377380">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string> <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="2874278239714821984">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="3069635524964070596">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using your Google sign-in.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="6399092175942158529">"You have drawn your unlock pattern incorrectly <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your Android TV device using your Google sign-in.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="5691623136957148335">"You have drawn your unlock pattern incorrectly <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using your Google sign-in.\n\n Please try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="3069635524964070596">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="6399092175942158529">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your Android TV device using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="5691623136957148335">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="7914445759242151426">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the tablet will be reset to factory default and all user data will be lost."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="4275591249631864248">"You have incorrectly attempted to unlock your Android TV device <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, your Android TV device will be reset to factory default and all user data will be lost."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="1166532464798446579">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the phone will be reset to factory default and all user data will be lost."</string> @@ -953,15 +953,15 @@ <string name="lockscreen_failed_attempts_now_wiping" product="tv" msgid="2205435033340091883">"You have incorrectly attempted to unlock your Android TV device <xliff:g id="NUMBER">%d</xliff:g> times. Your Android TV device will now be reset to factory default."</string> <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="2203704707679895487">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The phone will now be reset to factory default."</string> <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6807200118164539589">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string> - <string name="lockscreen_forgot_pattern_button_text" msgid="8362442730606839031">"Forgotten pattern?"</string> + <string name="lockscreen_forgot_pattern_button_text" msgid="8362442730606839031">"Forgot pattern?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="9218940117797602518">"Account unlock"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="3775904917743034195">"Too many pattern attempts"</string> - <string name="lockscreen_glogin_instructions" msgid="4695162942525531700">"To unlock, sign in with your Google Account."</string> + <string name="lockscreen_glogin_instructions" msgid="4695162942525531700">"To unlock, sign in with your Google account."</string> <string name="lockscreen_glogin_username_hint" msgid="6916101478673157045">"Username (email)"</string> <string name="lockscreen_glogin_password_hint" msgid="3031027901286812848">"Password"</string> <string name="lockscreen_glogin_submit_button" msgid="3590556636347843733">"Sign in"</string> <string name="lockscreen_glogin_invalid_input" msgid="4369219936865697679">"Invalid username or password."</string> - <string name="lockscreen_glogin_account_recovery_hint" msgid="1683405808525090649">"Forgot your username or password?\nVisit "<b>"google.co.uk/accounts/recovery"</b>"."</string> + <string name="lockscreen_glogin_account_recovery_hint" msgid="1683405808525090649">"Forgot your username or password?\nVisit "<b>"google.com/accounts/recovery"</b>"."</string> <string name="lockscreen_glogin_checking_password" msgid="2607271802803381645">"Checking…"</string> <string name="lockscreen_unlock_label" msgid="4648257878373307582">"Unlock"</string> <string name="lockscreen_sound_on_label" msgid="1660281470535492430">"Sound on"</string> @@ -973,7 +973,7 @@ <string name="lockscreen_access_pattern_detected" msgid="3931150554035194012">"Pattern completed"</string> <string name="lockscreen_access_pattern_area" msgid="1288780416685002841">"Pattern area."</string> <string name="keyguard_accessibility_widget_changed" msgid="7298011259508200234">"%1$s. Widget %2$d of %3$d."</string> - <string name="keyguard_accessibility_add_widget" msgid="8245795023551343672">"Add widget"</string> + <string name="keyguard_accessibility_add_widget" msgid="8245795023551343672">"Add widget."</string> <string name="keyguard_accessibility_widget_empty_slot" msgid="544239307077644480">"Empty"</string> <string name="keyguard_accessibility_unlock_area_expanded" msgid="7768634718706488951">"Unlock area expanded."</string> <string name="keyguard_accessibility_unlock_area_collapsed" msgid="4729922043778400434">"Unlock area collapsed."</string> @@ -990,8 +990,8 @@ <string name="keyguard_accessibility_pattern_unlock" msgid="8669128146589233293">"Pattern unlock."</string> <string name="keyguard_accessibility_face_unlock" msgid="4533832120787386728">"Face Unlock."</string> <string name="keyguard_accessibility_pin_unlock" msgid="4020864007967340068">"Pin unlock."</string> - <string name="keyguard_accessibility_sim_pin_unlock" msgid="4895939120871890557">"SIM PIN unlock."</string> - <string name="keyguard_accessibility_sim_puk_unlock" msgid="3459003464041899101">"SIM PUK unlock."</string> + <string name="keyguard_accessibility_sim_pin_unlock" msgid="4895939120871890557">"Sim Pin unlock."</string> + <string name="keyguard_accessibility_sim_puk_unlock" msgid="3459003464041899101">"Sim Puk unlock."</string> <string name="keyguard_accessibility_password_unlock" msgid="6130186108581153265">"Password unlock."</string> <string name="keyguard_accessibility_pattern_area" msgid="1419570880512350689">"Pattern area."</string> <string name="keyguard_accessibility_slide_area" msgid="4331399051142520176">"Slide area."</string> @@ -1013,18 +1013,18 @@ <string name="js_dialog_before_unload_negative_button" msgid="3873765747622415310">"Stay on this Page"</string> <string name="js_dialog_before_unload" msgid="7213364985774778744">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nAre you sure you want to navigate away from this page?"</string> <string name="save_password_label" msgid="9161712335355510035">"Confirm"</string> - <string name="double_tap_toast" msgid="7065519579174882778">"Tip: double-tap to zoom in and out."</string> - <string name="autofill_this_form" msgid="3187132440451621492">"Auto-fill"</string> - <string name="setup_autofill" msgid="5431369130866618567">"Set up Auto-fill"</string> + <string name="double_tap_toast" msgid="7065519579174882778">"Tip: Double-tap to zoom in and out."</string> + <string name="autofill_this_form" msgid="3187132440451621492">"Autofill"</string> + <string name="setup_autofill" msgid="5431369130866618567">"Set up Autofill"</string> <string name="autofill_window_title" msgid="4379134104008111961">"Autofill with <xliff:g id="SERVICENAME">%1$s</xliff:g>"</string> <string name="autofill_address_name_separator" msgid="8190155636149596125">" "</string> <string name="autofill_address_summary_name_format" msgid="3402882515222673691">"$1$2$3"</string> <string name="autofill_address_summary_separator" msgid="760522655085707045">", "</string> <string name="autofill_address_summary_format" msgid="8417010069362125194">"$1$2$3"</string> <string name="autofill_province" msgid="3676846437741893159">"Province"</string> - <string name="autofill_postal_code" msgid="7034789388968295591">"Postcode"</string> + <string name="autofill_postal_code" msgid="7034789388968295591">"Postal code"</string> <string name="autofill_state" msgid="3341725337190434069">"State"</string> - <string name="autofill_zip_code" msgid="1315503730274962450">"Zip code"</string> + <string name="autofill_zip_code" msgid="1315503730274962450">"ZIP code"</string> <string name="autofill_county" msgid="7781382735643492173">"County"</string> <string name="autofill_island" msgid="5367139008536593734">"Island"</string> <string name="autofill_district" msgid="6428712062213557327">"District"</string> @@ -1036,15 +1036,15 @@ <string name="permlab_readHistoryBookmarks" msgid="9102293913842539697">"read your Web bookmarks and history"</string> <string name="permdesc_readHistoryBookmarks" msgid="2323799501008967852">"Allows the app to read the history of all URLs that the Browser has visited, and all of the Browser\'s bookmarks. Note: this permission may not be enforced by third-party browsers or other applications with web browsing capabilities."</string> <string name="permlab_writeHistoryBookmarks" msgid="6090259925187986937">"write web bookmarks and history"</string> - <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="573341025292489065">"Allows the app to modify the Browser\'s history or bookmarks stored on your tablet. This may allow the app to delete or modify Browser data. Note: this permission may not be enforced by third-party browsers or other applications with web browsing capabilities."</string> - <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="88642768580408561">"Allows the app to modify the browser\'s history or bookmarks stored on your Android TV device. This may allow the app to delete or modify browser data. Note: This permission may not be enforced by third-party browsers or other applications with web browsing capabilities."</string> - <string name="permdesc_writeHistoryBookmarks" product="default" msgid="2245203087160913652">"Allows the app to modify the Browser\'s history or bookmarks stored on your phone. This may allow the app to delete or modify Browser data. Note: this permission may not be enforced by third-party browsers or other applications with web browsing capabilities."</string> + <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="573341025292489065">"Allows the app to modify the Browser\'s history or bookmarks stored on your tablet. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string> + <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="88642768580408561">"Allows the app to modify the Browser\'s history or bookmarks stored on your Android TV device. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string> + <string name="permdesc_writeHistoryBookmarks" product="default" msgid="2245203087160913652">"Allows the app to modify the Browser\'s history or bookmarks stored on your phone. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string> <string name="permlab_setAlarm" msgid="1158001610254173567">"set an alarm"</string> <string name="permdesc_setAlarm" msgid="2185033720060109640">"Allows the app to set an alarm in an installed alarm clock app. Some alarm clock apps may not implement this feature."</string> <string name="permlab_addVoicemail" msgid="4770245808840814471">"add voicemail"</string> <string name="permdesc_addVoicemail" msgid="5470312139820074324">"Allows the app to add messages to your voicemail inbox."</string> - <string name="permlab_writeGeolocationPermissions" msgid="8605631647492879449">"Modify Browser geo-location permissions"</string> - <string name="permdesc_writeGeolocationPermissions" msgid="5817346421222227772">"Allows the app to modify the Browser\'s geo-location permissions. Malicious apps may use this to allow sending location information to arbitrary websites."</string> + <string name="permlab_writeGeolocationPermissions" msgid="8605631647492879449">"modify Browser geolocation permissions"</string> + <string name="permdesc_writeGeolocationPermissions" msgid="5817346421222227772">"Allows the app to modify the Browser\'s geolocation permissions. Malicious apps may use this to allow sending location information to arbitrary web sites."</string> <string name="save_password_message" msgid="2146409467245462965">"Do you want the browser to remember this password?"</string> <string name="save_password_notnow" msgid="2878327088951240061">"Not now"</string> <string name="save_password_remember" msgid="6490888932657708341">"Remember"</string> @@ -1053,9 +1053,9 @@ <string name="text_copied" msgid="2531420577879738860">"Text copied to clipboard."</string> <string name="pasted_from_app" msgid="5627698450808256545">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted from <xliff:g id="SOURCE_APP_NAME">%2$s</xliff:g>"</string> <string name="pasted_from_clipboard" msgid="7355790625710831847">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted from your clipboard"</string> - <string name="pasted_text" msgid="4298871641549173733">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted text that you copied"</string> - <string name="pasted_image" msgid="4729097394781491022">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted an image that you copied"</string> - <string name="pasted_content" msgid="646276353060777131">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted content that you copied"</string> + <string name="pasted_text" msgid="4298871641549173733">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted text you copied"</string> + <string name="pasted_image" msgid="4729097394781491022">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted an image you copied"</string> + <string name="pasted_content" msgid="646276353060777131">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> pasted content you copied"</string> <string name="more_item_label" msgid="7419249600215749115">"More"</string> <string name="prepend_shortcut_label" msgid="1743716737502867951">"Menu+"</string> <string name="menu_meta_shortcut_label" msgid="1623390163674762478">"Meta+"</string> @@ -1084,7 +1084,7 @@ <string name="older" msgid="1645159827884647400">"Older"</string> <string name="preposition_for_date" msgid="2780767868832729599">"on <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="4336835286453822053">"at <xliff:g id="TIME">%s</xliff:g>"</string> - <string name="preposition_for_year" msgid="3149809685340130039">"in<xliff:g id="YEAR">%s</xliff:g>"</string> + <string name="preposition_for_year" msgid="3149809685340130039">"in <xliff:g id="YEAR">%s</xliff:g>"</string> <string name="day" msgid="8394717255950176156">"day"</string> <string name="days" msgid="4570879797423034973">"days"</string> <string name="hour" msgid="7796325297097314653">"hour"</string> @@ -1105,7 +1105,7 @@ <string name="duration_minutes_shortest_future" msgid="5260857299282734759">"in <xliff:g id="COUNT">%d</xliff:g>m"</string> <string name="duration_hours_shortest_future" msgid="2979276794547981674">"in <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"in <xliff:g id="COUNT">%d</xliff:g>d"</string> - <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g> y"</string> + <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g>y"</string> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minute ago}other{# minutes ago}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hour ago}other{# hours ago}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# day ago}other{# days ago}}"</string> @@ -1131,13 +1131,13 @@ <string name="failed_to_copy_to_clipboard" msgid="725919885138539875">"Failed to copy to clipboard"</string> <string name="paste" msgid="461843306215520225">"Paste"</string> <string name="paste_as_plain_text" msgid="7664800665823182587">"Paste as plain text"</string> - <string name="replace" msgid="7842675434546657444">"Replace..."</string> + <string name="replace" msgid="7842675434546657444">"Replace…"</string> <string name="delete" msgid="1514113991712129054">"Delete"</string> <string name="copyUrl" msgid="6229645005987260230">"Copy URL"</string> <string name="selectTextMode" msgid="3225108910999318778">"Select text"</string> <string name="undo" msgid="3175318090002654673">"Undo"</string> <string name="redo" msgid="7231448494008532233">"Redo"</string> - <string name="autofill" msgid="511224882647795296">"Auto-fill"</string> + <string name="autofill" msgid="511224882647795296">"Autofill"</string> <string name="textSelectionCABTitle" msgid="5151441579532476940">"Text selection"</string> <string name="addToDictionary" msgid="8041821113480950096">"Add to dictionary"</string> <string name="deleteText" msgid="4200807474529938112">"Delete"</string> @@ -1147,7 +1147,7 @@ <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Switch input method"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Storage space running out"</string> <string name="low_internal_storage_view_text" msgid="8172166728369697835">"Some system functions may not work"</string> - <string name="low_internal_storage_view_text_no_boot" msgid="7368968163411251788">"Not enough storage for the system. Make sure that you have 250 MB of free space and restart."</string> + <string name="low_internal_storage_view_text_no_boot" msgid="7368968163411251788">"Not enough storage for the system. Make sure you have 250MB of free space and restart."</string> <string name="app_running_notification_title" msgid="8985999749231486569">"<xliff:g id="APP_NAME">%1$s</xliff:g> is running"</string> <string name="app_running_notification_text" msgid="5120815883400228566">"Tap for more information or to stop the app."</string> <string name="ok" msgid="2646370155170753815">"OK"</string> @@ -1162,7 +1162,7 @@ <string name="not_checked" msgid="7972320087569023342">"not checked"</string> <string name="selected" msgid="6614607926197755875">"selected"</string> <string name="not_selected" msgid="410652016565864475">"not selected"</string> - <string name="in_progress" msgid="2149208189184319441">"In progress"</string> + <string name="in_progress" msgid="2149208189184319441">"in progress"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete action using"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Complete action using %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Complete action"</string> @@ -1225,8 +1225,8 @@ <string name="unsupported_compile_sdk_message" msgid="7326293500707890537">"<xliff:g id="APP_NAME">%1$s</xliff:g> was built for an incompatible version of the Android OS and may behave unexpectedly. An updated version of the app may be available."</string> <string name="unsupported_compile_sdk_show" msgid="1601210057960312248">"Always show"</string> <string name="unsupported_compile_sdk_check_update" msgid="1103639989147664456">"Check for update"</string> - <string name="smv_application" msgid="3775183542777792638">"The app <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) has violated its self-enforced Strict Mode policy."</string> - <string name="smv_process" msgid="1398801497130695446">"The process <xliff:g id="PROCESS">%1$s</xliff:g> has violated its self-enforced StrictMode policy."</string> + <string name="smv_application" msgid="3775183542777792638">"The app <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) has violated its self-enforced StrictMode policy."</string> + <string name="smv_process" msgid="1398801497130695446">"The process <xliff:g id="PROCESS">%1$s</xliff:g> has has violated its self-enforced StrictMode policy."</string> <string name="android_upgrading_title" product="default" msgid="7279077384220829683">"Phone is updating…"</string> <string name="android_upgrading_title" product="tablet" msgid="4268417249079938805">"Tablet is updating…"</string> <string name="android_upgrading_title" product="device" msgid="6774767702998149762">"Device is updating…"</string> @@ -1234,19 +1234,19 @@ <string name="android_start_title" product="automotive" msgid="7917984412828168079">"Android is starting…"</string> <string name="android_start_title" product="tablet" msgid="4429767260263190344">"Tablet is starting…"</string> <string name="android_start_title" product="device" msgid="6967413819673299309">"Device is starting…"</string> - <string name="android_upgrading_fstrim" msgid="3259087575528515329">"Optimising storage."</string> + <string name="android_upgrading_fstrim" msgid="3259087575528515329">"Optimizing storage."</string> <string name="android_upgrading_notification_title" product="default" msgid="3509927005342279257">"Finishing system update…"</string> <string name="app_upgrading_toast" msgid="1016267296049455585">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string> - <string name="android_upgrading_apk" msgid="1339564803894466737">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="android_upgrading_apk" msgid="1339564803894466737">"Optimizing app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> <string name="android_preparing_apk" msgid="589736917792300956">"Preparing <xliff:g id="APPNAME">%1$s</xliff:g>."</string> <string name="android_upgrading_starting_apps" msgid="6206161195076057075">"Starting apps."</string> <string name="android_upgrading_complete" msgid="409800058018374746">"Finishing boot."</string> <string name="fp_power_button_enrollment_title" msgid="3574363228413259548">"Continue setup?"</string> - <string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"You pressed the power button – this usually turns off the screen.\n\nTry tapping lightly while setting up your fingerprint."</string> + <string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"You pressed the power button — this usually turns off the screen.\n\nTry tapping lightly while setting up your fingerprint."</string> <string name="fp_power_button_enrollment_positive_button" msgid="2095415838459356833">"Turn off screen"</string> <string name="fp_power_button_enrollment_negative_button" msgid="6558436406362486747">"Continue setup"</string> <string name="fp_power_button_bp_title" msgid="5585506104526820067">"Continue verifying your fingerprint?"</string> - <string name="fp_power_button_bp_message" msgid="2983163038168903393">"You pressed the power button – this usually turns off the screen.\n\nTry tapping lightly to verify your fingerprint."</string> + <string name="fp_power_button_bp_message" msgid="2983163038168903393">"You pressed the power button — this usually turns off the screen.\n\nTry tapping lightly to verify your fingerprint."</string> <string name="fp_power_button_bp_positive_button" msgid="728945472408552251">"Turn off screen"</string> <string name="fp_power_button_bp_negative_button" msgid="3971364246496775178">"Continue"</string> <string name="heavy_weight_notification" msgid="8382784283600329576">"<xliff:g id="APP">%1$s</xliff:g> running"</string> @@ -1261,8 +1261,8 @@ <string name="dump_heap_notification_detail" msgid="8431586843001054050">"Heap dump collected. Tap to share."</string> <string name="dump_heap_title" msgid="4367128917229233901">"Share heap dump?"</string> <string name="dump_heap_text" msgid="1692649033835719336">"The <xliff:g id="PROC">%1$s</xliff:g> process has exceeded its memory limit of <xliff:g id="SIZE">%2$s</xliff:g>. A heap dump is available for you to share with its developer. Be careful: this heap dump can contain any of your personal information that the application has access to."</string> - <string name="dump_heap_system_text" msgid="6805155514925350849">"The <xliff:g id="PROC">%1$s</xliff:g> process has exceeded its memory limit of <xliff:g id="SIZE">%2$s</xliff:g>. A heap dump is available for you to share. Be careful: this heap dump can contain any sensitive personal information that the process has access to, which may include things that you’ve typed."</string> - <string name="dump_heap_ready_text" msgid="5849618132123045516">"A heap dump of <xliff:g id="PROC">%1$s</xliff:g>’s process is available for you to share. Be careful: this heap dump may contain any sensitive personal information that the process has access to, which may include things that you’ve typed."</string> + <string name="dump_heap_system_text" msgid="6805155514925350849">"The <xliff:g id="PROC">%1$s</xliff:g> process has exceeded its memory limit of <xliff:g id="SIZE">%2$s</xliff:g>. A heap dump is available for you to share. Be careful: this heap dump can contain any sensitive personal information that the process has access to, which may include things you’ve typed."</string> + <string name="dump_heap_ready_text" msgid="5849618132123045516">"A heap dump of <xliff:g id="PROC">%1$s</xliff:g>’s process is available for you to share. Be careful: this heap dump may contain any sensitive personal information that the process has access to, which may include things you’ve typed."</string> <string name="sendText" msgid="493003724401350724">"Choose an action for text"</string> <string name="volume_ringtone" msgid="134784084629229029">"Ringer volume"</string> <string name="volume_music" msgid="7727274216734955095">"Media volume"</string> @@ -1282,22 +1282,22 @@ <string name="ringtone_default_with_actual" msgid="2709686194556159773">"Default (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="397111123930141876">"None"</string> <string name="ringtone_picker_title" msgid="667342618626068253">"Ringtones"</string> - <string name="ringtone_picker_title_alarm" msgid="7438934548339024767">"Alarm Sounds"</string> - <string name="ringtone_picker_title_notification" msgid="6387191794719608122">"Notification Sounds"</string> + <string name="ringtone_picker_title_alarm" msgid="7438934548339024767">"Alarm sounds"</string> + <string name="ringtone_picker_title_notification" msgid="6387191794719608122">"Notification sounds"</string> <string name="ringtone_unknown" msgid="5059495249862816475">"Unknown"</string> - <string name="wifi_available_sign_in" msgid="381054692557675237">"Sign in to a Wi-Fi network"</string> + <string name="wifi_available_sign_in" msgid="381054692557675237">"Sign in to Wi-Fi network"</string> <string name="network_available_sign_in" msgid="1520342291829283114">"Sign in to network"</string> <!-- no translation found for network_available_sign_in_detailed (7520423801613396556) --> <skip /> - <string name="wifi_no_internet" msgid="1386911698276448061">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> has no Internet access"</string> + <string name="wifi_no_internet" msgid="1386911698276448061">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> has no internet access"</string> <string name="wifi_no_internet_detailed" msgid="634938444133558942">"Tap for options"</string> - <string name="mobile_no_internet" msgid="4014455157529909781">"Mobile network has no Internet access"</string> - <string name="other_networks_no_internet" msgid="6698711684200067033">"Network has no Internet access"</string> + <string name="mobile_no_internet" msgid="4014455157529909781">"Mobile network has no internet access"</string> + <string name="other_networks_no_internet" msgid="6698711684200067033">"Network has no internet access"</string> <string name="private_dns_broken_detailed" msgid="3709388271074611847">"Private DNS server cannot be accessed"</string> <string name="network_partial_connectivity" msgid="4791024923851432291">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> has limited connectivity"</string> <string name="network_partial_connectivity_detailed" msgid="5741329444564575840">"Tap to connect anyway"</string> <string name="network_switch_metered" msgid="1531869544142283384">"Switched to <xliff:g id="NETWORK_TYPE">%1$s</xliff:g>"</string> - <string name="network_switch_metered_detail" msgid="1358296010128405906">"Device uses <xliff:g id="NEW_NETWORK">%1$s</xliff:g> when <xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> has no Internet access. Charges may apply."</string> + <string name="network_switch_metered_detail" msgid="1358296010128405906">"Device uses <xliff:g id="NEW_NETWORK">%1$s</xliff:g> when <xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> has no internet access. Charges may apply."</string> <string name="network_switch_metered_toast" msgid="501662047275723743">"Switched from <xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> to <xliff:g id="NEW_NETWORK">%2$s</xliff:g>"</string> <string-array name="network_switch_type_name"> <item msgid="2255670471736226365">"mobile data"</item> @@ -1341,7 +1341,7 @@ <string name="date_time_done" msgid="8363155889402873463">"Done"</string> <string name="perms_new_perm_prefix" msgid="6984556020395757087"><font size="12" fgcolor="#ff33b5e5">"NEW: "</font></string> <string name="perms_description_app" msgid="2747752389870161996">"Provided by <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> - <string name="no_permissions" msgid="5729199278862516390">"No permission required"</string> + <string name="no_permissions" msgid="5729199278862516390">"No permissions required"</string> <string name="perm_costs_money" msgid="749054595022779685">"this may cost you money"</string> <string name="dlg_ok" msgid="5103447663504839312">"OK"</string> <string name="usb_charging_notification_title" msgid="1674124518282666955">"Charging this device via USB"</string> @@ -1353,7 +1353,7 @@ <string name="usb_accessory_notification_title" msgid="1385394660861956980">"USB accessory connected"</string> <string name="usb_notification_message" msgid="4715163067192110676">"Tap for more options."</string> <string name="usb_power_notification_message" msgid="7284765627437897702">"Charging connected device. Tap for more options."</string> - <string name="usb_unsupported_audio_accessory_title" msgid="2335775548086533065">"Analogue audio accessory detected"</string> + <string name="usb_unsupported_audio_accessory_title" msgid="2335775548086533065">"Analog audio accessory detected"</string> <string name="usb_unsupported_audio_accessory_message" msgid="1300168007129796621">"The attached device is not compatible with this phone. Tap to learn more."</string> <string name="adb_active_notification_title" msgid="408390247354560331">"USB debugging connected"</string> <string name="adb_active_notification_message" msgid="5617264033476778211">"Tap to turn off USB debugging"</string> @@ -1391,7 +1391,7 @@ <string name="alert_windows_notification_turn_off_action" msgid="7805857234839123780">"Turn off"</string> <string name="ext_media_checking_notification_title" msgid="8299199995416510094">"Checking <xliff:g id="NAME">%s</xliff:g>…"</string> <string name="ext_media_checking_notification_message" msgid="2231566971425375542">"Reviewing current content"</string> - <string name="ext_media_checking_notification_message" product="tv" msgid="7986154434946021415">"Analysing media storage"</string> + <string name="ext_media_checking_notification_message" product="tv" msgid="7986154434946021415">"Analyzing media storage"</string> <string name="ext_media_new_notification_title" msgid="3517407571407687677">"New <xliff:g id="NAME">%s</xliff:g>"</string> <string name="ext_media_new_notification_title" product="automotive" msgid="9085349544984742727">"<xliff:g id="NAME">%s</xliff:g> isn’t working"</string> <string name="ext_media_new_notification_message" msgid="6095403121990786986">"Tap to set up"</string> @@ -1415,7 +1415,7 @@ <string name="ext_media_nomedia_notification_message" msgid="2832724384636625852">"Some functionality may not work properly. Insert new storage."</string> <string name="ext_media_unmounting_notification_title" msgid="4147986383917892162">"Ejecting <xliff:g id="NAME">%s</xliff:g>"</string> <string name="ext_media_unmounting_notification_message" msgid="5717036261538754203">"Don’t remove"</string> - <string name="ext_media_init_action" msgid="2312974060585056709">"Set-up"</string> + <string name="ext_media_init_action" msgid="2312974060585056709">"Set up"</string> <string name="ext_media_unmount_action" msgid="966992232088442745">"Eject"</string> <string name="ext_media_browse_action" msgid="344865351947079139">"Explore"</string> <string name="ext_media_seamless_action" msgid="8837030226009268080">"Switch output"</string> @@ -1423,7 +1423,7 @@ <string name="ext_media_missing_message" msgid="4408988706227922909">"Insert device again"</string> <string name="ext_media_move_specific_title" msgid="8492118544775964250">"Moving <xliff:g id="NAME">%s</xliff:g>"</string> <string name="ext_media_move_title" msgid="2682741525619033637">"Moving data"</string> - <string name="ext_media_move_success_title" msgid="4901763082647316767">"Content transfer is finished"</string> + <string name="ext_media_move_success_title" msgid="4901763082647316767">"Content transfer is done"</string> <string name="ext_media_move_success_message" msgid="9159542002276982979">"Content moved to <xliff:g id="NAME">%s</xliff:g>"</string> <string name="ext_media_move_failure_title" msgid="3184577479181333665">"Couldn’t move content"</string> <string name="ext_media_move_failure_message" msgid="4197306718121869335">"Try moving content again"</string> @@ -1447,8 +1447,8 @@ <string name="permdesc_requestInstallPackages" msgid="3969369278325313067">"Allows an application to request installation of packages."</string> <string name="permlab_requestDeletePackages" msgid="2541172829260106795">"request delete packages"</string> <string name="permdesc_requestDeletePackages" msgid="6133633516423860381">"Allows an application to request deletion of packages."</string> - <string name="permlab_requestIgnoreBatteryOptimizations" msgid="7646611326036631439">"ask to ignore battery optimisations"</string> - <string name="permdesc_requestIgnoreBatteryOptimizations" msgid="634260656917874356">"Allows an app to ask for permission to ignore battery optimisations for that app."</string> + <string name="permlab_requestIgnoreBatteryOptimizations" msgid="7646611326036631439">"ask to ignore battery optimizations"</string> + <string name="permdesc_requestIgnoreBatteryOptimizations" msgid="634260656917874356">"Allows an app to ask for permission to ignore battery optimizations for that app."</string> <string name="permlab_queryAllPackages" msgid="2928450604653281650">"query all packages"</string> <string name="permdesc_queryAllPackages" msgid="5339069855520996010">"Allows an app to see all installed packages."</string> <string name="tutorial_double_tap_to_zoom_message_short" msgid="1842872462124648678">"Tap twice for zoom control"</string> @@ -1460,9 +1460,9 @@ <string name="ime_action_done" msgid="6299921014822891569">"Done"</string> <string name="ime_action_previous" msgid="6548799326860401611">"Prev"</string> <string name="ime_action_default" msgid="8265027027659800121">"Execute"</string> - <string name="dial_number_using" msgid="6060769078933953531">"Dial number\n using <xliff:g id="NUMBER">%s</xliff:g>"</string> - <string name="create_contact_using" msgid="6200708808003692594">"Create contact\n using <xliff:g id="NUMBER">%s</xliff:g>"</string> - <string name="grant_credentials_permission_message_header" msgid="5365733888842570481">"The following one or more applications request permission to access your account, now and in the future."</string> + <string name="dial_number_using" msgid="6060769078933953531">"Dial number\nusing <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using" msgid="6200708808003692594">"Create contact\nusing <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="grant_credentials_permission_message_header" msgid="5365733888842570481">"The following one or more apps request permission to access your account, now and in the future."</string> <string name="grant_credentials_permission_message_footer" msgid="1886710210516246461">"Do you want to allow this request?"</string> <string name="grant_permissions_header_text" msgid="3420736827804657201">"Access request"</string> <string name="allow" msgid="6195617008611933762">"Allow"</string> @@ -1472,7 +1472,7 @@ <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"Permission requested by <xliff:g id="APP">%1$s</xliff:g>\nfor account <xliff:g id="ACCOUNT">%2$s</xliff:g>."</string> <string name="forward_intent_to_owner" msgid="4620359037192871015">"You\'re using this app outside of your work profile"</string> <string name="forward_intent_to_work" msgid="3620262405636021151">"You\'re using this app in your work profile"</string> - <string name="input_method_binding_label" msgid="1166731601721983656">"Input Method"</string> + <string name="input_method_binding_label" msgid="1166731601721983656">"Input method"</string> <string name="sync_binding_label" msgid="469249309424662147">"Sync"</string> <string name="accessibility_binding_label" msgid="1974602776545801715">"Accessibility"</string> <string name="wallpaper_binding_label" msgid="1197440498000786738">"Wallpaper"</string> @@ -1514,7 +1514,7 @@ <string name="gpsNotifMessage" msgid="7346649122793758032">"Requested by <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)"</string> <string name="gpsVerifYes" msgid="3719843080744112940">"Yes"</string> <string name="gpsVerifNo" msgid="1671201856091564741">"No"</string> - <string name="sync_too_many_deletes" msgid="6999440774578705300">"Deletion limit exceeded"</string> + <string name="sync_too_many_deletes" msgid="6999440774578705300">"Delete limit exceeded"</string> <string name="sync_too_many_deletes_desc" msgid="7409327940303504440">"There are <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> deleted items for <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. What do you want to do?"</string> <string name="sync_really_delete" msgid="5657871730315579051">"Delete the items"</string> <string name="sync_undo_deletes" msgid="5786033331266418896">"Undo the deletes"</string> @@ -1530,8 +1530,8 @@ <string name="time_picker_decrement_minute_button" msgid="230925389943411490">"Decrease minute"</string> <string name="time_picker_increment_hour_button" msgid="3063572723197178242">"Increase hour"</string> <string name="time_picker_decrement_hour_button" msgid="584101766855054412">"Decrease hour"</string> - <string name="time_picker_increment_set_pm_button" msgid="5889149366900376419">"Set p.m."</string> - <string name="time_picker_decrement_set_am_button" msgid="1422608001541064087">"Set a.m."</string> + <string name="time_picker_increment_set_pm_button" msgid="5889149366900376419">"Set PM"</string> + <string name="time_picker_decrement_set_am_button" msgid="1422608001541064087">"Set AM"</string> <string name="date_picker_increment_month_button" msgid="3447263316096060309">"Increase month"</string> <string name="date_picker_decrement_month_button" msgid="6531888937036883014">"Decrease month"</string> <string name="date_picker_increment_day_button" msgid="4349336637188534259">"Increase day"</string> @@ -1583,15 +1583,15 @@ <string name="issued_to" msgid="5975877665505297662">"Issued to:"</string> <string name="common_name" msgid="1486334593631798443">"Common name:"</string> <string name="org_name" msgid="7526331696464255245">"Organization:"</string> - <string name="org_unit" msgid="995934486977223076">"Organisational unit:"</string> + <string name="org_unit" msgid="995934486977223076">"Organizational unit:"</string> <string name="issued_by" msgid="7872459822431585684">"Issued by:"</string> <string name="validity_period" msgid="1717724283033175968">"Validity:"</string> <string name="issued_on" msgid="5855489688152497307">"Issued on:"</string> <string name="expires_on" msgid="1623640879705103121">"Expires on:"</string> <string name="serial_number" msgid="3479576915806623429">"Serial number:"</string> <string name="fingerprints" msgid="148690767172613723">"Fingerprints:"</string> - <string name="sha256_fingerprint" msgid="7103976380961964600">"SHA-256 fingerprint"</string> - <string name="sha1_fingerprint" msgid="2339915142825390774">"SHA-1 fingerprint"</string> + <string name="sha256_fingerprint" msgid="7103976380961964600">"SHA-256 fingerprint:"</string> + <string name="sha1_fingerprint" msgid="2339915142825390774">"SHA-1 fingerprint:"</string> <string name="activity_chooser_view_see_all" msgid="3917045206812726099">"See all"</string> <string name="activity_chooser_view_dialog_title_default" msgid="8880731437191978314">"Choose activity"</string> <string name="share_action_provider_share_with" msgid="1904096863622941880">"Share with"</string> @@ -1643,9 +1643,9 @@ <string name="kg_invalid_sim_pin_hint" msgid="4821601451222564077">"Type a PIN that is 4 to 8 numbers."</string> <string name="kg_invalid_sim_puk_hint" msgid="2539364558870734339">"PUK code should be 8 numbers."</string> <string name="kg_invalid_puk" msgid="4809502818518963344">"Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM."</string> - <string name="kg_invalid_confirm_pin_hint" product="default" msgid="4705368340409816254">"PIN codes do not match"</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="4705368340409816254">"PIN codes does not match"</string> <string name="kg_login_too_many_attempts" msgid="699292728290654121">"Too many pattern attempts"</string> - <string name="kg_login_instructions" msgid="3619844310339066827">"To unlock, sign in with your Google Account."</string> + <string name="kg_login_instructions" msgid="3619844310339066827">"To unlock, sign in with your Google account."</string> <string name="kg_login_username_hint" msgid="1765453775467133251">"Username (email)"</string> <string name="kg_login_password_hint" msgid="3330530727273164402">"Password"</string> <string name="kg_login_submit_button" msgid="893611277617096870">"Sign in"</string> @@ -1662,13 +1662,13 @@ <string name="kg_failed_attempts_now_wiping" product="tv" msgid="5045460916106267585">"You have incorrectly attempted to unlock your Android TV device <xliff:g id="NUMBER">%d</xliff:g> times. Your Android TV device will now be reset to factory default."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="5043730590446071189">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The phone will now be reset to factory default."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="7086799295109717623">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> - <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4670840383567106114">"You have drawn your unlock pattern incorrectly <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your Android TV device using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> + <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4670840383567106114">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your Android TV device using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remove"</string> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Use Accessibility Shortcut?"</string> - <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"When the shortcut is on, pressing both volume buttons for three seconds will start an accessibility feature."</string> + <string name="accessibility_shortcut_toogle_warning" msgid="4161716521310929544">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature."</string> <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"Turn on shortcut for accessibility features?"</string> <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"Holding down both volume keys for a few seconds turns on accessibility features. This may change how your device works.\n\nCurrent features:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nYou can change selected features in Settings > Accessibility."</string> <string name="accessibility_shortcut_multiple_service_list" msgid="2128323171922023762">" • <xliff:g id="SERVICE">%1$s</xliff:g>\n"</string> @@ -1687,7 +1687,7 @@ <string name="accessibility_dialog_button_allow" msgid="2092558122987144530">"Allow"</string> <string name="accessibility_dialog_button_deny" msgid="4129575637812472671">"Deny"</string> <string name="accessibility_select_shortcut_menu_title" msgid="6002726538854613272">"Tap a feature to start using it:"</string> - <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"Choose features to use with the Accessibility button"</string> + <string name="accessibility_edit_shortcut_menu_button_title" msgid="239446795930436325">"Choose features to use with the accessibility button"</string> <string name="accessibility_edit_shortcut_menu_volume_title" msgid="1077294237378645981">"Choose features to use with the volume key shortcut"</string> <string name="accessibility_uncheck_legacy_item_warning" msgid="8047830891064817447">"<xliff:g id="SERVICE_NAME">%s</xliff:g> has been turned off"</string> <string name="edit_accessibility_shortcut_menu_button" msgid="8885752738733772935">"Edit shortcuts"</string> @@ -1696,15 +1696,15 @@ <string name="leave_accessibility_shortcut_on" msgid="6543362062336990814">"Use Shortcut"</string> <string name="color_inversion_feature_name" msgid="326050048927789012">"Colour inversion"</string> <string name="color_correction_feature_name" msgid="3655077237805422597">"Colour correction"</string> - <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"One-handed mode"</string> + <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"One-Handed mode"</string> <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Extra dim"</string> <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Held volume keys. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> turned on."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"Held volume keys. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> turned off."</string> <string name="accessibility_shortcut_spoken_feedback" msgid="4228997042855695090">"Press and hold both volume keys for three seconds to use <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> - <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"Choose a feature to use when you tap the Accessibility button:"</string> + <string name="accessibility_button_prompt_text" msgid="8343213623338605305">"Choose a feature to use when you tap the accessibility button:"</string> <string name="accessibility_gesture_prompt_text" msgid="8742535972130563952">"Choose a feature to use with the accessibility gesture (swipe up from the bottom of the screen with two fingers):"</string> <string name="accessibility_gesture_3finger_prompt_text" msgid="5211827854510660203">"Choose a feature to use with the accessibility gesture (swipe up from the bottom of the screen with three fingers):"</string> - <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"To switch between features, touch and hold the Accessibility button."</string> + <string name="accessibility_button_instructional_text" msgid="8853928358872550500">"To switch between features, touch & hold the accessibility button."</string> <string name="accessibility_gesture_instructional_text" msgid="9196230728837090497">"To switch between features, swipe up with two fingers and hold."</string> <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"To switch between features, swipe up with three fingers and hold."</string> <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"Magnification"</string> @@ -1756,9 +1756,9 @@ <string name="mediasize_na_junior_legal" msgid="3398084874757748531">"Junior Legal"</string> <string name="mediasize_na_ledger" msgid="1819497882853940248">"Ledger"</string> <string name="mediasize_na_tabloid" msgid="6792611672983574375">"Tabloid"</string> - <string name="mediasize_na_index_3x5" msgid="990821038991491710">"Index Card 3 x 5"</string> - <string name="mediasize_na_index_4x6" msgid="4414381976602032401">"Index Card 4 x 6"</string> - <string name="mediasize_na_index_5x8" msgid="4499341583361946948">"Index Card 5 x 8"</string> + <string name="mediasize_na_index_3x5" msgid="990821038991491710">"Index Card 3x5"</string> + <string name="mediasize_na_index_4x6" msgid="4414381976602032401">"Index Card 4x6"</string> + <string name="mediasize_na_index_5x8" msgid="4499341583361946948">"Index Card 5x8"</string> <string name="mediasize_na_monarch" msgid="4396943937986136896">"Monarch"</string> <string name="mediasize_na_quarto" msgid="2119101847712239885">"Quarto"</string> <string name="mediasize_na_foolscap" msgid="5011612828564394648">"Foolscap"</string> @@ -1821,12 +1821,12 @@ <string name="restr_pin_enter_admin_pin" msgid="1199419462726962697">"Enter admin PIN"</string> <string name="restr_pin_enter_pin" msgid="373139384161304555">"Enter PIN"</string> <string name="restr_pin_incorrect" msgid="3861383632940852496">"Incorrect"</string> - <string name="restr_pin_enter_old_pin" msgid="7537079094090650967">"Current PIN:"</string> + <string name="restr_pin_enter_old_pin" msgid="7537079094090650967">"Current PIN"</string> <string name="restr_pin_enter_new_pin" msgid="3267614461844565431">"New PIN"</string> <string name="restr_pin_confirm_pin" msgid="7143161971614944989">"Confirm new PIN"</string> <string name="restr_pin_create_pin" msgid="917067613896366033">"Create a PIN for modifying restrictions"</string> <string name="restr_pin_error_doesnt_match" msgid="7063392698489280556">"PINs don\'t match. Try again."</string> - <string name="restr_pin_error_too_short" msgid="1547007808237941065">"PIN is too short. Must be at least four digits."</string> + <string name="restr_pin_error_too_short" msgid="1547007808237941065">"PIN is too short. Must be at least 4 digits."</string> <string name="restr_pin_try_later" msgid="5897719962541636727">"Try again later"</string> <string name="immersive_cling_title" msgid="2307034298721541791">"Viewing full screen"</string> <string name="immersive_cling_description" msgid="7092737175345204832">"To exit, swipe down from the top."</string> @@ -1849,8 +1849,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Updated by your admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features and some network connections."</string> - <string name="battery_saver_description" msgid="8518809702138617167">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features and some network connections."</string> + <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features, and some network connections."</string> + <string name="battery_saver_description" msgid="8518809702138617167">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features, and some network connections."</string> <string name="data_saver_description" msgid="4995164271550590517">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you\'re currently using can access data, but may do so less frequently. This may mean, for example, that images don\'t display until you tap them."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Turn on Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Turn on"</string> @@ -1866,7 +1866,7 @@ <string name="zen_mode_until" msgid="2250286190237669079">"Until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_alarm" msgid="7046911727540499275">"Until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (next alarm)"</string> <string name="zen_mode_forever" msgid="740585666364912448">"Until you turn off"</string> - <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"Until you turn off Do not disturb"</string> + <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"Until you turn off Do Not Disturb"</string> <string name="zen_mode_rule_name_combination" msgid="7174598364351313725">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string> <string name="toolbar_collapse_description" msgid="8009920446193610996">"Collapse"</string> <string name="zen_mode_feature_name" msgid="3785547207263754500">"Do not disturb"</string> @@ -1898,22 +1898,22 @@ <string name="usb_midi_peripheral_product_name" msgid="2836276258480904434">"USB Peripheral Port"</string> <string name="floating_toolbar_open_overflow_description" msgid="2260297653578167367">"More options"</string> <string name="floating_toolbar_close_overflow_description" msgid="3949818077708138098">"Close overflow"</string> - <string name="maximize_button_text" msgid="4258922519914732645">"Maximise"</string> + <string name="maximize_button_text" msgid="4258922519914732645">"Maximize"</string> <string name="close_button_text" msgid="10603510034455258">"Close"</string> <string name="notification_messaging_title_template" msgid="772857526770251989">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string> <string name="call_notification_answer_action" msgid="5999246836247132937">"Answer"</string> <string name="call_notification_answer_video_action" msgid="2086030940195382249">"Video"</string> <string name="call_notification_decline_action" msgid="3700345945214000726">"Decline"</string> - <string name="call_notification_hang_up_action" msgid="9130720590159188131">"Hang up"</string> + <string name="call_notification_hang_up_action" msgid="9130720590159188131">"Hang Up"</string> <string name="call_notification_incoming_text" msgid="6143109825406638201">"Incoming call"</string> - <string name="call_notification_ongoing_text" msgid="3880832933933020875">"On-going call"</string> + <string name="call_notification_ongoing_text" msgid="3880832933933020875">"Ongoing call"</string> <string name="call_notification_screening_text" msgid="8396931408268940208">"Screening an incoming call"</string> - <string name="default_notification_channel_label" msgid="3697928973567217330">"Uncategorised"</string> + <string name="default_notification_channel_label" msgid="3697928973567217330">"Uncategorized"</string> <string name="importance_from_user" msgid="2782756722448800447">"You set the importance of these notifications."</string> <string name="importance_from_person" msgid="4235804979664465383">"This is important because of the people involved."</string> <string name="notification_history_title_placeholder" msgid="7748630986182249599">"Custom app notification"</string> - <string name="user_creation_account_exists" msgid="2239146360099708035">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> (a User with this account already exists)?"</string> - <string name="user_creation_adding" msgid="7305185499667958364">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g>?"</string> + <string name="user_creation_account_exists" msgid="2239146360099708035">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> (a User with this account already exists) ?"</string> + <string name="user_creation_adding" msgid="7305185499667958364">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> ?"</string> <string name="supervised_user_creation_label" msgid="6884904353827427515">"Add supervised user"</string> <string name="language_selection_title" msgid="52674936078683285">"Add a language"</string> <string name="country_selection_title" msgid="5221495687299014379">"Region preference"</string> @@ -1923,7 +1923,7 @@ <string name="region_picker_section_all" msgid="756441309928774155">"All regions"</string> <string name="locale_search_menu" msgid="6258090710176422934">"Search"</string> <string name="app_suspended_title" msgid="888873445010322650">"App isn’t available"</string> - <string name="app_suspended_default_message" msgid="6451215678552004172">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> isn’t available at the moment. This is managed by <xliff:g id="APP_NAME_1">%2$s</xliff:g>."</string> + <string name="app_suspended_default_message" msgid="6451215678552004172">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> isn’t available right now. This is managed by <xliff:g id="APP_NAME_1">%2$s</xliff:g>."</string> <string name="app_suspended_more_details" msgid="211260942831587014">"Learn more"</string> <string name="app_suspended_unsuspend_message" msgid="1665438589450555459">"Unpause app"</string> <string name="work_mode_off_title" msgid="961171256005852058">"Turn on work apps?"</string> @@ -1948,7 +1948,7 @@ <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv" msgid="3470977315395784567">"This app is requesting additional security. Try on your Android TV device instead."</string> <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet" msgid="698460091901465092">"This app is requesting additional security. Try on your tablet instead."</string> <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default" msgid="8552691971910603907">"This app is requesting additional security. Try on your phone instead."</string> - <string name="deprecated_target_sdk_message" msgid="5203207875657579953">"This app was built for an older version of Android and may not work properly. Try checking for updates or contact the developer."</string> + <string name="deprecated_target_sdk_message" msgid="5203207875657579953">"This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer."</string> <string name="deprecated_target_sdk_app_store" msgid="8456784048558808909">"Check for update"</string> <string name="new_sms_notification_title" msgid="6528758221319927107">"You have new messages"</string> <string name="new_sms_notification_content" msgid="3197949934153460639">"Open SMS app to view"</string> @@ -1986,21 +1986,21 @@ <string name="time_picker_prompt_label" msgid="303588544656363889">"Type in time"</string> <string name="time_picker_text_input_mode_description" msgid="4761160667516611576">"Switch to text input mode for the time input."</string> <string name="time_picker_radial_mode_description" msgid="1222342577115016953">"Switch to clock mode for the time input."</string> - <string name="autofill_picker_accessibility_title" msgid="4425806874792196599">"Auto-fill options"</string> - <string name="autofill_save_accessibility_title" msgid="1523225776218450005">"Save for AutoFill"</string> - <string name="autofill_error_cannot_autofill" msgid="6528827648643138596">"Contents can’t be auto-filled"</string> - <string name="autofill_picker_no_suggestions" msgid="1076022650427481509">"No auto-fill suggestions"</string> - <string name="autofill_picker_some_suggestions" msgid="5560549696296202701">"{count,plural, =1{One auto-fill suggestion}other{# auto-fill suggestions}}"</string> + <string name="autofill_picker_accessibility_title" msgid="4425806874792196599">"Autofill options"</string> + <string name="autofill_save_accessibility_title" msgid="1523225776218450005">"Save for Autofill"</string> + <string name="autofill_error_cannot_autofill" msgid="6528827648643138596">"Contents can’t be autofilled"</string> + <string name="autofill_picker_no_suggestions" msgid="1076022650427481509">"No autofill suggestions"</string> + <string name="autofill_picker_some_suggestions" msgid="5560549696296202701">"{count,plural, =1{One autofill suggestion}other{# autofill suggestions}}"</string> <string name="autofill_save_title" msgid="7719802414283739775">"Save to "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>"?"</string> <string name="autofill_save_title_with_type" msgid="3002460014579799605">"Save <xliff:g id="TYPE">%1$s</xliff:g> to "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>"?"</string> <string name="autofill_save_title_with_2types" msgid="3783270967447869241">"Save <xliff:g id="TYPE_0">%1$s</xliff:g> and <xliff:g id="TYPE_1">%2$s</xliff:g> to "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string> - <string name="autofill_save_title_with_3types" msgid="6598228952100102578">"Save <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g> and <xliff:g id="TYPE_2">%3$s</xliff:g> to "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>"?"</string> + <string name="autofill_save_title_with_3types" msgid="6598228952100102578">"Save <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, and <xliff:g id="TYPE_2">%3$s</xliff:g> to "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>"?"</string> <string name="autofill_update_title" msgid="3630695947047069136">"Update in "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>"?"</string> <string name="autofill_update_title_with_type" msgid="5264152633488495704">"Update <xliff:g id="TYPE">%1$s</xliff:g> in "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>"?"</string> <string name="autofill_update_title_with_2types" msgid="1797514386321086273">"Update <xliff:g id="TYPE_0">%1$s</xliff:g> and <xliff:g id="TYPE_1">%2$s</xliff:g> in "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string> - <string name="autofill_update_title_with_3types" msgid="1312232153076212291">"Update these items in "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>": <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g> and <xliff:g id="TYPE_2">%3$s</xliff:g>?"</string> + <string name="autofill_update_title_with_3types" msgid="1312232153076212291">"Update these items in "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>": <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, and <xliff:g id="TYPE_2">%3$s</xliff:g> ?"</string> <string name="autofill_save_yes" msgid="8035743017382012850">"Save"</string> - <string name="autofill_save_no" msgid="9212826374207023544">"No, thanks"</string> + <string name="autofill_save_no" msgid="9212826374207023544">"No thanks"</string> <string name="autofill_save_notnow" msgid="2853932672029024195">"Not now"</string> <string name="autofill_save_never" msgid="6821841919831402526">"Never"</string> <string name="autofill_update_yes" msgid="4608662968996874445">"Update"</string> @@ -2027,9 +2027,9 @@ <string name="mmcc_imsi_unknown_in_hlr_msim_template" msgid="3688508325248599657">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not provisioned"</string> <string name="mmcc_illegal_ms_msim_template" msgid="832644375774599327">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string> <string name="mmcc_illegal_me_msim_template" msgid="4802735138861422802">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string> - <string name="popup_window_default_title" msgid="6907717596694826919">"Pop-Up Window"</string> + <string name="popup_window_default_title" msgid="6907717596694826919">"Popup Window"</string> <string name="slice_more_content" msgid="3377367737876888459">"+ <xliff:g id="NUMBER">%1$d</xliff:g>"</string> - <string name="shortcut_restored_on_lower_version" msgid="9206301954024286063">"App version downgraded or isn’t compatible with this shortcut"</string> + <string name="shortcut_restored_on_lower_version" msgid="9206301954024286063">"App version downgraded, or isn’t compatible with this shortcut"</string> <string name="shortcut_restore_not_supported" msgid="4763198938588468400">"Couldn’t restore shortcut because app doesn’t support backup and restore"</string> <string name="shortcut_restore_signature_mismatch" msgid="579345304221605479">"Couldn’t restore shortcut because of app signature mismatch"</string> <string name="shortcut_restore_unknown_issue" msgid="2478146134395982154">"Couldn’t restore shortcut"</string> @@ -2040,16 +2040,16 @@ <string name="log_access_confirmation_title" msgid="2343578467290592708">"Allow <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> to access all device logs?"</string> <string name="log_access_confirmation_allow" msgid="5302517782599389507">"Allow one-time access"</string> <string name="log_access_confirmation_deny" msgid="7685790957455099845">"Don’t allow"</string> - <string name="log_access_confirmation_body" msgid="6581985716241928135">"Device logs record what happens on your device. Apps can use these logs to find and fix issues.\n\nSome logs may contain sensitive info, so only allow apps that you trust to access all device logs. \n\nIf you don’t allow this app to access all device logs, it can still access its own logs. Your device manufacturer may still be able to access some logs or info on your device. Learn more"</string> + <string name="log_access_confirmation_body" msgid="6581985716241928135">"Device logs record what happens on your device. Apps can use these logs to find and fix issues.\n\nSome logs may contain sensitive info, so only allow apps you trust to access all device logs. \n\nIf you don’t allow this app to access all device logs, it can still access its own logs. Your device manufacturer may still be able to access some logs or info on your device. Learn more"</string> <string name="log_access_do_not_show_again" msgid="1058690599083091552">"Don’t show again"</string> <string name="slices_permission_request" msgid="3677129866636153406">"<xliff:g id="APP_0">%1$s</xliff:g> wants to show <xliff:g id="APP_2">%2$s</xliff:g> slices"</string> <string name="screenshot_edit" msgid="7408934887203689207">"Edit"</string> <string name="volume_dialog_ringer_guidance_vibrate" msgid="2055927873175228519">"Calls and notifications will vibrate"</string> <string name="volume_dialog_ringer_guidance_silent" msgid="1011246774949993783">"Calls and notifications will be muted"</string> <string name="notification_channel_system_changes" msgid="2462010596920209678">"System changes"</string> - <string name="notification_channel_do_not_disturb" msgid="7832584281883687653">"Do not disturb"</string> + <string name="notification_channel_do_not_disturb" msgid="7832584281883687653">"Do Not Disturb"</string> <string name="zen_upgrade_notification_visd_title" msgid="2001148984371968620">"New: Do Not Disturb is hiding notifications"</string> - <string name="zen_upgrade_notification_visd_content" msgid="3683314609114134946">"Tap to find out more and change."</string> + <string name="zen_upgrade_notification_visd_content" msgid="3683314609114134946">"Tap to learn more and change."</string> <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Do Not Disturb has changed"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tap to check what\'s blocked."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Review notification settings"</string> @@ -2061,17 +2061,17 @@ <string name="notification_appops_camera_active" msgid="8177643089272352083">"Camera"</string> <string name="notification_appops_microphone_active" msgid="581333393214739332">"Microphone"</string> <string name="notification_appops_overlay_active" msgid="5571732753262836481">"displaying over other apps on your screen"</string> - <string name="notification_feedback_indicator" msgid="663476517711323016">"Provide feedback"</string> - <string name="notification_feedback_indicator_alerted" msgid="6552871804121942099">"This notification was promoted to default. Tap to provide feedback."</string> - <string name="notification_feedback_indicator_silenced" msgid="3799442124723177262">"This notification was demoted to silent. Tap to provide feedback."</string> + <string name="notification_feedback_indicator" msgid="663476517711323016">"Provide Feedback"</string> + <string name="notification_feedback_indicator_alerted" msgid="6552871804121942099">"This notification was promoted to Default. Tap to provide feedback."</string> + <string name="notification_feedback_indicator_silenced" msgid="3799442124723177262">"This notification was demoted to Silent. Tap to provide feedback."</string> <string name="notification_feedback_indicator_promoted" msgid="9030204303764698640">"This notification was ranked higher. Tap to provide feedback."</string> <string name="notification_feedback_indicator_demoted" msgid="8880309924296450875">"This notification was ranked lower. Tap to provide feedback."</string> <string name="nas_upgrade_notification_title" msgid="8436359459300146555">"Enhanced notifications"</string> - <string name="nas_upgrade_notification_content" msgid="5157550369837103337">"Suggested actions and replies are now provided by enhanced notifications. Android adaptive notifications are no longer supported."</string> + <string name="nas_upgrade_notification_content" msgid="5157550369837103337">"Suggested actions and replies are now provided by enhanced notifications. Android Adaptive Notifications are no longer supported."</string> <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"OK"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Turn off"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Learn more"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Enhanced notifications replaced Android adaptive notifications in Android 12. This feature shows suggested actions and replies, and organises your notifications.\n\nEnhanced notifications can access notification content, including personal information like contact names and messages. This feature can also dismiss or respond to notifications, such as answering phone calls, and control Do Not Disturb."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Enhanced notifications replaced Android Adaptive Notifications in Android 12. This feature shows suggested actions and replies, and organizes your notifications.\n\nEnhanced notifications can access notification content, including personal information like contact names and messages. This feature can also dismiss or respond to notifications, such as answering phone calls, and control Do Not Disturb."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Routine Mode info notification"</string> <string name="dynamic_mode_notification_title" msgid="9205715501274608016">"Battery may run out before usual charge"</string> <string name="dynamic_mode_notification_summary" msgid="4141614604437372157">"Battery Saver activated to extend battery life"</string> @@ -2109,25 +2109,25 @@ <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Recent Apps"</string> <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Notifications"</string> <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Quick Settings"</string> - <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Power Dialogue"</string> + <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Power Dialog"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Lock Screen"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Screenshot"</string> - <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"Headset hook"</string> - <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"On-screen accessibility shortcut"</string> - <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"On-screen accessibility shortcut chooser"</string> - <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"Accessibility shortcut"</string> - <string name="accessibility_system_action_dismiss_notification_shade" msgid="8931637495533770352">"Dismiss notification shade"</string> - <string name="accessibility_system_action_dpad_up_label" msgid="1029042950229333782">"Dpad up"</string> - <string name="accessibility_system_action_dpad_down_label" msgid="3441918448624921461">"Dpad down"</string> - <string name="accessibility_system_action_dpad_left_label" msgid="6557647179116479152">"Dpad left"</string> - <string name="accessibility_system_action_dpad_right_label" msgid="9180196950365804081">"Dpad right"</string> - <string name="accessibility_system_action_dpad_center_label" msgid="8149791419358224893">"Dpad centre"</string> + <string name="accessibility_system_action_headset_hook_label" msgid="8524691721287425468">"Headset Hook"</string> + <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"On-screen Accessibility Shortcut"</string> + <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"On-screen Accessibility Shortcut Chooser"</string> + <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"Accessibility Shortcut"</string> + <string name="accessibility_system_action_dismiss_notification_shade" msgid="8931637495533770352">"Dismiss Notification Shade"</string> + <string name="accessibility_system_action_dpad_up_label" msgid="1029042950229333782">"Dpad Up"</string> + <string name="accessibility_system_action_dpad_down_label" msgid="3441918448624921461">"Dpad Down"</string> + <string name="accessibility_system_action_dpad_left_label" msgid="6557647179116479152">"Dpad Left"</string> + <string name="accessibility_system_action_dpad_right_label" msgid="9180196950365804081">"Dpad Right"</string> + <string name="accessibility_system_action_dpad_center_label" msgid="8149791419358224893">"Dpad Center"</string> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"Caption bar of <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> has been put into the RESTRICTED bucket"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sent an image"</string> <string name="conversation_title_fallback_one_to_one" msgid="1980753619726908614">"Conversation"</string> - <string name="conversation_title_fallback_group_chat" msgid="456073374993104303">"Group conversation"</string> + <string name="conversation_title_fallback_group_chat" msgid="456073374993104303">"Group Conversation"</string> <string name="unread_convo_overflow" msgid="920517615597353833">"<xliff:g id="MAX_UNREAD_COUNT">%1$d</xliff:g>+"</string> <string name="resolver_personal_tab" msgid="2051260504014442073">"Personal"</string> <string name="resolver_work_tab" msgid="2690019516263167035">"Work"</string> @@ -2158,7 +2158,7 @@ <string name="PERSOSUBSTATE_SIM_SIM_PUK_ENTRY" msgid="3013902515773728996">"Enter PUK"</string> <string name="PERSOSUBSTATE_RUIM_NETWORK1_ENTRY" msgid="2974411408893410289">"RUIM network1 unlock PIN"</string> <string name="PERSOSUBSTATE_RUIM_NETWORK2_ENTRY" msgid="687618528751880721">"RUIM network2 unlock PIN"</string> - <string name="PERSOSUBSTATE_RUIM_HRPD_ENTRY" msgid="6810596579655575381">"RUIM HRPD unlock PIN"</string> + <string name="PERSOSUBSTATE_RUIM_HRPD_ENTRY" msgid="6810596579655575381">"RUIM hrpd unlock PIN"</string> <string name="PERSOSUBSTATE_RUIM_CORPORATE_ENTRY" msgid="2715929642540980259">"RUIM corporate unlock PIN"</string> <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_ENTRY" msgid="8557791623303951590">"RUIM service provider unlock PIN"</string> <string name="PERSOSUBSTATE_RUIM_RUIM_ENTRY" msgid="7382468767274580323">"RUIM unlock PIN"</string> @@ -2174,8 +2174,8 @@ <string name="PERSOSUBSTATE_SIM_IMPI_ENTRY" msgid="7043865376145617024">"IMPI unlock PIN"</string> <string name="PERSOSUBSTATE_SIM_NS_SP_ENTRY" msgid="6144227308185112176">"Network subset service provider unlock PIN"</string> <string name="PERSOSUBSTATE_SIM_NETWORK_IN_PROGRESS" msgid="4233355366318061180">"Requesting SIM network unlock…"</string> - <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_IN_PROGRESS" msgid="6742563947637715645">"Requesting SIM network subset unlock…"</string> - <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_IN_PROGRESS" msgid="2033399698172403560">"Requesting SIM service provider unlock…"</string> + <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_IN_PROGRESS" msgid="6742563947637715645">"Requesting SIM network subset unlock …"</string> + <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_IN_PROGRESS" msgid="2033399698172403560">"Requesting SIM service provider un lock…"</string> <string name="PERSOSUBSTATE_SIM_CORPORATE_IN_PROGRESS" msgid="4795977251920732254">"Requesting SIM corporate unlock…"</string> <string name="PERSOSUBSTATE_SIM_NETWORK_PUK_IN_PROGRESS" msgid="1090425878157254446">"Requesting PUK unlock…"</string> <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK_IN_PROGRESS" msgid="6476898876518094438">"Requesting PUK unlock…"</string> @@ -2185,14 +2185,14 @@ <string name="PERSOSUBSTATE_SIM_SIM_IN_PROGRESS" msgid="6709169861932992750">"Requesting SIM unlock…"</string> <string name="PERSOSUBSTATE_RUIM_NETWORK1_IN_PROGRESS" msgid="4013870911606478520">"Requesting RUIM network1 unlock…"</string> <string name="PERSOSUBSTATE_RUIM_NETWORK2_IN_PROGRESS" msgid="9032651188219523434">"Requesting RUIM network2 unlock…"</string> - <string name="PERSOSUBSTATE_RUIM_HRPD_IN_PROGRESS" msgid="6584576506344491207">"Requesting RUIM HRPD unlock…"</string> + <string name="PERSOSUBSTATE_RUIM_HRPD_IN_PROGRESS" msgid="6584576506344491207">"Requesting RUIM hrpd unlock…"</string> <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_IN_PROGRESS" msgid="830981927724888114">"Requesting RUIM service provider unlock…"</string> <string name="PERSOSUBSTATE_RUIM_CORPORATE_IN_PROGRESS" msgid="7851790973098894802">"Requesting RUIM corporate unlock…"</string> <string name="PERSOSUBSTATE_SIM_SPN_IN_PROGRESS" msgid="1149560739586960121">"Requesting SPN unlock…"</string> <string name="PERSOSUBSTATE_SIM_SP_EHPLMN_IN_PROGRESS" msgid="5708964693522116025">"Requesting SP Equivalent Home PLMN unlock…"</string> <string name="PERSOSUBSTATE_SIM_ICCID_IN_PROGRESS" msgid="7288103122966483455">"Requesting ICCID unlock…"</string> <string name="PERSOSUBSTATE_SIM_IMPI_IN_PROGRESS" msgid="4036752174056147753">"Requesting IMPI unlock…"</string> - <string name="PERSOSUBSTATE_SIM_NS_SP_IN_PROGRESS" msgid="5089536274515338566">"Requesting network subset service provider unlock…"</string> + <string name="PERSOSUBSTATE_SIM_NS_SP_IN_PROGRESS" msgid="5089536274515338566">"Requesting Network subset service provider unlock…"</string> <string name="PERSOSUBSTATE_RUIM_RUIM_IN_PROGRESS" msgid="6737197986936251958">"Requesting RUIM unlock…"</string> <string name="PERSOSUBSTATE_RUIM_NETWORK1_PUK_IN_PROGRESS" msgid="5658767775619998623">"Requesting PUK unlock…"</string> <string name="PERSOSUBSTATE_RUIM_NETWORK2_PUK_IN_PROGRESS" msgid="665978313257653727">"Requesting PUK unlock…"</string> @@ -2200,16 +2200,16 @@ <string name="PERSOSUBSTATE_RUIM_CORPORATE_PUK_IN_PROGRESS" msgid="2695664012344346788">"Requesting PUK unlock…"</string> <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK_IN_PROGRESS" msgid="2695678959963807782">"Requesting PUK unlock…"</string> <string name="PERSOSUBSTATE_RUIM_RUIM_PUK_IN_PROGRESS" msgid="1230605365926493599">"Requesting PUK unlock…"</string> - <string name="PERSOSUBSTATE_SIM_NETWORK_ERROR" msgid="1924844017037151535">"SIM network unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_ERROR" msgid="3372797822292089708">"SIM network subset unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_ERROR" msgid="1878443146720411381">"SIM service provider unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_SIM_CORPORATE_ERROR" msgid="7664778312218023192">"SIM corporate unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_SIM_NETWORK_ERROR" msgid="1924844017037151535">"SIM Network unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_ERROR" msgid="3372797822292089708">"SIM Network Subset unlock request unsucces sful."</string> + <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_ERROR" msgid="1878443146720411381">"SIM Service Provider unlock request unsu ccessful."</string> + <string name="PERSOSUBSTATE_SIM_CORPORATE_ERROR" msgid="7664778312218023192">"SIM Corporate unlock request unsuccessful."</string> <string name="PERSOSUBSTATE_SIM_SIM_ERROR" msgid="2472944311643350302">"SIM unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_RUIM_NETWORK1_ERROR" msgid="828089694480999120">"RUIM network1 unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_RUIM_NETWORK2_ERROR" msgid="17619001007092511">"RUIM network2 unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_RUIM_HRPD_ERROR" msgid="807214229604353614">"RUIM HRPD unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_RUIM_CORPORATE_ERROR" msgid="8644184447744175747">"RUIM corporate unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_ERROR" msgid="3801002648649640407">"RUIM service provider unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_RUIM_NETWORK1_ERROR" msgid="828089694480999120">"RUIM Network1 unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_RUIM_NETWORK2_ERROR" msgid="17619001007092511">"RUIM Network2 unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_RUIM_HRPD_ERROR" msgid="807214229604353614">"RUIM Hrpd unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_RUIM_CORPORATE_ERROR" msgid="8644184447744175747">"RUIM Corporate unlock request unsuccessful."</string> + <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_ERROR" msgid="3801002648649640407">"RUIM Service Provider unlock request un successful."</string> <string name="PERSOSUBSTATE_RUIM_RUIM_ERROR" msgid="707397021218680753">"RUIM unlock request unsuccessful."</string> <string name="PERSOSUBSTATE_SIM_NETWORK_PUK_ERROR" msgid="894358680773257820">"PUK unlock unsuccessful."</string> <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK_ERROR" msgid="352466878146726991">"PUK unlock unsuccessful."</string> @@ -2227,16 +2227,16 @@ <string name="PERSOSUBSTATE_SIM_ICCID_ERROR" msgid="7559167306794441462">"ICCID unlock request unsuccessful."</string> <string name="PERSOSUBSTATE_SIM_IMPI_ERROR" msgid="2782926139511136588">"IMPI unlock request unsuccessful."</string> <string name="PERSOSUBSTATE_SIM_NS_SP_ERROR" msgid="1890493954453456758">"Network subset service provider unlock request unsuccessful."</string> - <string name="PERSOSUBSTATE_SIM_NETWORK_SUCCESS" msgid="4886243367747126325">"SIM network unlock successful."</string> - <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_SUCCESS" msgid="4053809277733513987">"SIM network subset unlock successful."</string> - <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_SUCCESS" msgid="8249342930499801740">"SIM service provider unlock successful ."</string> - <string name="PERSOSUBSTATE_SIM_CORPORATE_SUCCESS" msgid="2339794542560381270">"SIM corporate unlock successful."</string> + <string name="PERSOSUBSTATE_SIM_NETWORK_SUCCESS" msgid="4886243367747126325">"SIM Network unlock successful."</string> + <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_SUCCESS" msgid="4053809277733513987">"SIM Network Subset unlock successful."</string> + <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_SUCCESS" msgid="8249342930499801740">"SIM Service Provider unlock successful ."</string> + <string name="PERSOSUBSTATE_SIM_CORPORATE_SUCCESS" msgid="2339794542560381270">"SIM Corporate unlock successful."</string> <string name="PERSOSUBSTATE_SIM_SIM_SUCCESS" msgid="6975608174152828954">"SIM unlock successful."</string> - <string name="PERSOSUBSTATE_RUIM_NETWORK1_SUCCESS" msgid="2846699261330463192">"RUIM network1 unlock successful."</string> - <string name="PERSOSUBSTATE_RUIM_NETWORK2_SUCCESS" msgid="5335414726057102801">"RUIM network2 unlock successful."</string> - <string name="PERSOSUBSTATE_RUIM_HRPD_SUCCESS" msgid="8868100318474971969">"RUIM HRPD unlock successful."</string> - <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_SUCCESS" msgid="6020936629725666932">"RUIM service provider unlock successful."</string> - <string name="PERSOSUBSTATE_RUIM_CORPORATE_SUCCESS" msgid="6944873647584595489">"RUIM corporate unlock successful."</string> + <string name="PERSOSUBSTATE_RUIM_NETWORK1_SUCCESS" msgid="2846699261330463192">"RUIM Network1 unlock successful."</string> + <string name="PERSOSUBSTATE_RUIM_NETWORK2_SUCCESS" msgid="5335414726057102801">"RUIM Network2 unlock successful."</string> + <string name="PERSOSUBSTATE_RUIM_HRPD_SUCCESS" msgid="8868100318474971969">"RUIM Hrpd unlock successful."</string> + <string name="PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_SUCCESS" msgid="6020936629725666932">"RUIM Service Provider unlock successf ul."</string> + <string name="PERSOSUBSTATE_RUIM_CORPORATE_SUCCESS" msgid="6944873647584595489">"RUIM Corporate unlock successful."</string> <string name="PERSOSUBSTATE_RUIM_RUIM_SUCCESS" msgid="2526483514124121988">"RUIM unlock successful."</string> <string name="PERSOSUBSTATE_SIM_NETWORK_PUK_SUCCESS" msgid="7662200333621664621">"PUK unlock successful."</string> <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK_SUCCESS" msgid="2861223407953766632">"PUK unlock successful."</string> @@ -2266,14 +2266,14 @@ <string name="sensor_privacy_start_use_camera_notification_content_title" msgid="7287720213963466672">"Unblock device camera"</string> <string name="sensor_privacy_start_use_notification_content_text" msgid="7595608891015777346">"For <b><xliff:g id="APP">%s</xliff:g></b> and all apps and services"</string> <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7089318886628390827">"Unblock"</string> - <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensor privacy"</string> + <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensor Privacy"</string> <string name="splash_screen_view_icon_description" msgid="180638751260598187">"Application icon"</string> <string name="splash_screen_view_branding_description" msgid="7911129347402728216">"Application branding image"</string> <string name="view_and_control_notification_title" msgid="4300765399209912240">"Check access settings"</string> <string name="view_and_control_notification_content" msgid="8003766498562604034">"<xliff:g id="SERVICE_NAME">%s</xliff:g> can view and control your screen. Tap to review."</string> - <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> translated."</string> + <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> Translated."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Message translated from <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> to <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> - <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Background activity"</string> + <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Background Activity"</string> <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"An app is draining battery"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"An app is still active"</string> <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> is running in the background. Tap to manage battery usage."</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 1dba09497a9c..5186666936ac 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -447,7 +447,7 @@ <string name="permlab_accessBackgroundLocation" msgid="1721164702777366138">"acceder a la ubicación en segundo plano"</string> <string name="permdesc_accessBackgroundLocation" msgid="8264885066095638105">"Esta aplicación puede acceder a la ubicación en cualquier momento, aunque no la estés usando."</string> <string name="permlab_modifyAudioSettings" msgid="6129039778010031815">"cambiar tu configuración de audio"</string> - <string name="permdesc_modifyAudioSettings" msgid="8687227609663124921">"Permite que la aplicación modifique la configuración de audio global, por ejemplo, el volumen y el altavoz de salida."</string> + <string name="permdesc_modifyAudioSettings" msgid="8687227609663124921">"Permite que la aplicación modifique la configuración de audio global, por ejemplo, el volumen y la bocina de salida."</string> <string name="permlab_recordAudio" msgid="1208457423054219147">"grabar audio"</string> <string name="permdesc_recordAudio" msgid="5857246765327514062">"Esta app puede grabar audio con el micrófono mientras está en uso."</string> <string name="permlab_recordBackgroundAudio" msgid="5891032812308878254">"grabar audio en segundo plano"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index da39213dbee5..560332843f34 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1993,7 +1993,7 @@ <string name="autofill_picker_no_suggestions" msgid="1076022650427481509">"Aucune suggestion de saisie automatique"</string> <string name="autofill_picker_some_suggestions" msgid="5560549696296202701">"{count,plural, =1{1 suggestion de saisie automatique}one{# suggestion de saisie automatique}many{# suggestions de saisie automatique}other{# suggestions de saisie automatique}}"</string> <string name="autofill_save_title" msgid="7719802414283739775">"Enregistrer dans "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>" ?"</string> - <string name="autofill_save_title_with_type" msgid="3002460014579799605">"Enregistrer la <xliff:g id="TYPE">%1$s</xliff:g> dans "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>" ?"</string> + <string name="autofill_save_title_with_type" msgid="3002460014579799605">"Enregistrer le <xliff:g id="TYPE">%1$s</xliff:g> dans "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>" ?"</string> <string name="autofill_save_title_with_2types" msgid="3783270967447869241">"Enregistrer <xliff:g id="TYPE_0">%1$s</xliff:g> et <xliff:g id="TYPE_1">%2$s</xliff:g> dans "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>" ?"</string> <string name="autofill_save_title_with_3types" msgid="6598228952100102578">"Enregistrer <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g> et <xliff:g id="TYPE_2">%3$s</xliff:g> dans "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>" ?"</string> <string name="autofill_update_title" msgid="3630695947047069136">"Mettre à jour cet élément dans "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>" ?"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 1b0c46899b27..0db578f7ce77 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1147,7 +1147,7 @@ <string name="input_method_ime_switch_button_desc" msgid="2736542240252198501">"Bytt inndatametode"</string> <string name="low_internal_storage_view_title" msgid="9024241779284783414">"Lite ledig lagringsplass"</string> <string name="low_internal_storage_view_text" msgid="8172166728369697835">"Enkelte systemfunksjoner fungerer muligens ikke slik de skal"</string> - <string name="low_internal_storage_view_text_no_boot" msgid="7368968163411251788">"Det er ikke nok lagringsplass for systemet. Kontrollér at du har 250 MB ledig plass, og start på nytt."</string> + <string name="low_internal_storage_view_text_no_boot" msgid="7368968163411251788">"Det er ikke nok lagringsplass for systemet. Kontroller at du har 250 MB ledig plass, og start på nytt."</string> <string name="app_running_notification_title" msgid="8985999749231486569">"<xliff:g id="APP_NAME">%1$s</xliff:g> kjører"</string> <string name="app_running_notification_text" msgid="5120815883400228566">"Trykk for å få mer informasjon eller for å stoppe appen."</string> <string name="ok" msgid="2646370155170753815">"OK"</string> @@ -1680,7 +1680,7 @@ <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"AV"</string> <string name="accessibility_enable_service_title" msgid="3931558336268541484">"Vil du gi <xliff:g id="SERVICE">%1$s</xliff:g> full kontroll over enheten din?"</string> <string name="accessibility_service_warning_description" msgid="291674995220940133">"Full kontroll er passende for apper som hjelper deg med tilgjengelighetsbehov, men ikke for de fleste apper."</string> - <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Se og kontrollér skjermen"</string> + <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Se og kontroller skjermen"</string> <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Den kan lese alt innhold på skjermen og vise innhold over andre apper."</string> <string name="accessibility_service_action_perform_title" msgid="779670378951658160">"Se og utfør handlinger"</string> <string name="accessibility_service_action_perform_description" msgid="2718852014003170558">"Den kan spore kommunikasjonen din med en app eller maskinvaresensor og kommunisere med apper på dine vegne."</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index f595dba67643..2a63a0d4bbe4 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -1279,7 +1279,7 @@ <string name="volume_icon_description_media" msgid="4997633254078171233">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</string> <string name="volume_icon_description_notification" msgid="579091344110747279">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</string> <string name="ringtone_default" msgid="9118299121288174597">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਰਿੰਗਟੋਨ"</string> - <string name="ringtone_default_with_actual" msgid="2709686194556159773">"ਪੂਰਵ-ਨਿਰਧਾਰਤ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> + <string name="ringtone_default_with_actual" msgid="2709686194556159773">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="397111123930141876">"ਕੋਈ ਨਹੀਂ"</string> <string name="ringtone_picker_title" msgid="667342618626068253">"ਰਿੰਗਟੋਨਾਂ"</string> <string name="ringtone_picker_title_alarm" msgid="7438934548339024767">"ਅਲਾਰਮ ਧੁਨੀਆਂ"</string> diff --git a/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java b/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java index 98485c024a59..ee73f00d9d46 100644 --- a/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java +++ b/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java @@ -29,10 +29,11 @@ import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** - * Test class for {@link ConstrainDisplayApisConfig}. + * Test for {@link ConstrainDisplayApisConfig}. * * Build/Install/Run: * atest FrameworksCoreTests:ConstrainDisplayApisConfigTest @@ -72,6 +73,7 @@ public final class ConstrainDisplayApisConfigTest { testNeverConstrainDisplayApis("com.android.test", /* version= */ 1, /* expected= */ false); } + @Ignore("b/257375674") @Test public void neverConstrainDisplayApis_flagsHasSingleEntry_returnsTrueForPackageWithinRange() { setNeverConstrainDisplayApisFlag("com.android.test:1:1"); @@ -107,6 +109,7 @@ public final class ConstrainDisplayApisConfigTest { testNeverConstrainDisplayApis("com.android.test4", /* version= */ 9, /* expected= */ false); } + @Ignore("b/257375674") @Test public void neverConstrainDisplayApis_flagHasInvalidEntries_ignoresInvalidEntries() { // We add a valid entry before and after the invalid ones to make sure they are applied. diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index abf7e9911086..42c892a240b6 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1667,6 +1667,9 @@ public class Canvas extends BaseCanvas { * effectively treating them as zeros. In API level {@value Build.VERSION_CODES#P} and above * these parameters will be respected. * + * <p>Note: antialiasing is not supported, therefore {@link Paint#ANTI_ALIAS_FLAG} is + * ignored.</p> + * * @param bitmap The bitmap to draw using the mesh * @param meshWidth The number of columns in the mesh. Nothing is drawn if this is 0 * @param meshHeight The number of rows in the mesh. Nothing is drawn if this is 0 @@ -1678,7 +1681,7 @@ public class Canvas extends BaseCanvas { * null, there must be at least (meshWidth+1) * (meshHeight+1) + colorOffset values * in the array. * @param colorOffset Number of color elements to skip before drawing - * @param paint May be null. The paint used to draw the bitmap + * @param paint May be null. The paint used to draw the bitmap. Antialiasing is not supported. */ public void drawBitmapMesh(@NonNull Bitmap bitmap, int meshWidth, int meshHeight, @NonNull float[] verts, int vertOffset, @Nullable int[] colors, int colorOffset, @@ -1832,9 +1835,12 @@ public class Canvas extends BaseCanvas { /** * Draws the specified bitmap as an N-patch (most often, a 9-patch.) * + * <p>Note: antialiasing is not supported, therefore {@link Paint#ANTI_ALIAS_FLAG} is + * ignored.</p> + * * @param patch The ninepatch object to render * @param dst The destination rectangle. - * @param paint The paint to draw the bitmap with. may be null + * @param paint The paint to draw the bitmap with. May be null. Antialiasing is not supported. */ public void drawPatch(@NonNull NinePatch patch, @NonNull Rect dst, @Nullable Paint paint) { super.drawPatch(patch, dst, paint); @@ -1843,9 +1849,12 @@ public class Canvas extends BaseCanvas { /** * Draws the specified bitmap as an N-patch (most often, a 9-patch.) * + * <p>Note: antialiasing is not supported, therefore {@link Paint#ANTI_ALIAS_FLAG} is + * ignored.</p> + * * @param patch The ninepatch object to render * @param dst The destination rectangle. - * @param paint The paint to draw the bitmap with. may be null + * @param paint The paint to draw the bitmap with. May be null. Antialiasing is not supported. */ public void drawPatch(@NonNull NinePatch patch, @NonNull RectF dst, @Nullable Paint paint) { super.drawPatch(patch, dst, paint); @@ -2278,6 +2287,9 @@ public class Canvas extends BaseCanvas { * array is optional, but if it is present, then it is used to specify the index of each * triangle, rather than just walking through the arrays in order. * + * <p>Note: antialiasing is not supported, therefore {@link Paint#ANTI_ALIAS_FLAG} is + * ignored.</p> + * * @param mode How to interpret the array of vertices * @param vertexCount The number of values in the vertices array (and corresponding texs and * colors arrays if non-null). Each logical vertex is two values (x, y), vertexCount @@ -2292,8 +2304,9 @@ public class Canvas extends BaseCanvas { * @param colorOffset Number of values in colors to skip before drawing. * @param indices If not null, array of indices to reference into the vertex (texs, colors) * array. - * @param indexCount number of entries in the indices array (if not null). - * @param paint Specifies the shader to use if the texs array is non-null. + * @param indexCount Number of entries in the indices array (if not null). + * @param paint Specifies the shader to use if the texs array is non-null. Antialiasing is not + * supported. */ public void drawVertices(@NonNull VertexMode mode, int vertexCount, @NonNull float[] verts, int vertOffset, @Nullable float[] texs, int texOffset, @Nullable int[] colors, diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 451b99ea7550..f438a03b1434 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -137,6 +137,13 @@ public class Paint { * <p>Enabling this flag will cause all draw operations that support * antialiasing to use it.</p> * + * <p>Notable draw operations that do <b>not</b> support antialiasing include:</p> + * <ul> + * <li>{@link android.graphics.Canvas#drawBitmapMesh}</li> + * <li>{@link android.graphics.Canvas#drawPatch}</li> + * <li>{@link android.graphics.Canvas#drawVertices}</li> + * </ul> + * * @see #Paint(int) * @see #setFlags(int) */ diff --git a/packages/BackupRestoreConfirmation/res/values-en-rCA/strings.xml b/packages/BackupRestoreConfirmation/res/values-en-rCA/strings.xml index d096d98a1a51..d5019d55c560 100644 --- a/packages/BackupRestoreConfirmation/res/values-en-rCA/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-en-rCA/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="backup_confirm_title" msgid="827563724209303345">"Full backup"</string> - <string name="restore_confirm_title" msgid="5469365809567486602">"Full restoration"</string> + <string name="restore_confirm_title" msgid="5469365809567486602">"Full restore"</string> <string name="backup_confirm_text" msgid="1878021282758896593">"A full backup of all data to a connected desktop computer has been requested. Do you want to allow this to happen?\n\nIf you did not request the backup yourself, do not allow the operation to proceed."</string> <string name="allow_backup_button_label" msgid="4217228747769644068">"Back up my data"</string> <string name="deny_backup_button_label" msgid="6009119115581097708">"Do not back up"</string> @@ -32,7 +32,7 @@ <string name="restore_enc_password_text" msgid="6140898525580710823">"If the restore data is encrypted, please enter the password below:"</string> <string name="toast_backup_started" msgid="550354281452756121">"Backup starting..."</string> <string name="toast_backup_ended" msgid="3818080769548726424">"Backup finished"</string> - <string name="toast_restore_started" msgid="7881679218971277385">"Restoration starting..."</string> - <string name="toast_restore_ended" msgid="1764041639199696132">"Restoration ended"</string> + <string name="toast_restore_started" msgid="7881679218971277385">"Restore starting..."</string> + <string name="toast_restore_ended" msgid="1764041639199696132">"Restore ended"</string> <string name="toast_timeout" msgid="5276598587087626877">"Operation timed out"</string> </resources> diff --git a/packages/DynamicSystemInstallationService/res/values-en-rCA/strings.xml b/packages/DynamicSystemInstallationService/res/values-en-rCA/strings.xml index 62dba985f715..08672938ff77 100644 --- a/packages/DynamicSystemInstallationService/res/values-en-rCA/strings.xml +++ b/packages/DynamicSystemInstallationService/res/values-en-rCA/strings.xml @@ -3,8 +3,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_description" msgid="8582605799129954556">"Please enter your password and continue to Dynamic System Updates"</string> <string name="notification_install_completed" msgid="6252047868415172643">"Dynamic system is ready. To start using it, restart your device."</string> - <string name="notification_install_inprogress" msgid="7383334330065065017">"Installation in progress"</string> - <string name="notification_install_failed" msgid="4066039210317521404">"Installation failed"</string> + <string name="notification_install_inprogress" msgid="7383334330065065017">"Install in progress"</string> + <string name="notification_install_failed" msgid="4066039210317521404">"Install failed"</string> <string name="notification_image_validation_failed" msgid="2720357826403917016">"Image validation failed. Abort installation."</string> <string name="notification_dynsystem_in_use" msgid="1053194595682188396">"Currently running a dynamic system. Restart to use the original Android version."</string> <string name="notification_action_cancel" msgid="5929299408545961077">"Cancel"</string> diff --git a/packages/InputDevices/res/values-en-rCA/strings.xml b/packages/InputDevices/res/values-en-rCA/strings.xml index ab48729d5006..116178300348 100644 --- a/packages/InputDevices/res/values-en-rCA/strings.xml +++ b/packages/InputDevices/res/values-en-rCA/strings.xml @@ -19,7 +19,7 @@ <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Swiss German"</string> <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belgian"</string> <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Bulgarian"</string> - <string name="keyboard_layout_bulgarian_phonetic" msgid="7568914730360106653">"Bulgarian, phonetic"</string> + <string name="keyboard_layout_bulgarian_phonetic" msgid="7568914730360106653">"Bulgarian, Phonetic"</string> <string name="keyboard_layout_italian" msgid="6497079660449781213">"Italian"</string> <string name="keyboard_layout_danish" msgid="8036432066627127851">"Danish"</string> <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norwegian"</string> diff --git a/packages/PackageInstaller/res/values-en-rCA/strings.xml b/packages/PackageInstaller/res/values-en-rCA/strings.xml index f09f7bbcc8b2..c67351c258c1 100644 --- a/packages/PackageInstaller/res/values-en-rCA/strings.xml +++ b/packages/PackageInstaller/res/values-en-rCA/strings.xml @@ -60,13 +60,13 @@ <string name="uninstall_update_text" msgid="863648314632448705">"Replace this app with the factory version? All data will be removed."</string> <string name="uninstall_update_text_multiuser" msgid="8992883151333057227">"Replace this app with the factory version? All data will be removed. This affects all users of this device, including those with work profiles."</string> <string name="uninstall_keep_data" msgid="7002379587465487550">"Keep <xliff:g id="SIZE">%1$s</xliff:g> of app data."</string> - <string name="uninstalling_notification_channel" msgid="840153394325714653">"Running uninstallations"</string> - <string name="uninstall_failure_notification_channel" msgid="1136405866767576588">"Failed uninstallations"</string> + <string name="uninstalling_notification_channel" msgid="840153394325714653">"Running uninstalls"</string> + <string name="uninstall_failure_notification_channel" msgid="1136405866767576588">"Failed uninstalls"</string> <string name="uninstalling" msgid="8709566347688966845">"Uninstalling…"</string> <string name="uninstalling_app" msgid="8866082646836981397">"Uninstalling <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string> - <string name="uninstall_done" msgid="439354138387969269">"Uninstallation finished."</string> + <string name="uninstall_done" msgid="439354138387969269">"Uninstall finished."</string> <string name="uninstall_done_app" msgid="4588850984473605768">"Uninstalled <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string> - <string name="uninstall_failed" msgid="1847750968168364332">"Uninstallation unsuccessful."</string> + <string name="uninstall_failed" msgid="1847750968168364332">"Uninstall unsuccessful."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Uninstalling <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> unsuccessful."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Can\'t uninstall active device admin app"</string> <string name="uninstall_failed_device_policy_manager_of_user" msgid="4813104025494168064">"Can\'t uninstall active device admin app for <xliff:g id="USERNAME">%1$s</xliff:g>"</string> @@ -76,9 +76,9 @@ <string name="manage_device_administrators" msgid="3092696419363842816">"Manage device admin apps"</string> <string name="manage_users" msgid="1243995386982560813">"Manage users"</string> <string name="uninstall_failed_msg" msgid="2176744834786696012">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be uninstalled."</string> - <string name="Parse_error_dlg_text" msgid="1661404001063076789">"There was a problem while parsing the package."</string> + <string name="Parse_error_dlg_text" msgid="1661404001063076789">"There was a problem parsing the package."</string> <string name="wear_not_allowed_dlg_title" msgid="8664785993465117517">"Android Wear"</string> - <string name="wear_not_allowed_dlg_text" msgid="704615521550939237">"Install/uninstall actions not supported on Wear."</string> + <string name="wear_not_allowed_dlg_text" msgid="704615521550939237">"Install/Uninstall actions not supported on Wear."</string> <string name="message_staging" msgid="8032722385658438567">"Staging app…"</string> <string name="app_name_unknown" msgid="6881210203354323926">"Unknown"</string> <string name="untrusted_external_source_warning" product="tablet" msgid="7067510047443133095">"For your security, your tablet currently isn’t allowed to install unknown apps from this source. You can change this in Settings."</string> @@ -89,8 +89,8 @@ <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Your TV and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your TV or loss of data that may result from its use."</string> <string name="anonymous_source_continue" msgid="4375745439457209366">"Continue"</string> <string name="external_sources_settings" msgid="4046964413071713807">"Settings"</string> - <string name="wear_app_channel" msgid="1960809674709107850">"Installing/uninstalling Wear apps"</string> + <string name="wear_app_channel" msgid="1960809674709107850">"Installing/uninstalling wear apps"</string> <string name="app_installed_notification_channel_description" msgid="2695385797601574123">"App installed notification"</string> <string name="notification_installation_success_message" msgid="6450467996056038442">"Successfully installed"</string> - <string name="notification_installation_success_status" msgid="3172502643504323321">"Successfully installed \'<xliff:g id="APPNAME">%1$s</xliff:g>\'"</string> + <string name="notification_installation_success_status" msgid="3172502643504323321">"Successfully installed “<xliff:g id="APPNAME">%1$s</xliff:g>”"</string> </resources> diff --git a/packages/PrintSpooler/res/values-en-rCA/strings.xml b/packages/PrintSpooler/res/values-en-rCA/strings.xml index 7fbfeb3b3d3b..606cc3e4b95e 100644 --- a/packages/PrintSpooler/res/values-en-rCA/strings.xml +++ b/packages/PrintSpooler/res/values-en-rCA/strings.xml @@ -23,21 +23,21 @@ <string name="label_copies_summary" msgid="3861966063536529540">"Copies:"</string> <string name="label_paper_size" msgid="908654383827777759">"Paper size"</string> <string name="label_paper_size_summary" msgid="5668204981332138168">"Paper size:"</string> - <string name="label_color" msgid="1108690305218188969">"Colour"</string> + <string name="label_color" msgid="1108690305218188969">"Color"</string> <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string> <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string> <string name="label_pages" msgid="7768589729282182230">"Pages"</string> <string name="destination_default_text" msgid="5422708056807065710">"Select a printer"</string> <string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> <string name="template_page_range" msgid="428638530038286328">"Range of <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> - <string name="pages_range_example" msgid="8558694453556945172">"e.g. 1–5,8,11–13"</string> + <string name="pages_range_example" msgid="8558694453556945172">"e.g. 1—5,8,11—13"</string> <string name="print_preview" msgid="8010217796057763343">"Print preview"</string> <string name="install_for_print_preview" msgid="6366303997385509332">"Install PDF viewer for preview"</string> <string name="printing_app_crashed" msgid="854477616686566398">"Printing app crashed"</string> <string name="generating_print_job" msgid="3119608742651698916">"Generating print job"</string> <string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string> <string name="all_printers" msgid="5018829726861876202">"All printers…"</string> - <string name="print_dialog" msgid="32628687461331979">"Print dialogue"</string> + <string name="print_dialog" msgid="32628687461331979">"Print dialog"</string> <string name="current_page_template" msgid="5145005201131935302">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string> <string name="page_description_template" msgid="6831239682256197161">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string> <string name="summary_template" msgid="8899734908625669193">"Summary, copies <xliff:g id="COPIES">%1$s</xliff:g>, paper size <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string> @@ -91,7 +91,7 @@ <string name="print_service_security_warning_summary" msgid="1427434625361692006">"Your document may pass through one or more servers on its way to the printer."</string> <string-array name="color_mode_labels"> <item msgid="7602948745415174937">"Black & White"</item> - <item msgid="2762241247228983754">"Colour"</item> + <item msgid="2762241247228983754">"Color"</item> </string-array> <string-array name="duplex_mode_labels"> <item msgid="3882302912790928315">"None"</item> diff --git a/packages/SettingsLib/res/values-en-rCA/arrays.xml b/packages/SettingsLib/res/values-en-rCA/arrays.xml index 697e49afdc3d..27412f151b5e 100644 --- a/packages/SettingsLib/res/values-en-rCA/arrays.xml +++ b/packages/SettingsLib/res/values-en-rCA/arrays.xml @@ -86,7 +86,7 @@ <item msgid="8147982633566548515">"map14"</item> </string-array> <string-array name="bluetooth_a2dp_codec_titles"> - <item msgid="2494959071796102843">"Use system selection (default)"</item> + <item msgid="2494959071796102843">"Use System Selection (Default)"</item> <item msgid="4055460186095649420">"SBC"</item> <item msgid="720249083677397051">"AAC"</item> <item msgid="1049450003868150455">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX">aptX™</xliff:g> audio"</item> @@ -94,7 +94,7 @@ <item msgid="3825367753087348007">"LDAC"</item> </string-array> <string-array name="bluetooth_a2dp_codec_summaries"> - <item msgid="8868109554557331312">"Use system selection (default)"</item> + <item msgid="8868109554557331312">"Use System Selection (Default)"</item> <item msgid="9024885861221697796">"SBC"</item> <item msgid="4688890470703790013">"AAC"</item> <item msgid="8627333814413492563">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX">aptX™</xliff:g> audio"</item> @@ -102,52 +102,52 @@ <item msgid="2553206901068987657">"LDAC"</item> </string-array> <string-array name="bluetooth_a2dp_codec_sample_rate_titles"> - <item msgid="926809261293414607">"Use system selection (default)"</item> + <item msgid="926809261293414607">"Use System Selection (Default)"</item> <item msgid="8003118270854840095">"44.1 kHz"</item> <item msgid="3208896645474529394">"48.0 kHz"</item> <item msgid="8420261949134022577">"88.2 kHz"</item> <item msgid="8887519571067543785">"96.0 kHz"</item> </string-array> <string-array name="bluetooth_a2dp_codec_sample_rate_summaries"> - <item msgid="2284090879080331090">"Use system selection (default)"</item> + <item msgid="2284090879080331090">"Use System Selection (Default)"</item> <item msgid="1872276250541651186">"44.1 kHz"</item> <item msgid="8736780630001704004">"48.0 kHz"</item> <item msgid="7698585706868856888">"88.2 kHz"</item> <item msgid="8946330945963372966">"96.0 kHz"</item> </string-array> <string-array name="bluetooth_a2dp_codec_bits_per_sample_titles"> - <item msgid="2574107108483219051">"Use system selection (default)"</item> + <item msgid="2574107108483219051">"Use System Selection (Default)"</item> <item msgid="4671992321419011165">"16 bits/sample"</item> <item msgid="1933898806184763940">"24 bits/sample"</item> <item msgid="1212577207279552119">"32 bits/sample"</item> </string-array> <string-array name="bluetooth_a2dp_codec_bits_per_sample_summaries"> - <item msgid="9196208128729063711">"Use system selection (default)"</item> + <item msgid="9196208128729063711">"Use System Selection (Default)"</item> <item msgid="1084497364516370912">"16 bits/sample"</item> <item msgid="2077889391457961734">"24 bits/sample"</item> <item msgid="3836844909491316925">"32 bits/sample"</item> </string-array> <string-array name="bluetooth_a2dp_codec_channel_mode_titles"> - <item msgid="3014194562841654656">"Use system selection (default)"</item> + <item msgid="3014194562841654656">"Use System Selection (Default)"</item> <item msgid="5982952342181788248">"Mono"</item> <item msgid="927546067692441494">"Stereo"</item> </string-array> <string-array name="bluetooth_a2dp_codec_channel_mode_summaries"> - <item msgid="1997302811102880485">"Use system selection (default)"</item> + <item msgid="1997302811102880485">"Use System Selection (Default)"</item> <item msgid="8005696114958453588">"Mono"</item> <item msgid="1333279807604675720">"Stereo"</item> </string-array> <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_titles"> - <item msgid="1241278021345116816">"Optimised for Audio Quality (990kbps/909kbps)"</item> - <item msgid="3523665555859696539">"Balanced Audio And Connection Quality (660 kbps/606 kbps)"</item> - <item msgid="886408010459747589">"Optimised for Connection Quality (330kbps/303kbps)"</item> + <item msgid="1241278021345116816">"Optimized for Audio Quality (990kbps/909kbps)"</item> + <item msgid="3523665555859696539">"Balanced Audio And Connection Quality (660kbps/606kbps)"</item> + <item msgid="886408010459747589">"Optimized for Connection Quality (330kbps/303kbps)"</item> <item msgid="3808414041654351577">"Best Effort (Adaptive Bit Rate)"</item> </string-array> <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_summaries"> - <item msgid="804499336721569838">"Optimised for Audio Quality"</item> - <item msgid="7451422070435297462">"Balanced Audio and Connection Quality"</item> - <item msgid="6173114545795428901">"Optimised for Connection Quality"</item> - <item msgid="4349908264188040530">"Best effort (adaptive bit rate)"</item> + <item msgid="804499336721569838">"Optimized for Audio Quality"</item> + <item msgid="7451422070435297462">"Balanced Audio And Connection Quality"</item> + <item msgid="6173114545795428901">"Optimized for Connection Quality"</item> + <item msgid="4349908264188040530">"Best Effort (Adaptive Bit Rate)"</item> </string-array> <string-array name="bluetooth_audio_active_device_summaries"> <item msgid="8019740759207729126"></item> @@ -157,25 +157,25 @@ </string-array> <string-array name="select_logd_size_titles"> <item msgid="1191094707770726722">"Off"</item> - <item msgid="7839165897132179888">"64 K"</item> - <item msgid="2715700596495505626">"256 K"</item> - <item msgid="7099386891713159947">"1 M"</item> - <item msgid="6069075827077845520">"4 M"</item> - <item msgid="6078203297886482480">"8 M"</item> + <item msgid="7839165897132179888">"64K"</item> + <item msgid="2715700596495505626">"256K"</item> + <item msgid="7099386891713159947">"1M"</item> + <item msgid="6069075827077845520">"4M"</item> + <item msgid="6078203297886482480">"8M"</item> </string-array> <string-array name="select_logd_size_lowram_titles"> <item msgid="1145807928339101085">"Off"</item> - <item msgid="4064786181089783077">"64 K"</item> - <item msgid="3052710745383602630">"256 K"</item> - <item msgid="3691785423374588514">"1 M"</item> + <item msgid="4064786181089783077">"64K"</item> + <item msgid="3052710745383602630">"256K"</item> + <item msgid="3691785423374588514">"1M"</item> </string-array> <string-array name="select_logd_size_summaries"> <item msgid="409235464399258501">"Off"</item> - <item msgid="4195153527464162486">"64 K per log buffer"</item> - <item msgid="7464037639415220106">"256 K per log buffer"</item> - <item msgid="8539423820514360724">"1 M per log buffer"</item> - <item msgid="1984761927103140651">"4 M per log buffer"</item> - <item msgid="2983219471251787208">"8 M per log buffer"</item> + <item msgid="4195153527464162486">"64K per log buffer"</item> + <item msgid="7464037639415220106">"256K per log buffer"</item> + <item msgid="8539423820514360724">"1M per log buffer"</item> + <item msgid="1984761927103140651">"4M per log buffer"</item> + <item msgid="2983219471251787208">"8M per log buffer"</item> </string-array> <string-array name="select_logpersist_titles"> <item msgid="704720725704372366">"Off"</item> @@ -218,7 +218,7 @@ </string-array> <string-array name="overlay_display_devices_entries"> <item msgid="4497393944195787240">"None"</item> - <item msgid="8461943978957133391">"480 p"</item> + <item msgid="8461943978957133391">"480p"</item> <item msgid="6923083594932909205">"480p (secure)"</item> <item msgid="1226941831391497335">"720p"</item> <item msgid="7051983425968643928">"720p (secure)"</item> @@ -254,10 +254,10 @@ <string-array name="app_process_limit_entries"> <item msgid="794656271086646068">"Standard limit"</item> <item msgid="8628438298170567201">"No background processes"</item> - <item msgid="915752993383950932">"At most, 1 process"</item> - <item msgid="8554877790859095133">"At most, 2 processes"</item> - <item msgid="9060830517215174315">"At most, 3 processes"</item> - <item msgid="6506681373060736204">"At most, 4 processes"</item> + <item msgid="915752993383950932">"At most 1 process"</item> + <item msgid="8554877790859095133">"At most 2 processes"</item> + <item msgid="9060830517215174315">"At most 3 processes"</item> + <item msgid="6506681373060736204">"At most 4 processes"</item> </string-array> <string-array name="usb_configuration_titles"> <item msgid="3358668781763928157">"Charging"</item> diff --git a/packages/SettingsLib/res/values-en-rCA/strings.xml b/packages/SettingsLib/res/values-en-rCA/strings.xml index 637295a148ae..6685e9d84f57 100644 --- a/packages/SettingsLib/res/values-en-rCA/strings.xml +++ b/packages/SettingsLib/res/values-en-rCA/strings.xml @@ -46,22 +46,22 @@ <string name="wifi_security_passpoint" msgid="2209078477216565387">"Passpoint"</string> <string name="wifi_security_sae" msgid="3644520541721422843">"WPA3-Personal"</string> <string name="wifi_security_psk_sae" msgid="8135104122179904684">"WPA2/WPA3-Personal"</string> - <string name="wifi_security_none_owe" msgid="5241745828327404101">"None/Enhanced open"</string> - <string name="wifi_security_owe" msgid="3343421403561657809">"Enhanced open"</string> + <string name="wifi_security_none_owe" msgid="5241745828327404101">"None/Enhanced Open"</string> + <string name="wifi_security_owe" msgid="3343421403561657809">"Enhanced Open"</string> <string name="wifi_security_eap_suiteb" msgid="415842785991698142">"WPA3-Enterprise 192-bit"</string> <string name="wifi_remembered" msgid="3266709779723179188">"Saved"</string> <string name="wifi_disconnected" msgid="7054450256284661757">"Disconnected"</string> <string name="wifi_disabled_generic" msgid="2651916945380294607">"Disabled"</string> <string name="wifi_disabled_network_failure" msgid="2660396183242399585">"IP Configuration Failure"</string> <string name="wifi_disabled_by_recommendation_provider" msgid="1302938248432705534">"Not connected due to low quality network"</string> - <string name="wifi_disabled_wifi_failure" msgid="8819554899148331100">"Wi-Fi Connection Failure"</string> + <string name="wifi_disabled_wifi_failure" msgid="8819554899148331100">"WiFi Connection Failure"</string> <string name="wifi_disabled_password_failure" msgid="6892387079613226738">"Authentication problem"</string> <string name="wifi_cant_connect" msgid="5718417542623056783">"Can\'t connect"</string> <string name="wifi_cant_connect_to_ap" msgid="3099667989279700135">"Can\'t connect to \'<xliff:g id="AP_NAME">%1$s</xliff:g>\'"</string> <string name="wifi_check_password_try_again" msgid="8817789642851605628">"Check password and try again"</string> <string name="wifi_not_in_range" msgid="1541760821805777772">"Not in range"</string> <string name="wifi_no_internet_no_reconnect" msgid="821591791066497347">"Won\'t automatically connect"</string> - <string name="wifi_no_internet" msgid="1774198889176926299">"No Internet access"</string> + <string name="wifi_no_internet" msgid="1774198889176926299">"No internet access"</string> <string name="saved_network" msgid="7143698034077223645">"Saved by <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="connected_to_metered_access_point" msgid="9179693207918156341">"Connected to metered network"</string> <string name="connected_via_network_scorer" msgid="7665725527352893558">"Automatically connected via %1$s"</string> @@ -70,27 +70,27 @@ <string name="connected_via_app" msgid="3532267661404276584">"Connected via <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="available_via_passpoint" msgid="1716000261192603682">"Available via %1$s"</string> <string name="tap_to_sign_up" msgid="5356397741063740395">"Tap to sign up"</string> - <string name="wifi_connected_no_internet" msgid="5087420713443350646">"No Internet"</string> + <string name="wifi_connected_no_internet" msgid="5087420713443350646">"No internet"</string> <string name="private_dns_broken" msgid="1984159464346556931">"Private DNS server cannot be accessed"</string> <string name="wifi_limited_connection" msgid="1184778285475204682">"Limited connection"</string> - <string name="wifi_status_no_internet" msgid="3799933875988829048">"No Internet"</string> - <string name="wifi_status_sign_in_required" msgid="2236267500459526855">"Sign-in required"</string> + <string name="wifi_status_no_internet" msgid="3799933875988829048">"No internet"</string> + <string name="wifi_status_sign_in_required" msgid="2236267500459526855">"Sign in required"</string> <string name="wifi_ap_unable_to_handle_new_sta" msgid="5885145407184194503">"Access point temporarily full"</string> <string name="connected_via_carrier" msgid="1968057009076191514">"Connected via %1$s"</string> <string name="available_via_carrier" msgid="465598683092718294">"Available via %1$s"</string> <string name="osu_opening_provider" msgid="4318105381295178285">"Opening <xliff:g id="PASSPOINTPROVIDER">%1$s</xliff:g>"</string> <string name="osu_connect_failed" msgid="9107873364807159193">"Couldn’t connect"</string> <string name="osu_completing_sign_up" msgid="8412636665040390901">"Completing sign-up…"</string> - <string name="osu_sign_up_failed" msgid="5605453599586001793">"Couldn’t complete sign-up. Tap to try again"</string> + <string name="osu_sign_up_failed" msgid="5605453599586001793">"Couldn’t complete sign-up. Tap to try again."</string> <string name="osu_sign_up_complete" msgid="7640183358878916847">"Sign-up complete. Connecting…"</string> - <string name="speed_label_very_slow" msgid="8526005255731597666">"Very slow"</string> + <string name="speed_label_very_slow" msgid="8526005255731597666">"Very Slow"</string> <string name="speed_label_slow" msgid="6069917670665664161">"Slow"</string> <string name="speed_label_okay" msgid="1253594383880810424">"OK"</string> <string name="speed_label_medium" msgid="9078405312828606976">"Medium"</string> <string name="speed_label_fast" msgid="2677719134596044051">"Fast"</string> - <string name="speed_label_very_fast" msgid="8215718029533182439">"Very fast"</string> + <string name="speed_label_very_fast" msgid="8215718029533182439">"Very Fast"</string> <string name="wifi_passpoint_expired" msgid="6540867261754427561">"Expired"</string> - <string name="preference_summary_default_combination" msgid="2644094566845577901">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string> + <string name="preference_summary_default_combination" msgid="2644094566845577901">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string> <string name="bluetooth_disconnected" msgid="7739366554710388701">"Disconnected"</string> <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Disconnecting…"</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Connecting…"</string> @@ -120,8 +120,8 @@ <string name="bluetooth_profile_pbap" msgid="7064307749579335765">"Contact sharing"</string> <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Use for contact sharing"</string> <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Internet connection sharing"</string> - <string name="bluetooth_profile_map" msgid="8907204701162107271">"Text messages"</string> - <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM access"</string> + <string name="bluetooth_profile_map" msgid="8907204701162107271">"Text Messages"</string> + <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM Access"</string> <string name="bluetooth_profile_a2dp_high_quality" msgid="4739440941324792775">"HD audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="2477639096903834374">"HD audio"</string> <string name="bluetooth_profile_hearing_aid" msgid="58154575573984914">"Hearing Aids"</string> @@ -130,14 +130,14 @@ <string name="bluetooth_le_audio_profile_summary_connected" msgid="3162538609379333442">"Connected to LE_AUDIO"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="7422607970115444153">"Connected to media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="2420981566026949688">"Connected to phone audio"</string> - <string name="bluetooth_opp_profile_summary_connected" msgid="2393521801478157362">"Connected to file-transfer server"</string> + <string name="bluetooth_opp_profile_summary_connected" msgid="2393521801478157362">"Connected to file transfer server"</string> <string name="bluetooth_map_profile_summary_connected" msgid="4141725591784669181">"Connected to map"</string> <string name="bluetooth_sap_profile_summary_connected" msgid="1280297388033001037">"Connected to SAP"</string> - <string name="bluetooth_opp_profile_summary_not_connected" msgid="3959741824627764954">"Not connected to file-transfer server"</string> + <string name="bluetooth_opp_profile_summary_not_connected" msgid="3959741824627764954">"Not connected to file transfer server"</string> <string name="bluetooth_hid_profile_summary_connected" msgid="3923653977051684833">"Connected to input device"</string> - <string name="bluetooth_pan_user_profile_summary_connected" msgid="380469653827505727">"Connected to device for Internet access"</string> - <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3744773111299503493">"Sharing local Internet connection with device"</string> - <string name="bluetooth_pan_profile_summary_use_for" msgid="7422039765025340313">"Use for Internet access"</string> + <string name="bluetooth_pan_user_profile_summary_connected" msgid="380469653827505727">"Connected to device for internet access"</string> + <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3744773111299503493">"Sharing local internet connection with device"</string> + <string name="bluetooth_pan_profile_summary_use_for" msgid="7422039765025340313">"Use for internet access"</string> <string name="bluetooth_map_profile_summary_use_for" msgid="4453622103977592583">"Use for map"</string> <string name="bluetooth_sap_profile_summary_use_for" msgid="6204902866176714046">"Use for SIM access"</string> <string name="bluetooth_a2dp_profile_summary_use_for" msgid="7324694226276491807">"Use for media audio"</string> @@ -156,17 +156,17 @@ <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Computer"</string> <string name="bluetooth_talkback_headset" msgid="3406852564400882682">"Headset"</string> - <string name="bluetooth_talkback_phone" msgid="868393783858123880">"Telephone"</string> + <string name="bluetooth_talkback_phone" msgid="868393783858123880">"Phone"</string> <string name="bluetooth_talkback_imaging" msgid="8781682986822514331">"Imaging"</string> <string name="bluetooth_talkback_headphone" msgid="8613073829180337091">"Headphone"</string> <string name="bluetooth_talkback_input_peripheral" msgid="5133944817800149942">"Input Peripheral"</string> <string name="bluetooth_talkback_bluetooth" msgid="1143241359781999989">"Bluetooth"</string> - <string name="accessibility_wifi_off" msgid="1195445715254137155">"Wi-Fi off."</string> - <string name="accessibility_no_wifi" msgid="5297119459491085771">"Wi-Fi disconnected."</string> - <string name="accessibility_wifi_one_bar" msgid="6025652717281815212">"Wi-Fi one bar."</string> - <string name="accessibility_wifi_two_bars" msgid="687800024970972270">"Wi-Fi two bars."</string> - <string name="accessibility_wifi_three_bars" msgid="779895671061950234">"Wi-Fi three bars."</string> - <string name="accessibility_wifi_signal_full" msgid="7165262794551355617">"Wi-Fi signal full."</string> + <string name="accessibility_wifi_off" msgid="1195445715254137155">"Wifi off."</string> + <string name="accessibility_no_wifi" msgid="5297119459491085771">"Wifi disconnected."</string> + <string name="accessibility_wifi_one_bar" msgid="6025652717281815212">"Wifi one bar."</string> + <string name="accessibility_wifi_two_bars" msgid="687800024970972270">"Wifi two bars."</string> + <string name="accessibility_wifi_three_bars" msgid="779895671061950234">"Wifi three bars."</string> + <string name="accessibility_wifi_signal_full" msgid="7165262794551355617">"Wifi signal full."</string> <string name="accessibility_wifi_security_type_none" msgid="162352241518066966">"Open network"</string> <string name="accessibility_wifi_security_type_secured" msgid="2399774097343238942">"Secure network"</string> <string name="process_kernel_label" msgid="950292573930336765">"Android OS"</string> @@ -188,7 +188,7 @@ <string name="tts_default_rate_title" msgid="3964187817364304022">"Speech rate"</string> <string name="tts_default_rate_summary" msgid="3781937042151716987">"Speed at which the text is spoken"</string> <string name="tts_default_pitch_title" msgid="6988592215554485479">"Pitch"</string> - <string name="tts_default_pitch_summary" msgid="9132719475281551884">"Affects the tone of the synthesised speech"</string> + <string name="tts_default_pitch_summary" msgid="9132719475281551884">"Affects the tone of the synthesized speech"</string> <string name="tts_default_lang_title" msgid="4698933575028098940">"Language"</string> <string name="tts_lang_use_system" msgid="6312945299804012406">"Use system language"</string> <string name="tts_lang_not_selected" msgid="7927823081096056147">"Language not selected"</string> @@ -198,7 +198,7 @@ <string name="tts_install_data_title" msgid="1829942496472751703">"Install voice data"</string> <string name="tts_install_data_summary" msgid="3608874324992243851">"Install the voice data required for speech synthesis"</string> <string name="tts_engine_security_warning" msgid="3372432853837988146">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string> - <string name="tts_engine_network_required" msgid="8722087649733906851">"This language requires a working network connection for Text-to-Speech output."</string> + <string name="tts_engine_network_required" msgid="8722087649733906851">"This language requires a working network connection for text-to-speech output."</string> <string name="tts_default_sample_string" msgid="6388016028292967973">"This is an example of speech synthesis"</string> <string name="tts_status_title" msgid="8190784181389278640">"Default language status"</string> <string name="tts_status_ok" msgid="8583076006537547379">"<xliff:g id="LOCALE">%1$s</xliff:g> is fully supported"</string> @@ -234,7 +234,7 @@ <string name="apn_settings_not_available" msgid="1147111671403342300">"Access Point Name settings are not available for this user"</string> <string name="enable_adb" msgid="8072776357237289039">"USB debugging"</string> <string name="enable_adb_summary" msgid="3711526030096574316">"Debug mode when USB is connected"</string> - <string name="clear_adb_keys" msgid="3010148733140369917">"Revoke USB debugging authorisations"</string> + <string name="clear_adb_keys" msgid="3010148733140369917">"Revoke USB debugging authorizations"</string> <string name="enable_adb_wireless" msgid="6973226350963971018">"Wireless debugging"</string> <string name="enable_adb_wireless_summary" msgid="7344391423657093011">"Debug mode when Wi‑Fi is connected"</string> <string name="adb_wireless_error" msgid="721958772149779856">"Error"</string> @@ -243,22 +243,22 @@ <string name="adb_pair_method_qrcode_title" msgid="6982904096137468634">"Pair device with QR code"</string> <string name="adb_pair_method_qrcode_summary" msgid="7130694277228970888">"Pair new devices using QR code scanner"</string> <string name="adb_pair_method_code_title" msgid="1122590300445142904">"Pair device with pairing code"</string> - <string name="adb_pair_method_code_summary" msgid="6370414511333685185">"Pair new devices using six-digit code"</string> + <string name="adb_pair_method_code_summary" msgid="6370414511333685185">"Pair new devices using six digit code"</string> <string name="adb_paired_devices_title" msgid="5268997341526217362">"Paired devices"</string> <string name="adb_wireless_device_connected_summary" msgid="3039660790249148713">"Currently connected"</string> <string name="adb_wireless_device_details_title" msgid="7129369670526565786">"Device details"</string> <string name="adb_device_forget" msgid="193072400783068417">"Forget"</string> <string name="adb_device_fingerprint_title_format" msgid="291504822917843701">"Device fingerprint: <xliff:g id="FINGERPRINT_PARAM">%1$s</xliff:g>"</string> <string name="adb_wireless_connection_failed_title" msgid="664211177427438438">"Connection unsuccessful"</string> - <string name="adb_wireless_connection_failed_message" msgid="9213896700171602073">"Make sure that <xliff:g id="DEVICE_NAME">%1$s</xliff:g> is connected to the correct network"</string> + <string name="adb_wireless_connection_failed_message" msgid="9213896700171602073">"Make sure <xliff:g id="DEVICE_NAME">%1$s</xliff:g> is connected to the correct network"</string> <string name="adb_pairing_device_dialog_title" msgid="7141739231018530210">"Pair with device"</string> <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Wi‑Fi pairing code"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Pairing unsuccessful"</string> - <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Make sure that the device is connected to the same network."</string> + <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Make sure the device is connected to the same network."</string> <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Pair device over Wi‑Fi by scanning a QR code"</string> <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Pairing device…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Failed to pair the device. Either the QR code was incorrect, or the device is not connected to the same network."</string> - <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP address and port"</string> + <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP address & Port"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Scan QR code"</string> <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Pair device over Wi‑Fi by scanning a QR code"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Please connect to a Wi‑Fi network"</string> @@ -278,28 +278,28 @@ <string name="mock_location_app_set" msgid="4706722469342913843">"Mock location app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="debug_networking_category" msgid="6829757985772659599">"Networking"</string> <string name="wifi_display_certification" msgid="1805579519992520381">"Wireless display certification"</string> - <string name="wifi_verbose_logging" msgid="1785910450009679371">"Enable Wi‑Fi verbose logging"</string> + <string name="wifi_verbose_logging" msgid="1785910450009679371">"Enable Wi‑Fi Verbose Logging"</string> <string name="wifi_scan_throttling" msgid="2985624788509913617">"Wi‑Fi scan throttling"</string> - <string name="wifi_non_persistent_mac_randomization" msgid="7482769677894247316">"Wi‑Fi non‑persistent MAC randomisation"</string> + <string name="wifi_non_persistent_mac_randomization" msgid="7482769677894247316">"Wi‑Fi non‑persistent MAC randomization"</string> <string name="mobile_data_always_on" msgid="8275958101875563572">"Mobile data always active"</string> <string name="tethering_hardware_offload" msgid="4116053719006939161">"Tethering hardware acceleration"</string> <string name="bluetooth_show_devices_without_names" msgid="923584526471885819">"Show Bluetooth devices without names"</string> <string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"Disable absolute volume"</string> <string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Enable Gabeldorsche"</string> - <string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"Bluetooth AVRCP version"</string> + <string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"Bluetooth AVRCP Version"</string> <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"Select Bluetooth AVRCP Version"</string> - <string name="bluetooth_select_map_version_string" msgid="526308145174175327">"Bluetooth MAP version"</string> - <string name="bluetooth_select_map_version_dialog_title" msgid="7085934373987428460">"Select Bluetooth MAP version"</string> - <string name="bluetooth_select_a2dp_codec_type" msgid="952001408455456494">"Bluetooth audio codec"</string> + <string name="bluetooth_select_map_version_string" msgid="526308145174175327">"Bluetooth MAP Version"</string> + <string name="bluetooth_select_map_version_dialog_title" msgid="7085934373987428460">"Select Bluetooth MAP Version"</string> + <string name="bluetooth_select_a2dp_codec_type" msgid="952001408455456494">"Bluetooth Audio Codec"</string> <string name="bluetooth_select_a2dp_codec_type_dialog_title" msgid="7510542404227225545">"Trigger Bluetooth Audio Codec\nSelection"</string> - <string name="bluetooth_select_a2dp_codec_sample_rate" msgid="1638623076480928191">"Bluetooth audio sample rate"</string> + <string name="bluetooth_select_a2dp_codec_sample_rate" msgid="1638623076480928191">"Bluetooth Audio Sample Rate"</string> <string name="bluetooth_select_a2dp_codec_sample_rate_dialog_title" msgid="5876305103137067798">"Trigger Bluetooth Audio Codec\nSelection: Sample Rate"</string> - <string name="bluetooth_select_a2dp_codec_type_help_info" msgid="8647200416514412338">"Grey-out means not supported by phone or headset"</string> - <string name="bluetooth_select_a2dp_codec_bits_per_sample" msgid="6253965294594390806">"Bluetooth audio bits per sample"</string> + <string name="bluetooth_select_a2dp_codec_type_help_info" msgid="8647200416514412338">"Gray-out means not supported by phone or headset"</string> + <string name="bluetooth_select_a2dp_codec_bits_per_sample" msgid="6253965294594390806">"Bluetooth Audio Bits Per Sample"</string> <string name="bluetooth_select_a2dp_codec_bits_per_sample_dialog_title" msgid="4898693684282596143">"Trigger Bluetooth Audio Codec\nSelection: Bits Per Sample"</string> - <string name="bluetooth_select_a2dp_codec_channel_mode" msgid="364277285688014427">"Bluetooth audio channel mode"</string> + <string name="bluetooth_select_a2dp_codec_channel_mode" msgid="364277285688014427">"Bluetooth Audio Channel Mode"</string> <string name="bluetooth_select_a2dp_codec_channel_mode_dialog_title" msgid="2076949781460359589">"Trigger Bluetooth Audio Codec\nSelection: Channel Mode"</string> - <string name="bluetooth_select_a2dp_codec_ldac_playback_quality" msgid="3233402355917446304">"Bluetooth audio LDAC codec: Playback quality"</string> + <string name="bluetooth_select_a2dp_codec_ldac_playback_quality" msgid="3233402355917446304">"Bluetooth Audio LDAC Codec: Playback Quality"</string> <string name="bluetooth_select_a2dp_codec_ldac_playback_quality_dialog_title" msgid="7274396574659784285">"Trigger Bluetooth Audio LDAC\nCodec Selection: Playback Quality"</string> <string name="bluetooth_select_a2dp_codec_streaming_label" msgid="2040810756832027227">"Streaming: <xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string> <string name="select_private_dns_configuration_title" msgid="7887550926056143018">"Private DNS"</string> @@ -311,14 +311,14 @@ <string name="private_dns_mode_provider_failure" msgid="8356259467861515108">"Couldn\'t connect"</string> <string name="wifi_display_certification_summary" msgid="8111151348106907513">"Show options for wireless display certification"</string> <string name="wifi_verbose_logging_summary" msgid="4993823188807767892">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string> - <string name="wifi_scan_throttling_summary" msgid="2577105472017362814">"Reduces battery drain and improves network performance"</string> - <string name="wifi_non_persistent_mac_randomization_summary" msgid="2159794543105053930">"When this mode is enabled, this device’s MAC address may change each time that it connects to a network that has MAC randomisation enabled."</string> + <string name="wifi_scan_throttling_summary" msgid="2577105472017362814">"Reduces battery drain & improves network performance"</string> + <string name="wifi_non_persistent_mac_randomization_summary" msgid="2159794543105053930">"When this mode is enabled, this device’s MAC address may change each time it connects to a network that has MAC randomization enabled."</string> <string name="wifi_metered_label" msgid="8737187690304098638">"Metered"</string> <string name="wifi_unmetered_label" msgid="6174142840934095093">"Unmetered"</string> <string name="select_logd_size_title" msgid="1604578195914595173">"Logger buffer sizes"</string> <string name="select_logd_size_dialog_title" msgid="2105401994681013578">"Select Logger sizes per log buffer"</string> <string name="dev_logpersist_clear_warning_title" msgid="8631859265777337991">"Clear logger persistent storage?"</string> - <string name="dev_logpersist_clear_warning_message" msgid="6447590867594287413">"When we are no longer monitoring with the persistent logger, we are required to erase the logger data resident on your device."</string> + <string name="dev_logpersist_clear_warning_message" msgid="6447590867594287413">"When we no longer are monitoring with the persistent logger, we are required to erase the logger data resident on your device."</string> <string name="select_logpersist_title" msgid="447071974007104196">"Store logger data persistently on device"</string> <string name="select_logpersist_dialog_title" msgid="7745193591195485594">"Select log buffers to store persistently on device"</string> <string name="select_usb_configuration_title" msgid="6339801314922294586">"Select USB Configuration"</string> @@ -329,22 +329,22 @@ <string name="mobile_data_always_on_summary" msgid="1112156365594371019">"Always keep mobile data active, even when Wi‑Fi is active (for fast network switching)."</string> <string name="tethering_hardware_offload_summary" msgid="7801345335142803029">"Use tethering hardware acceleration if available"</string> <string name="adb_warning_title" msgid="7708653449506485728">"Allow USB debugging?"</string> - <string name="adb_warning_message" msgid="8145270656419669221">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string> + <string name="adb_warning_message" msgid="8145270656419669221">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data."</string> <string name="adbwifi_warning_title" msgid="727104571653031865">"Allow wireless debugging?"</string> <string name="adbwifi_warning_message" msgid="8005936574322702388">"Wireless debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data."</string> - <string name="adb_keys_warning_message" msgid="2968555274488101220">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string> + <string name="adb_keys_warning_message" msgid="2968555274488101220">"Revoke access to USB debugging from all computers you’ve previously authorized?"</string> <string name="dev_settings_warning_title" msgid="8251234890169074553">"Allow development settings?"</string> <string name="dev_settings_warning_message" msgid="37741686486073668">"These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave."</string> <string name="verify_apps_over_usb_title" msgid="6031809675604442636">"Verify apps over USB"</string> - <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"Check apps installed via ADB/ADT for harmful behaviour."</string> + <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"Check apps installed via ADB/ADT for harmful behavior."</string> <string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"Bluetooth devices without names (MAC addresses only) will be displayed"</string> <string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"Disables the Bluetooth absolute volume feature in case of volume issues with remote devices such as unacceptably loud volume or lack of control."</string> <string name="bluetooth_enable_gabeldorsche_summary" msgid="2054730331770712629">"Enables the Bluetooth Gabeldorsche feature stack."</string> - <string name="enhanced_connectivity_summary" msgid="1576414159820676330">"Enables the enhanced connectivity feature."</string> + <string name="enhanced_connectivity_summary" msgid="1576414159820676330">"Enables the Enhanced Connectivity feature."</string> <string name="enable_terminal_title" msgid="3834790541986303654">"Local terminal"</string> <string name="enable_terminal_summary" msgid="2481074834856064500">"Enable terminal app that offers local shell access"</string> <string name="hdcp_checking_title" msgid="3155692785074095986">"HDCP checking"</string> - <string name="hdcp_checking_dialog_title" msgid="7691060297616217781">"Set HDCP checking behaviour"</string> + <string name="hdcp_checking_dialog_title" msgid="7691060297616217781">"Set HDCP checking behavior"</string> <string name="debug_debugging_category" msgid="535341063709248842">"Debugging"</string> <string name="debug_app" msgid="8903350241392391766">"Select debug app"</string> <string name="debug_app_not_set" msgid="1934083001283807188">"No debug application set"</string> @@ -373,7 +373,7 @@ <string name="debug_hw_overdraw" msgid="8944851091008756796">"Debug GPU overdraw"</string> <string name="disable_overlays" msgid="4206590799671557143">"Disable HW overlays"</string> <string name="disable_overlays_summary" msgid="1954852414363338166">"Always use GPU for screen compositing"</string> - <string name="simulate_color_space" msgid="1206503300335835151">"Simulate colour space"</string> + <string name="simulate_color_space" msgid="1206503300335835151">"Simulate color space"</string> <string name="enable_opengl_traces_title" msgid="4638773318659125196">"Enable OpenGL traces"</string> <string name="usb_audio_disable_routing" msgid="3367656923544254975">"Disable USB audio routing"</string> <string name="usb_audio_disable_routing_summary" msgid="8768242894849534699">"Disable automatic routing to USB audio peripherals"</string> @@ -389,30 +389,30 @@ <string name="enable_gpu_debug_layers" msgid="4986675516188740397">"Enable GPU debug layers"</string> <string name="enable_gpu_debug_layers_summary" msgid="4921521407377170481">"Allow loading GPU debug layers for debug apps"</string> <string name="enable_verbose_vendor_logging" msgid="1196698788267682072">"Enable verbose vendor logging"</string> - <string name="enable_verbose_vendor_logging_summary" msgid="5426292185780393708">"Include additional device-specific vendor logs in bug reports, which may contain private information, use more battery and/or use more storage."</string> + <string name="enable_verbose_vendor_logging_summary" msgid="5426292185780393708">"Include additional device-specific vendor logs in bug reports, which may contain private information, use more battery, and/or use more storage."</string> <string name="window_animation_scale_title" msgid="5236381298376812508">"Window animation scale"</string> <string name="transition_animation_scale_title" msgid="1278477690695439337">"Transition animation scale"</string> <string name="animator_duration_scale_title" msgid="7082913931326085176">"Animator duration scale"</string> <string name="overlay_display_devices_title" msgid="5411894622334469607">"Simulate secondary displays"</string> <string name="debug_applications_category" msgid="5394089406638954196">"Apps"</string> - <string name="immediately_destroy_activities" msgid="1826287490705167403">"Don\'t keep activities"</string> + <string name="immediately_destroy_activities" msgid="1826287490705167403">"Don’t keep activities"</string> <string name="immediately_destroy_activities_summary" msgid="6289590341144557614">"Destroy every activity as soon as the user leaves it"</string> <string name="app_process_limit_title" msgid="8361367869453043007">"Background process limit"</string> <string name="show_all_anrs" msgid="9160563836616468726">"Show background ANRs"</string> - <string name="show_all_anrs_summary" msgid="8562788834431971392">"Display App Not Responding dialogue for background apps"</string> + <string name="show_all_anrs_summary" msgid="8562788834431971392">"Display App Not Responding dialog for background apps"</string> <string name="show_notification_channel_warnings" msgid="3448282400127597331">"Show notification channel warnings"</string> <string name="show_notification_channel_warnings_summary" msgid="68031143745094339">"Displays on-screen warning when an app posts a notification without a valid channel"</string> <string name="force_allow_on_external" msgid="9187902444231637880">"Force allow apps on external"</string> <string name="force_allow_on_external_summary" msgid="8525425782530728238">"Makes any app eligible to be written to external storage, regardless of manifest values"</string> - <string name="force_resizable_activities" msgid="7143612144399959606">"Force activities to be resizeable"</string> - <string name="force_resizable_activities_summary" msgid="2490382056981583062">"Make all activities resizeable for multi-window, regardless of manifest values."</string> + <string name="force_resizable_activities" msgid="7143612144399959606">"Force activities to be resizable"</string> + <string name="force_resizable_activities_summary" msgid="2490382056981583062">"Make all activities resizable for multi-window, regardless of manifest values."</string> <string name="enable_freeform_support" msgid="7599125687603914253">"Enable freeform windows"</string> <string name="enable_freeform_support_summary" msgid="1822862728719276331">"Enable support for experimental freeform windows."</string> <string name="local_backup_password_title" msgid="4631017948933578709">"Desktop backup password"</string> - <string name="local_backup_password_summary_none" msgid="7646898032616361714">"Desktop full backups aren\'t currently protected"</string> + <string name="local_backup_password_summary_none" msgid="7646898032616361714">"Desktop full backups aren’t currently protected"</string> <string name="local_backup_password_summary_change" msgid="1707357670383995567">"Tap to change or remove the password for desktop full backups"</string> <string name="local_backup_password_toast_success" msgid="4891666204428091604">"New backup password set"</string> - <string name="local_backup_password_toast_confirmation_mismatch" msgid="2994718182129097733">"New password and confirmation don\'t match"</string> + <string name="local_backup_password_toast_confirmation_mismatch" msgid="2994718182129097733">"New password and confirmation don’t match"</string> <string name="local_backup_password_toast_validation_failure" msgid="714669442363647122">"Failure setting backup password"</string> <string name="loading_injected_setting_summary" msgid="8394446285689070348">"Loading…"</string> <string-array name="color_mode_names"> @@ -421,9 +421,9 @@ <item msgid="6564241960833766170">"Standard"</item> </string-array> <string-array name="color_mode_descriptions"> - <item msgid="6828141153199944847">"Enhanced colours"</item> - <item msgid="4548987861791236754">"Natural colours as seen by the eye"</item> - <item msgid="1282170165150762976">"Colours optimised for digital content"</item> + <item msgid="6828141153199944847">"Enhanced colors"</item> + <item msgid="4548987861791236754">"Natural colors as seen by the eye"</item> + <item msgid="1282170165150762976">"Colors optimized for digital content"</item> </string-array> <string name="inactive_apps_title" msgid="5372523625297212320">"Standby apps"</string> <string name="inactive_app_inactive_summary" msgid="3161222402614236260">"Inactive. Tap to toggle."</string> @@ -440,15 +440,15 @@ <string name="select_webview_provider_title" msgid="3917815648099445503">"WebView implementation"</string> <string name="select_webview_provider_dialog_title" msgid="2444261109877277714">"Set WebView implementation"</string> <string name="select_webview_provider_toast_text" msgid="8512254949169359848">"This choice is no longer valid. Try again."</string> - <string name="picture_color_mode" msgid="1013807330552931903">"Picture colour mode"</string> + <string name="picture_color_mode" msgid="1013807330552931903">"Picture color mode"</string> <string name="picture_color_mode_desc" msgid="151780973768136200">"Use sRGB"</string> <string name="daltonizer_mode_disabled" msgid="403424372812399228">"Disabled"</string> <string name="daltonizer_mode_monochromacy" msgid="362060873835885014">"Monochromacy"</string> <string name="daltonizer_mode_deuteranomaly" msgid="3507284319584683963">"Deuteranomaly (red-green)"</string> <string name="daltonizer_mode_protanomaly" msgid="7805583306666608440">"Protanomaly (red-green)"</string> <string name="daltonizer_mode_tritanomaly" msgid="7135266249220732267">"Tritanomaly (blue-yellow)"</string> - <string name="accessibility_display_daltonizer_preference_title" msgid="1810693571332381974">"Colour correction"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="1522101114585266455">"Colour correction can be helpful when you want to:<br/> <ol> <li>&nbsp;See colours more accurately</li> <li>&nbsp;Remove colours to help you focus</li> </ol>"</string> + <string name="accessibility_display_daltonizer_preference_title" msgid="1810693571332381974">"Color correction"</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="1522101114585266455">"Color correction can be helpful when you want to:<br/> <ol> <li>&nbsp;See colors more accurately</li> <li>&nbsp;Remove colors to help you focus</li> </ol>"</string> <string name="daltonizer_type_overridden" msgid="4509604753672535721">"Overridden by <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_settings_home_page" msgid="4885165789445462557">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> - <xliff:g id="TIME_STRING">%2$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="8264199158671531431">"About <xliff:g id="TIME_REMAINING">%1$s</xliff:g> left"</string> @@ -475,7 +475,7 @@ <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="4374784375644214578">"Device may shut down soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="6727132649743436802">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="8085099012811384899">"<xliff:g id="TIME">%1$s</xliff:g> left until full"</string> - <string name="power_charging_duration" msgid="6127154952524919719">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> left until full"</string> + <string name="power_charging_duration" msgid="6127154952524919719">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> left until full"</string> <string name="power_charging_limited" msgid="7956120998372505295">"<xliff:g id="LEVEL">%1$s</xliff:g> - Charging temporarily limited"</string> <string name="battery_info_status_unknown" msgid="268625384868401114">"Unknown"</string> <string name="battery_info_status_charging" msgid="4279958015430387405">"Charging"</string> @@ -485,9 +485,9 @@ <string name="battery_info_status_discharging" msgid="6962689305413556485">"Not charging"</string> <string name="battery_info_status_not_charging" msgid="3371084153747234837">"Connected, not charging"</string> <string name="battery_info_status_full" msgid="1339002294876531312">"Charged"</string> - <string name="battery_info_status_full_charged" msgid="3536054261505567948">"Fully charged"</string> + <string name="battery_info_status_full_charged" msgid="3536054261505567948">"Fully Charged"</string> <string name="disabled_by_admin_summary_text" msgid="5343911767402923057">"Controlled by admin"</string> - <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlled by restricted setting"</string> + <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlled by Restricted Setting"</string> <string name="disabled" msgid="8017887509554714950">"Disabled"</string> <string name="external_source_trusted" msgid="1146522036773132905">"Allowed"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Not allowed"</string> @@ -513,13 +513,13 @@ <string name="active_input_method_subtypes" msgid="4232680535471633046">"Active input methods"</string> <string name="use_system_language_to_select_input_method_subtypes" msgid="4865195835541387040">"Use system languages"</string> <string name="failed_to_open_app_settings_toast" msgid="764897252657692092">"Failed to open settings for <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string> - <string name="ime_security_warning" msgid="6547562217880551450">"This input method may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</string> + <string name="ime_security_warning" msgid="6547562217880551450">"This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</string> <string name="direct_boot_unaware_dialog_message" msgid="7845398276735021548">"Note: After a reboot, this app can\'t start until you unlock your phone"</string> <string name="ims_reg_title" msgid="8197592958123671062">"IMS registration state"</string> <string name="ims_reg_status_registered" msgid="884916398194885457">"Registered"</string> <string name="ims_reg_status_not_registered" msgid="2989287366045704694">"Not registered"</string> <string name="status_unavailable" msgid="5279036186589861608">"Unavailable"</string> - <string name="wifi_status_mac_randomized" msgid="466382542497832189">"MAC is randomised"</string> + <string name="wifi_status_mac_randomized" msgid="466382542497832189">"MAC is randomized"</string> <string name="wifi_tether_connected_summary" msgid="5282919920463340158">"{count,plural, =0{0 device connected}=1{1 device connected}other{# devices connected}}"</string> <string name="accessibility_manual_zen_more_time" msgid="5141801092071134235">"More time."</string> <string name="accessibility_manual_zen_less_time" msgid="6828877595848229965">"Less time."</string> @@ -528,7 +528,7 @@ <string name="done" msgid="381184316122520313">"Done"</string> <string name="alarms_and_reminders_label" msgid="6918395649731424294">"Alarms and reminders"</string> <string name="alarms_and_reminders_switch_title" msgid="4939393911531826222">"Allow setting alarms and reminders"</string> - <string name="alarms_and_reminders_title" msgid="8819933264635406032">"Alarms and reminders"</string> + <string name="alarms_and_reminders_title" msgid="8819933264635406032">"Alarms & reminders"</string> <string name="alarms_and_reminders_footer_title" msgid="6302587438389079695">"Allow this app to set alarms and schedule time-sensitive actions. This lets the app run in the background, which may use more battery.\n\nIf this permission is off, existing alarms and time-based events scheduled by this app won’t work."</string> <string name="keywords_alarms_and_reminders" msgid="6633360095891110611">"schedule, alarm, reminder, clock"</string> <string name="zen_mode_enable_dialog_turn_on" msgid="6418297231575050426">"Turn on"</string> @@ -547,7 +547,7 @@ <string name="media_transfer_this_device_name" product="default" msgid="2357329267148436433">"This phone"</string> <string name="media_transfer_this_device_name" product="tablet" msgid="3714653244000242800">"This tablet"</string> <string name="media_transfer_this_phone" msgid="7194341457812151531">"This phone"</string> - <string name="profile_connect_timeout_subtext" msgid="4043408193005851761">"Problem connecting. Turn device off and back on"</string> + <string name="profile_connect_timeout_subtext" msgid="4043408193005851761">"Problem connecting. Turn device off & back on"</string> <string name="media_transfer_wired_device_name" msgid="4447880899964056007">"Wired audio device"</string> <string name="help_label" msgid="3528360748637781274">"Help and feedback"</string> <string name="storage_category" msgid="2287342585424631813">"Storage"</string> @@ -556,23 +556,23 @@ <string name="shared_data_no_blobs_text" msgid="3108114670341737434">"There is no shared data for this user."</string> <string name="shared_data_query_failure_text" msgid="3489828881998773687">"There was an error fetching shared data. Try again."</string> <string name="blob_id_text" msgid="8680078988996308061">"Shared data ID: <xliff:g id="BLOB_ID">%d</xliff:g>"</string> - <string name="blob_expires_text" msgid="7882727111491739331">"Expires on <xliff:g id="DATE">%s</xliff:g>"</string> + <string name="blob_expires_text" msgid="7882727111491739331">"Expires at <xliff:g id="DATE">%s</xliff:g>"</string> <string name="shared_data_delete_failure_text" msgid="3842701391009628947">"There was an error deleting the shared data."</string> <string name="shared_data_no_accessors_dialog_text" msgid="8903738462570715315">"There are no leases acquired for this shared data. Would you like to delete it?"</string> <string name="accessor_info_title" msgid="8289823651512477787">"Apps sharing data"</string> <string name="accessor_no_description_text" msgid="7510967452505591456">"No description provided by the app."</string> - <string name="accessor_expires_text" msgid="4625619273236786252">"Lease expires on <xliff:g id="DATE">%s</xliff:g>"</string> + <string name="accessor_expires_text" msgid="4625619273236786252">"Lease expires at <xliff:g id="DATE">%s</xliff:g>"</string> <string name="delete_blob_text" msgid="2819192607255625697">"Delete shared data"</string> - <string name="delete_blob_confirmation_text" msgid="7807446938920827280">"Are you sure that you want to delete this shared data?"</string> + <string name="delete_blob_confirmation_text" msgid="7807446938920827280">"Are you sure you want to delete this shared data?"</string> <string name="user_add_user_item_summary" msgid="5748424612724703400">"Users have their own apps and content"</string> <string name="user_add_profile_item_summary" msgid="5418602404308968028">"You can restrict access to apps and content from your account"</string> <string name="user_add_user_item_title" msgid="2394272381086965029">"User"</string> <string name="user_add_profile_item_title" msgid="3111051717414643029">"Restricted profile"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Add new user?"</string> - <string name="user_add_user_message_long" msgid="1527434966294733380">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with apps, wallpaper and so on. Users can also adjust device settings such as Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users. Accessibility settings and services may not transfer to the new user."</string> + <string name="user_add_user_message_long" msgid="1527434966294733380">"You can share this device with other people by creating additional users. Each user has their own space, which they can customize with apps, wallpaper, and so on. Users can also adjust device settings like Wi‑Fi that affect everyone.\n\nWhen you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users. Accessibility settings and services may not transfer to the new user."</string> <string name="user_add_user_message_short" msgid="3295959985795716166">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Set up user now?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"Make sure that the person is available to take the device and set up their space."</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"Make sure the person is available to take the device and set up their space"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Set up profile now?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"Set up now"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"Not now"</string> @@ -581,7 +581,7 @@ <string name="user_new_profile_name" msgid="2405500423304678841">"New profile"</string> <string name="user_info_settings_title" msgid="6351390762733279907">"User info"</string> <string name="profile_info_settings_title" msgid="105699672534365099">"Profile info"</string> - <string name="user_need_lock_message" msgid="4311424336209509301">"Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data."</string> + <string name="user_need_lock_message" msgid="4311424336209509301">"Before you can create a restricted profile, you’ll need to set up a screen lock to protect your apps and personal data."</string> <string name="user_set_lock_button" msgid="1427128184982594856">"Set lock"</string> <string name="user_switch_to_user" msgid="6975428297154968543">"Switch to <xliff:g id="USER_NAME">%s</xliff:g>"</string> <string name="creating_new_user_dialog_message" msgid="7232880257538970375">"Creating new user…"</string> @@ -609,7 +609,7 @@ <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"Disabled"</string> <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"Enabled"</string> <string name="cached_apps_freezer_reboot_dialog_text" msgid="695330563489230096">"Your device must be rebooted for this change to apply. Reboot now or cancel."</string> - <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"Wired headphones"</string> + <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"Wired headphone"</string> <string name="wifi_hotspot_switch_on_text" msgid="9212273118217786155">"On"</string> <string name="wifi_hotspot_switch_off_text" msgid="7245567251496959764">"Off"</string> <string name="carrier_network_change_mode" msgid="4257621815706644026">"Carrier network changing"</string> @@ -642,8 +642,8 @@ <string name="dream_complication_title_time" msgid="701747800712893499">"Time"</string> <string name="dream_complication_title_date" msgid="8661176085446135789">"Date"</string> <string name="dream_complication_title_weather" msgid="598609151677172783">"Weather"</string> - <string name="dream_complication_title_aqi" msgid="4587552608957834110">"Air quality"</string> - <string name="dream_complication_title_cast_info" msgid="4038776652841885084">"Cast info"</string> + <string name="dream_complication_title_aqi" msgid="4587552608957834110">"Air Quality"</string> + <string name="dream_complication_title_cast_info" msgid="4038776652841885084">"Cast Info"</string> <string name="avatar_picker_title" msgid="8492884172713170652">"Choose a profile picture"</string> <string name="default_user_icon_description" msgid="6554047177298972638">"Default user icon"</string> <string name="physical_keyboard_title" msgid="4811935435315835220">"Physical keyboard"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 2df4835b868e..9ffd609e186c 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -184,7 +184,7 @@ <string name="launch_defaults_some" msgid="3631650616557252926">"कुछ डिफ़ॉल्ट सेट हैं"</string> <string name="launch_defaults_none" msgid="8049374306261262709">"कोई डिफ़ॉल्ट सेट नहीं है"</string> <string name="tts_settings" msgid="8130616705989351312">"लेख से बोली सेटिंग"</string> - <string name="tts_settings_title" msgid="7602210956640483039">"लिखाई को बोली में बदलना"</string> + <string name="tts_settings_title" msgid="7602210956640483039">"लिखाई को बोली में बदलने की सुविधा"</string> <string name="tts_default_rate_title" msgid="3964187817364304022">"बोली दर"</string> <string name="tts_default_rate_summary" msgid="3781937042151716987">"बोलने की गति तय करें"</string> <string name="tts_default_pitch_title" msgid="6988592215554485479">"पिच"</string> diff --git a/packages/SettingsLib/res/values-nb/arrays.xml b/packages/SettingsLib/res/values-nb/arrays.xml index 0f6e1fcb541c..b59dd897cddd 100644 --- a/packages/SettingsLib/res/values-nb/arrays.xml +++ b/packages/SettingsLib/res/values-nb/arrays.xml @@ -49,9 +49,9 @@ <item msgid="1999413958589971747">"Unngår dårlig tilkobling midlertidig"</item> </string-array> <string-array name="hdcp_checking_titles"> - <item msgid="2377230797542526134">"Kontrollér aldri"</item> - <item msgid="3919638466823112484">"Kontrollér kun DRM-innhold"</item> - <item msgid="9048424957228926377">"Kontrollér alltid"</item> + <item msgid="2377230797542526134">"Kontroller aldri"</item> + <item msgid="3919638466823112484">"Kontroller kun DRM-innhold"</item> + <item msgid="9048424957228926377">"Kontroller alltid"</item> </string-array> <string-array name="hdcp_checking_summaries"> <item msgid="4045840870658484038">"Bruk aldri HDCP-kontroll"</item> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index e7f6b3f17232..6dcfb1200a82 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -436,7 +436,7 @@ <string name="transcode_notification" msgid="5560515979793436168">"Vis omkodingsvarsler"</string> <string name="transcode_disable_cache" msgid="3160069309377467045">"Slå av omkodingsbuffer"</string> <string name="runningservices_settings_title" msgid="6460099290493086515">"Aktive tjenester"</string> - <string name="runningservices_settings_summary" msgid="1046080643262665743">"Se og kontrollér tjenester som kjører"</string> + <string name="runningservices_settings_summary" msgid="1046080643262665743">"Se og kontroller tjenester som kjører"</string> <string name="select_webview_provider_title" msgid="3917815648099445503">"WebView-implementering"</string> <string name="select_webview_provider_dialog_title" msgid="2444261109877277714">"Angi WebView-implementering"</string> <string name="select_webview_provider_toast_text" msgid="8512254949169359848">"Dette valget er ikke gyldig lenger. Prøv på nytt."</string> diff --git a/packages/Shell/res/values-en-rCA/strings.xml b/packages/Shell/res/values-en-rCA/strings.xml index 546281360131..65ab725da36e 100644 --- a/packages/Shell/res/values-en-rCA/strings.xml +++ b/packages/Shell/res/values-en-rCA/strings.xml @@ -28,7 +28,7 @@ <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"Select to share your bug report without a screenshot or wait for the screenshot to finish"</string> <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string> <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string> - <string name="bugreport_confirm" msgid="5917407234515812495">"Bug reports contain data from the system\'s various log files, which may include data that you consider sensitive (such as app-usage and location data). Only share bug reports with people and apps that you trust."</string> + <string name="bugreport_confirm" msgid="5917407234515812495">"Bug reports contain data from the system\'s various log files, which may include data you consider sensitive (such as app-usage and location data). Only share bug reports with people and apps you trust."</string> <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"Don\'t show again"</string> <string name="bugreport_storage_title" msgid="5332488144740527109">"Bug reports"</string> <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bug report file could not be read"</string> diff --git a/packages/SimAppDialog/res/values-en-rCA/strings.xml b/packages/SimAppDialog/res/values-en-rCA/strings.xml index 1ddbaf908d61..7983c04aadad 100644 --- a/packages/SimAppDialog/res/values-en-rCA/strings.xml +++ b/packages/SimAppDialog/res/values-en-rCA/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8898068901680117589">"Sim app dialogue"</string> + <string name="app_name" msgid="8898068901680117589">"Sim App Dialog"</string> <string name="install_carrier_app_title" msgid="334729104862562585">"Activate mobile service"</string> <string name="install_carrier_app_description" msgid="4014303558674923797">"To get your new SIM working properly, you\'ll need to install the <xliff:g id="ID_1">%1$s</xliff:g> app"</string> <string name="install_carrier_app_description_default" msgid="7356830245205847840">"To get your new SIM working properly, you\'ll need to install the carrier app"</string> diff --git a/packages/SoundPicker/res/values-en-rCA/strings.xml b/packages/SoundPicker/res/values-en-rCA/strings.xml index 4c237b993e07..b070835635fe 100644 --- a/packages/SoundPicker/res/values-en-rCA/strings.xml +++ b/packages/SoundPicker/res/values-en-rCA/strings.xml @@ -23,7 +23,7 @@ <string name="add_alarm_text" msgid="3545497316166999225">"Add alarm"</string> <string name="add_notification_text" msgid="4431129543300614788">"Add notification"</string> <string name="delete_ringtone_text" msgid="201443984070732499">"Delete"</string> - <string name="unable_to_add_ringtone" msgid="4583511263449467326">"Unable to add customised ringtone"</string> - <string name="unable_to_delete_ringtone" msgid="6792301380142859496">"Unable to delete customised ringtone"</string> + <string name="unable_to_add_ringtone" msgid="4583511263449467326">"Unable to add custom ringtone"</string> + <string name="unable_to_delete_ringtone" msgid="6792301380142859496">"Unable to delete custom ringtone"</string> <string name="app_label" msgid="3091611356093417332">"Sounds"</string> </resources> diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml index d96d2940c5bb..ffd82f7acbc1 100644 --- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml @@ -23,10 +23,10 @@ <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"Enter your PIN"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"Enter your pattern"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"Enter your password"</string> - <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid card."</string> + <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Invalid Card."</string> <string name="keyguard_charged" msgid="5478247181205188995">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> - <string name="keyguard_plugged_in_dock" msgid="449722738270908674">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging dock"</string> + <string name="keyguard_plugged_in_dock" msgid="449722738270908674">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging Dock"</string> <string name="keyguard_plugged_in" msgid="8169926454348380863">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string> <string name="keyguard_plugged_in_charging_fast" msgid="4386594091107340426">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string> <string name="keyguard_plugged_in_charging_slowly" msgid="217655355424210">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging slowly"</string> @@ -74,8 +74,8 @@ </plurals> <string name="kg_password_wrong_puk_code_dead" msgid="3698285357028468617">"SIM is unusable. Contact your carrier."</string> <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="3937306685604862886"> - <item quantity="other">Incorrect SIM PUK code. You have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable.</item> - <item quantity="one">Incorrect SIM PUK code. You have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable.</item> + <item quantity="other">Incorrect SIM PUK code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable.</item> + <item quantity="one">Incorrect SIM PUK code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable.</item> </plurals> <string name="kg_password_pin_failed" msgid="5136259126330604009">"SIM PIN operation failed!"</string> <string name="kg_password_puk_failed" msgid="6778867411556937118">"SIM PUK operation failed!"</string> @@ -89,7 +89,7 @@ <string name="kg_prompt_reason_timeout_password" msgid="2258263949430384278">"Password required for additional security"</string> <string name="kg_prompt_reason_device_admin" msgid="6961159596224055685">"Device locked by admin"</string> <string name="kg_prompt_reason_user_request" msgid="6015774877733717904">"Device was locked manually"</string> - <string name="kg_face_not_recognized" msgid="7903950626744419160">"Not recognised"</string> + <string name="kg_face_not_recognized" msgid="7903950626744419160">"Not recognized"</string> <string name="kg_face_sensor_privacy_enabled" msgid="6513157891227284806">"To use Face Unlock, turn on "<b>"Camera access"</b>" in Settings > Privacy"</string> <plurals name="kg_password_default_pin_message" formatted="false" msgid="7730152526369857818"> <item quantity="other">Enter SIM PIN. You have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item> @@ -101,5 +101,5 @@ </plurals> <string name="clock_title_default" msgid="6342735240617459864">"Default"</string> <string name="clock_title_bubble" msgid="2204559396790593213">"Bubble"</string> - <string name="clock_title_analog" msgid="8409262532900918273">"Analogue"</string> + <string name="clock_title_analog" msgid="8409262532900918273">"Analog"</string> </resources> diff --git a/packages/SystemUI/res-product/values-en-rCA/strings.xml b/packages/SystemUI/res-product/values-en-rCA/strings.xml index 04e63f5eb428..131c42a700a3 100644 --- a/packages/SystemUI/res-product/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-product/values-en-rCA/strings.xml @@ -25,7 +25,7 @@ <string name="inattentive_sleep_warning_message" product="default" msgid="5693904520452332224">"The device will soon turn off; press to keep it on."</string> <string name="keyguard_missing_sim_message" product="tablet" msgid="5018086454277963787">"No SIM card in tablet."</string> <string name="keyguard_missing_sim_message" product="default" msgid="7053347843877341391">"No SIM card in phone."</string> - <string name="kg_invalid_confirm_pin_hint" product="default" msgid="6278551068943958651">"PIN codes do not match"</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="6278551068943958651">"PIN codes does not match"</string> <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="302165994845009232">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this tablet will be reset, which will delete all its data."</string> <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="2594813176164266847">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this phone will be reset, which will delete all its data."</string> <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="8710104080409538587">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. This tablet will be reset, which will delete all its data."</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index e777795de587..23303e63e8c4 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -402,8 +402,8 @@ <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"L\'administrador ha activat el registre de xarxa, que supervisa el trànsit del teu dispositiu."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"L\'administrador ha activat el registre de xarxa, que monitora el trànsit al teu perfil de treball, però no al personal."</string> <string name="monitoring_description_named_vpn" msgid="7502657784155456414">"Aquest dispositiu es connecta a Internet a través de <xliff:g id="VPN_APP">%1$s</xliff:g>. El teu administrador de TI pot veure l\'activitat de la teva xarxa, inclosos els correus electrònics i les dades de navegació."</string> - <string name="monitoring_description_two_named_vpns" msgid="6726394451199620634">"Aquest dispositiu es connecta a Internet a través de <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>. El teu administrador de TI pot veure la teva activitat a la xarxa, inclosos els correus electrònics i les dades de navegació."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="7254359257263069766">"Les aplicacions de treball es connecten a Internet a través de <xliff:g id="VPN_APP">%1$s</xliff:g>. El teu administrador de TI i el teu proveïdor de VPN poden veure la teva activitat a la xarxa en aplicacions de treball, inclosos els correus electrònics i les dades de navegació."</string> + <string name="monitoring_description_two_named_vpns" msgid="6726394451199620634">"Aquest dispositiu es connecta a Internet a través de <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>. El teu administrador de TI pot veure la teva activitat de xarxa, inclosos els correus electrònics i les dades de navegació."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="7254359257263069766">"Les aplicacions de treball es connecten a Internet a través de <xliff:g id="VPN_APP">%1$s</xliff:g>. El teu administrador de TI i el teu proveïdor de VPN poden veure la teva activitat de xarxa en aplicacions de treball, inclosos els correus electrònics i les dades de navegació."</string> <string name="monitoring_description_personal_profile_named_vpn" msgid="5083909710727365452">"Les aplicacions personals es connecten a Internet a través de <xliff:g id="VPN_APP">%1$s</xliff:g>. El teu proveïdor de VPN pot veure l\'activitat de la teva xarxa, inclosos els correus electrònics i les dades de navegació."</string> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Obre la configuració de la VPN"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 3fed8c8a555c..e9ad2d9ea1d6 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -21,8 +21,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"System UI"</string> <string name="battery_low_title" msgid="5319680173344341779">"Turn on Battery Saver?"</string> - <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> - <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity and delays notifications."</string> + <string name="battery_low_description" msgid="3282977755476423966">"You have <xliff:g id="PERCENTAGE">%s</xliff:g> battery left. Battery Saver turns on Dark theme, restricts background activity, and delays notifications."</string> + <string name="battery_low_intro" msgid="5148725009653088790">"Battery Saver turns on Dark theme, restricts background activity, and delays notifications."</string> <string name="battery_low_percent_format" msgid="4276661262843170964">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string> <string name="invalid_charger_title" msgid="938685362320735167">"Can\'t charge via USB"</string> <string name="invalid_charger_text" msgid="2339310107232691577">"Use the charger that came with your device"</string> @@ -30,7 +30,7 @@ <string name="battery_saver_confirmation_title_generic" msgid="2299231884234959849">"About Battery Saver"</string> <string name="battery_saver_confirmation_ok" msgid="5042136476802816494">"Turn on"</string> <string name="battery_saver_start_action" msgid="8353766979886287140">"Turn on"</string> - <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"No, thanks"</string> + <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"No thanks"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Auto-rotate screen"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device."</string> @@ -64,7 +64,7 @@ <string name="wifi_debugging_secondary_user_title" msgid="2493201475880517725">"Wireless debugging not allowed"</string> <string name="wifi_debugging_secondary_user_message" msgid="4492383073970079751">"The user currently signed in to this device can’t turn on wireless debugging. To use this feature, switch to the primary user."</string> <string name="usb_contaminant_title" msgid="894052515034594113">"USB port disabled"</string> - <string name="usb_contaminant_message" msgid="7730476585174719805">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s OK to use the USB port again."</string> + <string name="usb_contaminant_message" msgid="7730476585174719805">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s okay to use the USB port again."</string> <string name="usb_port_enabled" msgid="531823867664717018">"USB port enabled to detect chargers and accessories"</string> <string name="usb_disable_contaminant_detection" msgid="3827082183595978641">"Enable USB"</string> <string name="learn_more" msgid="4690632085667273811">"Learn more"</string> @@ -85,18 +85,18 @@ <string name="screenshot_scroll_label" msgid="2930198809899329367">"Capture more"</string> <string name="screenshot_dismiss_description" msgid="4702341245899508786">"Dismiss screenshot"</string> <string name="screenshot_preview_description" msgid="7606510140714080474">"Screenshot preview"</string> - <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> - <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> - <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> - <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> per cent"</string> + <string name="screenshot_top_boundary_pct" msgid="2520148599096479332">"Top boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> + <string name="screenshot_bottom_boundary_pct" msgid="3880821519814946478">"Bottom boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> + <string name="screenshot_left_boundary_pct" msgid="8502323556112287469">"Left boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> + <string name="screenshot_right_boundary_pct" msgid="1201150713021779321">"Right boundary <xliff:g id="PERCENT">%1$d</xliff:g> percent"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen Recorder"</string> <string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processing screen recording"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> - <string name="screenrecord_start_label" msgid="1750350278888217473">"Start recording?"</string> - <string name="screenrecord_description" msgid="1123231719680353736">"While recording, the Android System can capture any sensitive information that’s visible on your screen or played on your device. This includes passwords, payment info, photos, messages and audio."</string> + <string name="screenrecord_start_label" msgid="1750350278888217473">"Start Recording?"</string> + <string name="screenrecord_description" msgid="1123231719680353736">"While recording, Android System can capture any sensitive information that’s visible on your screen or played on your device. This includes passwords, payment info, photos, messages, and audio."</string> <string name="screenrecord_audio_label" msgid="6183558856175159629">"Record audio"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Device audio"</string> - <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Sound from your device, like music, calls and ringtones"</string> + <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Sound from your device, like music, calls, and ringtones"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Microphone"</string> <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Device audio and microphone"</string> <string name="screenrecord_start" msgid="330991441575775004">"Start"</string> @@ -119,7 +119,7 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"Phone"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Voice Assist"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> - <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"QR code scanner"</string> + <string name="accessibility_qr_code_scanner_button" msgid="7521277927692910795">"QR Code Scanner"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"Unlock"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Device locked"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> @@ -158,7 +158,7 @@ <string name="biometric_dialog_last_password_attempt_before_wipe_profile" msgid="8538032972389729253">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted."</string> <string name="fingerprint_dialog_touch_sensor" msgid="2817887108047658975">"Touch the fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="4465698996175640549">"Fingerprint icon"</string> - <string name="fingerprint_dialog_use_fingerprint_instead" msgid="6178228876763024452">"Can’t recognise face. Use fingerprint instead."</string> + <string name="fingerprint_dialog_use_fingerprint_instead" msgid="6178228876763024452">"Can’t recognize face. Use fingerprint instead."</string> <!-- no translation found for keyguard_face_failed_use_fp (7140293906176164263) --> <skip /> <string name="accessibility_bluetooth_connected" msgid="4745196874551115205">"Bluetooth connected."</string> @@ -170,8 +170,8 @@ <string name="cell_data_off" msgid="4886198950247099526">"Off"</string> <string name="accessibility_airplane_mode" msgid="1899529214045998505">"Airplane mode."</string> <string name="accessibility_vpn_on" msgid="8037549696057288731">"VPN on."</string> - <string name="accessibility_battery_level" msgid="5143715405241138822">"Battery <xliff:g id="NUMBER">%d</xliff:g> per cent."</string> - <string name="accessibility_battery_level_with_estimate" msgid="4843119982547599452">"Battery <xliff:g id="PERCENTAGE">%1$s</xliff:g> percentage, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string> + <string name="accessibility_battery_level" msgid="5143715405241138822">"Battery <xliff:g id="NUMBER">%d</xliff:g> percent."</string> + <string name="accessibility_battery_level_with_estimate" msgid="4843119982547599452">"Battery <xliff:g id="PERCENTAGE">%1$s</xliff:g> percent, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string> <string name="accessibility_battery_level_charging" msgid="8892191177774027364">"Battery charging, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> percent."</string> <string name="accessibility_overflow_action" msgid="8555835828182509104">"See all notifications"</string> <string name="accessibility_tty_enabled" msgid="1123180388823381118">"TeleTypewriter enabled."</string> @@ -187,7 +187,7 @@ <string name="accessibility_quick_settings_dnd_none_on" msgid="3235552940146035383">"total silence"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3375848309132140014">"alarms only"</string> <string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Do Not Disturb."</string> - <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth"</string> + <string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string> <string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth on."</string> <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> <string name="accessibility_quick_settings_more_time" msgid="7646479831704665284">"More time."</string> @@ -196,12 +196,12 @@ <string name="accessibility_brightness" msgid="5391187016177823721">"Display brightness"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="2286843518689837719">"Mobile data is paused"</string> <string name="data_usage_disabled_dialog_title" msgid="9131615296036724838">"Data is paused"</string> - <string name="data_usage_disabled_dialog" msgid="7933201635215099780">"The data limit that you set has been reached. You are no longer using mobile data.\n\nIf you resume, charges may apply for data usage."</string> + <string name="data_usage_disabled_dialog" msgid="7933201635215099780">"The data limit you set has been reached. You are no longer using mobile data.\n\nIf you resume, charges may apply for data usage."</string> <string name="data_usage_disabled_dialog_enable" msgid="2796648546086408937">"Resume"</string> <string name="accessibility_location_active" msgid="2845747916764660369">"Location requests active"</string> <string name="accessibility_sensors_off_active" msgid="2619725434618911551">"Sensors off active"</string> <string name="accessibility_clear_all" msgid="970525598287244592">"Clear all notifications."</string> - <string name="notification_group_overflow_indicator" msgid="7605120293801012648">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="notification_group_overflow_indicator" msgid="7605120293801012648">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <plurals name="notification_group_overflow_description" formatted="false" msgid="91483442850649192"> <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item> <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item> @@ -241,8 +241,8 @@ <string name="quick_settings_cast_detail_empty_text" msgid="2846282280014617785">"No devices available"</string> <string name="quick_settings_cast_no_wifi" msgid="6980194769795014875">"Wi‑Fi not connected"</string> <string name="quick_settings_brightness_dialog_title" msgid="4980669966716685588">"Brightness"</string> - <string name="quick_settings_inversion_label" msgid="3501527749494755688">"Colour inversion"</string> - <string name="quick_settings_color_correction_label" msgid="5636617913560474664">"Colour correction"</string> + <string name="quick_settings_inversion_label" msgid="3501527749494755688">"Color inversion"</string> + <string name="quick_settings_color_correction_label" msgid="5636617913560474664">"Color correction"</string> <string name="quick_settings_more_user_settings" msgid="1064187451100861954">"User settings"</string> <string name="quick_settings_done" msgid="2163641301648855793">"Done"</string> <string name="quick_settings_close_user_panel" msgid="5599724542275896849">"Close"</string> @@ -303,11 +303,11 @@ <string name="sensor_privacy_mic_camera_unblocked_toast_content" msgid="7339355093282661115">"Microphone and camera available"</string> <string name="media_seamless_other_device" msgid="4654849800789196737">"Other device"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Toggle Overview"</string> - <string name="zen_priority_introduction" msgid="3159291973383796646">"You won\'t be disturbed by sounds and vibrations, except from alarms, reminders, events and callers you specify. You\'ll still hear anything you choose to play including music, videos and games."</string> - <string name="zen_alarms_introduction" msgid="3987266042682300470">"You won\'t be disturbed by sounds and vibrations, except from alarms. You\'ll still hear anything you choose to play including music, videos and games."</string> - <string name="zen_priority_customize_button" msgid="4119213187257195047">"Customise"</string> + <string name="zen_priority_introduction" msgid="3159291973383796646">"You won\'t be disturbed by sounds and vibrations, except from alarms, reminders, events, and callers you specify. You\'ll still hear anything you choose to play including music, videos, and games."</string> + <string name="zen_alarms_introduction" msgid="3987266042682300470">"You won\'t be disturbed by sounds and vibrations, except from alarms. You\'ll still hear anything you choose to play including music, videos, and games."</string> + <string name="zen_priority_customize_button" msgid="4119213187257195047">"Customize"</string> <string name="zen_silence_introduction_voice" msgid="853573681302712348">"This blocks ALL sounds and vibrations, including from alarms, music, videos, and games. You\'ll still be able to make phone calls."</string> - <string name="zen_silence_introduction" msgid="6117517737057344014">"This blocks ALL sounds and vibrations, including from alarms, music, videos and games."</string> + <string name="zen_silence_introduction" msgid="6117517737057344014">"This blocks ALL sounds and vibrations, including from alarms, music, videos, and games."</string> <string name="notification_tap_again" msgid="4477318164947497249">"Tap again to open"</string> <string name="tap_again" msgid="1315420114387908655">"Tap again"</string> <string name="keyguard_unlock" msgid="8031975796351361601">"Swipe up to open"</string> @@ -338,12 +338,12 @@ <string name="keyguard_indication_charging_time" msgid="6492711711891071502">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging • Full in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_fast" msgid="8390311020603859480">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly • Full in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly • Full in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> - <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging dock • Full in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> + <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging Dock • Full in <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Switch user"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"All apps and data in this session will be deleted."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Welcome back, guest!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Do you want to continue your session?"</string> - <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Start again"</string> + <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Start over"</string> <string name="guest_wipe_session_dontwipe" msgid="3211052048269304205">"Yes, continue"</string> <string name="user_limit_reached_title" msgid="2429229448830346057">"User limit reached"</string> <plurals name="user_limit_reached_message" formatted="false" msgid="2573535787802908398"> @@ -353,8 +353,8 @@ <string name="user_remove_user_title" msgid="9124124694835811874">"Remove user?"</string> <string name="user_remove_user_message" msgid="6702834122128031833">"All apps and data of this user will be deleted."</string> <string name="user_remove_user_remove" msgid="8387386066949061256">"Remove"</string> - <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> will have access to all of the information that is visible on your screen or played from your device while recording or casting. This includes information such as passwords, payment details, photos, messages and audio that you play."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"The service providing this function will have access to all of the information that is visible on your screen or played from your device while recording or casting. This includes information such as passwords, payment details, photos, messages and audio that you play."</string> + <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> will have access to all of the information that is visible on your screen or played from your device while recording or casting. This includes information such as passwords, payment details, photos, messages, and audio that you play."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"The service providing this function will have access to all of the information that is visible on your screen or played from your device while recording or casting. This includes information such as passwords, payment details, photos, messages, and audio that you play."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Start recording or casting?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Start recording or casting with <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> <string name="clear_all_notifications_text" msgid="348312370303046130">"Clear all"</string> @@ -373,19 +373,19 @@ <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> owns this device and may monitor network traffic"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="quick_settings_disclosure_management_named_vpn" msgid="4137564460025113168">"This device belongs to your organization and is connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="2169227918166358741">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to the Internet through <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="2169227918166358741">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to the internet through <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"This device belongs to your organization"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> <string name="quick_settings_disclosure_management_vpns" msgid="929181757984262902">"This device belongs to your organization and is connected to the internet through VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="3312645578322079185">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to the Internet through VPNs"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="3312645578322079185">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to the internet through VPNs"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Your organization may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Work profile network activity is visible to your IT admin"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Network may be monitored"</string> - <string name="quick_settings_disclosure_vpns" msgid="3586175303518266301">"This device is connected to the Internet through VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="153393105176944100">"Your work apps are connected to the Internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="451254750289172191">"Your personal apps are connected to the Internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="6191822916936028208">"This device is connected to the Internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_vpns" msgid="3586175303518266301">"This device is connected to the internet through VPNs"</string> + <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="153393105176944100">"Your work apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="451254750289172191">"Your personal apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6191822916936028208">"This device is connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Device management"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,22 +394,22 @@ <string name="monitoring_button_view_policies" msgid="3869724835853502410">"View Policies"</string> <string name="monitoring_button_view_controls" msgid="8316440345340701117">"View controls"</string> <string name="monitoring_description_named_management" msgid="505833016545056036">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>.\n\nYour IT admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your IT admin."</string> - <string name="monitoring_financed_description_named_management" msgid="6108439201399938668">"<xliff:g id="ORGANIZATION_NAME_0">%1$s</xliff:g> may be able to access data associated with this device, manage apps and change this device\'s settings.\n\nIf you have questions, contact <xliff:g id="ORGANIZATION_NAME_1">%2$s</xliff:g>."</string> + <string name="monitoring_financed_description_named_management" msgid="6108439201399938668">"<xliff:g id="ORGANIZATION_NAME_0">%1$s</xliff:g> may be able to access data associated with this device, manage apps, and change this devices settings.\n\nIf you have questions, contact <xliff:g id="ORGANIZATION_NAME_1">%2$s</xliff:g>."</string> <string name="monitoring_description_management" msgid="4308879039175729014">"This device belongs to your organization.\n\nYour IT admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your IT admin."</string> <string name="monitoring_description_management_ca_certificate" msgid="7785013130658110130">"Your organization installed a certificate authority on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_managed_profile_ca_certificate" msgid="7904323416598435647">"Your organization installed a certificate authority in your work profile. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Your admin has turned on network logging, which monitors traffic on your device."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile."</string> - <string name="monitoring_description_named_vpn" msgid="7502657784155456414">"This device is connected to the Internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin."</string> - <string name="monitoring_description_two_named_vpns" msgid="6726394451199620634">"This device is connected to the Internet through <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="7254359257263069766">"Your work apps are connected to the Internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity in work apps, including emails and browsing data, is visible to your IT admin and VPN provider."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="5083909710727365452">"Your personal apps are connected to the Internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your VPN provider."</string> + <string name="monitoring_description_named_vpn" msgid="7502657784155456414">"This device is connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin."</string> + <string name="monitoring_description_two_named_vpns" msgid="6726394451199620634">"This device is connected to the internet through <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="7254359257263069766">"Your work apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity in work apps, including emails and browsing data, is visible to your IT admin and VPN provider."</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="5083909710727365452">"Your personal apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your VPN provider."</string> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Open VPN settings"</string> - <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps that you use, your location and your screen time."</string> + <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps you use, your location, and your screen time."</string> <string name="legacy_vpn_name" msgid="4174223520162559145">"VPN"</string> - <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Kept unlocked by trust agent"</string> + <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Kept unlocked by TrustAgent"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Sound settings"</string> <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Automatically caption media"</string> @@ -420,16 +420,16 @@ <string name="screen_pinning_title" msgid="9058007390337841305">"App is pinned"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string> - <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"This keeps it in view until you unpin. Swipe up and hold to unpin."</string> + <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"This keeps it in view until you unpin. Swipe up & hold to unpin."</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"This keeps it in view until you unpin. Touch & hold Overview to unpin."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"This keeps it in view until you unpin. Touch & hold Home to unpin."</string> - <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Personal data may be accessible, such as contacts and email content."</string> + <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Personal data may be accessible (such as contacts and email content)."</string> <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"Pinned app may open other apps."</string> - <string name="screen_pinning_toast" msgid="8177286912533744328">"To unpin this app, touch and hold Back and Overview buttons"</string> - <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"To unpin this app, touch and hold Back and Home buttons"</string> - <string name="screen_pinning_toast_gesture_nav" msgid="170699893395336705">"To unpin this app, swipe up and hold"</string> + <string name="screen_pinning_toast" msgid="8177286912533744328">"To unpin this app, touch & hold Back and Overview buttons"</string> + <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"To unpin this app, touch & hold Back and Home buttons"</string> + <string name="screen_pinning_toast_gesture_nav" msgid="170699893395336705">"To unpin this app, swipe up & hold"</string> <string name="screen_pinning_positive" msgid="3285785989665266984">"Got it"</string> - <string name="screen_pinning_negative" msgid="6882816864569211666">"No, thanks"</string> + <string name="screen_pinning_negative" msgid="6882816864569211666">"No thanks"</string> <string name="screen_pinning_start" msgid="7483998671383371313">"App pinned"</string> <string name="screen_pinning_exit" msgid="4553787518387346893">"App unpinned"</string> <string name="stream_voice_call" msgid="7468348170702375660">"Call"</string> @@ -439,7 +439,7 @@ <string name="stream_alarm" msgid="16058075093011694">"Alarm"</string> <string name="stream_notification" msgid="7930294049046243939">"Notification"</string> <string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string> - <string name="stream_dtmf" msgid="7322536356554673067">"Dual multi-tone frequency"</string> + <string name="stream_dtmf" msgid="7322536356554673067">"Dual multi tone frequency"</string> <string name="stream_accessibility" msgid="3873610336741987152">"Accessibility"</string> <string name="volume_ringer_status_normal" msgid="1339039682222461143">"Ring"</string> <string name="volume_ringer_status_vibrate" msgid="6970078708957857825">"Vibrate"</string> @@ -468,7 +468,7 @@ <string name="wallet_secondary_label_no_card" msgid="8488069304491125713">"Tap to open"</string> <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updating"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> - <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards. Please try again later."</string> + <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards, please try again later"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lock screen settings"</string> <string name="qr_code_scanner_title" msgid="5290201053875420785">"Scan QR code"</string> <string name="status_bar_work" msgid="5238641949837091056">"Work profile"</string> @@ -479,17 +479,17 @@ <string name="accessibility_status_bar_hotspot" msgid="2888479317489131669">"Hotspot"</string> <string name="accessibility_managed_profile" msgid="4703836746209377356">"Work profile"</string> <string name="tuner_warning_title" msgid="7721976098452135267">"Fun for some but not for all"</string> - <string name="tuner_warning" msgid="1861736288458481650">"System UI Tuner gives you extra ways to tweak and customise the Android user interface. These experimental features may change, break or disappear in future releases. Proceed with caution."</string> - <string name="tuner_persistent_warning" msgid="230466285569307806">"These experimental features may change, break or disappear in future releases. Proceed with caution."</string> + <string name="tuner_warning" msgid="1861736288458481650">"System UI Tuner gives you extra ways to tweak and customize the Android user interface. These experimental features may change, break, or disappear in future releases. Proceed with caution."</string> + <string name="tuner_persistent_warning" msgid="230466285569307806">"These experimental features may change, break, or disappear in future releases. Proceed with caution."</string> <string name="got_it" msgid="477119182261892069">"Got it"</string> <string name="tuner_toast" msgid="3812684836514766951">"Congrats! System UI Tuner has been added to Settings"</string> - <string name="remove_from_settings" msgid="633775561782209994">"Remove from settings"</string> + <string name="remove_from_settings" msgid="633775561782209994">"Remove from Settings"</string> <string name="remove_from_settings_prompt" msgid="551565437265615426">"Remove System UI Tuner from Settings and stop using all of its features?"</string> <string name="enable_bluetooth_title" msgid="866883307336662596">"Turn on Bluetooth?"</string> <string name="enable_bluetooth_message" msgid="6740938333772779717">"To connect your keyboard with your tablet, you first have to turn on Bluetooth."</string> <string name="enable_bluetooth_confirmation_ok" msgid="2866408183324184876">"Turn on"</string> <string name="tuner_full_importance_settings" msgid="1388025816553459059">"Power notification controls"</string> - <string name="rotation_lock_camera_rotation_on" msgid="789434807790534274">"On – Face-based"</string> + <string name="rotation_lock_camera_rotation_on" msgid="789434807790534274">"On - Face-based"</string> <string name="power_notification_controls_description" msgid="1334963837572708952">"With power notification controls, you can set an importance level from 0 to 5 for an app\'s notifications. \n\n"<b>"Level 5"</b>" \n- Show at the top of the notification list \n- Allow full screen interruption \n- Always peek \n\n"<b>"Level 4"</b>" \n- Prevent full screen interruption \n- Always peek \n\n"<b>"Level 3"</b>" \n- Prevent full screen interruption \n- Never peek \n\n"<b>"Level 2"</b>" \n- Prevent full screen interruption \n- Never peek \n- Never make sound and vibration \n\n"<b>"Level 1"</b>" \n- Prevent full screen interruption \n- Never peek \n- Never make sound or vibrate \n- Hide from lock screen and status bar \n- Show at the bottom of the notification list \n\n"<b>"Level 0"</b>" \n- Block all notifications from the app"</string> <string name="inline_done_button" msgid="6043094985588909584">"Done"</string> <string name="inline_ok_button" msgid="603075490581280343">"Apply"</string> @@ -502,10 +502,10 @@ <string name="notification_channel_summary_default" msgid="3282930979307248890">"May ring or vibrate based on phone settings"</string> <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"May ring or vibrate based on phone settings. Conversations from <xliff:g id="APP_NAME">%1$s</xliff:g> bubble by default."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Have the system determine if this notification should make sound or vibration"</string> - <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> promoted to default"</string> - <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> demoted to silent"</string> - <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> ranked higher"</string> - <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> ranked lower"</string> + <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> Promoted to Default"</string> + <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> Demoted to Silent"</string> + <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Status:</b> Ranked Higher"</string> + <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Ranked Lower"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Shows at the top of conversation notifications and as a profile picture on lock screen"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Shows at the top of conversation notifications and as a profile picture on lock screen, appears as a bubble"</string> <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Shows at the top of conversation notifications and as a profile picture on lock screen, interrupts Do Not Disturb"</string> @@ -518,15 +518,15 @@ <string name="notification_delegate_header" msgid="1264510071031479920">"Proxied notification"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"All <xliff:g id="APP_NAME">%1$s</xliff:g> notifications"</string> <string name="see_more_title" msgid="7409317011708185729">"See more"</string> - <string name="feedback_alerted" msgid="5192459808484271208">"This notification was automatically <b>promoted to default</b> by the system."</string> - <string name="feedback_silenced" msgid="9116540317466126457">"This notification was automatically <b>demoted to silent</b> by the system."</string> + <string name="feedback_alerted" msgid="5192459808484271208">"This notification was automatically <b>promoted to Default</b> by the system."</string> + <string name="feedback_silenced" msgid="9116540317466126457">"This notification was automatically <b>demoted to Silent</b> by the system."</string> <string name="feedback_promoted" msgid="2125562787759780807">"This notification was automatically <b>ranked higher</b> in your shade."</string> <string name="feedback_demoted" msgid="951884763467110604">"This notification was automatically <b>ranked lower</b> in your shade."</string> <string name="feedback_prompt" msgid="3656728972307896379">"Let the developer know your feedback. Was this correct?"</string> <string name="notification_channel_controls_opened_accessibility" msgid="6111817750774381094">"Notification controls for <xliff:g id="APP_NAME">%1$s</xliff:g> opened"</string> <string name="notification_channel_controls_closed_accessibility" msgid="1561909368876911701">"Notification controls for <xliff:g id="APP_NAME">%1$s</xliff:g> closed"</string> <string name="notification_more_settings" msgid="4936228656989201793">"More settings"</string> - <string name="notification_app_settings" msgid="8963648463858039377">"Customise"</string> + <string name="notification_app_settings" msgid="8963648463858039377">"Customize"</string> <string name="notification_conversation_bubble" msgid="2242180995373949022">"Show bubble"</string> <string name="notification_conversation_unbubble" msgid="6908427185031099868">"Remove bubbles"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> @@ -551,7 +551,7 @@ <string name="keyboard_key_dpad_down" msgid="2110172278574325796">"Down"</string> <string name="keyboard_key_dpad_left" msgid="8329738048908755640">"Left"</string> <string name="keyboard_key_dpad_right" msgid="6282105433822321767">"Right"</string> - <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centre"</string> + <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string> <string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string> <string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string> <string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string> @@ -561,7 +561,7 @@ <string name="keyboard_key_media_next" msgid="8502476691227914952">"Next"</string> <string name="keyboard_key_media_previous" msgid="5637875709190955351">"Previous"</string> <string name="keyboard_key_media_rewind" msgid="3450387734224327577">"Rewind"</string> - <string name="keyboard_key_media_fast_forward" msgid="3572444327046911822">"Fast-Forward"</string> + <string name="keyboard_key_media_fast_forward" msgid="3572444327046911822">"Fast Forward"</string> <string name="keyboard_key_page_up" msgid="173914303254199845">"Page Up"</string> <string name="keyboard_key_page_down" msgid="9035902490071829731">"Page Down"</string> <string name="keyboard_key_forward_del" msgid="5325501825762733459">"Delete"</string> @@ -573,10 +573,10 @@ <string name="notif_inline_reply_remove_attachment_description" msgid="7954075334095405429">"Remove attachment"</string> <string name="keyboard_shortcut_group_system" msgid="1583416273777875970">"System"</string> <string name="keyboard_shortcut_group_system_home" msgid="7465138628692109907">"Home"</string> - <string name="keyboard_shortcut_group_system_recents" msgid="8628108256824616927">"Recent"</string> + <string name="keyboard_shortcut_group_system_recents" msgid="8628108256824616927">"Recents"</string> <string name="keyboard_shortcut_group_system_back" msgid="1055709713218453863">"Back"</string> <string name="keyboard_shortcut_group_system_notifications" msgid="3615971650562485878">"Notifications"</string> - <string name="keyboard_shortcut_group_system_shortcuts_helper" msgid="4856808328618265589">"Keyboard shortcuts"</string> + <string name="keyboard_shortcut_group_system_shortcuts_helper" msgid="4856808328618265589">"Keyboard Shortcuts"</string> <string name="keyboard_shortcut_group_system_switch_input" msgid="952555530383268166">"Switch keyboard layout"</string> <string name="keyboard_shortcut_group_applications" msgid="7386239431100651266">"Applications"</string> <string name="keyboard_shortcut_group_applications_assist" msgid="771606231466098742">"Assist"</string> @@ -618,7 +618,7 @@ <string name="save" msgid="3392754183673848006">"Save"</string> <string name="reset" msgid="8715144064608810383">"Reset"</string> <string name="clipboard" msgid="8517342737534284617">"Clipboard"</string> - <string name="accessibility_key" msgid="3471162841552818281">"Customised navigation button"</string> + <string name="accessibility_key" msgid="3471162841552818281">"Custom navigation button"</string> <string name="left_keycode" msgid="8211040899126637342">"Left keycode"</string> <string name="right_keycode" msgid="2480715509844798438">"Right keycode"</string> <string name="left_icon" msgid="5036278531966897006">"Left icon"</string> @@ -630,7 +630,7 @@ <string name="qs_edit" msgid="5583565172803472437">"Edit"</string> <string name="tuner_time" msgid="2450785840990529997">"Time"</string> <string-array name="clock_options"> - <item msgid="3986445361435142273">"Show hours, minutes and seconds"</item> + <item msgid="3986445361435142273">"Show hours, minutes, and seconds"</item> <item msgid="1271006222031257266">"Show hours and minutes (default)"</item> <item msgid="6135970080453877218">"Don\'t show this icon"</item> </string-array> @@ -657,7 +657,7 @@ <string name="accessibility_quick_settings_collapse" msgid="4674876336725041982">"Close quick settings."</string> <string name="accessibility_quick_settings_user" msgid="505821942882668619">"Signed in as <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="accessibility_quick_settings_choose_user_action" msgid="4554388498186576087">"choose user"</string> - <string name="data_connection_no_internet" msgid="691058178914184544">"No Internet"</string> + <string name="data_connection_no_internet" msgid="691058178914184544">"No internet"</string> <string name="accessibility_quick_settings_open_settings" msgid="536838345505030893">"Open <xliff:g id="ID_1">%s</xliff:g> settings."</string> <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit order of settings."</string> <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"Power menu"</string> @@ -665,14 +665,14 @@ <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Phone turned off due to heat"</string> <string name="thermal_shutdown_message" msgid="6142269839066172984">"Your phone is now running normally.\nTap for more info"</string> - <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> + <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video, or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"See care steps"</string> <string name="high_temp_title" msgid="2218333576838496100">"Phone is getting warm"</string> - <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features are limited while phone cools down.\nTap for more info"</string> - <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run more slowly.\n\nOnce your phone has cooled down, it will run normally."</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features limited while phone cools down.\nTap for more info"</string> + <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally."</string> <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"See care steps"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Unplug charger"</string> - <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adaptor, and take care as the cable may be warm."</string> + <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adapter, and take care as the cable may be warm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"See care steps"</string> <string name="lockscreen_shortcut_left" msgid="1238765178956067599">"Left shortcut"</string> <string name="lockscreen_shortcut_right" msgid="4138414674531853719">"Right shortcut"</string> @@ -697,11 +697,11 @@ <string name="instant_apps" msgid="8337185853050247304">"Instant Apps"</string> <string name="instant_apps_title" msgid="8942706782103036910">"<xliff:g id="APP">%1$s</xliff:g> running"</string> <string name="instant_apps_message" msgid="6112428971833011754">"App opened without being installed."</string> - <string name="instant_apps_message_with_help" msgid="1816952263531203932">"App opened without being installed. Tap to find out more."</string> + <string name="instant_apps_message_with_help" msgid="1816952263531203932">"App opened without being installed. Tap to learn more."</string> <string name="app_info" msgid="5153758994129963243">"App info"</string> <string name="go_to_web" msgid="636673528981366511">"Go to browser"</string> <string name="mobile_data" msgid="4564407557775397216">"Mobile data"</string> - <string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string> + <string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string> <string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi is off"</string> <string name="bt_is_off" msgid="7436344904889461591">"Bluetooth is off"</string> @@ -712,18 +712,18 @@ <string name="running_foreground_services_title" msgid="5137313173431186685">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="3009459259222695385">"Tap for details on battery and data usage"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Turn off mobile data?"</string> - <string name="mobile_data_disable_message" msgid="8604966027899770415">"You won\'t have access to data or the Internet through <xliff:g id="CARRIER">%s</xliff:g>. Internet will only be available via Wi-Fi."</string> + <string name="mobile_data_disable_message" msgid="8604966027899770415">"You wont have access to data or the internet through <xliff:g id="CARRIER">%s</xliff:g>. Internet will only be available via Wi-Fi."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"your carrier"</string> <string name="touch_filtered_warning" msgid="8119511393338714836">"Because an app is obscuring a permission request, Settings can’t verify your response."</string> <string name="slice_permission_title" msgid="3262615140094151017">"Allow <xliff:g id="APP_0">%1$s</xliff:g> to show <xliff:g id="APP_2">%2$s</xliff:g> slices?"</string> - <string name="slice_permission_text_1" msgid="6675965177075443714">"– It can read information from <xliff:g id="APP">%1$s</xliff:g>"</string> - <string name="slice_permission_text_2" msgid="6758906940360746983">"– It can take actions inside <xliff:g id="APP">%1$s</xliff:g>"</string> + <string name="slice_permission_text_1" msgid="6675965177075443714">"- It can read information from <xliff:g id="APP">%1$s</xliff:g>"</string> + <string name="slice_permission_text_2" msgid="6758906940360746983">"- It can take actions inside <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="slice_permission_checkbox" msgid="4242888137592298523">"Allow <xliff:g id="APP">%1$s</xliff:g> to show slices from any app"</string> <string name="slice_permission_allow" msgid="6340449521277951123">"Allow"</string> <string name="slice_permission_deny" msgid="6870256451658176895">"Deny"</string> <string name="auto_saver_title" msgid="6873691178754086596">"Tap to schedule Battery Saver"</string> <string name="auto_saver_text" msgid="3214960308353838764">"Turn on when battery is likely to run out"</string> - <string name="no_auto_saver_action" msgid="7467924389609773835">"No, thanks"</string> + <string name="no_auto_saver_action" msgid="7467924389609773835">"No thanks"</string> <string name="heap_dump_tile_name" msgid="2464189856478823046">"Dump SysUI Heap"</string> <string name="ongoing_privacy_dialog_a11y_title" msgid="2205794093673327974">"In use"</string> <string name="ongoing_privacy_chip_content_multiple_apps" msgid="8341216022442383954">"Applications are using your <xliff:g id="TYPES_LIST">%s</xliff:g>."</string> @@ -742,8 +742,8 @@ <string name="privacy_type_media_projection" msgid="8136723828804251547">"screen recording"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"No title"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> - <string name="magnification_window_title" msgid="4863914360847258333">"Magnification window"</string> - <string name="magnification_controls_title" msgid="8421106606708891519">"Magnification window controls"</string> + <string name="magnification_window_title" msgid="4863914360847258333">"Magnification Window"</string> + <string name="magnification_controls_title" msgid="8421106606708891519">"Magnification Window Controls"</string> <string name="accessibility_control_zoom_in" msgid="1189272315480097417">"Zoom in"</string> <string name="accessibility_control_zoom_out" msgid="69578832020304084">"Zoom out"</string> <string name="accessibility_control_move_up" msgid="6622825494014720136">"Move up"</string> @@ -754,7 +754,7 @@ <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Magnify full screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Magnify part of screen"</string> <string name="magnification_mode_switch_click_label" msgid="2786203505805898199">"Switch"</string> - <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Tap to open accessibility features. Customise or replace this button in Settings.\n\n"<annotation id="link">"View settings"</annotation></string> + <string name="accessibility_floating_button_migration_tooltip" msgid="5217151214439341902">"Tap to open accessibility features. Customize or replace this button in Settings.\n\n"<annotation id="link">"View settings"</annotation></string> <string name="accessibility_floating_button_docking_tooltip" msgid="6814897496767461517">"Move button to the edge to hide it temporarily"</string> <string name="accessibility_floating_button_action_move_top_left" msgid="6253520703618545705">"Move top left"</string> <string name="accessibility_floating_button_action_move_top_right" msgid="6106225581993479711">"Move top right"</string> @@ -770,15 +770,15 @@ <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> control added.</item> </plurals> <string name="controls_removed" msgid="3731789252222856959">"Removed"</string> - <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favourited"</string> - <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favourited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> - <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavourited"</string> - <string name="accessibility_control_change_favorite" msgid="2943178027582253261">"favourite"</string> - <string name="accessibility_control_change_unfavorite" msgid="6997408061750740327">"unfavourite"</string> + <string name="accessibility_control_favorite" msgid="8694362691985545985">"Favorited"</string> + <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Favorited, position <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string name="accessibility_control_not_favorite" msgid="1291760269563092359">"Unfavorited"</string> + <string name="accessibility_control_change_favorite" msgid="2943178027582253261">"favorite"</string> + <string name="accessibility_control_change_unfavorite" msgid="6997408061750740327">"unfavorite"</string> <string name="accessibility_control_move" msgid="8980344493796647792">"Move to position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="controls_favorite_default_title" msgid="967742178688938137">"Controls"</string> <string name="controls_favorite_subtitle" msgid="6481675111056961083">"Choose controls to access from Quick Settings"</string> - <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold and drag to rearrange controls"</string> + <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold & drag to rearrange controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> <string name="controls_favorite_see_other_apps" msgid="7709087332255283460">"See other apps"</string> @@ -789,11 +789,11 @@ <string name="controls_dialog_ok" msgid="2770230012857881822">"Add"</string> <string name="controls_dialog_message" msgid="342066938390663844">"Suggested by <xliff:g id="APP">%s</xliff:g>"</string> <string name="controls_tile_locked" msgid="731547768182831938">"Device locked"</string> - <string name="controls_settings_show_controls_dialog_title" msgid="3357852503553809554">"Show and control devices from the lock screen?"</string> - <string name="controls_settings_show_controls_dialog_message" msgid="7666211700524587969">"You can add controls for your external devices to the lock screen.\n\nYour device app may allow you to control some devices without unlocking your phone or tablet.\n\nYou can make changes at any time in Settings."</string> - <string name="controls_settings_trivial_controls_dialog_title" msgid="7593188157655036677">"Control devices from the lock screen?"</string> + <string name="controls_settings_show_controls_dialog_title" msgid="3357852503553809554">"Show and control devices from lock screen?"</string> + <string name="controls_settings_show_controls_dialog_message" msgid="7666211700524587969">"You can add controls for your external devices to the lock screen.\n\nYour device app may allow you to control some devices without unlocking your phone or tablet.\n\nYou can make changes any time in Settings."</string> + <string name="controls_settings_trivial_controls_dialog_title" msgid="7593188157655036677">"Control devices from lock screen?"</string> <string name="controls_settings_trivial_controls_dialog_message" msgid="237183787721917586">"You can control some devices without unlocking your phone or tablet.\n\nYour device app determines which devices can be controlled in this way."</string> - <string name="controls_settings_dialog_neutral_button" msgid="4514446354793124140">"No, thanks"</string> + <string name="controls_settings_dialog_neutral_button" msgid="4514446354793124140">"No thanks"</string> <string name="controls_settings_dialog_positive_button" msgid="436070672551674863">"Yes"</string> <string name="controls_pin_use_alphanumeric" msgid="8478371861023048414">"PIN contains letters or symbols"</string> <string name="controls_pin_verify" msgid="3452778292918877662">"Verify <xliff:g id="DEVICE">%s</xliff:g>"</string> @@ -828,7 +828,7 @@ <string name="controls_error_timeout" msgid="794197289772728958">"Inactive, check app"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Not found"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Control is unavailable"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Couldn’t access <xliff:g id="DEVICE">%1$s</xliff:g>. Check the <xliff:g id="APPLICATION">%2$s</xliff:g> app to make sure that the control is still available and that the app settings haven’t changed."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Couldn’t access <xliff:g id="DEVICE">%1$s</xliff:g>. Check the <xliff:g id="APPLICATION">%2$s</xliff:g> app to make sure the control is still available and that the app settings haven’t changed."</string> <string name="controls_open_app" msgid="483650971094300141">"Open app"</string> <string name="controls_error_generic" msgid="352500456918362905">"Can’t load status"</string> <string name="controls_error_failed" msgid="960228639198558525">"Error, try again"</string> @@ -836,7 +836,7 @@ <string name="controls_menu_edit" msgid="890623986951347062">"Edit controls"</string> <string name="media_output_dialog_add_output" msgid="5642703238877329518">"Add outputs"</string> <string name="media_output_dialog_group" msgid="5571251347877452212">"Group"</string> - <string name="media_output_dialog_single_device" msgid="3102758980643351058">"One device selected"</string> + <string name="media_output_dialog_single_device" msgid="3102758980643351058">"1 device selected"</string> <string name="media_output_dialog_multiple_devices" msgid="1093771040315422350">"<xliff:g id="COUNT">%1$d</xliff:g> devices selected"</string> <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(disconnected)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Can\'t switch. Tap to try again."</string> @@ -848,9 +848,9 @@ <string name="media_output_dialog_accessibility_seekbar" msgid="5332843993805568978">"Volume"</string> <string name="media_output_first_broadcast_title" msgid="6292237789860753022">"How broadcasting works"</string> <string name="media_output_broadcast" msgid="3555580945878071543">"Broadcast"</string> - <string name="media_output_first_notify_broadcast_message" msgid="6353857724136398494">"People near you with compatible Bluetooth devices can listen to the media that you\'re broadcasting"</string> + <string name="media_output_first_notify_broadcast_message" msgid="6353857724136398494">"People near you with compatible Bluetooth devices can listen to the media you\'re broadcasting"</string> <string name="media_output_broadcasting_message" msgid="4150299923404886073">"To listen to your broadcast, people nearby with compatible Bluetooth devices can scan your QR code or use your broadcast name and password"</string> - <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast name"</string> + <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast Name"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Save"</string> <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Starting…"</string> @@ -861,21 +861,21 @@ <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Conversation widgets"</string> - <string name="select_conversation_text" msgid="3376048251434956013">"Tap a conversation to add it to your home screen"</string> + <string name="select_conversation_text" msgid="3376048251434956013">"Tap a conversation to add it to your Home screen"</string> <string name="no_conversations_text" msgid="5354115541282395015">"Your recent conversations will show up here"</string> <string name="priority_conversations" msgid="3967482288896653039">"Priority conversations"</string> <string name="recent_conversations" msgid="8531874684782574622">"Recent conversations"</string> <string name="days_timestamp" msgid="5821854736213214331">"<xliff:g id="DURATION">%1$s</xliff:g> days ago"</string> <string name="one_week_timestamp" msgid="4925600765473875590">"1 week ago"</string> <string name="two_weeks_timestamp" msgid="9111801081871962155">"2 weeks ago"</string> - <string name="over_one_week_timestamp" msgid="3770560704420807142">"More than 1 week ago"</string> - <string name="over_two_weeks_timestamp" msgid="6300507859007874050">"More than 2 weeks ago"</string> + <string name="over_one_week_timestamp" msgid="3770560704420807142">"Over 1 week ago"</string> + <string name="over_two_weeks_timestamp" msgid="6300507859007874050">"Over 2 weeks ago"</string> <string name="birthday_status" msgid="2596961629465396761">"Birthday"</string> - <string name="birthday_status_content_description" msgid="682836371128282925">"It\'s <xliff:g id="NAME">%1$s</xliff:g>\'s birthday"</string> + <string name="birthday_status_content_description" msgid="682836371128282925">"It\'s <xliff:g id="NAME">%1$s</xliff:g>s birthday"</string> <string name="upcoming_birthday_status" msgid="2005452239256870351">"Birthday soon"</string> - <string name="upcoming_birthday_status_content_description" msgid="2165036816803797148">"It\'s <xliff:g id="NAME">%1$s</xliff:g>\'s birthday soon"</string> + <string name="upcoming_birthday_status_content_description" msgid="2165036816803797148">"It\'s <xliff:g id="NAME">%1$s</xliff:g>s birthday soon"</string> <string name="anniversary_status" msgid="1790034157507590838">"Anniversary"</string> - <string name="anniversary_status_content_description" msgid="8212171790843327442">"It\'s <xliff:g id="NAME">%1$s</xliff:g>\'s anniversary"</string> + <string name="anniversary_status_content_description" msgid="8212171790843327442">"It\'s <xliff:g id="NAME">%1$s</xliff:g>s anniversary"</string> <string name="location_status" msgid="1294990572202541812">"Sharing location"</string> <string name="location_status_content_description" msgid="2982386178160071305">"<xliff:g id="NAME">%1$s</xliff:g> is sharing location"</string> <string name="new_story_status" msgid="9012195158584846525">"New story"</string> @@ -888,7 +888,7 @@ <string name="status_before_loading" msgid="1500477307859631381">"Content will show up soon"</string> <string name="missed_call" msgid="4228016077700161689">"Missed call"</string> <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> - <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> + <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls, and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> <string name="new_notification_text_content_description" msgid="2915029960094389291">"<xliff:g id="NAME">%1$s</xliff:g> sent a message: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string> @@ -899,13 +899,13 @@ <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tap for more information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No alarm set"</string> <string name="accessibility_fingerprint_label" msgid="5255731221854153660">"Fingerprint sensor"</string> - <string name="accessibility_authenticate_hint" msgid="798914151813205721">"Authenticate"</string> + <string name="accessibility_authenticate_hint" msgid="798914151813205721">"authenticate"</string> <string name="accessibility_enter_hint" msgid="2617864063504824834">"enter device"</string> <string name="keyguard_try_fingerprint" msgid="2825130772993061165">"Use fingerprint to open"</string> <string name="accessibility_fingerprint_bouncer" msgid="7189102492498735519">"Authentication required. Touch the fingerprint sensor to authenticate."</string> <string name="ongoing_phone_call_content_description" msgid="5332334388483099947">"Ongoing phone call"</string> <string name="mobile_data_settings_title" msgid="3955246641380064901">"Mobile data"</string> - <string name="preference_summary_default_combination" msgid="8453246369903749670">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string> + <string name="preference_summary_default_combination" msgid="8453246369903749670">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string> <string name="mobile_data_connection_active" msgid="944490013299018227">"Connected"</string> <string name="mobile_data_off_summary" msgid="3663995422004150567">"Mobile data won\'t auto‑connect"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"No connection"</string> @@ -918,7 +918,7 @@ <string name="wifi_failed_connect_message" msgid="4161863112079000071">"Failed to connect to network"</string> <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"Wi‑Fi won’t auto-connect for now"</string> <string name="see_all_networks" msgid="3773666844913168122">"See all"</string> - <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"To switch networks, disconnect Ethernet"</string> + <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"To switch networks, disconnect ethernet"</string> <string name="wifi_scan_notify_message" msgid="3753839537448621794">"To improve device experience, apps and services can still scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. You can change this in Wi‑Fi scanning settings. "<annotation id="link">"Change"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Turn off Airplane mode"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> wants to add the following tile to Quick Settings"</string> @@ -945,13 +945,13 @@ <string name="clipboard_text_copied" msgid="5100836834278976679">"Text copied"</string> <string name="clipboard_image_copied" msgid="3793365360174328722">"Image copied"</string> <string name="clipboard_content_copied" msgid="144452398567828145">"Content copied"</string> - <string name="clipboard_editor" msgid="2971197550401892843">"Clipboard editor"</string> + <string name="clipboard_editor" msgid="2971197550401892843">"Clipboard Editor"</string> <string name="clipboard_overlay_window_name" msgid="6450043652167357664">"Clipboard"</string> <string name="clipboard_image_preview" msgid="2156475174343538128">"Image preview"</string> <string name="clipboard_edit" msgid="4500155216174011640">"edit"</string> <string name="add" msgid="81036585205287996">"Add"</string> <string name="manage_users" msgid="1823875311934643849">"Manage users"</string> - <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Split screen."</string> + <string name="drag_split_not_supported" msgid="4326847447699729722">"This notification does not support dragging to Splitscreen."</string> <string name="dream_overlay_status_bar_wifi_off" msgid="4497069245055003582">"Wi‑Fi unavailable"</string> <string name="dream_overlay_status_bar_priority_mode" msgid="5428462123314728739">"Priority mode"</string> <string name="dream_overlay_status_bar_alarm_set" msgid="566707328356590886">"Alarm set"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings_tv.xml b/packages/SystemUI/res/values-en-rCA/strings_tv.xml index 09401c34a03f..4dbabcfb8c29 100644 --- a/packages/SystemUI/res/values-en-rCA/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rCA/strings_tv.xml @@ -23,11 +23,11 @@ <string name="notification_vpn_disconnected" msgid="7150747626448044843">"VPN is disconnected"</string> <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> - <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No notifications"</string> + <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No Notifications"</string> <string name="mic_recording_announcement" msgid="7587123608060316575">"Microphone is recording"</string> <string name="camera_recording_announcement" msgid="7240177719403759112">"Camera is recording"</string> - <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and microphone are recording"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and Microphone are recording"</string> <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Microphone stopped recording"</string> <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Camera stopped recording"</string> - <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and microphone stopped recording"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and Microphone stopped recording"</string> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index a66b2144ddef..48d6bcefcb8f 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -209,7 +209,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="936972553861524360">"ဖန်သားပြင် အနေအထားက အလျားလိုက်အဖြစ် ပုံသေ လုပ်ထားပါသည်"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="2356633398683813837">"ဖန်သားပြင် အနေအထားက ဒေါင်လိုက်အဖြစ် ပုံသေ လုပ်ထားပါသည်"</string> <string name="dessert_case" msgid="9104973640704357717">"မုန့်ထည့်သော ပုံး"</string> - <string name="start_dreams" msgid="9131802557946276718">"ဖန်သားပြင်အသုံးပြုမှု ချွေတာမှုစနစ်"</string> + <string name="start_dreams" msgid="9131802557946276718">"စခရင်နားချိန်"</string> <string name="ethernet_label" msgid="2203544727007463351">"အီသာနက်"</string> <string name="quick_settings_dnd_label" msgid="7728690179108024338">"မနှောင့်ယှက်ရ"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"ဘလူးတုသ်"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index e2cc98e87495..f56377355033 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -469,7 +469,7 @@ <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"正在更新"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"解锁设备即可使用"</string> <string name="wallet_error_generic" msgid="257704570182963611">"获取您的卡片时出现问题，请稍后重试"</string> - <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"锁定屏幕设置"</string> + <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"锁屏设置"</string> <string name="qr_code_scanner_title" msgid="5290201053875420785">"扫描二维码"</string> <string name="status_bar_work" msgid="5238641949837091056">"工作资料"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"飞行模式"</string> diff --git a/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt b/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt index dc79f40ffef6..6f645b562008 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt @@ -26,6 +26,7 @@ import java.util.concurrent.Executor import javax.inject.Inject import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.statusbar.policy.DeviceProvisionedController interface ChipVisibilityListener { fun onChipVisibilityRefreshed(visible: Boolean) @@ -54,7 +55,8 @@ class HeaderPrivacyIconsController @Inject constructor( private val activityStarter: ActivityStarter, private val appOpsController: AppOpsController, private val broadcastDispatcher: BroadcastDispatcher, - private val safetyCenterManager: SafetyCenterManager + private val safetyCenterManager: SafetyCenterManager, + private val deviceProvisionedController: DeviceProvisionedController ) { var chipVisibilityListener: ChipVisibilityListener? = null @@ -134,6 +136,8 @@ class HeaderPrivacyIconsController @Inject constructor( fun onParentVisible() { privacyChip.setOnClickListener { + // Do not expand dialog while device is not provisioned + if (!deviceProvisionedController.isDeviceProvisioned) return@setOnClickListener // If the privacy chip is visible, it means there were some indicators uiEventLogger.log(PrivacyChipEvent.ONGOING_INDICATORS_CHIP_CLICK) if (safetyCenterEnabled) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/HeaderPrivacyIconsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/HeaderPrivacyIconsControllerTest.kt index 4c7240673fb0..3620233fc9df 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/HeaderPrivacyIconsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/HeaderPrivacyIconsControllerTest.kt @@ -19,6 +19,7 @@ import com.android.systemui.privacy.PrivacyDialogController import com.android.systemui.privacy.PrivacyItemController import com.android.systemui.privacy.logging.PrivacyLogger import com.android.systemui.statusbar.phone.StatusIconContainer +import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor @@ -66,6 +67,8 @@ class HeaderPrivacyIconsControllerTest : SysuiTestCase() { private lateinit var broadcastDispatcher: BroadcastDispatcher @Mock private lateinit var safetyCenterManager: SafetyCenterManager + @Mock + private lateinit var deviceProvisionedController: DeviceProvisionedController private val uiExecutor = FakeExecutor(FakeSystemClock()) private val backgroundExecutor = FakeExecutor(FakeSystemClock()) @@ -80,6 +83,7 @@ class HeaderPrivacyIconsControllerTest : SysuiTestCase() { whenever(privacyChip.context).thenReturn(context) whenever(privacyChip.resources).thenReturn(context.resources) whenever(privacyChip.isAttachedToWindow).thenReturn(true) + whenever(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) cameraSlotName = context.getString(com.android.internal.R.string.status_bar_camera) microphoneSlotName = context.getString(com.android.internal.R.string.status_bar_microphone) @@ -98,7 +102,8 @@ class HeaderPrivacyIconsControllerTest : SysuiTestCase() { activityStarter, appOpsController, broadcastDispatcher, - safetyCenterManager + safetyCenterManager, + deviceProvisionedController ) backgroundExecutor.runAllReady() @@ -199,6 +204,18 @@ class HeaderPrivacyIconsControllerTest : SysuiTestCase() { ) } + @Test + fun testNoDialogWhenDeviceNotProvisioned() { + whenever(deviceProvisionedController.isDeviceProvisioned).thenReturn(false) + controller.onParentVisible() + + val captor = argumentCaptor<View.OnClickListener>() + verify(privacyChip).setOnClickListener(capture(captor)) + + captor.value.onClick(privacyChip) + verify(privacyDialogController, never()).showDialog(any(Context::class.java)) + } + private fun setPrivacyController(micCamera: Boolean, location: Boolean) { whenever(privacyItemController.micCameraAvailable).thenReturn(micCamera) whenever(privacyItemController.locationAvailable).thenReturn(location) diff --git a/packages/overlays/DisplayCutoutEmulationHoleOverlay/res/values-en-rCA/strings.xml b/packages/overlays/DisplayCutoutEmulationHoleOverlay/res/values-en-rCA/strings.xml index 9db960fe68c1..e7ec332a6f7a 100644 --- a/packages/overlays/DisplayCutoutEmulationHoleOverlay/res/values-en-rCA/strings.xml +++ b/packages/overlays/DisplayCutoutEmulationHoleOverlay/res/values-en-rCA/strings.xml @@ -17,5 +17,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="display_cutout_emulation_overlay" msgid="7305489596221077240">"Punch hole cutout"</string> + <string name="display_cutout_emulation_overlay" msgid="7305489596221077240">"Punch Hole cutout"</string> </resources> diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a78c64b6538d..fb9d60af10cd 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -3760,22 +3760,27 @@ public class ActivityManagerService extends IActivityManager.Stub finishForceStopPackageLocked(packageName, appInfo.uid); } } - final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED, - Uri.fromParts("package", packageName, null)); - intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); - intent.putExtra(Intent.EXTRA_UID, (appInfo != null) ? appInfo.uid : -1); - intent.putExtra(Intent.EXTRA_USER_HANDLE, resolvedUserId); - final int[] visibilityAllowList = - mPackageManagerInt.getVisibilityAllowList(packageName, resolvedUserId); - if (isInstantApp) { - intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); - broadcastIntentInPackage("android", null, SYSTEM_UID, uid, pid, intent, - null, null, 0, null, null, permission.ACCESS_INSTANT_APPS, null, - false, false, resolvedUserId, false, null, visibilityAllowList); - } else { - broadcastIntentInPackage("android", null, SYSTEM_UID, uid, pid, intent, - null, null, 0, null, null, null, null, false, false, resolvedUserId, - false, null, visibilityAllowList); + + if (succeeded) { + final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED, + Uri.fromParts("package", packageName, null /* fragment */)); + intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); + intent.putExtra(Intent.EXTRA_UID, + (appInfo != null) ? appInfo.uid : INVALID_UID); + intent.putExtra(Intent.EXTRA_USER_HANDLE, resolvedUserId); + if (isInstantApp) { + intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); + } + final int[] visibilityAllowList = mPackageManagerInt.getVisibilityAllowList( + packageName, resolvedUserId); + + broadcastIntentInPackage("android", null /* featureId */, SYSTEM_UID, + uid, pid, intent, null /* resolvedType */, null /* resultTo */, + 0 /* resultCode */, null /* resultData */, null /* resultExtras */, + isInstantApp ? permission.ACCESS_INSTANT_APPS : null, + null /* bOptions */, false /* serialized */, false /* sticky */, + resolvedUserId, false /* allowBackgroundActivityStarts */, + null /* backgroundActivityStartsToken */, visibilityAllowList); } if (observer != null) { diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index 4044cceb606b..9ccf83996782 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java @@ -377,11 +377,16 @@ public final class PendingIntentRecord extends IIntentSender.Stub { resolvedType = key.requestResolvedType; } - // Apply any launch flags from the ActivityOptions. This is to ensure that the caller - // can specify a consistent launch mode even if the PendingIntent is immutable + // Apply any launch flags from the ActivityOptions. This is used only by SystemUI + // to ensure that we can launch the pending intent with a consistent launch mode even + // if the provided PendingIntent is immutable (ie. to force an activity to launch into + // a new task, or to launch multiple instances if supported by the app) final ActivityOptions opts = ActivityOptions.fromBundle(options); if (opts != null) { - finalIntent.addFlags(opts.getPendingIntentLaunchFlags()); + // TODO(b/254490217): Move this check into SafeActivityOptions + if (controller.mAtmInternal.isCallerRecents(Binder.getCallingUid())) { + finalIntent.addFlags(opts.getPendingIntentLaunchFlags()); + } } // Extract options before clearing calling identity diff --git a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java index 6759d79eedca..9a190316f4eb 100644 --- a/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java +++ b/services/core/java/com/android/server/media/MediaButtonReceiverHolder.java @@ -32,7 +32,6 @@ import android.os.Handler; import android.os.PowerWhitelistManager; import android.os.UserHandle; import android.text.TextUtils; -import android.util.EventLog; import android.util.Log; import android.view.KeyEvent; @@ -118,12 +117,6 @@ final class MediaButtonReceiverHolder { int componentType = getComponentType(pendingIntent); ComponentName componentName = getComponentName(pendingIntent, componentType); if (componentName != null) { - if (!TextUtils.equals(componentName.getPackageName(), sessionPackageName)) { - EventLog.writeEvent(0x534e4554, "238177121", -1, ""); // SafetyNet logging - throw new IllegalArgumentException("ComponentName does not belong to " - + "sessionPackageName. sessionPackageName = " + sessionPackageName - + ", ComponentName pkg = " + componentName.getPackageName()); - } return new MediaButtonReceiverHolder(userId, pendingIntent, componentName, componentType); } diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index b8131a8ee5b5..0785fac17984 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -940,14 +940,6 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR @Override public void setMediaButtonReceiver(PendingIntent pi, String sessionPackageName) throws RemoteException { - //mPackageName has been verified in MediaSessionService.enforcePackageName(). - if (!TextUtils.equals(sessionPackageName, mPackageName)) { - EventLog.writeEvent(0x534e4554, "238177121", -1, ""); // SafetyNet logging - throw new IllegalArgumentException("sessionPackageName name does not match " - + "package name provided to MediaSessionRecord. sessionPackageName = " - + sessionPackageName + ", pkg = " - + mPackageName); - } final long token = Binder.clearCallingIdentity(); try { if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER) @@ -969,12 +961,11 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR //mPackageName has been verified in MediaSessionService.enforcePackageName(). if (receiver != null && !TextUtils.equals( mPackageName, receiver.getPackageName())) { - EventLog.writeEvent(0x534e4554, "238177121", -1, ""); // SafetyNet logging + EventLog.writeEvent(0x534e4554, "238177121", -1, ""); // SafetyNet logging. throw new IllegalArgumentException("receiver does not belong to " + "package name provided to MediaSessionRecord. Pkg = " + mPackageName + ", Receiver Pkg = " + receiver.getPackageName()); } - if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER) != 0) { return; diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 16df5deb2e5c..cdd0ee752c4a 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -194,10 +194,10 @@ java_genrule { ":FrameworksServicesTests_install_uses_sdk_q0", ":FrameworksServicesTests_install_uses_sdk_q0_r0", ":FrameworksServicesTests_install_uses_sdk_r0", - ":FrameworksServicesTests_install_uses_sdk_r5", + ":FrameworksServicesTests_install_uses_sdk_r1000", ":FrameworksServicesTests_install_uses_sdk_r_none", ":FrameworksServicesTests_install_uses_sdk_r0_s0", - ":FrameworksServicesTests_install_uses_sdk_r0_s5", + ":FrameworksServicesTests_install_uses_sdk_r0_s1000", ":FrameworksServicesTests_keyset_permdef_sa_unone", ":FrameworksServicesTests_keyset_permuse_sa_ua_ub", ":FrameworksServicesTests_keyset_permuse_sb_ua_ub", diff --git a/services/tests/servicestests/apks/install_uses_sdk/Android.bp b/services/tests/servicestests/apks/install_uses_sdk/Android.bp index a51293dc1997..289439561178 100644 --- a/services/tests/servicestests/apks/install_uses_sdk/Android.bp +++ b/services/tests/servicestests/apks/install_uses_sdk/Android.bp @@ -32,9 +32,9 @@ android_test_helper_app { } android_test_helper_app { - name: "FrameworksServicesTests_install_uses_sdk_r5", + name: "FrameworksServicesTests_install_uses_sdk_r1000", defaults: ["FrameworksServicesTests_apks_defaults"], - manifest: "AndroidManifest-r5.xml", + manifest: "AndroidManifest-r1000.xml", } android_test_helper_app { @@ -44,9 +44,9 @@ android_test_helper_app { } android_test_helper_app { - name: "FrameworksServicesTests_install_uses_sdk_r0_s5", + name: "FrameworksServicesTests_install_uses_sdk_r0_s1000", defaults: ["FrameworksServicesTests_apks_defaults"], - manifest: "AndroidManifest-r0-s5.xml", + manifest: "AndroidManifest-r0-s1000.xml", } android_test_helper_app { diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml b/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml index bafe4c4faa3f..25743b87cabd 100644 --- a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml +++ b/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29"> <!-- This fails because 31 is not version 5 --> <extension-sdk android:sdkVersion="30" android:minExtensionVersion="0" /> - <extension-sdk android:sdkVersion="31" android:minExtensionVersion="5" /> + <extension-sdk android:sdkVersion="31" android:minExtensionVersion="1000" /> </uses-sdk> <application> diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml b/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r1000.xml index 7723d051a041..9bf925417e49 100644 --- a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml +++ b/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r1000.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29"> <!-- This will fail to install, because minExtensionVersion is not met --> - <extension-sdk android:sdkVersion="30" android:minExtensionVersion="5" /> + <extension-sdk android:sdkVersion="30" android:minExtensionVersion="1000" /> </uses-sdk> <application> diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java b/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java index 07cca0ca6ba0..615b8daf8ff4 100644 --- a/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java @@ -630,10 +630,11 @@ public class PackageParserLegacyCoreTest { assertEquals(0, minExtVers.get(31, -1)); Map<Pair<String, Integer>, Integer> appToError = new HashMap<>(); - appToError.put(Pair.create("install_uses_sdk.apk_r5", R.raw.install_uses_sdk_r5), - PackageManager.INSTALL_FAILED_OLDER_SDK); - appToError.put(Pair.create("install_uses_sdk.apk_r0_s5", R.raw.install_uses_sdk_r0_s5), + appToError.put(Pair.create("install_uses_sdk.apk_r1000", R.raw.install_uses_sdk_r1000), PackageManager.INSTALL_FAILED_OLDER_SDK); + appToError.put( + Pair.create("install_uses_sdk.apk_r0_s1000", R.raw.install_uses_sdk_r0_s1000), + PackageManager.INSTALL_FAILED_OLDER_SDK); appToError.put(Pair.create("install_uses_sdk.apk_q0", R.raw.install_uses_sdk_q0), PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED); @@ -650,7 +651,7 @@ public class PackageParserLegacyCoreTest { int result = entry.getValue(); try { parsePackage(filename, resId, x -> x); - expect.withMessage("Expected parsing error %d from %s", result, filename).fail(); + expect.withMessage("Expected parsing error %s from %s", result, filename).fail(); } catch (PackageManagerException expected) { expect.that(expected.error).isEqualTo(result); } |